Index: archive/ekiga.xml
===================================================================
--- archive/ekiga.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
+++ archive/ekiga.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY ekiga-download-http "&gnome-download-http;/ekiga/4.0/ekiga-&ekiga-version;.tar.xz">
+  <!ENTITY ekiga-download-ftp  "&gnome-download-ftp;/ekiga/4.0/ekiga-&ekiga-version;.tar.xz">
+  <!ENTITY ekiga-md5sum        "704ba532a8e3e0b5e3e2971dd2db39e4">
+  <!ENTITY ekiga-size          "8.0 MB">
+  <!ENTITY ekiga-buildsize     "315 MB">
+  <!ENTITY ekiga-time          "3.5 SBU">
+]>
+
+<sect1 id="ekiga" xreflabel="Ekiga-&ekiga-version;">
+  <?dbhtml filename="ekiga.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Ekiga-&ekiga-version;</title>
+
+  <indexterm zone="ekiga">
+    <primary sortas="a-Ekiga">Ekiga</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Ekiga</title>
+
+    <para>
+      <application>Ekiga</application> is a VoIP, IP Telephony, and Video
+      Conferencing application that allows you to make audio and video calls to
+      remote users with SIP or H.323 compatible hardware and software.  It
+      supports many audio and video codecs and all modern VoIP features for
+      both SIP and H.323.  <application>Ekiga</application> is the first Open
+      Source application to support both H.323 and SIP, as well as audio and
+      video.
+    </para>
+
+    &lfs82_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&ekiga-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&ekiga-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &ekiga-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &ekiga-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &ekiga-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &ekiga-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Ekiga Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="boost"/>,
+      <xref linkend="gnome-icon-theme"/>,
+      <xref linkend="gtk2"/>, and
+      <xref linkend="opal"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="GConf"/>, and
+      <xref linkend="libnotify"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="avahi"/>,
+      <phrase revision="sysv"><ulink url="&gnome-download-http;/evolution-data-server/">
+      Evolution Data Server</ulink></phrase>
+      <phrase revision="systemd"><xref linkend="evolution-data-server"/></phrase>,
+      <ulink url="&gnome-download-http;/gnome-doc-utils/">
+      GNOME Doc Utils</ulink>, and
+      <xref linkend="openldap"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/ekiga"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Ekiga</title>
+
+    <para>
+      Install <application>Ekiga</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-eds     \
+            --disable-gdu     \
+            --disable-ldap    &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--disable-eds</parameter>: This switch disables support for the
+      <application>Evolution Data Server</application>. Remove if you have
+      installed <application>Evolution Data Server</application>.
+    </para>
+
+    <para>
+      <parameter>--disable-gdu</parameter>: This switch disables documentation
+      generation using <application>GNOME Doc Utils</application>. Remove if
+      you have installed <application>GNOME Doc Utils</application>.
+    </para>
+
+    <para>
+      <parameter>--disable-ldap</parameter>: This switch disables LDAP support
+      in <application>Ekiga</application>. Remove if you have installed
+      <application>OpenLDAP</application>.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/without-scrollkeeper.xml"/>
+
+    <para>
+      <option>--disable-dbus</option>: This switch disables
+      <application>D-Bus</application> support. Use if you have not installed
+      <application>D-Bus</application>.
+    </para>
+
+    <para>
+      <option>--enable-avahi</option>: This switch enables use of the
+      <application>Avahi</application> with <application>Ekiga</application>.
+      Use if you have installed <application>Avahi</application>.
+    </para>
+
+    <note>
+      <para>
+        If you have not installed recommended dependencies you will need
+        additional switches passed to <command>configure</command>. Examine
+        <command>./configure --help</command> output to see all available
+        switches.
+      </para>
+    </note>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          ekiga, ekiga-config-tool and ekiga-helper
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/lib/ekiga,
+          /usr/share/gnome/help/ekiga,
+          /usr/share/omf/ekiga,
+          /usr/share/pixmaps/ekiga and
+          /usr/share/sounds/ekiga
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="ekiga-prog">
+        <term><command>ekiga</command></term>
+        <listitem>
+          <para>
+            is a SIP and H.323 VoIP, IP Telephony and Video Conferencing
+            application which complies to the SIP and H.323 protocols.
+          </para>
+          <indexterm zone="ekiga ekiga-prog">
+            <primary sortas="b-ekiga">ekiga</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="ekiga-config-tool">
+        <term><command>ekiga-config-tool</command></term>
+        <listitem>
+          <para>
+            fixes problems with the Ekiga settings.
+          </para>
+          <indexterm zone="ekiga ekiga-config-tool">
+            <primary sortas="b-ekiga-config-tool">ekiga-config-tool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </sect2>
+
+</sect1>
Index: archive/midori.xml
===================================================================
--- archive/midori.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
+++ archive/midori.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY midori-download-http
+           "http://www.midori-browser.org/downloads/midori_&midori-version;_all_.tar.bz2">
+  <!ENTITY midori-download-ftp  " ">
+  <!ENTITY midori-md5sum        "fcc03ef759fce4fe9f2446d9da4a065e">
+  <!ENTITY midori-size          "1.4 MB">
+  <!ENTITY midori-buildsize     "91 MB">
+  <!ENTITY midori-time          "0.8 SBU">
+]>
+
+<sect1 id="midori" xreflabel="Midori-&midori-version;">
+  <?dbhtml filename="midori.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Midori-&midori-version;</title>
+
+  <indexterm zone="midori">
+    <primary sortas="a-Midori">Midori</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Midori</title>
+
+    <para>
+      <application>Midori</application> is a lightweight web browser that uses
+      <application>WebKitGTK+</application>.
+    </para>
+
+    &lfs82_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&midori-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&midori-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &midori-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &midori-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &midori-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &midori-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Midori Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cmake"/>,
+      <xref linkend="gcr"/>,
+      <xref linkend="libnotify"/>,
+      <xref linkend="webkitgtk"/> (see "Command Explanations"), and
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="librsvg"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>,
+      <!--<xref linkend="webkitgtk2"/>, and -->
+      <ulink url="http://webkitgtk.org/releases/">WebKitGTK+-2.4.11</ulink> , and 
+      <phrase revision="sysv"><ulink url="https://launchpad.net/zeitgeist/0.9/">Zeitgeist</ulink></phrase>
+      <phrase revision="systemd"><xref linkend="libzeitgeist"/></phrase>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/midori"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Midori</title>
+
+    <para>
+      Install <application>Midori</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>sed -e 's/protected Tally/public Tally/g'  \
+    -i midori/midori-notebook.vala         &amp;&amp;
+sed -e 's/%d other files/%u other files/g' \
+    -i extensions/transfers.vala           &amp;&amp;
+
+for f in transfers adblock/widgets apps history-list notes; do
+    sed -e 's/.remove (iter/.remove (ref iter/g' \
+        -i "extensions/$f.vala"
+done        &amp;&amp;
+
+mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      -DUSE_ZEITGEIST=OFF         \
+      -DHALF_BRO_INCOM_WEBKIT2=ON \
+      -DUSE_GTK3=1                \
+      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/midori-&midori-version; \
+      ..  &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a working test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed ...</command>: The recent release of vala generates errors
+      for some constructs that were accepted before. The <command>sed</command>
+      commands fix those errors.
+    </para>
+
+    <para>
+      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
+      used to apply a higher level of compiler optimizations.
+    </para>
+
+    <para>
+      <parameter>-DUSE_ZEITGEIST=OFF</parameter>: Remove this switch if
+      Zeitgeist is installed.
+    </para>
+
+    <para>
+      <parameter>-DHALF_BRO_INCOM_WEBKIT2=ON</parameter>: Links to <xref
+      linkend="webkitgtk"/> instead of WebKitGTK+-2.4.x. Strictly
+      speaking, <xref linkend="webkitgtk"/> is not required and Midori could
+      be linked to WebKitGTK+-2.4.x. The former used to be considered <quote>
+      experimental</quote> by upstream, but now is considered stable. However
+      the syntax has not yet been updated.
+    </para>
+
+    <para>
+      <parameter>-DUSE_GTK3=1</parameter>: Using this switch allows linking to
+      WebkitGTK+ built against <application>GTK+ 3</application>.
+    </para>
+
+    <para>
+      <option>-DUSE_APIDOCS=1</option>: Use this switch if
+      <application>GTK-Doc</application> is installed and you
+      wish to build and install the API documentation.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          midori
+        </seg>
+        <seg>
+          libmidori-core.so
+        </seg>
+        <seg>
+          /{etc/xdg,/usr/{lib,share}}/midori and
+          /usr/share/doc/midori-&midori-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="midori-prog">
+        <term><command>midori</command></term>
+        <listitem>
+          <para>
+            is a lightweight <application>WebKitGTK+</application> browser.
+          </para>
+          <indexterm zone="midori midori-prog">
+            <primary sortas="b-midori">midori</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/opal.xml
===================================================================
--- archive/opal.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
+++ archive/opal.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY opal-download-http "&gnome-download-http;/opal/3.10/opal-&opal-version;.tar.xz">
+  <!ENTITY opal-download-ftp  "&gnome-download-ftp;/opal/3.10/opal-&opal-version;.tar.xz">
+  <!ENTITY opal-md5sum        "6efa1b4c5e0ad6460019b4c6df0898d7">
+  <!ENTITY opal-size          "5.7 MB">
+  <!ENTITY opal-buildsize     "305 MB">
+  <!ENTITY opal-time          "2.0 SBU">
+]>
+
+<sect1 id="opal" xreflabel="Opal-&opal-version;">
+  <?dbhtml filename="opal.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Opal-&opal-version;</title>
+
+  <indexterm zone="opal">
+    <primary sortas="a-Opal">Opal</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Opal</title>
+
+    <para>
+      The <application>Opal</application> package contains a C++ class library for
+      normalising the numerous telephony protocols into a single integrated call
+      model.
+    </para>
+
+    &lfs82_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&opal-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&opal-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &opal-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &opal-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &opal-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &opal-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/opal-&opal-version;-ffmpeg2-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Opal Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="ptlib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="http://www.celt-codec.org/">Celt</ulink>,
+      <xref linkend="ffmpeg"/>,
+      <ulink url="http://www.quut.com/gsm/">GSM</ulink>,
+      <ulink url="http://www.isdn4linux.de/">ISDN4Linux</ulink>,
+      <xref linkend="libtheora"/>,
+      <xref linkend="openjdk"/>,
+      <xref linkend="ruby"/>,
+      <ulink url="http://www.soft-switch.org/">Spandsp</ulink>,
+      <xref linkend="speex"/>, and
+      <xref linkend="x264"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/opal"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Opal</title>
+
+    <para>Fix a build issue with <application>GCC-7.1</application>:</para>
+
+<screen><userinput>sed -i 's| abs(| std::fabs(|g' plugins/video/common/mpi.cxx</userinput></screen>
+
+    <para>Install <application>Opal</application> by running the following
+    commands:</para>
+
+<screen><userinput>patch -Np1 -i ../opal-&opal-version;-ffmpeg2-1.patch &amp;&amp;
+
+sed -e 's/CODEC_ID/AV_&amp;/' \
+    -e 's/PIX_FMT_/AV_&amp;/' \
+    -i plugins/video/H.263-1998/h263-1998.cxx \
+       plugins/video/common/dyna.cxx          \
+       plugins/video/H.264/h264-x264.cxx      \
+       plugins/video/MPEG4-ffmpeg/mpeg4.cxx   &amp;&amp;
+
+sed -e '/&lt;&lt; mime.PrintContents/ s/mime/(const std::string\&amp;)&amp;/' \
+    -i src/im/msrp.cxx  &amp;&amp;
+
+sed -e '/abs(/s/MPI.*)/(int)(&amp;)/' \
+    -i ./plugins/video/common/mpi.cxx &amp;&amp;
+
+
+./configure --prefix=/usr &amp;&amp;
+CXXFLAGS=-Wno-deprecated-declarations make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+chmod -v 644 /usr/lib/libopal_s.a</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed ...</command>: The first sed fixes several files 
+      to work properly with <xref linkend='ffmpeg'/>.  The second and 
+      third fixes build issues with <xref linkend='gcc'/>.
+    </para>
+
+    <para>
+      <envar>CXXFLAGS=-Wno-deprecated-declarations</envar>: This parameter
+      reduces a lot of warnings generated by <xref linkend='gcc'/>.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libopal.so and libopal_s.a
+        </seg>
+        <seg>
+          /usr/include/opal and
+          /usr/lib/opal-&opal-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libopal">
+        <term><filename class="libraryfile">libopal.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Opal</application> API functions.
+          </para>
+          <indexterm zone="opal libopal">
+            <primary sortas="c-libopal">libopal.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ general.ent	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "23">                   <!-- Always 2 digits -->
+<!ENTITY day          "24">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 23nd, &year;">
+<!ENTITY releasedate  "August 24th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/genlib/enchant.xml
===================================================================
--- general/genlib/enchant.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ general/genlib/enchant.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -33,5 +33,5 @@
     interface into various existing spell checking libraries.</para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/genlib/ptlib.xml
===================================================================
--- general/genlib/ptlib.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ general/genlib/ptlib.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/graphlib/libjpeg-turbo.xml
===================================================================
--- general/graphlib/libjpeg-turbo.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ general/graphlib/libjpeg-turbo.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -78,5 +78,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="nasm"/> or <xref linkend="yasm"/>
+      <xref linkend="cmake"/> and
+      <xref linkend="nasm"/> or 
+      <xref linkend="yasm"/>
     </para>
 
Index: gnome/applications/gucharmap.xml
===================================================================
--- gnome/applications/gucharmap.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ gnome/applications/gucharmap.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: gnome/platform/libpeas.xml
===================================================================
--- gnome/platform/libpeas.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ gnome/platform/libpeas.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ introduction/welcome/changelog.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -42,4 +42,22 @@
     </listitem>
 -->
+    <listitem>
+      <para>August 24th, 2018</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Archive midori.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Archive opal and ekiga.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update xterm to install .desktop files.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update plasma to properly link to  .desktop file.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    
     <listitem>
       <para>August 23rd, 2018</para>
Index: kde/plasma5/plasma-all.xml
===================================================================
--- kde/plasma5/plasma-all.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ kde/plasma5/plasma-all.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -243,4 +243,7 @@
 exit
 
+cd /usr/share/xsessions/
+[ -e plasma.desktop ] || as_root ln -sfv $KF5_PREFIX/share/xsessions/plasma.desktop
+
 cd $KF5_PREFIX/share/plasma/plasmoids
 
Index: multimedia/cdwriteutils/cdrtools.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ multimedia/cdwriteutils/cdrtools.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -34,5 +34,5 @@
     (burning) CDs, DVDs, and Blu-ray discs.</para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/cdwriteutils/dvd+rw-tools.xml
===================================================================
--- multimedia/cdwriteutils/dvd+rw-tools.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ multimedia/cdwriteutils/dvd+rw-tools.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/cdwriteutils/libisoburn.xml
===================================================================
--- multimedia/cdwriteutils/libisoburn.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ multimedia/cdwriteutils/libisoburn.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/libdriv/frei0r.xml
===================================================================
--- multimedia/libdriv/frei0r.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ multimedia/libdriv/frei0r.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -34,5 +34,5 @@
     o.</para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/libdriv/libdiscid.xml
===================================================================
--- multimedia/libdriv/libdiscid.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ multimedia/libdriv/libdiscid.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ multimedia/libdriv/libdriv.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -67,5 +67,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvpx.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mlt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opal.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opal.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pulseaudio.xml"/>
Index: multimedia/libdriv/libmusicbrainz.xml
===================================================================
--- multimedia/libdriv/libmusicbrainz.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ multimedia/libdriv/libmusicbrainz.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -42,5 +42,5 @@
     other related information.</para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/libdriv/libquicktime.xml
===================================================================
--- multimedia/libdriv/libquicktime.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ multimedia/libdriv/libquicktime.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: ltimedia/libdriv/opal.xml
===================================================================
--- multimedia/libdriv/opal.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ 	(revision )
@@ -1,211 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY opal-download-http "&gnome-download-http;/opal/3.10/opal-&opal-version;.tar.xz">
-  <!ENTITY opal-download-ftp  "&gnome-download-ftp;/opal/3.10/opal-&opal-version;.tar.xz">
-  <!ENTITY opal-md5sum        "6efa1b4c5e0ad6460019b4c6df0898d7">
-  <!ENTITY opal-size          "5.7 MB">
-  <!ENTITY opal-buildsize     "305 MB">
-  <!ENTITY opal-time          "2.0 SBU">
-]>
-
-<sect1 id="opal" xreflabel="Opal-&opal-version;">
-  <?dbhtml filename="opal.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Opal-&opal-version;</title>
-
-  <indexterm zone="opal">
-    <primary sortas="a-Opal">Opal</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Opal</title>
-
-    <para>
-      The <application>Opal</application> package contains a C++ class library for
-      normalising the numerous telephony protocols into a single integrated call
-      model.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&opal-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&opal-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &opal-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &opal-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &opal-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &opal-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/opal-&opal-version;-ffmpeg2-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Opal Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="ptlib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://www.celt-codec.org/">Celt</ulink>,
-      <xref linkend="ffmpeg"/>,
-      <ulink url="http://www.quut.com/gsm/">GSM</ulink>,
-      <ulink url="http://www.isdn4linux.de/">ISDN4Linux</ulink>,
-      <xref linkend="libtheora"/>,
-      <xref linkend="openjdk"/>,
-      <xref linkend="ruby"/>,
-      <ulink url="http://www.soft-switch.org/">Spandsp</ulink>,
-      <xref linkend="speex"/>, and
-      <xref linkend="x264"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/opal"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Opal</title>
-
-    <para>Fix a build issue with <application>GCC-7.1</application>:</para>
-
-<screen><userinput>sed -i 's| abs(| std::fabs(|g' plugins/video/common/mpi.cxx</userinput></screen>
-
-    <para>Install <application>Opal</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../opal-&opal-version;-ffmpeg2-1.patch &amp;&amp;
-
-sed -e 's/CODEC_ID/AV_&amp;/' \
-    -e 's/PIX_FMT_/AV_&amp;/' \
-    -i plugins/video/H.263-1998/h263-1998.cxx \
-       plugins/video/common/dyna.cxx          \
-       plugins/video/H.264/h264-x264.cxx      \
-       plugins/video/MPEG4-ffmpeg/mpeg4.cxx   &amp;&amp;
-
-sed -e '/&lt;&lt; mime.PrintContents/ s/mime/(const std::string\&amp;)&amp;/' \
-    -i src/im/msrp.cxx  &amp;&amp;
-
-sed -e '/abs(/s/MPI.*)/(int)(&amp;)/' \
-    -i ./plugins/video/common/mpi.cxx &amp;&amp;
-
-
-./configure --prefix=/usr &amp;&amp;
-CXXFLAGS=-Wno-deprecated-declarations make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-chmod -v 644 /usr/lib/libopal_s.a</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ...</command>: The first sed fixes several files 
-      to work properly with <xref linkend='ffmpeg'/>.  The second and 
-      third fixes build issues with <xref linkend='gcc'/>.
-    </para>
-
-    <para>
-      <envar>CXXFLAGS=-Wno-deprecated-declarations</envar>: This parameter
-      reduces a lot of warnings generated by <xref linkend='gcc'/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libopal.so and libopal_s.a
-        </seg>
-        <seg>
-          /usr/include/opal and
-          /usr/lib/opal-&opal-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libopal">
-        <term><filename class="libraryfile">libopal.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Opal</application> API functions.
-          </para>
-          <indexterm zone="opal libopal">
-            <primary sortas="c-libopal">libopal.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/videoutils/transcode.xml
===================================================================
--- multimedia/videoutils/transcode.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ multimedia/videoutils/transcode.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -48,5 +48,6 @@
     </para>
 
-    <!--&lfs82_checked;--> <!-- Come on guys, it doesn't work properly -->
+    <!--&lfs82_checked;--> 
+    <!-- Come on guys, it doesn't work properly -->
     <para>
       Subjects to the comments below, this package is known to build and
Index: postlfs/editors/bluefish.xml
===================================================================
--- postlfs/editors/bluefish.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ postlfs/editors/bluefish.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ postlfs/editors/emacs.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -34,5 +34,5 @@
     customizable, self-documenting real-time display editor.</para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: postlfs/editors/gedit.xml
===================================================================
--- postlfs/editors/gedit.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ postlfs/editors/gedit.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ postlfs/editors/vim.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -42,5 +42,5 @@
     <application>X</application> support is automatically detected.</para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: postlfs/filesystems/ntfs-3g.xml
===================================================================
--- postlfs/filesystems/ntfs-3g.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ postlfs/filesystems/ntfs-3g.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -41,5 +41,5 @@
     </para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: postlfs/security/tripwire.xml
===================================================================
--- postlfs/security/tripwire.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ postlfs/security/tripwire.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -33,5 +33,5 @@
     used to verify the integrity of the files on a given system.</para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xterm.xml
===================================================================
--- x/installing/xterm.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ x/installing/xterm.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -103,6 +103,8 @@
     user:</para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-make install-ti</userinput></screen>
+<screen role="root"><userinput>make install    &amp;&amp;
+make install-ti &amp;&amp;
+
+cp -v *.desktop /usr/share/applications/</userinput></screen>
 
   </sect2>
Index: x/lib/gtksourceview.xml
===================================================================
--- x/lib/gtksourceview.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ x/lib/gtksourceview.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: xsoft/graphweb/graphweb.xml
===================================================================
--- xsoft/graphweb/graphweb.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ xsoft/graphweb/graphweb.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -23,5 +23,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="falkon.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firefox.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="midori.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="midori.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="seamonkey.xml"/>
   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="galeon.xml"/> -->
Index: oft/graphweb/midori.xml
===================================================================
--- xsoft/graphweb/midori.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ 	(revision )
@@ -1,230 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY midori-download-http
-           "http://www.midori-browser.org/downloads/midori_&midori-version;_all_.tar.bz2">
-  <!ENTITY midori-download-ftp  " ">
-  <!ENTITY midori-md5sum        "fcc03ef759fce4fe9f2446d9da4a065e">
-  <!ENTITY midori-size          "1.4 MB">
-  <!ENTITY midori-buildsize     "91 MB">
-  <!ENTITY midori-time          "0.8 SBU">
-]>
-
-<sect1 id="midori" xreflabel="Midori-&midori-version;">
-  <?dbhtml filename="midori.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Midori-&midori-version;</title>
-
-  <indexterm zone="midori">
-    <primary sortas="a-Midori">Midori</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Midori</title>
-
-    <para>
-      <application>Midori</application> is a lightweight web browser that uses
-      <application>WebKitGTK+</application>.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&midori-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&midori-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &midori-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &midori-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &midori-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &midori-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Midori Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="gcr"/>,
-      <xref linkend="libnotify"/>,
-      <xref linkend="webkitgtk"/> (see "Command Explanations"), and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="librsvg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <!--<xref linkend="webkitgtk2"/>, and -->
-      <ulink url="http://webkitgtk.org/releases/">WebKitGTK+-2.4.11</ulink> , and 
-      <phrase revision="sysv"><ulink url="https://launchpad.net/zeitgeist/0.9/">Zeitgeist</ulink></phrase>
-      <phrase revision="systemd"><xref linkend="libzeitgeist"/></phrase>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/midori"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Midori</title>
-
-    <para>
-      Install <application>Midori</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -e 's/protected Tally/public Tally/g'  \
-    -i midori/midori-notebook.vala         &amp;&amp;
-sed -e 's/%d other files/%u other files/g' \
-    -i extensions/transfers.vala           &amp;&amp;
-
-for f in transfers adblock/widgets apps history-list notes; do
-    sed -e 's/.remove (iter/.remove (ref iter/g' \
-        -i "extensions/$f.vala"
-done        &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DUSE_ZEITGEIST=OFF         \
-      -DHALF_BRO_INCOM_WEBKIT2=ON \
-      -DUSE_GTK3=1                \
-      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/midori-&midori-version; \
-      ..  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ...</command>: The recent release of vala generates errors
-      for some constructs that were accepted before. The <command>sed</command>
-      commands fix those errors.
-    </para>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-      used to apply a higher level of compiler optimizations.
-    </para>
-
-    <para>
-      <parameter>-DUSE_ZEITGEIST=OFF</parameter>: Remove this switch if
-      Zeitgeist is installed.
-    </para>
-
-    <para>
-      <parameter>-DHALF_BRO_INCOM_WEBKIT2=ON</parameter>: Links to <xref
-      linkend="webkitgtk"/> instead of WebKitGTK+-2.4.x. Strictly
-      speaking, <xref linkend="webkitgtk"/> is not required and Midori could
-      be linked to WebKitGTK+-2.4.x. The former used to be considered <quote>
-      experimental</quote> by upstream, but now is considered stable. However
-      the syntax has not yet been updated.
-    </para>
-
-    <para>
-      <parameter>-DUSE_GTK3=1</parameter>: Using this switch allows linking to
-      WebkitGTK+ built against <application>GTK+ 3</application>.
-    </para>
-
-    <para>
-      <option>-DUSE_APIDOCS=1</option>: Use this switch if
-      <application>GTK-Doc</application> is installed and you
-      wish to build and install the API documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          midori
-        </seg>
-        <seg>
-          libmidori-core.so
-        </seg>
-        <seg>
-          /{etc/xdg,/usr/{lib,share}}/midori and
-          /usr/share/doc/midori-&midori-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="midori-prog">
-        <term><command>midori</command></term>
-        <listitem>
-          <para>
-            is a lightweight <application>WebKitGTK+</application> browser.
-          </para>
-          <indexterm zone="midori midori-prog">
-            <primary sortas="b-midori">midori</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: oft/other/ekiga.xml
===================================================================
--- xsoft/other/ekiga.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ 	(revision )
@@ -1,242 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY ekiga-download-http "&gnome-download-http;/ekiga/4.0/ekiga-&ekiga-version;.tar.xz">
-  <!ENTITY ekiga-download-ftp  "&gnome-download-ftp;/ekiga/4.0/ekiga-&ekiga-version;.tar.xz">
-  <!ENTITY ekiga-md5sum        "704ba532a8e3e0b5e3e2971dd2db39e4">
-  <!ENTITY ekiga-size          "8.0 MB">
-  <!ENTITY ekiga-buildsize     "315 MB">
-  <!ENTITY ekiga-time          "3.5 SBU">
-]>
-
-<sect1 id="ekiga" xreflabel="Ekiga-&ekiga-version;">
-  <?dbhtml filename="ekiga.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Ekiga-&ekiga-version;</title>
-
-  <indexterm zone="ekiga">
-    <primary sortas="a-Ekiga">Ekiga</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Ekiga</title>
-
-    <para>
-      <application>Ekiga</application> is a VoIP, IP Telephony, and Video
-      Conferencing application that allows you to make audio and video calls to
-      remote users with SIP or H.323 compatible hardware and software.  It
-      supports many audio and video codecs and all modern VoIP features for
-      both SIP and H.323.  <application>Ekiga</application> is the first Open
-      Source application to support both H.323 and SIP, as well as audio and
-      video.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ekiga-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ekiga-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ekiga-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ekiga-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ekiga-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ekiga-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Ekiga Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="boost"/>,
-      <xref linkend="gnome-icon-theme"/>,
-      <xref linkend="gtk2"/>, and
-      <xref linkend="opal"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="GConf"/>, and
-      <xref linkend="libnotify"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <phrase revision="sysv"><ulink url="&gnome-download-http;/evolution-data-server/">
-      Evolution Data Server</ulink></phrase>
-      <phrase revision="systemd"><xref linkend="evolution-data-server"/></phrase>,
-      <ulink url="&gnome-download-http;/gnome-doc-utils/">
-      GNOME Doc Utils</ulink>, and
-      <xref linkend="openldap"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/ekiga"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ekiga</title>
-
-    <para>
-      Install <application>Ekiga</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-eds     \
-            --disable-gdu     \
-            --disable-ldap    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-eds</parameter>: This switch disables support for the
-      <application>Evolution Data Server</application>. Remove if you have
-      installed <application>Evolution Data Server</application>.
-    </para>
-
-    <para>
-      <parameter>--disable-gdu</parameter>: This switch disables documentation
-      generation using <application>GNOME Doc Utils</application>. Remove if
-      you have installed <application>GNOME Doc Utils</application>.
-    </para>
-
-    <para>
-      <parameter>--disable-ldap</parameter>: This switch disables LDAP support
-      in <application>Ekiga</application>. Remove if you have installed
-      <application>OpenLDAP</application>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/without-scrollkeeper.xml"/>
-
-    <para>
-      <option>--disable-dbus</option>: This switch disables
-      <application>D-Bus</application> support. Use if you have not installed
-      <application>D-Bus</application>.
-    </para>
-
-    <para>
-      <option>--enable-avahi</option>: This switch enables use of the
-      <application>Avahi</application> with <application>Ekiga</application>.
-      Use if you have installed <application>Avahi</application>.
-    </para>
-
-    <note>
-      <para>
-        If you have not installed recommended dependencies you will need
-        additional switches passed to <command>configure</command>. Examine
-        <command>./configure --help</command> output to see all available
-        switches.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ekiga, ekiga-config-tool and ekiga-helper
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/ekiga,
-          /usr/share/gnome/help/ekiga,
-          /usr/share/omf/ekiga,
-          /usr/share/pixmaps/ekiga and
-          /usr/share/sounds/ekiga
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ekiga-prog">
-        <term><command>ekiga</command></term>
-        <listitem>
-          <para>
-            is a SIP and H.323 VoIP, IP Telephony and Video Conferencing
-            application which complies to the SIP and H.323 protocols.
-          </para>
-          <indexterm zone="ekiga ekiga-prog">
-            <primary sortas="b-ekiga">ekiga</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="ekiga-config-tool">
-        <term><command>ekiga-config-tool</command></term>
-        <listitem>
-          <para>
-            fixes problems with the Ekiga settings.
-          </para>
-          <indexterm zone="ekiga ekiga-config-tool">
-            <primary sortas="b-ekiga-config-tool">ekiga-config-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: xsoft/other/icedtea-web.xml
===================================================================
--- xsoft/other/icedtea-web.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ xsoft/other/icedtea-web.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -71,7 +71,7 @@
     such as:</bridgehead>
     <para role="required">
-      <xref role="runtime" linkend="epiphany"/>,
+      <xref role="runtime" linkend="epiphany"/> or
 <!-- support removed in firefox-52, see https://support.mozilla.org/en-US/kb/npapi-plugins      <xref linkend="firefox"/>,
--->   <xref role="runtime" linkend="midori"/>, or
+      <xref role="runtime" linkend="midori"/>, or -->
       <xref role="runtime" linkend="seamonkey"/>
     </para>
Index: xsoft/other/other.xml
===================================================================
--- xsoft/other/other.xml	(revision 0944506c256bc57d0b0fb413cb4fe34103435592)
+++ xsoft/other/other.xml	(revision 7788630df27acad72e865c12b63e5f9746867837)
@@ -20,5 +20,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="balsa.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ekiga.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ekiga.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="feh.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fontforge.xml"/>
