Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
+++ xsoft/graphweb/firefox.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -0,0 +1,376 @@
+<?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 firefox-download-http
+           "&mozilla-http;/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
+  <!ENTITY firefox-download-ftp
+           "&mozilla-ftp;/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
+  <!ENTITY firefox-md5sum        "60466afbc7105d29dcd18f996c9c67e0">
+  <!ENTITY firefox-size          "172 MB">
+  <!ENTITY firefox-buildsize     "3.6 GB (73 MB installed)">
+  <!ENTITY firefox-time          "28 SBU">
+]>
+
+<sect1 id="firefox" xreflabel="Firefox-&firefox-version;">
+  <?dbhtml filename="firefox.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy: krejzi $</othername>
+    <date>$Date: 2014-10-29 19:58:34 +0100 (Wed, 29 Oct 2014) $</date>
+  </sect1info>
+
+  <title>Firefox-&firefox-version;</title>
+
+  <indexterm zone="firefox">
+    <primary sortas="a-Firefox">Firefox</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Firefox</title>
+
+    <para>
+      <application>Firefox</application> is a stand-alone browser based on the
+      <application>Mozilla</application> codebase.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&firefox-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&firefox-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &firefox-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &firefox-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &firefox-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &firefox-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Firefox Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="gtk2"/>,
+      <xref linkend="unzip"/>,
+      <xref linkend="yasm"/> and
+      <xref linkend="zip"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="icu"/>,
+      <xref linkend="libevent"/>,
+      <xref linkend="libvpx"/>,
+      <xref linkend="nspr"/>,
+      <xref linkend="nss"/> and
+      <xref linkend="sqlite"/>
+    </para>
+
+    <note>
+      <para>
+        If you don't install recommended dependencies, then internal copies of
+        those packages will be used. They might be tested to work, but they can
+        be out of date or contain security holes.
+      </para>
+    </note>
+
+    <note>
+      <para>
+        You must have installed <application>OpenSSL</application> before
+        <application>Python 2</application>, or the build system will quickly
+        fail with output including "ImportError: cannot import name
+        HTTPSHandler". If you are in any doubt about this (e.g. upgrading from
+        an older version of SeaMonkey), check if
+        <filename>/usr/lib/python&python2-majorver;/lib-dynload/_ssl.so</filename>
+        exists. If it does not, reinstall <xref linkend="python2"/> (after
+        installing <xref linkend="openssl"/>. The latest version of any
+        <emphasis>currently maintained</emphasis> version of OpenSSL should be
+        satisfactory if already installed.
+      </para>
+    </note>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="curl"/>,
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="doxygen"/>,
+      <xref linkend="gst-plugins-base"/> (with
+      <xref linkend="gst-plugins-good"/> and
+      <xref linkend="gst-ffmpeg"/> at runtime), or
+      <xref linkend="gst10-plugins-base"/> (with
+      <xref linkend="gst10-plugins-good"/> and
+      <xref linkend="gst10-libav"/> at runtime),
+      <xref linkend="libnotify"/>,
+      <xref linkend="openjdk"/>,
+      <xref linkend="pulseaudio"/>,
+      <xref linkend="startup-notification"/>,
+      <xref linkend="wget"/>,
+      <xref linkend="wireless_tools"/>,
+      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink> and
+      <ulink url="https://code.google.com/p/libproxy/">libproxy</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/firefox"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Firefox</title>
+
+    <para>
+      The configuration of <application>Firefox</application> is accomplished by
+      creating a <filename>mozconfig</filename> file containing the desired
+      configuration options. A default <filename>mozconfig</filename> is created
+      below. To see the entire list of available configuration options (and an
+      abbreviated description of each one), issue <command>./configure
+      --help</command>. You may also wish to review the entire file and
+      uncomment any other desired options.
+      Create the file by issuing the following command:
+    </para>
+
+<screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
+<literal># If you have a multicore machine, all cores will be used by default.
+# If desired, you can reduce the number of cores used, e.g. to 1, by
+# uncommenting the next line and setting a valid number of CPU cores.
+#mk_add_options MOZ_MAKE_FLAGS="-j1"
+
+# If you have installed DBus-Glib comment out this line:
+ac_add_options --disable-dbus
+
+# If you have installed dbus-glib, and you have installed (or will install)
+# wireless-tools, and you wish to use geolocation web services, comment out
+# this line
+ac_add_options --disable-necko-wifi
+
+# If you have installed libnotify comment out this line:
+ac_add_options --disable-libnotify
+
+# Comment out following option if you have PulseAudio installed
+ac_add_options --disable-pulseaudio
+
+# GStreamer is necessary for H.264 video playback in HTML5 Video Player.
+# To enable it, make sure you also set "media.gstreamer.enabled" to
+# "true" in about:config.
+
+# If you don't have GStreamer 0.10.x installed, uncomment this line:
+#ac_add_options --disable-gstreamer
+# or uncomment this line if you have GStreamer 1.x.y installed:
+#ac_add_options --enable-gstreamer=1.0
+
+# Uncomment these lines if you have installed optional dependencies:
+#ac_add_options --enable-system-hunspell
+#ac_add_options --enable-startup-notification
+
+# Comment out following options if you have not installed
+# recommended dependencies:
+ac_add_options --enable-system-sqlite
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-icu
+
+# The BLFS editors recommend not changing anything below this line:
+ac_add_options --prefix=/usr
+ac_add_options --enable-application=browser
+
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+
+ac_add_options --enable-optimize
+ac_add_options --enable-strip
+ac_add_options --enable-install-strip
+
+ac_add_options --enable-gio
+ac_add_options --enable-official-branding
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-url-classifier
+
+ac_add_options --enable-system-cairo
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-pixman
+
+ac_add_options --with-pthreads
+
+ac_add_options --with-system-bz2
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir</literal>
+EOF</userinput></screen>
+
+    <para>
+      First, fix building with system freetype-2.6 or later:
+    </para>
+
+<screen><userinput>sed -i '/^ftglyph.h/ i ftfntfmt.h' config/system-headers</userinput></screen>
+
+    <para>
+      Compile <application>Firefox</application> by issuing the following
+      commands:
+    </para>
+
+<screen><userinput>make -f client.mk</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Install <application>Firefox</application> by running the following
+      commands as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make -f client.mk install INSTALL_SDK= &amp;&amp;
+
+chown -R root:root /usr/lib/firefox-&firefox-version; &amp;&amp;
+
+mkdir -pv /usr/lib/mozilla/plugins &amp;&amp;
+ln -sfv ../../mozilla/plugins /usr/lib/firefox-&firefox-version;/browser</userinput></screen>
+
+    <para>
+      While still as the <systemitem class="username">root</systemitem> user,
+      install the icon files which will be used in the desktop file below:
+    </para>
+
+<screen role="root"><userinput>for s in 16 32 48
+do
+install -v -Dm644 /usr/lib/firefox-&firefox-version;/browser/chrome/icons/default/default${s}.png \
+                  /usr/share/icons/hicolor/${s}x${s}/apps/firefox.png
+done &amp;&amp;
+install -v -Dm644 /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png \
+                  /usr/share/icons/hicolor/128x128/apps/firefox.png &amp;&amp;
+gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
+unset s</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>make -f client.mk ...</command>: Mozilla products are packaged to
+      allow the use of a configuration file which can be used to pass the
+      configuration settings to the <command>configure</command> command.
+      <command>make</command> uses the <filename>client.mk</filename> file to
+      get initial configuration and setup parameters.
+    </para>
+
+    <para>
+      <command>ln -sfv ... /usr/lib/firefox-&firefox-version;/browser</command>:
+      This command creates a symbolic link to <filename
+      class="directory">/usr/lib/mozilla/plugins</filename>. It's not really
+      needed, as <application>Firefox</application> checks <filename
+      class="directory">/usr/lib/mozilla/plugins</filename> by default, but the
+      symbolic link is made to keep all the plugins installed in one folder.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Firefox</title>
+
+    <para>
+      If you use a desktop environment such as <application>GNOME</application>
+      or <application>KDE</application>, you may want to create a desktop file
+      in order to be able to launch <application>Firefox</application> from the
+      desktop menus. If you didn't enable
+      <application>Startup Notification</application> support in your mozconfig
+      then change the StartupNotify line to false. Run the following commands
+      as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
+
+cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF"
+<literal>[Desktop Entry]
+Encoding=UTF-8
+Name=Firefox Web Browser
+Comment=Browse the World Wide Web
+GenericName=Web Browser
+Exec=firefox %u
+Terminal=false
+Type=Application
+Icon=firefox
+Categories=GNOME;GTK;Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+StartupNotify=true</literal>
+EOF</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          firefox
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/lib/firefox-&firefox-version; and
+          /usr/lib/mozilla/plugins
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="firefox-prog">
+        <term><command>firefox</command></term>
+        <listitem>
+          <para>
+            is a <application>GTK+ 2</application> internet browser that uses the
+            Mozilla Gecko rendering engine.
+          </para>
+          <indexterm zone="firefox firefox-prog">
+            <primary sortas="b-firefox">firefox</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: xsoft/graphweb/graphweb.xml
===================================================================
--- xsoft/graphweb/graphweb.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/graphweb/graphweb.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -20,5 +20,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="seamonkey.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firefox-systemd.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="galeon.xml"/> -->
   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="konq.xml"/> -->
Index: xsoft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/graphweb/seamonkey.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -6,11 +6,11 @@
 
   <!ENTITY seamonkey-download-http
-  "https://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/&seamonkey-version;/source/seamonkey-&seamonkey-version;.source.tar.bz2">
+           "&mozilla-http;/seamonkey/releases/&seamonkey-version;/source/seamonkey-&seamonkey-version;.source.tar.bz2">
   <!ENTITY seamonkey-download-ftp
-  "ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/&seamonkey-version;/source/seamonkey-&seamonkey-version;.source.tar.bz2">
-  <!ENTITY seamonkey-md5sum        "44b6f9cfc2a95fd08dba35ff236d306e">
-  <!ENTITY seamonkey-size          "180 MB">
-  <!ENTITY seamonkey-buildsize     "4.1 GB (77 MB installed)">
-  <!ENTITY seamonkey-time          "17 SBU (using parallelism=4)">
+           "&mozilla-ftp;/seamonkey/releases/&seamonkey-version;/source/seamonkey-&seamonkey-version;.source.tar.bz2">
+  <!ENTITY seamonkey-md5sum        "d9b1f863cb8808ca92a2d9ac004ae5ee">
+  <!ENTITY seamonkey-size          "194 MB">
+  <!ENTITY seamonkey-buildsize     "3.6 GB (72 MB installed)">
+  <!ENTITY seamonkey-time          "61 SBU">
 ]>
 
@@ -47,5 +47,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -89,32 +89,60 @@
       <xref linkend="alsa-lib"/>,
       <xref linkend="gtk2"/>,
-      <xref linkend="zip"/>, and
-      <xref linkend="unzip"/>.
+      <xref linkend="unzip"/>,
+      <xref linkend="yasm"/> and
+      <xref linkend="zip"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="yasm"/> or <xref linkend="libvpx"/>
-      (to allow <application>SeaMonkey</application> to play webm videos).
-    </para>
+      <xref linkend="icu"/>,
+      <xref linkend="libevent"/>,
+      <xref linkend="libvpx"/>,
+      <xref linkend="nspr"/>,
+      <xref linkend="nss"/> and
+      <xref linkend="sqlite"/>
+    </para>
+
+    <note>
+      <para>
+        If you don't install recommended dependencies, then internal copies of
+        those packages will be used. They might be tested to work, but they can
+        be out of date or contain security holes.
+      </para>
+    </note>
+
+    <note>
+      <para>
+        You must have installed <application>OpenSSL</application> before
+        <application>Python 2</application>, or the build system will quickly
+        fail with output including "ImportError: cannot import name
+        HTTPSHandler". If you are in any doubt about this (e.g. upgrading from
+        an older version of SeaMonkey), check if
+        <filename>/usr/lib/python&python2-majorver;/lib-dynload/_ssl.so</filename>
+        exists. If it does not, reinstall <xref linkend="python2"/> (after
+        installing <xref linkend="openssl"/>. The latest version of any
+        <emphasis>currently maintained</emphasis> version of OpenSSL should be
+        satisfactory if already installed.
+      </para>
+    </note>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="curl"/>,
       <xref linkend="dbus-glib"/>,
-      <xref linkend="startup-notification"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="libevent"/>,
       <xref linkend="doxygen"/>,
       <xref linkend="gst-plugins-base"/> (with
       <xref linkend="gst-plugins-good"/> and
-      <xref linkend="gst-ffmpeg"/> at runtime),
+      <xref linkend="gst-ffmpeg"/> at runtime), or
+      <xref linkend="gst10-plugins-base"/> (with
+      <xref linkend="gst10-plugins-good"/> and
+      <xref linkend="gst10-libav"/> at runtime),
       <xref linkend="libnotify"/>,
-      <xref linkend="nspr"/>,
-      <xref linkend="nss"/>,
       <xref linkend="openjdk"/>,
       <xref linkend="pulseaudio"/>,
-      <xref linkend="wireless_tools"/>,
-      <xref linkend="valgrind"/> (only for testing the jemalloc code),
-      <xref linkend="wget"/>, and
+      <xref linkend="startup-notification"/>,
+      <xref linkend="valgrind"/>,
+      <xref linkend="wget"/>,
+      <xref linkend="wireless_tools"/> and
       <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>
     </para>
@@ -127,12 +155,5 @@
   <sect2 role="installation">
     <title>Installation of SeaMonkey</title>
-<!--
-    <para>
-      If you have not installed <xref linkend="wireless_tools"/>, apply the
-      patch or the installer will fail:
-    </para>
-
-<screen><userinput>patch -p1 &lt; ../seamonkey-&seamonkey-version;-necko-wifi-1.patch</userinput></screen>
--->
+
     <para>
       The configuration of <application>SeaMonkey</application> is accomplished
@@ -146,19 +167,19 @@
     </para>
 
-<screen><?dbfo keep-together="auto"?><userinput>cat &gt; mozconfig &lt;&lt; EOF
-<literal># If you have a multicore machine you can speed up the build by running
-# several jobs at once, but if you have a single core, delete this line:
-mk_add_options MOZ_MAKE_FLAGS="-j$(getconf _NPROCESSORS_ONLN)"
-
-# If you have installed Yasm delete this option:
-ac_add_options --disable-webm
-
-# If you have installed DBus-Glib delete this option:
+<screen><?dbfo keep-together="auto"?><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
+<literal># If you have a multicore machine, all cores will be used by default.
+# If desired, you can reduce the number of cores used, e.g. to 1, by
+# uncommenting the next line and setting a valid number of CPU cores.
+#mk_add_options MOZ_MAKE_FLAGS="-j1"
+
+# If you have installed DBus-Glib comment out this line:
 ac_add_options --disable-dbus
 
-# If you have installed wireless-tools delete this option:
+# If you have installed dbus-glib, and you have installed (or will install)
+# wireless-tools, and you wish to use geolocation web services, comment out
+# this line
 ac_add_options --disable-necko-wifi
 
-# If you have installed libnotify delete this option:
+# If you have installed libnotify comment out this line:
 ac_add_options --disable-libnotify
 
@@ -166,43 +187,79 @@
 ac_add_options --disable-pulseaudio
 
-# GStreamer is necessary for H.264 video playback in HTML5 Video Player;
-# to be enabled, also remember to set "media.gstreamer.enabled" to "true"
-# in about:config. If you do *not* have GStreamer 0.x.y, uncomment this line:
+# GStreamer is necessary for H.264 video playback in HTML5 Video Player.
+# To enable it, make sure you also set "media.gstreamer.enabled" to
+# "true" in about:config.
+
+# If you don't have GStreamer 0.10.x installed, uncomment this line:
 #ac_add_options --disable-gstreamer
-
-# Uncomment these if you have installed them:
-# ac_add_options --enable-startup-notification
-# ac_add_options --enable-system-hunspell
-# ac_add_options --enable-system-sqlite
-# ac_add_options --with-system-libevent
-# ac_add_options --with-system-libvpx
-# ac_add_options --with-system-nspr
-# ac_add_options --with-system-nss
-
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-build-dir
+# or uncomment this line if you have GStreamer 1.x.y installed:
+#ac_add_options --enable-gstreamer=1.0
+
+# Uncomment these lines if you have installed optional dependencies:
+#ac_add_options --enable-system-hunspell
+#ac_add_options --enable-startup-notification
+
+# Comment out following options if you have not installed
+# recommended dependencies:
+ac_add_options --enable-system-sqlite
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-icu
+
+# The BLFS editors recommend not changing anything below this line:
+ac_add_options --prefix=/usr
+ac_add_options --enable-application=suite
+
 ac_add_options --disable-crashreporter
-ac_add_options --disable-debug
-ac_add_options --disable-debug-symbols
-ac_add_options --disable-installer
-ac_add_options --disable-static
+ac_add_options --disable-updater
 ac_add_options --disable-tests
-ac_add_options --disable-updater
-ac_add_options --enable-application=suite
-ac_add_options --enable-shared
+
+ac_add_options --enable-optimize
+ac_add_options --enable-strip
+ac_add_options --enable-install-strip
+
+ac_add_options --enable-gio
+ac_add_options --enable-official-branding
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-url-classifier
+
 ac_add_options --enable-system-cairo
 ac_add_options --enable-system-ffi
-ac_add_options --prefix=/usr
+ac_add_options --enable-system-pixman
+
 ac_add_options --with-pthreads
+
+ac_add_options --with-system-bz2
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-png
-ac_add_options --with-system-zlib</literal>
+ac_add_options --with-system-zlib
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-build-dir</literal>
 EOF</userinput></screen>
 
     <para>
+      First, fix building with system freetype-2.6 or later:
+    </para>
+
+<screen><userinput>sed -i '/^ftglyph.h/ i ftfntfmt.h' mozilla/config/system-headers</userinput></screen>
+
+    <para>
       The moz-build-dir directory needs to exist and match the value used in
-      mozconfig (above) for the object directory (MOZ_OBJDIR):
-    </para>
-
-<screen><userinput>mkdir -vp mozilla/moz-build-dir</userinput></screen>
+      the mozconfig above for the object directory (MOZ_OBJDIR):
+    </para>
+
+<screen><userinput>mkdir -v mozilla/moz-build-dir</userinput></screen>
+
+    <note>
+      <para>
+        If you have a multicore machine, <application>SeaMonkey</application>
+        will use all the cores by default. Exceptionally, you can reduce
+        the number of cores, e.g. to 1, by prepending the
+        <envar>MOZ_MAKE_FLAGS="-j1"</envar> environment variable to all
+        of the <command>make</command> commands below.
+      </para>
+    </note>
 
     <para>
@@ -214,8 +271,5 @@
 
     <para>
-      This package does not come with a test suite. However, if
-      <application>X</application> is running it can be launched
-      from the build directory before installing with the command line:
-      <userinput>moz-build-dir/mozilla/dist/seamonkey/seamonkey</userinput>
+      This package does not come with a test suite.
     </para>
 
@@ -225,27 +279,22 @@
     </para>
 
-<screen role="root"><userinput>make -f client.mk install INSTALL_SDK= &amp;&amp;
-cp -v moz-build-dir/dist/man/man1/seamonkey.1 /usr/share/man/man1</userinput></screen>
-
-    <bridgehead renderas="sect3" id="devel-seamonkey" xreflabel="SeaMonkey">
-      All the Development Libraries and Headers
-    </bridgehead>
-
-    <para>
-      If you want to install the full <application>SeaMonkey</application>
-      development environment, as the
+<screen role="root"><userinput>make -f client.mk install INSTALL_SDK=       &amp;&amp;
+chown -R root:root /usr/lib/seamonkey-&seamonkey-version; &amp;&amp;
+install -v -m644 moz-build-dir/dist/man/man1/seamonkey.1 /usr/share/man/man1</userinput></screen>
+
+    <para>
+      The above instruction just installs the parts you need to run
+      <application>SeaMonkey</application>. Alternatively, if you want to
+      install the full <application>SeaMonkey</application> development
+      environment, run the following command as the
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make -C moz-build-dir install</userinput></screen>
+<screen role="root"><userinput>make -f client.mk install</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>mkdir -vp mozilla/moz-build-dir</command>: fixes a build failure
-      at the beginning of the build.
-    </para>
 
     <para>
@@ -261,12 +310,4 @@
   <sect2 role="configuration">
     <title>Configuring SeaMonkey</title>
-
-    <para>
-      If you deleted the <option>--disable-webm</option> option from your
-      <filename>mozconfig</filename>, your <application>SeaMonkey</application>
-      can play most youtube videos without the need for the flash plugin. To
-      enable this, go to <ulink url="http://www.youtube.com/html5"/> and click
-      on 'Join the HTML5 Trial' (needs cookies enabled).
-    </para>
 
     <para>
@@ -305,14 +346,14 @@
 
     <para>
-      If you use a desktop environment like <application>Gnome</application> or
-      <application>KDE</application> you may wish to create a
-      <filename>seamonkey.desktop</filename> file so that
-      <application>SeaMonkey</application> appears in the panel's menus. If you
-      didn't enable <application>Startup-Notification</application> in your
-      mozconfig change the StartupNotify line to false. As the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -pv /usr/share/{applications,pixmaps}              &amp;&amp;
+      If you use a desktop environment such as <application>GNOME</application>
+      or <application>KDE</application>, you may want to create a desktop file
+      in order to be able to launch <application>SeaMonkey</application> from the
+      desktop menus. If you didn't enable
+      <application>Startup Notification</application> support in your mozconfig
+      then change the StartupNotify line to false. Run the following commands
+      as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>mkdir -pv /usr/share/{applications,pixmaps} &amp;&amp;
 
 cat &gt; /usr/share/applications/seamonkey.desktop &lt;&lt; "EOF" &amp;&amp;
@@ -339,13 +380,15 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>seamonkey</seg>
+        <seg>
+          seamonkey
+        </seg>
         <seg>
           None
         </seg>
         <seg>
-          /usr/lib/seamonkey-&seamonkey-version;.
+          /usr/lib/seamonkey-&seamonkey-version;
         </seg>
       </seglistitem>
Index: xsoft/office/abiword.xml
===================================================================
--- xsoft/office/abiword.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/office/abiword.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -11,13 +11,13 @@
   <!ENTITY AbiWord-download-ftp  " ">
   <!ENTITY AbiWord-md5sum        "f3f8052e7b4979a43b75775a381e6cb8">
-  <!ENTITY AbiWord-size          "10.6 MB">
+  <!ENTITY AbiWord-size          "11 MB">
 
   <!ENTITY AbiWordDocs-download-http
            "http://www.abisource.com/downloads/abiword/&AbiWord-version;/source/abiword-docs-&AbiWord-version;.tar.gz">
-  <!ENTITY AbiWordDocs-md5sum        "1.5 MB">
-  <!ENTITY AbiWordDocs-size          "c9b78cb5f9c415ed63ce1cf9874fa8a4">
-
-  <!ENTITY AbiWord-buildsize     "405.2 MB">
-  <!ENTITY AbiWord-time          "6.7 SBU">
+  <!ENTITY AbiWordDocs-md5sum        "c9b78cb5f9c415ed63ce1cf9874fa8a4">
+  <!ENTITY AbiWordDocs-size          "1.5">
+
+  <!ENTITY AbiWord-buildsize     "575 MB (73 MB installed)">
+  <!ENTITY AbiWord-time          "7.7 SBU - additional 0.5 SBU for docs">
 ]>
 
@@ -44,5 +44,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -95,9 +95,4 @@
         <para>
           AbiWord Docs size: &AbiWordDocs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch: <ulink url="http://www.linuxfromscratch.org/patches/blfs/svn/abiword-&AbiWord-version;-libgcrypt_1_6_0-1.patch"/>
         </para>
       </listitem>
@@ -121,13 +116,16 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="http://aiksaurus.sourceforge.net/">Aiksaurus</ulink>,
       <xref linkend="dbus-glib"/>,
       <xref linkend="evolution-data-server"/>,
       <xref linkend="gobject-introspection"/>,
-      <ulink url="http://helm.cs.unibo.it/mml-widget/">GtkMathView</ulink>,
       <xref linkend="libchamplain"/>,
       <xref linkend="libgcrypt"/>,
       <xref linkend="libical"/>,
       <xref linkend="libsoup"/>,
+      <xref linkend="redland"/>,
+      <xref linkend="telepathy-glib"/>,
+      <xref linkend="valgrind"/>,
+      <ulink url="http://aiksaurus.sourceforge.net/">Aiksaurus</ulink>,
+      <ulink url="http://helm.cs.unibo.it/mml-widget/">GtkMathView</ulink>,
       <ulink url="http://sourceforge.net/projects/wvware">libwmf</ulink>,
       <ulink url="http://sourceforge.net/projects/libwpd/">libwpd</ulink>,
@@ -137,9 +135,6 @@
       Link Grammar Parser</ulink>,
       <ulink url="&gnome-download-http;/loudmouth">Loudmouth</ulink>,
-      <xref linkend="redland"/>,
-      <xref linkend="telepathy-glib"/>,
-      <ulink url="http://libots.sourceforge.net/">OTS</ulink>
-      <ulink url="http://software.frodo.looijaard.name/psiconv/">Psiconv</ulink>, and
-      <xref linkend="valgrind"/>
+      <ulink url="http://libots.sourceforge.net/">OTS</ulink>, and
+      <ulink url="http://software.frodo.looijaard.name/psiconv/">Psiconv</ulink>
     </para>
 
@@ -166,6 +161,5 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../abiword-&AbiWord-version;-libgcrypt_1_6_0-1.patch &amp;&amp;
-./configure --prefix=/usr                              &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -180,6 +174,13 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>
-      If you wish to install the local help files, untar and build them first
+    <note>
+      <para>
+        In order to install the local help files,
+        a graphics session is recommended.
+      </para>
+    </note>
+
+    <para>
+      If you wish to install the local help files, untar and build them first:
     </para>
 
Index: xsoft/office/gnumeric.xml
===================================================================
--- xsoft/office/gnumeric.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/office/gnumeric.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -7,8 +7,8 @@
   <!ENTITY gnumeric-download-http "&gnome-download-http;/gnumeric/1.12/gnumeric-&gnumeric-version;.tar.xz">
   <!ENTITY gnumeric-download-ftp  "&gnome-download-ftp;/gnumeric/1.12/gnumeric-&gnumeric-version;.tar.xz">
-  <!ENTITY gnumeric-md5sum        "14897887000c7c6ca4e1e1d2dd230ee7">
+  <!ENTITY gnumeric-md5sum        "84e39df0028b3b6091ca55a3b538070e">
   <!ENTITY gnumeric-size          "18 MB">
-  <!ENTITY gnumeric-buildsize     "252 MB (additional 2 MB for the tests)">
-  <!ENTITY gnumeric-time          "1.8 SBU (additional 1.5 SBU for the tests)">
+  <!ENTITY gnumeric-buildsize     "298 MB (additional 2 MB for the tests)">
+  <!ENTITY gnumeric-time          "1.6 SBU (additional 6.8 SBU for the tests)">
 ]>
 
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -79,6 +79,15 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended Runtime</bridgehead>
+    <para role="recommended runtime">
+       an icon theme such as <xref linkend="adwaita-icon-theme"/> or
+       <xref linkend="oxygen-icons"/>
+       <xref linkend="x-window-system"/>, and
+       <xref linkend="yelp"/> for the buit-in help functionality
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="dconf"/> (to prevent some test failures),
       <xref linkend="gobject-introspection"/>,
       <xref linkend="pygobject3"/>,
@@ -92,5 +101,7 @@
     </para>
 
-    <note>
+<!--  Now in "recommendended runtime deps". Keeping as a comment because it
+      is easier to revert
+   <note>
       <para>
         Though only a run-time dependency, if you don't install the
@@ -99,5 +110,5 @@
       </para>
     </note>
-
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/gnumeric"/>
@@ -127,5 +138,7 @@
     <para>
       If you wish to test the results, issue <command>make -k check</command>.
-      A few tests fail, some for known reasons.
+      Tests must be run from an active X session, and <xref linkend="dconf"/>
+      should be installed to prevent some failures. Even so, a few tests fail,
+      some for known reasons.
     </para>
 
Index: xsoft/office/libreoffice-systemd.xml
===================================================================
--- xsoft/office/libreoffice-systemd.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
+++ xsoft/office/libreoffice-systemd.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -0,0 +1,611 @@
+<?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 libreoffice-dl "http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;">
+
+  <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
+  <!ENTITY libreoffice-core-md5sum        "427075aba3e1d32197954b7d6a2d0566">
+  <!ENTITY libreoffice-core-size          "157 MB">
+
+  <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
+  <!ENTITY libreoffice-dict-md5sum        "106c6826526289c679162b04166a8937">
+  <!ENTITY libreoffice-dict-size          "36 MB">
+
+  <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
+  <!ENTITY libreoffice-help-md5sum        "9019bcc3d1bc4bb882c3366a2dfc302d">
+  <!ENTITY libreoffice-help-size          "1.8 MB">
+
+  <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
+  <!ENTITY libreoffice-translations-md5sum        "8a7d1a0976f37334cb15cd93e01f5914">
+  <!ENTITY libreoffice-translations-size          "122 MB">
+
+  <!ENTITY libreoffice-buildsize          "8.5 GB (615 MB installed)">
+  <!ENTITY libreoffice-time               "140 SBU">
+]>
+
+<sect1 id="libreoffice" xreflabel="LibreOffice-&libreoffice-version;">
+  <?dbhtml filename="libreoffice.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: krejzi $</othername>
+    <date>$Date: 2014-10-30 22:25:41 +0100 (Thu, 30 Oct 2014) $</date>
+  </sect1info>
+
+  <title>LibreOffice-&libreoffice-version;</title>
+
+  <indexterm zone="libreoffice">
+    <primary sortas="a-LibreOffice">LibreOffice</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to LibreOffice</title>
+
+    <para>
+      <application>LibreOffice</application> is a full-featured office suite.
+      It is largely compatible with <application>Microsoft Office</application>
+      and is descended from <application>OpenOffice.org</application>.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Core Download: <ulink url="&libreoffice-core-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Core Download MD5 sum: &libreoffice-core-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Core Download size: &libreoffice-core-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libreoffice-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libreoffice-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Dictionaries: <ulink url="&libreoffice-dict-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Dictionaries MD5 sum: &libreoffice-dict-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Dictionaries size: &libreoffice-dict-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Help Files: <ulink url="&libreoffice-help-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Help Files MD5 sum: &libreoffice-help-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Help Files size: &libreoffice-help-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Translations: <ulink url="&libreoffice-translations-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Translations MD5 sum: &libreoffice-translations-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Translations size: &libreoffice-translations-size;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">LibreOffice Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="perl-archive-zip"/>,
+      <xref linkend="unzip"/>,
+      <xref linkend="wget"/>,
+      <xref linkend="which"/>, and
+      <xref linkend="zip"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <note>
+      <para>
+        Most of these packages are recommended because if they're not installed,
+        the build process will compile and install its own (often older)
+        version. If you have not installed some of the dependencies listed below,
+        make sure you examine the <command>./configure --help</command> output
+        for information on switches needed to prevent
+        <command>./configure</command> to look for them.
+      </para>
+    </note>
+
+    <para role="recommended">
+      <xref linkend="boost"/>,
+      <xref linkend="clucene"/>,
+      <xref linkend="cups"/>,
+      <xref linkend="curl"/>,
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="glu"/>,
+      <xref linkend="graphite2"/>,
+      <xref linkend="gst-plugins-base"/> or
+      <xref linkend="gst10-plugins-base"/>,
+      <xref linkend="gtk2"/>,
+      <xref linkend="harfbuzz"/>,
+      <xref linkend="icu"/>,
+      <xref linkend="lcms2"/>,
+      <xref linkend="libatomic_ops"/>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="librsvg"/>,
+      <xref linkend="libxml2"/> and
+      <xref linkend="libxslt"/>,
+      <xref linkend="mesalib"/>,
+      <xref linkend="neon"/>,
+      <xref linkend="npapi-sdk"/>,
+      <xref linkend="nss"/>,
+      <xref linkend="openldap"/>,
+      <xref linkend="openssl"/>,
+      <xref linkend="poppler"/>,
+      <xref linkend="python3"/>,
+      <xref linkend="redland"/>, and
+      <xref linkend="unixodbc"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="avahi"/>,
+      <xref linkend="bluez"/>,
+      <xref linkend="doxygen"/> (not relevant if using --disable-odk),
+      <xref linkend="gdb"/>,
+      <xref linkend="gtk3"/>,
+      <xref linkend="kdelibs"/>,
+      <xref linkend="mariadb"/>,
+      <xref linkend="mitkrb"/>,
+      <xref linkend="openjdk"/>,
+      <xref linkend="postgresql"/>,
+      <xref linkend="sane"/>,
+      <xref linkend="vlc"/>,
+      <xref linkend="zenity"/>,
+      <ulink url="https://projects.coin-or.org/CoinMP/">CoinMP</ulink>,
+      <ulink url="http://sourceforge.net/projects/cppunit/">Cppunit</ulink>,
+      <ulink url="http://www.firebirdsql.org/">Firebird</ulink>,
+      <ulink url="http://downloads.sourceforge.net/glew/">GLEW</ulink>,
+      <ulink url="https://code.google.com/p/hamcrest/">Hamcrest</ulink>,
+      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>,
+      <ulink url="http://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
+      <ulink url="https://code.google.com/p/include-what-you-use/">IWYU</ulink>,
+      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libabw">libabw</ulink>,
+      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr">libcdr</ulink>,
+      <ulink url="http://sourceforge.net/projects/libcmis/">libcmis</ulink>,
+      <ulink url="http://www.sourceforge.net/projects/libebook/">libebook</ulink>,
+      <ulink url="http://www.freedesktop.org/wiki/Software/libexttextcat/">libexttextcat</ulink>,
+      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand">libfreehand</ulink>,
+      <ulink url="http://tagoh.bitbucket.org/liblangtag/">liblangtag</ulink>,
+      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libmspub">libmspub</ulink>,
+      <ulink url="http://sourceforge.net/projects/libmwaw/">libmwaw</ulink>,
+      <ulink url="http://sourceforge.net/projects/libwpd/files/libodfgen/">libodfgen</ulink>,
+      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker">libpagemaker</ulink>,
+      <ulink url="http://sourceforge.net/projects/libwpd/files/librevenge/">librevenge</ulink>,
+      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio">libvisio</ulink>,
+      <ulink url="http://libwpd.sourceforge.net/">libwpd</ulink>,
+      <ulink url="http://libwpg.sourceforge.net/">libwpg</ulink>,
+      <ulink url="http://libwps.sourceforge.net/">libwps</ulink>,
+      <ulink url="http://lpsolve.sourceforge.net/">lp_solve</ulink>,
+      <ulink url="http://code.google.com/p/multidimalgorithm/">mdds</ulink>,
+      <ulink url="http://sourceforge.net/projects/hunspell/files/MyThes/">MyThes</ulink>,
+      <ulink url="http://sourceforge.net/projects/ogl-math/">OGL-Math</ulink>,
+      <ulink url="https://github.com/KhronosGroup/OpenCOLLADA/">OpenCOLLADA</ulink>,
+      <ulink url="https://gitorious.org/orcus">Orcus</ulink>, and
+      <ulink url="http://hci.iwr.uni-heidelberg.de/vigra/">VIGRA</ulink>
+    </para>
+
+    <para>
+      There are many optional dependencies not listed here. They can be
+      found in <quote>download.lst</quote> in the source directory.
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libreoffice"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of LibreOffice</title>
+
+    <para>
+      Create symlinks to tarballs from the source directory so they won't
+      get downloaded again:
+    </para>
+
+<screen><userinput>install -v -dm755 external/tarballs &amp;&amp;
+
+ln -sfv ../../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz external/tarballs/ &amp;&amp;
+ln -sfv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
+
+    <para>
+      If you have downloaded the translations tarball, create a symlink:
+    </para>
+
+<screen><userinput>ln -sfv ../../../libreoffice-translations-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
+
+    <note>
+      <para>
+        During the build process, some packages will be downloaded (including
+        the ones listed as recommended and optional dependencies) if they are
+        not present on the system. Doing so, build time may be different
+        for everyone.
+      </para>
+    </note>
+
+    <para>
+      In the rest of the page, locales "fr" and "en-GB" are examples. Change
+      them to suit your needs. You might want to read the "Command Explanations"
+      further below before proceeding.
+    </para>
+
+    <para>
+      Prepare <application>LibreOffice</application> for compilation by running
+      the following commands:
+    </para>
+
+<screen><userinput>sed -e "/gzip -f/d"   \
+    -e "s|.1.gz|.1|g" \
+    -i bin/distro-install-desktop-integration &amp;&amp;
+
+sed -e "/distro-install-file-lists/d" \
+    -i Makefile.in                            &amp;&amp;
+
+sed -e "/ustrbuf/a #include &lt;algorithm&gt;" \
+    -i svl/source/misc/gridprinter.cxx        &amp;&amp;
+
+chmod -v +x bin/unpack-sources                &amp;&amp;
+
+./autogen.sh --prefix=/usr               \
+             --sysconfdir=/etc           \
+             --with-vendor="BLFS"        \
+             --with-lang="fr en-GB"      \
+             --with-help                 \
+             --with-myspell-dicts        \
+             --with-alloc=system         \
+             --without-java              \
+             --without-system-dicts      \
+             --disable-gconf             \
+             --disable-odk               \
+             --disable-postgresql-sdbc   \
+             --enable-release-build      \
+             --enable-python=system      \
+             --with-system-boost         \
+             --with-system-clucene       \
+             --with-system-cairo         \
+             --with-system-curl          \
+             --with-system-expat         \
+             --with-system-graphite      \
+             --with-system-harfbuzz      \
+             --with-system-icu           \
+             --with-system-jpeg          \
+             --with-system-lcms2         \
+             --with-system-libatomic_ops \
+             --with-system-libpng        \
+             --with-system-libxml        \
+             --with-system-mesa-headers  \
+             --with-system-neon          \
+             --with-system-npapi-headers \
+             --with-system-nss           \
+             --with-system-odbc          \
+             --with-system-openldap      \
+             --with-system-openssl       \
+             --with-system-poppler       \
+             --with-system-redland       \
+             --with-system-zlib          \
+             --with-parallelism=$(getconf _NPROCESSORS_ONLN)</userinput></screen>
+
+    <para>
+      The instructions below will only build the package without running
+      any unit tests. If you prefer to run the unit tests, replace
+      <command>make build</command> with <command>make</command>.
+    </para>
+
+    <note>
+      <para>
+        The package needs to be built from an X terminal emulator.
+      </para>
+    </note>
+
+    <para>
+      Build the package:
+    </para>
+
+<screen><userinput>make build</userinput></screen>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make distro-pack-install             &amp;&amp;
+install -v -dm755 /usr/share/appdata &amp;&amp;
+install -v -m644  sysui/desktop/appstream-appdata/*.xml \
+                  /usr/share/appdata</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed -e ...</command>: The first sed prevents compression of the
+      manual pages, the second one prevents install from failing and the
+      third one prevents a build failure by adding a necessary include.
+    </para>
+
+    <para>
+      <command>chmod -v +x ...</command>: Fix the unpack script's permissions.
+    </para>
+
+    <para>
+      <parameter>--with-vendor=BLFS</parameter>: This switch sets BLFS as
+      the vendor which is mentioned when you click "About" on the toolbar.
+    </para>
+
+    <para>
+      <parameter>--with-lang="fr en-GB"</parameter>: This switch sets
+      what languages to support. To list several languages, separate them
+      with a space. For all languages, use
+      <parameter>--with-lang=ALL</parameter>.
+    </para>
+
+    <note>
+      <para>
+        For a list of the available languages, look in
+        <filename>solenv/inc/langlist.mk</filename>.
+      </para>
+    </note>
+
+    <para>
+      <parameter>--with-help</parameter>: This switch is used to enable
+      installation of the help files.
+    </para>
+
+    <para>
+      <parameter>--with-myspell-dicts</parameter>: This switch is used
+      to enable installation of the bundled dictionaries.
+    </para>
+
+    <para>
+      <parameter>--with-alloc=system</parameter>: This switch tells
+      <application>LibreOffice</application> to use system allocator
+      instead of the internal one.
+    </para>
+
+    <para>
+      <parameter>--without-system-dicts</parameter>: This switch is
+      used to ensure that the dictionaries installed by this
+      package are being used.
+    </para>
+
+    <para>
+      <parameter>--without-java</parameter>: This switch disables
+      <application>Java</application> support in
+      <application>LibreOffice</application>.
+    </para>
+
+    <para>
+      <parameter>--disable-gconf</parameter>: This switch disables compiling
+      <application>LibreOffice</application> with the deprecated
+      <application>GNOME</application> configuration system support.
+    </para>
+
+    <para>
+      <parameter>--disable-odk</parameter>: This switch disables installing the
+      office development kit. Remove if you want to develop a
+      <application>LibreOffice</application> based application.
+    </para>
+
+    <para>
+      <parameter>--disable-postgresql-sdbc</parameter>: This switch disables compiling
+      <application>LibreOffice</application> with the ability to connect to a
+      <application>PostgreSQL</application> database. Remove it if you would
+      like <application>LibreOffice</application> to be able to connect to a
+      <application>PostgreSQL</application> database. If you have installed
+      <application>PostgreSQL</application> on your system and would like
+      <application>LibreOffice</application> to use that rather than compile its
+      own copy, use the <option>--with-system-postgresql</option> switch.
+    </para>
+ 
+    <para>
+      <parameter>--enable-release-build</parameter>: This switch is used to
+      remove "Beta" or "Dev" from <application>LibreOffice</application>
+      splash screen and "About" menu.
+    </para>
+
+    <para>
+      <parameter>--enable-python=system</parameter>: This switch tells
+      <application>LibreOffice</application> to use installed
+      <application>Python 3</application> to build the translations
+      instead of the bundled one.
+    </para>
+
+    <para>
+      <parameter>--with-system-*</parameter>: These switches prevent
+      <application>LibreOffice</application> from trying to compile its own
+      versions of these dependencies. If you've not installed some of the
+      dependencies, remove the corresponding switches.
+    </para>
+
+    <para>
+      <parameter>--with-parallelism=$(getconf _NPROCESSORS_ONLN)</parameter>: This
+      switch tells <application>LibreOffice</application> to use all your
+      CPUs to compile in parallel and speed up the build.
+    </para>
+
+    <para>
+      <option>--enable-gstreamer-0-10</option>: Use this switch if you want to
+      use <xref linkend="gst-plugins-base"/> instead of
+      <xref linkend="gst10-plugins-base"/> for the avmedia module.
+    </para>
+
+    <para>
+      <option>--disable-gstreamer-1-0</option>: Use this switch if you
+      haven't installed <xref linkend="gst10-plugins-base"/>.
+    </para>
+
+    <para>
+      <option>--enable-gtk3</option>: Use this switch if you want to
+      build the <application>GTK+ 3</application> integration module.
+    </para>
+
+    <para>
+      <option>--enable-kde4</option>: Use this switch if you want to
+      build the <application>KDE</application> integration module.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          libreoffice, lobase, localc, lodraw, loffice, lofromtemplate,
+          loimpress, lomath, loweb, lowriter, soffice and unopkg
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/lib/libreoffice
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="lobase">
+        <term><command>lobase</command></term>
+        <listitem>
+          <para>
+            is a database manager.
+          </para>
+          <indexterm zone="libreoffice lobase">
+            <primary sortas="b-lobase">lobase</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="localc">
+        <term><command>localc</command></term>
+        <listitem>
+          <para>
+            is a spreadsheet program.
+          </para>
+          <indexterm zone="libreoffice localc">
+            <primary sortas="b-localc">localc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lodraw">
+        <term><command>lodraw</command></term>
+        <listitem>
+          <para>
+            is a vector graphics editor and diagramming tool.
+          </para>
+          <indexterm zone="libreoffice lodraw">
+            <primary sortas="b-lodraw">lodraw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="loimpress">
+        <term><command>loimpress</command></term>
+        <listitem>
+          <para>
+            can edit and display PowerPoint presentations.
+          </para>
+          <indexterm zone="libreoffice loimpress">
+            <primary sortas="b-loimpress">loimpress</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lomath">
+        <term><command>lomath</command></term>
+        <listitem>
+          <para>
+            is a mathematical formula editor. 
+          </para>
+          <indexterm zone="libreoffice lomath">
+            <primary sortas="b-lomath">lomath</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lowriter">
+        <term><command>lowriter</command></term>
+        <listitem>
+          <para>
+            is a word processor.
+          </para>
+          <indexterm zone="libreoffice lowriter">
+            <primary sortas="b-lowriter">lowriter</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="unopkg">
+        <term><command>unopkg</command></term>
+        <listitem>
+          <para>
+            is a tool to manage <application>LibreOffice</application>
+            extensions from the command line. 
+          </para>
+          <indexterm zone="libreoffice unopkg">
+            <primary sortas="b-unopkg">unopkg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: xsoft/office/office.xml
===================================================================
--- xsoft/office/office.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/office/office.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -24,6 +24,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abiword.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnumeric.xml"/>
-<!-- Hopefully gnucash will come back when updated  
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnucash.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libreoffice.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libreoffice-systemd.xml"/>
 </chapter>
Index: xsoft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/other/balsa.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -7,7 +7,7 @@
   <!ENTITY balsa-download-http "http://pawsa.fedorapeople.org/balsa/balsa-&balsa-version;.tar.bz2">
   <!ENTITY balsa-download-ftp  " ">
-  <!ENTITY balsa-md5sum        "afd175b4de2c6cc685ace50dc3ad61ff">
-  <!ENTITY balsa-size          "3.7 MB">
-  <!ENTITY balsa-buildsize     "72 MB">
+  <!ENTITY balsa-md5sum        "da3b500b5c939f85071fb1fe3e3efc01">
+  <!ENTITY balsa-size          "3.9 MB">
+  <!ENTITY balsa-buildsize     "78 MB">
   <!ENTITY balsa-time          "0.5 SBU">
 ]>
@@ -33,5 +33,5 @@
     <application>GNOME</application>-2 based mail client.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -82,5 +82,5 @@
     <para role="optional">
       <xref linkend="compface"/>,
-      <xref linkend="gpg2"/> and
+      <xref linkend="gnupg2"/> and
       <xref linkend="gpgme"/> (both for S/MIME support),
       <xref linkend="gtksourceview"/>,
Index: xsoft/other/feh.xml
===================================================================
--- xsoft/other/feh.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
+++ xsoft/other/feh.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -0,0 +1,195 @@
+<?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 feh-download-http "http://feh.finalrewind.org/feh-&feh-version;.tar.bz2">
+  <!ENTITY feh-download-ftp  " ">
+  <!ENTITY feh-md5sum        "18a70487dddf43682d4acc896bfed0d3">
+  <!ENTITY feh-size          "2.1 MB">
+  <!ENTITY feh-buildsize     "6.9 MB">
+  <!ENTITY feh-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="feh" xreflabel="feh-&feh-version;">
+  <?dbhtml filename="feh.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: fernando $</othername>
+    <date>$Date: 2015-01-10 19:45:03 +0100 (Sat, 10 Jan 2015) $</date>
+  </sect1info>
+
+  <title>feh-&feh-version;</title>
+
+  <indexterm zone="feh">
+    <primary sortas="a-feh">feh</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to feh</title>
+
+    <para>
+      <application>feh</application> is a fast, lightweight image viewer which
+      uses Imlib2. It is commandline-driven and supports multiple images
+      through slideshows, thumbnail browsing or multiple windows, and montages
+      or index prints (using TrueType fonts to display file info). Advanced
+      features include fast dynamic zooming, progressive loading, loading via
+      HTTP (with reload support for watching webcams), recursive file opening
+      (slideshow of a directory hierarchy), and mouse wheel/keyboard control.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&feh-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&feh-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &feh-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &feh-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &feh-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &feh-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">feh Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libpng"/> and
+      <xref linkend="imlib2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="curl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libexif"/> and
+      <xref linkend="perl-test-command"/>
+      (required to run the testsuite)
+    </para>
+
+    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
+    <para role="optional">
+      <xref linkend="libjpeg"/> (for lossless image rotation), and
+      <xref linkend="imagemagick"/> (to load unsupported formats)
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/feh"/>
+    </para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of feh</title>
+
+    <para>
+      Install <application>feh</application> by running the following commands:
+    </para>
+
+<screen><userinput>sed -i "s:doc/feh:&amp;-&feh-version;:" config.mk &amp;&amp;
+make PREFIX=/usr</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make test</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make PREFIX=/usr install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i "s:doc/feh:&amp;-&feh-version;:" config.mk</command>: This
+      sed fixes the doc directory to a versioned one, as used in BLFS.
+   </para>
+
+    <para>
+      <option>curl=0</option>: Use this make flag if you don't have cURL
+      package installed.
+    </para>
+
+    <para>
+      <option>exif=1</option>: This make flag enables builtin Exif tag display
+      support.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          feh
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/doc/feh-&feh-version; and
+          /usr/share/feh
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="feh-prog">
+        <term><command>feh</command></term>
+        <listitem>
+          <para>
+            is an image viewer and cataloguer.
+          </para>
+          <indexterm zone="feh feh-prog">
+            <primary sortas="b-feh">feh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: xsoft/other/fontforge-systemd.xml
===================================================================
--- xsoft/other/fontforge-systemd.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/other/fontforge-systemd.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -5,10 +5,11 @@
   %general-entities;
 
-  <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/20141126/fontforge-2014-11-26-Unix-Source.tar.gz">
+<!--  <!ENTITY fontforge-download-http "&sources-anduin-other-http;/fontforge-&fontforge-version;.tar.xz">-->
+  <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/&fontforge-version;/fontforge-&fontforge-version;.tar.gz">
   <!ENTITY fontforge-download-ftp  " ">
-  <!ENTITY fontforge-md5sum        "2193a30700a56aa7c466407ac37ce0e3">
-  <!ENTITY fontforge-size          "119.2 MB">
-  <!ENTITY fontforge-buildsize     "354.8 MB">
-  <!ENTITY fontforge-time          "3.9 SBU">
+  <!ENTITY fontforge-md5sum        "a68cd6797e2e5fb0aa88a33bbe15315b">
+  <!ENTITY fontforge-size          "120 MB">
+  <!ENTITY fontforge-buildsize     "406 MB">
+  <!ENTITY fontforge-time          "2.4 SBU">
 ]>
 
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -73,20 +74,20 @@
     </itemizedlist>
 
-    <note>
-    <para>
-      The <application>FontForge</application> tarball extracts 
-      to fontforge-20141126.
-    </para>
-    </note>
-
     <bridgehead renderas="sect3">FontForge Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="freetype2"/>,
+      <xref linkend="git"/>,
+      <xref linkend="glib2"/> and
+      <xref linkend="libxml2"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="cairo"/>,
-      <xref linkend="freetype2"/>,
+      <xref linkend="gtk2"/>,
       <xref linkend="harfbuzz"/>,
-      <xref linkend="gtk2"/>,      
-      <xref linkend="libxml2"/> and
+      <xref linkend="pango"/> and
       <xref linkend="xorg7-lib"/>
     </para>
@@ -98,6 +99,6 @@
       <xref linkend="libpng"/>,
       <xref linkend="libtiff"/>,
-      <xref linkend="pango"/>,
       <xref linkend="python2"/>,
+      <ulink url="http://ipython.org/">IPython</ulink>,
       <ulink url="https://github.com/fontforge/libspiro">libspiro</ulink>,
       <ulink url="https://bitbucket.org/sortsmill/libunicodenames">
@@ -121,13 +122,15 @@
     </para>
 
-<screen><userinput>./bootstrap --force &amp;&amp;
-./configure --prefix=/usr    \
-            --disable-static \
+<screen><userinput>rm -rf libltdl &amp;&amp;
+rm m4/argz.m4  &amp;&amp;
+./bootstrap    &amp;&amp;
+./configure --prefix=/usr     \
             --enable-gtk2-use \
+            --disable-static  \
             --docdir=/usr/share/doc/fontforge-&fontforge-version; &amp;&amp;
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make -k check</command>.
+      To test the results, issue: <command>make check</command>.
     </para>
 
@@ -138,4 +141,23 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>rm -rf libltdl ... ./bootstrap</command>:
+      These commands work around the old version of libtool in the source,
+      and the idiosyncracies of the bootstrap command, to allow it to build with
+      current libtool where some files have been renamed.
+    </para>
+
+    <para>
+      <parameter>--enable-gtk2-use</parameter>: This switch enables building
+      of the utilities that require <application>GTK+2</application>.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
Index: xsoft/other/gimp.xml
===================================================================
--- xsoft/other/gimp.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
+++ xsoft/other/gimp.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -0,0 +1,577 @@
+<?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 gimp-download-http "http://download.gimp.org/pub/gimp/v2.8/gimp-&gimp-version;.tar.bz2">
+  <!ENTITY gimp-download-ftp  " ">
+  <!ENTITY gimp-md5sum        "233c948203383fa078434cc3f8f925cb">
+  <!ENTITY gimp-size          "20 MB">
+  <!ENTITY gimp-buildsize     "642 MB (additional 553 MB to run the test suite,
+                                the help files add from 307 MB (en only) to
+                                reputedly 1.3 GB (all 18 languages), typically
+                                increasing by 60 MB per translation)">
+  <!ENTITY gimp-time          "4.2 SBU (additional 0.9 SBU to run the test
+                                suite, and for the help files, from 0.6 SBU (en
+                                only) to reputedly 19 SBU (all) - typically 1.3
+                                SBU per translation)">
+
+  <!ENTITY gimp-help-version  "2.8.2">
+  <!ENTITY gimp-help-download "http://download.gimp.org/pub/gimp/help/gimp-help-&gimp-help-version;.tar.bz2">
+  <!ENTITY gimp-help-md5sum   "a591c8974b2f4f584d0a769d52ed6c5b">
+  <!ENTITY gimp-help-size     "152 MB">
+]>
+
+<sect1 id="gimp" xreflabel="Gimp-&gimp-version;">
+  <?dbhtml filename="gimp.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy: krejzi $</othername>
+    <date>$Date: 2014-10-29 21:36:30 +0100 (Wed, 29 Oct 2014) $</date>
+  </sect1info>
+
+  <title>Gimp-&gimp-version;</title>
+
+  <indexterm zone="gimp">
+    <primary sortas="a-Gimp">Gimp</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Gimp</title>
+
+    <para>
+      The <application>Gimp</application> package contains
+      the GNU Image Manipulation Program which is useful for
+      photo retouching, image composition and image authoring.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gimp-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gimp-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gimp-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gimp-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gimp-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gimp-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Optional help files: <ulink url="&gimp-help-download;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gimp-help-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gimp-help-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Optional patch:
+          <ulink url="&patch-root;/gimp-&gimp-version;-device_info-1.patch"/>
+        </para>
+      </listitem>
+<!--      <listitem>
+        <para>
+          Compressed Patch MD5 sum: 5312793a67132131a6e3360e76f392e4
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+         Compressed Patch size: 486 KB
+        </para>
+      </listitem> -->
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Gimp Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gegl"/> and
+      <xref linkend="gtk2"/> 
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="pygtk"/> (including the gtk and pango modules)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="aalib"/>,
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="curl"/>,
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="gs"/> (with libgs installed),
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="gvfs"/>,
+      <xref linkend="iso-codes"/>,
+      <xref linkend="jasper"/>,
+      <xref linkend="lcms"/> or <xref linkend="lcms2"/>,
+      <xref linkend="libexif"/>,
+      <xref linkend="libgudev"/>,
+      <xref linkend="libmng"/>,
+      <xref linkend="librsvg"/>,
+      <ulink url="http://wvware.sourceforge.net/libwmf.html">libwmf</ulink>,
+      <xref linkend="poppler"/>,
+      an <xref linkend="server-mail"/> (that provides a
+      <command>sendmail</command> program), and
+      <xref linkend="webkitgtk2"/> (Compiled against GTK+ 2, required for the help-plugin)
+    </para>
+
+    <bridgehead renderas="sect4">Optional, for optimizing the PNG files in the
+    help system</bridgehead>
+    <para role="optional">
+      <ulink url="http://pngnq.sourceforge.net/">pngnq</ulink> and
+      <ulink url="http://pmt.sourceforge.net/pngcrush/">pngcrush</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gimp"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Gimp</title>
+
+    <para>
+      In order to get rid of an annoying message when running from a terminal
+      and/or if you wish to run the test suite, optionally use the
+      following patch:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../gimp-&gimp-version;-device_info-1.patch</userinput></screen>
+
+    <para>
+      Install <application>Gimp</application> by running
+      the following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc --without-gvfs &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results (requires an X-Windowed terminal) issue:
+      <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      The <filename>gimp-help</filename> tarball contains images and English
+      text help for help files, together with translations. It is
+      &quot;work in progress&quot;.
+    </para>
+
+    <para>
+      If you downloaded the <filename>gimp-help</filename> tarball, unpack
+      it and change into the root of the newly created source tree. Prepare for
+      the build with the following command:
+    </para>
+
+<screen><userinput>ALL_LINGUAS=&quot;ca da de el en en_GB es fr it ja ko nl nn pt_BR ru sl sv zh_CN&quot; \
+./configure --prefix=/usr &amp;&amp;</userinput></screen>
+
+    <para>
+      Remove from <envar>ALL_LINGUAS</envar> the codes for any languages which
+      you do not wish to install. Alternatively, remove the line starting with
+      <envar>ALL_LINGUAS</envar>, if you wish to build all languages. 
+    </para>
+
+<!--    <para>
+      Alternatively, if you wish to build languages including Catalan,
+      apply the patch:
+    </para>
+
+<screen role="nodump"><userinput>xzcat ../gimp-help-2.8.0-build_fixes-1.patch.xz \
+ | patch -p1 &amp;&amp;
+./autogen.sh -prefix=/usr &amp;&amp;</userinput></screen>
+
+    <para>
+      Again, you can specify a subset of languages by specifying
+      <envar>ALL_LINGUAS</envar> in front of <command>./autogen.sh</command>, but
+      this time including &quot;ca&quot;.
+    </para>
+ -->
+    <para>
+      Now build the help files:
+    </para>
+
+<screen><userinput>make</userinput></screen>
+
+    <para>
+      Issue the following commands as the
+      <systemitem class="username">root</systemitem> user to install the help
+      files:
+    </para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+chown -R root:root /usr/share/gimp/2.0/help</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/update-icons-and-desktop.xml"/>
+
+  </sect2>
+
+  <sect2 role="commands" id="gimp-cmd-explanations">
+    <title>Command Explanations</title>
+
+    <para>
+      <envar>ALL_LINGUAS=&quot;ca da de el en en_GB ...&quot;</envar>: by
+      default, the help files will be rendered in all the available languages.
+      Remove the codes of any languages you do not wish to build.
+    </para>
+
+    <para>
+      <parameter>--without-gvfs</parameter>: the choice of the backend to
+      handle URI information, e.g., when dragging images from a browser into the
+      <application>Gimp</application>, is made at compile time.  This parameter will
+      ensure that <application>cURL</application> is used at run-time, instead of
+      <application>Gvfs</application>.  You can omit this if you are installing
+      <application>Gvfs</application> AND will be running <command>gvfsd</command>,
+      e.g., in a <application>GNOME</application> desktop.
+    </para>
+
+    <para><option>--disable-python</option>: This option is necessary if
+    you have not installed <application>PyGTK</application>.</para>
+
+<!--<para>
+      <command>./autogen.sh</command> <parameter>-prefix=/usr</parameter>: In this case, using
+      <command>autoreconf</command> to regenerate <filename>configure</filename>
+      does not work, because of how the gimp-help developers chose to address
+      problems with the autotools.
+    </para>
+
+    <para>
+      <command>xzcat ../gimp-help-2.8.0-build_fixes-1.patch.xz</command>:
+      this patch is large, so it has been compressed with
+      <application>xz</application>. You are encouraged to be suspicious of
+      all patches until you have looked at them. Use <command>view</command>
+      to read the compressed patch before you apply it.
+    </para>
+-->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring The Gimp</title>
+
+    <sect3 id="gimp-config">
+      <title>Config Files</title>
+
+      <para>
+        <filename>/etc/gimp/2.0/*</filename> and
+        <filename>~/.gimp-2.8/gimprc</filename>
+      </para>
+
+      <indexterm zone="gimp gimp-config">
+        <primary sortas="e-AA.gimp-2.0/gimprc">~/.gimp-2.0/gimprc</primary>
+      </indexterm>
+
+      <indexterm zone="gimp gimp-config">
+        <primary sortas="e-etc-gimp-2.0-star">/etc/gimp/2.0/*</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>
+        The <application>Gimp</application> executes a configuration wizard
+        for each user upon their initial use of the program.
+      </para>
+
+      <para>
+        The <application>Gimp</application> executes the
+        <command>firefox</command> web browser by default to view the help
+        files. If you do not have <application>Firefox</application>, or
+        prefer a different web browser, you can set a new system value in
+        <filename>/etc/gimp/2.0/gimprc</filename>. Execute the following
+        command as the <systemitem class="username">root</systemitem> user,
+        replacing <replaceable>&lt;browser&gt;</replaceable> with your
+        preferred web browser:
+      </para>
+
+<screen role="root"><userinput>echo '(web-browser "<replaceable>&lt;browser&gt;</replaceable> %s")' &gt;&gt; /etc/gimp/2.0/gimprc</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gimp, gimp-2.8, gimp-console, gimp-console-2.8 and
+          gimptool-2.0
+        </seg>
+        <seg>
+          libgimp-2.0.so, libgimpbase-2.0.so, libgimpcolor-2.0.so,
+          libgimpconfig-2.0.so, libgimpmath-2.0.so, libgimpmodule-2.0.so,
+          libgimpthumb-2.0.so, libgimpui-2.0.so and libgimpwidgets-2.0.so
+        </seg>
+        <seg>
+          /etc/gimp,
+          /usr/include/gimp-2.0,
+          /usr/lib/gimp,
+          /usr/share/gimp,
+          /usr/share/gtk-doc/html/{libgimp,libgimpbase,libgimpcolor},
+          /usr/share/gtk-doc/html/{libgimpconfig,libgimpmath},
+          /usr/share/gtk-doc/html/{libgimpmodule,libgimpthumb} and
+          /usr/share/gtk-doc/html/libgimpwidgets
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gimp-prog">
+        <term><command>gimp</command></term>
+        <listitem>
+          <para>
+            is a symbolic link to <command>gimp-2.8</command>.
+          </para>
+          <indexterm zone="gimp gimp-prog">
+            <primary sortas="b-gimp">gimp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gimp-2.8">
+        <term><command>gimp-2.8</command></term>
+        <listitem>
+          <para>
+            is the Gnu Image Manipulation Program. It works with a variety
+            of image formats and provides a large selection of tools.
+          </para>
+          <indexterm zone="gimp gimp-2.8">
+            <primary sortas="b-gimp-2.8">gimp-2.8</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gimp-console">
+        <term><command>gimp-console</command></term>
+        <listitem>
+          <para>
+            is a symbolic link to <command>gimp-console-2.8</command>.
+          </para>
+          <indexterm zone="gimp gimp-console">
+            <primary sortas="b-gimp-console">gimp-console</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gimp-console-2.8">
+        <term><command>gimp-console-2.8</command></term>
+        <listitem>
+          <para>
+            is a console program that behaves as if The
+            <application>Gimp</application> was called with the
+            <option>--no-interface</option> command-line option.
+          </para>
+          <indexterm zone="gimp gimp-console-2.8">
+            <primary sortas="b-gimp-console-2.8">gimp-console-2.8</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gimptool-2.0">
+        <term><command>gimptool-2.0</command></term>
+        <listitem>
+          <para>
+            is a tool that can build plug-ins or scripts and install them
+            if they are distributed in one source file.
+            <command>gimptool-2.0</command> can also be used by programs that
+            need to know what libraries and include-paths The
+            <application>Gimp</application> was compiled with.
+          </para>
+          <indexterm zone="gimp gimptool-2.0">
+            <primary sortas="b-gimptool-2.0">gimptool-2.0</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgimp-2.0">
+        <term><filename class="libraryfile">libgimp-2.0.so</filename></term>
+        <listitem>
+          <para>
+            provides C bindings for The <application>Gimp</application>'s
+            Procedural Database (PDB) which offers an interface to core functions
+            and to functionality provided by plug-ins.
+          </para>
+          <indexterm zone="gimp libgimp-2.0">
+            <primary sortas="c-libgimp-2.0">libgimp-2.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgimpbase-2.0">
+        <term><filename class="libraryfile">libgimpbase-2.0.so</filename></term>
+        <listitem>
+          <para>
+            provides the C functions for basic
+            <application>Gimp</application> functionality such as determining
+            enumeration data types, gettext translation, determining The
+            <application>Gimp</application>'s version number and capabilities,
+            handling data files and accessing the environment.
+          </para>
+          <indexterm zone="gimp libgimpbase-2.0">
+            <primary sortas="c-libgimpbase-2.0">libgimpbase-2.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgimpcolor-2.0">
+        <term><filename
+        class="libraryfile">libgimpcolor-2.0.so</filename></term>
+        <listitem>
+          <para>
+            provides the C functions relating to RGB, HSV and CMYK colors as
+            well as converting colors between different color models and
+            performing adaptive supersampling on an area.
+          </para>
+          <indexterm zone="gimp libgimpcolor-2.0">
+            <primary sortas="c-libgimpcolor-2.0">libgimpcolor-2.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgimpconfig-2.0">
+        <term><filename
+        class="libraryfile">libgimpconfig-2.0.so</filename></term>
+        <listitem>
+          <para>
+            contains C functions for reading and writing config information.
+          </para>
+          <indexterm zone="gimp libgimpconfig-2.0">
+            <primary sortas="c-libgimpconfig-2.0">libgimpconfig-2.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgimpmath-2.0">
+        <term><filename class="libraryfile">libgimpmath-2.0.so</filename></term>
+        <listitem>
+          <para>
+            contains C functions which provide mathematical definitions and
+            macros, manipulate 3x3 transformation matrices, set up and manipulate
+            vectors and the MD5 message-digest algorithm.
+          </para>
+          <indexterm zone="gimp libgimpmath-2.0">
+            <primary sortas="c-libgimpmath-2.0">libgimpmath-2.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgimpmodule-2.0">
+        <term><filename class="libraryfile">libgimpmodule-2.0.so</filename></term>
+        <listitem>
+          <para>
+            provides the C functions which implements module loading using
+            GModule and keeps a list of GimpModule's found in a given
+            searchpath.
+          </para>
+          <indexterm zone="gimp libgimpmodule-2.0">
+            <primary sortas="c-libgimpmodule-2.0">libgimpmodule-2.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgimpthumb-2.0">
+        <term><filename class="libraryfile">libgimpthumb-2.0.so</filename></term>
+        <listitem>
+          <para>
+            provides the C functions for handling The
+            <application>Gimp</application>'s thumbnail objects.
+          </para>
+          <indexterm zone="gimp libgimpthumb-2.0">
+            <primary sortas="c-libgimpthumb-2.0">libgimpthumb-2.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgimpui-2.0">
+        <term><filename class="libraryfile">libgimpui-2.0.so</filename></term>
+        <listitem>
+          <para>
+            contains The <application>Gimp</application>'s common user
+            interface functions.
+          </para>
+          <indexterm zone="gimp libgimpui-2.0">
+            <primary sortas="c-libgimpui-2.0">libgimpui-2.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgimpwidgets-2.0">
+        <term><filename class="libraryfile">libgimpwidgets-2.0.so</filename></term>
+        <listitem>
+          <para>
+            contains The <application>Gimp</application>
+            and <application>GTK</application>'s widget creation and
+            manipulation functions.
+          </para>
+          <indexterm zone="gimp libgimpwidgets-2.0">
+            <primary
+            sortas="c-libgimpwidgets-2.0">libgimpwidgets-2.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: xsoft/other/gparted-systemd.xml
===================================================================
--- xsoft/other/gparted-systemd.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/other/gparted-systemd.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -8,8 +8,8 @@
            "&sourceforge-repo;/gparted/gparted-&gparted-version;.tar.bz2">
   <!ENTITY gparted-download-ftp  " ">
-  <!ENTITY gparted-md5sum        "d9df57f9d4b4dbd148644774f8bbccfb">
-  <!ENTITY gparted-size          "2.0 MB">
-  <!ENTITY gparted-buildsize     "78 MB (additional 4 MB, building the optional documentation)">
-  <!ENTITY gparted-time          "0.9 SBU (additional 0.1 SBU, building the optional documentation)">
+  <!ENTITY gparted-md5sum        "67c4bdf680461e1107b718aff6095ea6">
+  <!ENTITY gparted-size          "2.1 MB">
+  <!ENTITY gparted-buildsize     "94 MB">
+  <!ENTITY gparted-time          "0.9 SBU">
 ]>
 
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -172,6 +172,6 @@
        /usr/share/applications/gparted.desktop.back &amp;&amp;
 
-sed -i 's/Exec=/Exec=sudo -A /'
-       /usr/share/applications/gparted.desktop      &amp;&amp;</userinput></screen>
+sed -i 's/Exec=/Exec=sudo -A /' \
+       /usr/share/applications/gparted.desktop</userinput></screen>
 
     </sect3>
@@ -182,9 +182,8 @@
         <para>
           To optionally use <command>pkexec</command>, you need
-          <xref linkend="polkit-gnome"/> or <xref linkend="lxpolkit"/> or
-          any Polkit authentication agent provided by your desktop
-          environment and  <xref linkend="systemd"/> (for Logind). Run the
-          following commands as the <systemitem
-          class="username">root</systemitem> user:
+          <xref linkend="polkit-gnome"/> or any Polkit authentication agent
+          provided by your desktop environment and
+          <xref linkend="systemd"/>. Run the following commands
+          as the <systemitem class="username">root</systemitem> user:
         </para>
 
@@ -200,4 +199,5 @@
 pkexec /usr/sbin/gparted $@</literal>
 EOF
+
 chmod -v 755 /usr/sbin/gparted_polkit
 
@@ -223,4 +223,5 @@
 &lt;/policyconfig&gt;</literal>
 EOF
+
 chmod -v 644 /usr/share/polkit-1/actions/org.gnome.gparted.policy</userinput></screen>
 
Index: xsoft/other/hexchat.xml
===================================================================
--- xsoft/other/hexchat.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
+++ xsoft/other/hexchat.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -0,0 +1,136 @@
+<?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 hexchat-download-http "https://dl.hexchat.net/hexchat/hexchat-2.10.2.tar.xz">
+  <!ENTITY hexchat-download-ftp  " ">
+  <!ENTITY hexchat-md5sum        "c8e7477ac941295deaeb1732591ab20b">
+  <!ENTITY hexchat-size          "1.5 MB">
+  <!ENTITY hexchat-buildsize     "50 MB">
+  <!ENTITY hexchat-time          "0.3 SBU">
+]>
+
+<sect1 id="hexchat" xreflabel="HexChat-&hexchat-version;">
+  <?dbhtml filename="hexchat.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>HexChat-&hexchat-version;</title>
+
+  <indexterm zone="hexchat">
+    <primary sortas="a-HexChat">HexChat</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to HexChat</title>
+
+    <para><application>HexChat</application> is an IRC chat program.  It allows
+    you to join multiple IRC channels (chat rooms) at the same time, talk
+    publicly, have private one-on-one conversations, etc.  File transfers are
+    also possible.</para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&hexchat-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&hexchat-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &hexchat-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &hexchat-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &hexchat-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &hexchat-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">HexChat Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="glib2"/></para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended"><xref linkend="gtk2"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="iso-codes"/>,
+      <xref linkend="libcanberra"/>,
+      <xref linkend="libnotify"/>,
+      <xref linkend="openssl"/>,
+      <xref linkend="pciutils"/>, and
+      <ulink url="https://code.google.com/p/libproxy/">libproxy</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/hexchat"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of HexChat</title>
+
+    <para>Install <application>HexChat</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &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="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>hexchat</seg>
+        <seg>None</seg>
+        <seg>/usr/lib/hexchat</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="hexchat-prog">
+        <term><command>hexchat</command></term>
+        <listitem>
+          <para> is a graphical Internet Relay Chat (IRC) client.</para>
+          <indexterm zone="hexchat hexchat-prog">
+            <primary sortas="b-hexchat">hexchat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: xsoft/other/icedtea-web.xml
===================================================================
--- xsoft/other/icedtea-web.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/other/icedtea-web.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -7,7 +7,7 @@
   <!ENTITY icedtea-web-download-http "http://icedtea.classpath.org/download/source/icedtea-web-&icedtea-web-version;.tar.gz">
   <!ENTITY icedtea-web-download-ftp  " ">
-  <!ENTITY icedtea-web-md5sum        "7b82fd7138d14c002b69898a873be0cf">
-  <!ENTITY icedtea-web-size          "1.5 MB">
-  <!ENTITY icedtea-web-buildsize     "35 MB">
+  <!ENTITY icedtea-web-md5sum        "e5c3d732bf874a2b474f97a3f394b680">
+  <!ENTITY icedtea-web-size          "1.6 MB">
+  <!ENTITY icedtea-web-buildsize     "40 MB">
   <!ENTITY icedtea-web-time          "0.3 SBU">
 ]>
@@ -34,5 +34,5 @@
     implementation, licensed under GPLV3.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -65,5 +65,5 @@
       <xref linkend="openjdk"/> or
       <xref linkend="java"/> (remember to configure as described in the
-      <xref linkend="openjdk"/> page),
+      <xref linkend="ojdk-conf"/> page),
     </para>
 
Index: xsoft/other/inkscape-systemd.xml
===================================================================
--- xsoft/other/inkscape-systemd.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
+++ xsoft/other/inkscape-systemd.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -0,0 +1,216 @@
+<?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;
+
+  <!-- inkscape.org appears to point to launchpad, sf is out of date -->
+  <!ENTITY inkscape-download-http "https://launchpad.net/inkscape/0.91.x/0.91/+download/inkscape-&inkscape-version;.tar.bz2">
+  <!ENTITY inkscape-download-ftp  " ">
+  <!ENTITY inkscape-md5sum        "278dfa4514adcde23546370ec2c84581">
+  <!ENTITY inkscape-size          "25 MB">
+  <!ENTITY inkscape-buildsize     "1.9 GB">
+  <!ENTITY inkscape-time          "16 SBU">
+]>
+
+<sect1 id="inkscape" xreflabel="Inkscape-&inkscape-version;">
+  <?dbhtml filename="inkscape.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: fernando $</othername>
+    <date>$Date: 2015-02-08 11:30:45 +0100 (Sun, 08 Feb 2015) $</date>
+  </sect1info>
+
+  <title>Inkscape-&inkscape-version;</title>
+
+  <indexterm zone="inkscape">
+    <primary sortas="a-Inkscape">Inkscape</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Inkscape</title>
+
+    <para>
+      <application>Inkscape</application> is a what you see is what you get
+      Scalable Vector Graphics editor. It is useful for creating, viewing and
+      changing SVG images.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&inkscape-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&inkscape-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &inkscape-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &inkscape-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &inkscape-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &inkscape-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Optional patch (for full test coverage):
+          <ulink url="&patch-root;/inkscape-&inkscape-version;-testfiles-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Inkscape Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="boost"/>,
+      <xref linkend="gc"/>,
+      <xref linkend="gsl"/>,
+      <xref linkend="gtkmm2"/>
+      (or <xref linkend="gtkmm3"/> and
+      <ulink url="http://ftp.gnome.org/pub/gnome/sources/gdl/">GDL</ulink>
+      for the experimental GTK+3 build),
+      <xref linkend="libxslt"/> and
+      <xref linkend="popt"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="lcms2"/> or
+      <xref linkend="lcms"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="aspell"/>,
+      <xref linkend="dbus"/>,
+      <xref linkend="doxygen"/>,
+      <xref linkend="imagemagick"/>,
+      <xref linkend="poppler"/>,
+      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr">libcdr</ulink>,
+      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio">libvisio</ulink>,
+      <ulink url="https://github.com/LibreOffice/libcdr">libcdr</ulink>,
+      <ulink url="https://github.com/LibreOffice/libvisio">libvisio</ulink>,
+      <ulink url="http://libwpg.sourceforge.net/">libwpg</ulink>,
+      <ulink url="&sourceforge-repo;/NumPy/">NumPy</ulink>
+      (for the testsuite and at runtime for some extensions) and
+      <ulink url="https://pypi.python.org/pypi/lxml">python-lxml</ulink>
+      (for the testsuite, and at runtime for some of the extensions)
+    </para>
+
+    <bridgehead renderas="sect4">Optional Runtime Dependencies
+    (for some of the Inkscape extensions)</bridgehead>
+    <para role="optional">
+      <ulink url="http://search.cpan.org/dist/XML-XQL/">XML::XQL</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/inkscape"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Inkscape</title>
+
+    <para>
+      Install <application>Inkscape</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-testfiles-1.patch &amp;&amp;
+
+./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/update-icons-and-desktop.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          inkscape and inkview
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/inkscape
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="inkscape-prog">
+        <term><command>inkscape</command></term>
+        <listitem>
+          <para>
+            an SVG (Scalable Vector Graphics) editing program.
+          </para>
+          <indexterm zone="inkscape inkscape-prog">
+            <primary sortas="b-inkscape">inkscape</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="inkview">
+        <term><command>inkview</command></term>
+        <listitem>
+          <para>
+            is a simple program for displaying SVG files.
+          </para>
+          <indexterm zone="inkscape inkview">
+            <primary sortas="b-inkview">inkview</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: xsoft/other/other.xml
===================================================================
--- xsoft/other/other.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/other/other.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -20,11 +20,11 @@
 
   <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="feh.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fontforge-systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gimp-systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gimp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gparted-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hexchat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icedtea-web.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inkscape.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inkscape-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pidgin.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rox-filer.xml"/>
@@ -35,4 +35,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xchat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdg-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xscreensaver.xml"/>
 
 </chapter>
Index: xsoft/other/pidgin.xml
===================================================================
--- xsoft/other/pidgin.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/other/pidgin.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -9,6 +9,6 @@
   <!ENTITY pidgin-md5sum        "7c8bb6f997e05e7929104439872c2844">
   <!ENTITY pidgin-size          "9.0 MB">
-  <!ENTITY pidgin-buildsize     "220.9 MB (including the API docs)">
-  <!ENTITY pidgin-time          "2.3 SBU (additional 0.1 SBU for API docs)">
+  <!ENTITY pidgin-buildsize     "215 MB (additional 2 MB for the tests and 91 MB for API docs)">
+  <!ENTITY pidgin-time          "1.9 SBU (additional 0.1 SBU for API docs)">
 ]>
 
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -100,24 +100,30 @@
       <xref linkend="dbus"/>,
       <xref linkend="evolution-data-server"/>,
+      <xref linkend="GConf"/>,
+      <xref linkend="libidn"/> (required, if you wish to run the test suite),
+      <xref linkend="NetworkManager"/>,
+      <xref linkend="gstreamer"/> (required for audio support),
+      <xref linkend="sqlite"/> (required for the Contact Availability Prediction
+      plugin),
+      <xref linkend="startup-notification"/>,
+      <xref linkend="tcl"/>,
+      <xref linkend="tk"/>,
       <ulink url="http://www.freedesktop.org/wiki/Software/Farstream">
       Farstream (Version 0.1)</ulink>
       (required for video and voice support),
-      <xref linkend="GConf"/>,
-      <xref linkend="gstreamer"/> (required for audio support),
       <ulink url="http://gtkspell.sourceforge.net/">Gtkspell</ulink>,
-      <xref linkend="libidn"/>,
       <ulink url="http://libgadu.net/">libgadu</ulink>,
       <ulink url="http://meanwhile.sourceforge.net/">Meanwhile</ulink>
       (required for Sametime protocol support),
+      <ulink url="http://silcnet.org/software/">SILC Client</ulink>,
+      <ulink url="http://silcnet.org/software/">SILC Toolkit</ulink>,
+      <ulink url="http://packages.debian.org/stable/source/zephyr">Zephyr</ulink>, and
       <xref linkend="mitkrb"/> (required for Kerberos support in the Zephyr
       module),
-      <xref linkend="NetworkManager"/>,
-      <ulink url="http://silcnet.org/software/">SILC Client</ulink>,
-      <ulink url="http://silcnet.org/software/">SILC Toolkit</ulink>,
-      <xref linkend="startup-notification"/>,
-      <xref linkend="sqlite"/> (required for the Contact Availability Prediction
-      plugin),
-      <xref linkend="tcl"/>, and
-      <ulink url="http://packages.debian.org/stable/source/zephyr">Zephyr</ulink>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
+    <para role="optional">
+      <xref linkend="xdg-utils"/>
     </para>
 
@@ -131,6 +137,8 @@
 
     <para>
-      Compile <application>Pidgin</application> by running the following
-      commands:
+      If you wish to run the test suite, make sure that <xref
+      linkend="libidn"/> is installed and remove the switch
+      <quote>--disable-idn</quote>. Compile <application>Pidgin</application>
+      by running the following commands:
     </para>
 
@@ -150,10 +158,10 @@
       If you have <xref linkend="doxygen"/> installed
       (<xref linkend="graphviz"/> can be used also) and you wish to create the
-      API documentation, issue: <command>make docs</command>
-    </para>
-
-    <para>
-      <!--To test the results, issue: <command>make -k check</command>. -->For
-      unknown reasons, the test suite fails.
+      API documentation, issue: <command>make docs</command>.
+    </para>
+
+    <para>
+      Remember the remarks before <command>configure</command>. To test the
+      results, issue: <command>make check</command>.
     </para>
 
Index: xsoft/other/rox-filer.xml
===================================================================
--- xsoft/other/rox-filer.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/other/rox-filer.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -19,5 +19,5 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
-    <date> </date>
+    <date>$Date$</date>
   </sect1info>
 
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -95,6 +95,6 @@
       </para>
 
-<screen><literal>Filesystems -&#45;-&gt;
-  [*] Dnotify support</literal></screen>
+<screen><literal>File systems ---&gt;
+  [*] Dnotify support   [CONFIG_DNOTIFY]</literal></screen>
 
     <para>
Index: xsoft/other/rxvt-unicode.xml
===================================================================
--- xsoft/other/rxvt-unicode.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/other/rxvt-unicode.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -7,7 +7,7 @@
   <!ENTITY rxvt-unicode-download-http "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-&rxvt-unicode-version;.tar.bz2">
   <!ENTITY rxvt-unicode-download-ftp  " ">
-  <!ENTITY rxvt-unicode-md5sum        "4a5b823f08d21036f94a6c51e94d025b">
-  <!ENTITY rxvt-unicode-size          "896 KB">
-  <!ENTITY rxvt-unicode-buildsize     "25 MB">
+  <!ENTITY rxvt-unicode-md5sum        "a9a06c608258c5fd247c3725d8f44582">
+  <!ENTITY rxvt-unicode-size          "904 KB">
+  <!ENTITY rxvt-unicode-buildsize     "26 MB">
   <!ENTITY rxvt-unicode-time          "0.2 SBU">
 ]>
@@ -34,5 +34,5 @@
     emulator which includes support for XFT and Unicode.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -152,4 +152,30 @@
     <filename>urxvtperl</filename> man pages.</para>
 
+    <para>If you use a Desktop Environment, a menu entry can be included,
+    issuing, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen><userinput>cat &gt; /usr/share/applications/urxvt.desktop &lt;&lt; "EOF" &amp;&amp;
+<literal>[Desktop Entry]
+Encoding=UTF-8
+Name=Rxvt-Unicode Terminal
+Comment=Use the command line
+GenericName=Terminal
+Exec=urxvt 
+Terminal=false
+Type=Application
+Icon=utilities-terminal
+Categories=GTK;Utility;TerminalEmulator;
+#StartupNotify=true
+Keywords=console;command line;execute;</literal>
+EOF
+
+update-desktop-database -q</userinput></screen>
+
+    <para>For that, you need <xref linkend="desktop-file-utils"/> and at least
+    one of <xref linkend="adwaita-icon-theme"/>, <xref linkend="oxygen-icons"/>
+    or <xref linkend="lxde-icon-theme"/>. Uncomment the line with
+    <quote>StartupNotify=true</quote> if <xref linkend="startup-notification"/>
+    is installed.</para>
+
   </sect2>
 
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/other/thunderbird.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -6,11 +6,11 @@
 
   <!ENTITY thunderbird-download-http 
-           "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.bz2">
+           "&mozilla-http;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.bz2">
   <!ENTITY thunderbird-download-ftp
            "&mozilla-ftp;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.bz2">
-  <!ENTITY thunderbird-md5sum            "6bb66f5cb67d573939d4e2ead6f7c7ca">
-  <!ENTITY thunderbird-size              "164 MB">
-  <!ENTITY thunderbird-buildsize         " 3.7 GB (68 MB installed)">
-  <!ENTITY thunderbird-time              "13 SBU (using parallelism=8)">
+  <!ENTITY thunderbird-md5sum            "0a740cdeee86d3ab49c635c6070c4b06">
+  <!ENTITY thunderbird-size              "194 MB">
+  <!ENTITY thunderbird-buildsize         "3.9 GB (73 MB installed)">
+  <!ENTITY thunderbird-time              "50 SBU">
 ]>
 
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -80,5 +80,6 @@
       <xref linkend="alsa-lib"/>,
       <xref linkend="gtk2"/>,
-      <xref linkend="unzip"/> and
+      <xref linkend="unzip"/>,
+      <xref linkend="yasm"/> and
       <xref linkend="zip"/>
     </para>
@@ -89,16 +90,13 @@
       <xref linkend="libvpx"/>,
       <xref linkend="nspr"/>,
-      <xref linkend="nss"/>,
-      <xref linkend="sqlite"/> and
-      <xref linkend="yasm"/>
+      <xref linkend="nss"/> and
+      <xref linkend="sqlite"/>
     </para>
 
     <note>
       <para>
-        If you don't install recommended dependencies,
-        then internal copies of those packages will
-        be used. They might be tested to work, but
-        they can be out of date or contain security
-        holes.
+        If you don't install recommended dependencies, then internal copies of
+        those packages will be used. They might be tested to work, but they can
+        be out of date or contain security holes.
       </para>
     </note>
@@ -106,16 +104,14 @@
     <note>
       <para>
-        With <application>Thunderbird-31.0</application> and later versions, you
-        must have installed <application>Openssl</application> before
+        You must have installed <application>OpenSSL</application> before
         <application>Python 2</application>, or the build system will quickly
         fail with output including "ImportError: cannot import name
-        HTTPSHandler". If you are in any doubt about this (e.g. upgrading
-        from an older version of Thunderbird), check if
-        <filename>/usr/lib/python2.7/lib-dynload/_ssl.so</filename> exists.
-        If it does not, reinstall <xref linkend="python2"/> (after
-        installing <xref linkend="openssl"/>  - the latest version of any
-        <emphasis>currently maintained</emphasis> version of Openssl should
-        be satisfactory if already installed - if that package has not already
-        been installed).
+        HTTPSHandler". If you are in any doubt about this (e.g. upgrading from
+        an older version of SeaMonkey), check if
+        <filename>/usr/lib/python&python2-majorver;/lib-dynload/_ssl.so</filename>
+        exists. If it does not, reinstall <xref linkend="python2"/> (after
+        installing <xref linkend="openssl"/>. The latest version of any
+        <emphasis>currently maintained</emphasis> version of OpenSSL should be
+        satisfactory if already installed.
       </para>
     </note>
@@ -138,5 +134,5 @@
       <xref linkend="startup-notification"/>,
       <xref linkend="wget"/>,
-      <xref linkend="wireless_tools"/>, and
+      <xref linkend="wireless_tools"/> and
       <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>
     </para>
@@ -161,7 +157,8 @@
 
 <screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
-<literal># If you have a multicore machine, firefox will now use all the cores by
-# default. Exceptionally, you can reduce the number of cores, e.g. to 1,
-# by uncommenting the next line and setting a valid number of CPU cores.
+<literal># If you have a multicore machine, the build may be faster if using parallel
+# jobs. The build system automatically adds -jN to the "make" flags, where N
+# is the number of CPU cores. The option below is therefore useless, unless
+# you want to use a smaller number of jobs:
 #mk_add_options MOZ_MAKE_FLAGS="-j1"
 
@@ -175,18 +172,19 @@
 ac_add_options --disable-libnotify
 
-# GStreamer is necessary for H.264 video playback in HTML5 Video Player;
-# to be enabled, also remember to set "media.gstreamer.enabled" to "true"
-# in about:config. If you have installed GStreamer comment out this line:
+# Comment out following option if you have PulseAudio installed
+ac_add_options --disable-pulseaudio
+
+# GStreamer is necessary for H.264 video playback in HTML5 Video Player.
+# To enable it, make sure you also set "media.gstreamer.enabled" to
+# "true" in about:config.
+
+# If you have GStreamer 0.10.x installed, comment out this line:
 ac_add_options --disable-gstreamer
+# or uncomment this line if you have GStreamer 1.x.y installed:
+#ac_add_options --enable-gstreamer=1.0
 
 # Uncomment these lines if you have installed optional dependencies:
 #ac_add_options --enable-system-hunspell
 #ac_add_options --enable-startup-notification
-
-# Comment out following option if you have PulseAudio installed
-ac_add_options --disable-pulseaudio
-
-# If you have not installed Yasm then uncomment this line:
-#ac_add_options --disable-webm
 
 # If you want to compile the Mozilla Calendar, uncomment this line:
@@ -204,4 +202,5 @@
 # The BLFS editors recommend not changing anything below this line:
 ac_add_options --prefix=/usr
+ac_add_options --enable-application=mail
 
 ac_add_options --disable-crashreporter
@@ -229,18 +228,12 @@
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-png
-ac_add_options --with-system-zlib
-
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/thunderbuild</literal>
+ac_add_options --with-system-zlib</literal>
 EOF</userinput></screen>
 
     <para>
-      First, a bug needs to be fixed. Notice that thunderbuild matches
-      the value used in mozconfig (above) for the object directory
-      (MOZ_OBJDIR):
-    </para>
-
-<!-- might be necessary
-test $(uname -m) = "i686" && sed -i 's/enable-optimize/disable-optimize/' mozconfig || true &&-->
-<screen><userinput>mkdir -vp mozilla/thunderbuild</userinput></screen>
+      First, fix building with system freetype-2.6 or later:
+    </para>
+
+<screen><userinput>sed -i '/^ftglyph.h/ i ftfntfmt.h' mozilla/config/system-headers</userinput></screen>
 
     <para>
@@ -260,15 +253,19 @@
     </para>
 
-<screen role="root"><userinput>make -f client.mk install INSTALL_SDK=</userinput></screen>
-
-    <para>
-      The above instruction just installs the parts you need to run
-      <application>Thunderbird</application>. Alternatively, if you want to
-      install the full <application>Thunderbird</application> development
-      environment, run the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C thunderbuild install</userinput></screen>
+<screen role="root"><userinput>make -f client.mk install INSTALL_SDK= &amp;&amp;
+chown -R root:root /usr/lib/thunderbird-&thunderbird-version;</userinput></screen>
+
+    <para>
+      While still as the <systemitem class="username">root</systemitem> user,
+      install the icon files which will be used in the desktop file below:
+    </para>
+
+<screen role="root"><userinput>for s in 16 22 24 32 48 256
+do
+install -v -Dm644 /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default${s}.png \
+                  /usr/share/icons/hicolor/${s}x${s}/apps/thunderbird.png
+done &amp;&amp;
+gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
+unset s</userinput></screen>
 
   </sect2>
@@ -276,11 +273,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-<!-- might be necessary
-    <para>
-      <command>test $(uname -m) = "i686" &amp;&amp; sed ...</command>: On this
-      version of thunderbird, an old bug has reappeared in 32-bit builds.  With
-      optimization, the install fails with a Python error.  This command will
-      fix i686 builds and preserve the optimization on x86_64.
-    </para>-->
 
     <para>
@@ -297,62 +287,60 @@
     <title>Configuring Thunderbird</title>
 
-    <sect3><title>Configuration Information</title>
-
+    <para>
+      If your Window or Desktop Manager does not allow you to configure a
+      default browser, you can add a configuration parameter to
+      <application>Thunderbird</application> so that a browser will start when
+      when you click on an Internet/intranet/local URL. The procedure to check
+      or modify any of the configuration parameters is quite simple and the
+      instructions here can be used to view or modify any of the parameters.
+    </para>
+
+    <para>
+      First, open the configuration dialog by opening the <quote>Edit</quote>
+      drop-down menu. Choose <quote>Preferences</quote> and then click on the
+      <quote>Advanced</quote> icon on the top menu bar. Choose the
+      <quote>General</quote> tab and click on the <quote>Config Editor</quote>
+      button. This will display a list of the configuration preferences and
+      information related to each one. You can use the <quote>Filter:</quote>
+      bar to enter search criteria and narrow down the listed items. Changing
+      a preference can be done using two methods. One, if the preference has a
+      boolean value (True/False), simply double-click on the preference to
+      toggle the value and two, for other preferences simply right-click on
+      the desired line, choose <quote>Modify</quote> from the menu and change
+      the value. Creating new preference items is accomplished in the same
+      way, except choose <quote>New</quote> from the menu and provide the
+      desired data into the fields when prompted.
+    </para>
+
+    <para>
+      The configuration preference item you need to check so that
+      <application>Thunderbird</application> uses a specified browser is the
+      <parameter>network.protocol-handler.app.http</parameter> which should be
+      set to the path of the desired browser, e.g.
+      <option>/usr/bin/firefox</option>.
+    </para>
+
+    <tip>
       <para>
-        If your Window or Desktop Manager does not allow you to configure a
-        default browser, you can add a configuration parameter to
-        <application>Thunderbird</application> so that a browser will start when
-        when you click on an Internet/intranet/local URL. The procedure to check
-        or modify any of the configuration parameters is quite simple and the
-        instructions here can be used to view or modify any of the parameters.
+        There is a multitude of configuration parameters you can tweak to
+        customize <application>Thunderbird</application>. A very extensive,
+        but not so up-to-date list of these parameters can be found at
+        <ulink url="http://preferential.mozdev.org/preferences.html"/>.
       </para>
-
-      <para>
-        First, open the configuration dialog by opening the <quote>Edit</quote>
-        drop-down menu. Choose <quote>Preferences</quote> and then click on the
-        <quote>Advanced</quote> icon on the top menu bar. Choose the
-        <quote>General</quote> tab and click on the <quote>Config Editor</quote>
-        button. This will display a list of the configuration preferences and
-        information related to each one. You can use the <quote>Filter:</quote>
-        bar to enter search criteria and narrow down the listed items. Changing
-        a preference can be done using two methods. One, if the preference has a
-        boolean value (True/False), simply double-click on the preference to
-        toggle the value and two, for other preferences simply right-click on
-        the desired line, choose <quote>Modify</quote> from the menu and change
-        the value. Creating new preference items is accomplished in the same
-        way, except choose <quote>New</quote> from the menu and provide the
-        desired data into the fields when prompted.
-      </para>
-
-      <para>
-        The configuration preference item you need to check so that
-        <application>Thunderbird</application> uses a specified browser is the
-        <parameter>network.protocol-handler.app.http</parameter> which should be
-        set to the path of the desired browser, e.g.
-        <option>/usr/bin/firefox</option>.
-      </para>
-
-      <tip>
-        <para>
-          There is a multitude of configuration parameters you can tweak to
-          customize <application>Thunderbird</application>. A very extensive,
-          but not so up-to-date list of these parameters can be found at
-          <ulink url="http://preferential.mozdev.org/preferences.html"/>.
-        </para>
-      </tip>
-
-    <para>
-      If you use a desktop environment like <application>GNOME</application> or
-      <application>KDE</application> you may wish to create a
-      <filename>thunderbird.desktop</filename> file so that
-      <application>Thunderbird</application> appears in the panel's menus. If
-      you didn't enable <application>startup-notification</application> in your
-      mozconfig then change the StartupNotify line to false. Run the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -pv /usr/share/{applications,pixmaps} &amp;&amp;
-
-cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; "EOF" &amp;&amp;
+    </tip>
+
+    <para>
+      If you use a desktop environment such as <application>GNOME</application>
+      or <application>KDE</application>, you may want to create a desktop file
+      in order to be able to launch <application>Thunderbird</application> from the
+      desktop menus. If you didn't enable
+      <application>Startup Notification</application> support in your mozconfig
+      then change the StartupNotify line to false. Run the following commands
+      as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
+
+cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; "EOF"
 <literal>[Desktop Entry]
 Encoding=UTF-8
@@ -367,15 +355,5 @@
 MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;x-scheme-handler/mailto;
 StartupNotify=true</literal>
-EOF
-
-for s in 16 22 24 32 48 256
-do
-install -v -Dm644 /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default${s}.png \
-                  /usr/share/icons/hicolor/${s}x${s}/apps/thunderbird.png
-done &amp;&amp;
-gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
-unset s</userinput></screen>
-
-    </sect3>
+EOF</userinput></screen>
 
   </sect2>
@@ -385,7 +363,7 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
Index: xsoft/other/tigervnc.xml
===================================================================
--- xsoft/other/tigervnc.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/other/tigervnc.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -5,13 +5,14 @@
   %general-entities;
 
-  <!ENTITY tigervnc-download-http "&sourceforge-repo;/tigervnc/tigervnc-&tigervnc-version;.tar.gz">
+  <!ENTITY tigervnc-download-http "http://anduin.linuxfromscratch.org/sources/BLFS/conglomeration/tigervnc/tigervnc-&tigervnc-version;.tar.gz">
   <!ENTITY tigervnc-download-ftp  " ">
-  <!ENTITY tigervnc-md5sum        "e80b16aa74f1d8e89f284a6aef99955d">
-  <!ENTITY tigervnc-size          "6.6 MB">
-  <!ENTITY tigervnc-buildsize     "168 MB">
-  <!ENTITY tigervnc-time          "1.7 SBU">
+  <!ENTITY tigervnc-md5sum        "2177ee42fa1a3902b6feeaa7747f1c2a">
+  <!ENTITY tigervnc-size          "1.3 MB">
+  <!ENTITY tigervnc-buildsize     "160 MB">
+  <!ENTITY tigervnc-time          "1.6 SBU">
+  <!ENTITY tigervnc-xorg-version  "1.17.1">
 ]>
 
-<sect1 id="tigervnc" xreflabel="tigervnc-&tigervnc-version;">
+<sect1 id="tigervnc" xreflabel="Tigervnc-&tigervnc-version;">
   <?dbhtml filename="tigervnc.html"?>
 
@@ -24,5 +25,5 @@
 
   <indexterm zone="tigervnc">
-    <primary sortas="a-tigervnc">tigervnc</primary>
+    <primary sortas="a-Tigervnc">Tigervnc</primary>
   </indexterm>
 
@@ -30,31 +31,44 @@
     <title>Introduction to Tigervnc</title>
 
-    <para><application>Tigervnc</application> is an advanced VNC (Virtual 
-    Network Computing) implementation.  It allows creation of an Xorg server
-    not tied to a physical console and also provides a client for 
-    viewing of the remote graphical desktop.
-    </para>
-
-    &lfs76_checked;
+    <para>
+      <application>Tigervnc</application> is an advanced VNC (Virtual 
+      Network Computing) implementation. It allows creation of an Xorg
+      Server not tied to a physical console and also provides a client
+      for  viewing of the remote graphical desktop.
+    </para>
+
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&tigervnc-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&tigervnc-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &tigervnc-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &tigervnc-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &tigervnc-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &tigervnc-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&tigervnc-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&tigervnc-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &tigervnc-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &tigervnc-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &tigervnc-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &tigervnc-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -64,6 +78,6 @@
       <listitem>
         <para>
-          Required file:
-          <ulink url="&xorg-download-ftp;/xserver/xorg-server-1.15.0.tar.bz2"/>
+          Required package:
+          <ulink url="&xorg-download-http;/xserver/xorg-server-&tigervnc-xorg-version;.tar.bz2"/>
         </para>
       </listitem>
@@ -83,12 +97,16 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/tigervnc-&tigervnc-version;-xorg115-1.patch"/>
+          <ulink url="&patch-root;/tigervnc-&tigervnc-version;-xorg117-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
 
-    <note><para>The version of <application>Xorg</application> is a few versions
-    out of date, but is required for the customizations needed for this 
-    package.</para></note>
+    <note>
+      <para>
+        The version of <application>Xorg Server</application> is a few versions
+        out of date, but is required for the customizations needed for this 
+        package.
+      </para>
+    </note>
 
     <bridgehead renderas="sect3">Tigervnc Dependencies</bridgehead>
@@ -101,5 +119,4 @@
       <xref linkend="libgcrypt"/>,
       <xref linkend="libjpeg"/>,
-      <xref linkend="nasm"/>,
       <xref linkend="pixman"/>, and
       <xref linkend="xorg7-app"/>
@@ -113,6 +130,6 @@
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/tigervnc"/></para>
-
+      <ulink url="&blfs-wiki;/tigervnc"/>
+    </para>
   </sect2>
 
@@ -120,35 +137,42 @@
     <title>Installation of Tigervnc</title>
 
-    <para>Install <application>tigervnc</application> by running the following
-    commands:</para>
-
-<screen><userinput>tar -xf ../xorg-server-1.15.0.tar.bz2 -C unix/xserver --strip-components=1 &amp;&amp;
+    <para>
+      Install <application>Tigervnc</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>tar -xf ../xorg-server-&tigervnc-xorg-version;.tar.bz2 -C unix/xserver --strip-components=1 &amp;&amp;
 
 patch -Np1 -i ../tigervnc-&tigervnc-version;-gethomedir-1.patch &amp;&amp;
 patch -Np1 -i ../tigervnc-&tigervnc-version;-getmaster-1.patch  &amp;&amp;
-patch -Np1 -i ../tigervnc-&tigervnc-version;-xorg115-1.patch    &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev &amp;&amp;
+patch -Np1 -i ../tigervnc-&tigervnc-version;-xorg117-1.patch    &amp;&amp;
+sed -i 's/iconic/nowin/' unix/vncserver            &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr &amp;&amp;
 make &amp;&amp;
 
 pushd unix/xserver                  &amp;&amp;
-  patch -Np1 -i ../xserver114.patch &amp;&amp;
-  autoreconf -fiv                   &amp;&amp;
+  patch -Np1 -i ../xserver116.patch &amp;&amp;
+  autoreconf -fi                    &amp;&amp;
 
   ./configure $XORG_CONFIG \
-      --disable-present     --disable-dri3       --disable-dmx         \
+      --disable-xwayland    --enable-dri3        --disable-dmx         \
       --disable-static      --disable-xinerama   --disable-dri         \
       --disable-xorg        --disable-xnest      --disable-xvfb        \
       --disable-xwin        --disable-xephyr     --disable-kdrive      \
-      --disable-config-dbus --disable-config-hal --disable-config-udev \
+      --disable-devel-docs  --disable-config-hal --disable-config-udev \
       --disable-unit-tests  --disable-selective-werror                 \
-      --without-dtrace      --enable-dri2        --enable-glx \
+      --without-dtrace      --enable-dri2        --enable-glx          \
       --enable-glx-tls      --with-pic  &amp;&amp;
   make    &amp;&amp;
 popd</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <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;
@@ -156,9 +180,12 @@
 cd unix/xserver/hw/vnc &amp;&amp;
 make install           &amp;&amp;
-sed -i 's/iconic/nowin/' /usr/bin/vncserver &amp;&amp;
+
 [ -e /usr/bin/Xvnc ] || ln -svf $XORG_PREFIX/bin/Xvnc /usr/bin/Xvnc</userinput></screen>
 
-    <para>Finally, create a menu entry.  As the 
-      <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Finally, create a desktop menu entry by runing the following
+      command as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
 
 <screen role="root"><userinput>cat &gt; /usr/share/applications/vncviewer.desktop &lt;&lt; "EOF"
@@ -179,17 +206,25 @@
     <title>Command Explanations</title>
 
-    <para><command>tar .. xorg-server...</command>: This command extracts the
-    standard Xorg packages into the tree in a location needed for modification.</para>
-
-    <para><command>patch ...</command>: This set of patches modifies the standard
-    Xorg server so that the Xvnc command can be built.</para>
-
-    <para><option>--disable ...</option>: Most options that are usually needed for
-    the standard Xorg server are not needed fror the Xvnc instance being built.</para>
-
-    <para><command>[ -e /usr/bin/Xvnc ] || ln ... Xvnc</command>: If the Xvnc server
-    is not installed in the <filename class='directory'>/usr/bin</filename> 
-    directory, then create a link so the <command>vncserver</command> script 
-    can find it.</para>
+    <para>
+      <command>tar .. xorg-server...</command>: This command extracts the
+      standard Xorg packages into the tree in a location needed for modification.
+    </para>
+
+    <para>
+      <command>patch ...</command>: This set of patches modifies the standard
+      Xorg server so that the Xvnc command can be built.
+    </para>
+
+    <para>
+      <option>--disable ...</option>: Most options that are usually needed for
+      the standard Xorg server are not needed fror the Xvnc instance being built.
+    </para>
+
+    <para>
+      <command>[ -e /usr/bin/Xvnc ] || ln ... Xvnc</command>: If the Xvnc server
+      is not installed in the <filename class='directory'>/usr/bin</filename> 
+      directory, then create a link so the <command>vncserver</command> script 
+      can find it.
+    </para>
 
   </sect2>
@@ -198,11 +233,13 @@
     <title>Configuring Tigervnc</title>
 
-   <para>The user specific configuration files of vncserver resides 
-   in the <filename class='directory'>.vnc</filename> directory in the user's 
-   home directory.  The <filename>xstartup</filename> file in that
-   directory is a script specifying what commands to be run 
-   when a VNC desktop is started.  If no  <filename>xstartup</filename> file
-   exists, <command>vncserver</command> will try to start an xterm in a twm
-   session.  An example <filename>xstartup</filename> would be:</para>
+   <para>
+     The user specific configuration files of vncserver resides  in the
+     <filename class='directory'>.vnc</filename> directory in the user's
+     home directory. The <filename>xstartup</filename> file in that
+     directory is a script specifying what commands to be run  when a
+     VNC desktop is started.  If no  <filename>xstartup</filename> file
+     exists, <command>vncserver</command> will try to start an xterm in
+     a TWM session. An example <filename>xstartup</filename> would be:
+   </para>
 
 <screen>#!/bin/sh
@@ -223,13 +260,14 @@
 
       <seglistitem>
-        <seg>Xvnc, 
-             vncconfig,  
-             vncpasswd,  
-             vncserver,  
-             vncviewer, and 
-             x0vncserver</seg>
-        
-        <seg>libvnc.so</seg>
-        <seg>None</seg>
+        <seg>
+          Xvnc, vncconfig, vncpasswd, vncserver,
+          vncviewer, and x0vncserver
+        </seg>
+        <seg>
+          libvnc.so
+        </seg>
+        <seg>
+          None
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -243,7 +281,9 @@
         <term><command>Xvnc</command></term>
         <listitem>
-          <para> is a X VNC (Virtual Network Computing) server.
-          It is based on a standard X server, but it has a 
-          "virtual" screen rather than a physical one.</para>
+          <para>
+            is a X VNC (Virtual Network Computing) server. It is
+            based on a standard X server, but it has a "virtual"
+            screen rather than a physical one.
+          </para>
           <indexterm zone="tigervnc xvnc">
             <primary sortas="b-xvnc">Xvnc</primary>
@@ -255,5 +295,7 @@
         <term><command>vncconfig</command></term>
         <listitem>
-          <para>is a program to configure and control a VNC server.</para>
+          <para>
+            is a program to configure and control a VNC server.
+          </para>
           <indexterm zone="tigervnc vncconfig">
             <primary sortas="b-vncconfig">vncconfig</primary>
@@ -265,5 +307,7 @@
         <term><command>vncserver</command></term>
         <listitem>
-          <para>is a perl script used to start or stop a VNC server.</para>
+          <para>
+            is a Perl script used to start or stop a VNC server.
+          </para>
           <indexterm zone="tigervnc vncserver">
             <primary sortas="b-vncserver">vncserver</primary>
@@ -275,5 +319,7 @@
         <term><command>vncviewer</command></term>
         <listitem>
-          <para>is a client used to access VNC desktops.</para>
+          <para>
+            is a client used to access VNC desktops.
+          </para>
           <indexterm zone="tigervnc vncviewer">
             <primary sortas="b-vncviewer">vncviewer</primary>
@@ -285,6 +331,9 @@
         <term><command>x0vncserver</command></term>
         <listitem>
-          <para>is a program to make an X display onm a physical
-          terminal accessible via TigerVNC or compatible viewers.</para>
+          <para>
+            is a program to make an X display onm a physical
+            terminal accessible via TigerVNC or compatible
+            viewers.
+          </para>
           <indexterm zone="tigervnc x0vncserver">
             <primary sortas="b-x0vncserver">x0vncserver</primary>
Index: xsoft/other/transmission-systemd.xml
===================================================================
--- xsoft/other/transmission-systemd.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/other/transmission-systemd.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!ENTITY transmission-download-http
-           "http://download.transmissionbt.com/files/transmission-&transmission-version;.tar.xz">
+  <!ENTITY transmission-download-http "https://transmission.cachefly.net/transmission-&transmission-version;.tar.xz">
   <!ENTITY transmission-download-ftp  " ">
   <!ENTITY transmission-md5sum        "411aec1c418c14f6765710d89743ae42">
@@ -38,5 +37,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -163,6 +162,6 @@
 <screen role="root"><userinput>make INSTALL_ROOT=/usr -C qt install &amp;&amp;
 
-install -m644 qt/transmission-qt.desktop /usr/share/applications/transmission-qt.desktop &amp;&amp;
-install -m644 qt/icons/transmission.png  /usr/share/pixmaps/transmission-qt.png</userinput></screen>
+install -v -m644 qt/transmission-qt.desktop /usr/share/applications/transmission-qt.desktop &amp;&amp;
+install -v -m644 qt/icons/transmission.png  /usr/share/pixmaps/transmission-qt.png</userinput></screen>
 
   </sect2>
Index: xsoft/other/xchat.xml
===================================================================
--- xsoft/other/xchat.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/other/xchat.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -35,5 +35,5 @@
     also possible.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -111,7 +111,7 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/xchat-&xchat-version; &amp;&amp;
-install -v -m644    README faq.html \
-                    /usr/share/doc/xchat-&xchat-version;</userinput></screen>
+install -v -dm755 /usr/share/doc/xchat-&xchat-version; &amp;&amp;
+install -v -m644  README faq.html \
+                  /usr/share/doc/xchat-&xchat-version;</userinput></screen>
 
   </sect2>
Index: xsoft/other/xdg-utils.xml
===================================================================
--- xsoft/other/xdg-utils.xml	(revision f785791d919176c4b21091bcca7a1d77aa4d642f)
+++ xsoft/other/xdg-utils.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -9,6 +9,6 @@
 <!--    "http://portland.freedesktop.org/download/xdg-utils-&xdg-utils-version;.tar.gz">-->
   <!ENTITY xdg-utils-download-ftp  " ">
-  <!ENTITY xdg-utils-md5sum        "38b6f1d38cb02297ddbf64dba0a907a4">
-  <!ENTITY xdg-utils-size          "340 KB">
+  <!ENTITY xdg-utils-md5sum        "617ef5f9872ab5b148ad4717bc9012f5">
+  <!ENTITY xdg-utils-size          "284 KB">
   <!ENTITY xdg-utils-buildsize     "2.1 MB">
   <!ENTITY xdg-utils-time          "less than 0.1 SBU">
@@ -20,5 +20,5 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
-    <date> </date>
+    <date>$Date$</date>
   </sect1info>
 
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -112,5 +112,5 @@
     usr is not recommended.</para></caution>
 
-    <para>To run the tests, issue: <command>make test</command>.</para>
+    <para>To run the tests, issue: <command>make -k test</command>.</para>
 
     <para>Now install it as the <systemitem class="username">root</systemitem>
Index: xsoft/other/xscreensaver.xml
===================================================================
--- xsoft/other/xscreensaver.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
+++ xsoft/other/xscreensaver.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -0,0 +1,322 @@
+<?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 xscreensaver-download-http "http://www.jwz.org/xscreensaver/xscreensaver-&xscreensaver-version;.tar.gz">
+  <!ENTITY xscreensaver-download-ftp  " ">
+  <!ENTITY xscreensaver-md5sum        "c003f79502e67f46aa5bedf24cbbd77c">
+  <!ENTITY xscreensaver-size          "11 MB">
+  <!ENTITY xscreensaver-buildsize     "204 MB">
+  <!ENTITY xscreensaver-time          "1 SBU">
+]>
+
+<sect1 id="xscreensaver" xreflabel="XScreenSaver-&xscreensaver-version;">
+  <?dbhtml filename="xscreensaver.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: krejzi $</othername>
+    <date>$Date: 2014-10-29 21:20:13 +0100 (Wed, 29 Oct 2014) $</date>
+  </sect1info>
+
+  <title>XScreenSaver-&xscreensaver-version;</title>
+
+  <indexterm zone="xscreensaver">
+    <primary sortas="a-XScreenSaver">XScreenSaver</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to XScreenSaver</title>
+
+    <para>
+      The <application>XScreenSaver</application> is a modular screen saver
+      and locker for the X Window System. It is highly customizable and
+      allows the use of any program that can draw on the root window as a
+      display mode. The purpose of <application>XScreenSaver</application> is
+      to display pretty pictures on your screen when it is not in use, in
+      keeping with the philosophy that unattended monitors should always be
+      doing something interesting, just like they do in the movies. However,
+      <application>XScreenSaver</application> can also be used as a screen
+      locker, to prevent others from using your terminal while you are away.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&xscreensaver-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&xscreensaver-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &xscreensaver-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &xscreensaver-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &xscreensaver-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &xscreensaver-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">XScreenSaver Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libglade"/> and
+      <xref linkend="xorg7-app"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="glu"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gdm"/>,
+      <ulink url="http://linas.org/gle/">GLE</ulink> and
+      <xref linkend="linux-pam"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/xscreensaver"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of XScreenSaver</title>
+
+    <para>
+      Install <application>XScreenSaver</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &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>
+      <option>--with-setuid-hacks</option>: This switch allows some demos
+      to be installed setuid <systemitem class="username">root</systemitem>
+      which is needed in order to ping other hosts.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring XScreenSaver</title>
+
+    <sect3 id="xscreensaver-config">
+      <title>Config Files</title>
+
+      <para>
+        <filename>/etc/X11/app-defaults/XScreenSaver</filename> and
+        <filename>~/.xscreensaver</filename>
+      </para>
+
+      <indexterm zone="xscreensaver xscreensaver-config">
+        <primary sortas="e-etc-X11-app-defaults-XScreenSaver">/etc/X11/app-defaults/XScreenSaver</primary>
+      </indexterm>
+      <indexterm zone="xscreensaver xscreensaver-config">
+        <primary sortas="e-AA.xscreensaver">~/.xscreensaver</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Linux PAM Configuration</title>
+
+      <para>
+        If you have built <application>XScreenSaver</application> with
+        <application>Linux PAM</application> support, you need to create
+        <application>PAM</application> configuration file to get
+        <application>XScreenSaver</application> to work correctly with BLFS.
+      </para>
+
+      <para>
+        Issue the following commands as the <systemitem class="username">root</systemitem>
+        user to create the configuration file for <application>Linux PAM</application>:
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/pam.d/xscreensaver &lt;&lt; "EOF"
+<literal># Begin /etc/pam.d/xscreensaver
+
+auth    include system-auth
+account include system-account
+
+# End /etc/pam.d/xscreensaver</literal>
+EOF</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          xscreensaver, xscreensaver-command, xscreensaver-demo, xscreensaver-getimage,
+          xscreensaver-getimage-file, xscreensaver-getimage-video,
+          xscreensaver-gl-helper and xscreensaver-text
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/libexec/xscreensaver and
+          /usr/share/xscreensaver
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="xscreensaver-prog">
+        <term><command>xscreensaver</command></term>
+        <listitem>
+          <para>
+            is a screen saver and locker daemon.
+          </para>
+          <indexterm zone="xscreensaver xscreensaver-prog">
+            <primary sortas="b-xscreensaver">xscreensaver</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xscreensaver-command">
+        <term><command>xscreensaver-command</command></term>
+        <listitem>
+          <para>
+            controls a running <command>xscreensaver</command>
+            process by sending it client messages.
+          </para>
+          <indexterm zone="xscreensaver xscreensaver-command">
+            <primary sortas="b-xscreensaver-command">xscreensaver-command</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xscreensaver-demo">
+        <term><command>xscreensaver-demo</command></term>
+        <listitem>
+          <para>
+            is a graphical front-end for setting the parameters used
+            by the background <command>xscreensaver</command> daemon.
+          </para>
+          <indexterm zone="xscreensaver xscreensaver-demo">
+            <primary sortas="b-xscreensaver-demo">xscreensaver-demo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xscreensaver-getimage">
+        <term><command>xscreensaver-getimage</command></term>
+        <listitem>
+          <para>
+            is a helper program for the <command>xscreensaver</command>
+            modules that manipulate images.
+          </para>
+          <indexterm zone="xscreensaver xscreensaver-getimage">
+            <primary sortas="b-xscreensaver-getimaage">xscreensaver-getimage</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xscreensaver-getimage-file">
+        <term><command>xscreensaver-getimage-file</command></term>
+        <listitem>
+          <para>
+            is a helper program for the <command>xscreensaver</command>
+            modules that manipulate images.
+          </para>
+          <indexterm zone="xscreensaver xscreensaver-getimage-file">
+            <primary sortas="b-xscreensaver-getimaage-file">xscreensaver-getimage-file</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xscreensaver-getimage-video">
+        <term><command>xscreensaver-getimage-video</command></term>
+        <listitem>
+          <para>
+            is a helper program for the <command>xscreensaver</command>
+            modules that manipulate images.
+          </para>
+          <indexterm zone="xscreensaver xscreensaver-getimage-video">
+            <primary sortas="b-xscreensaver-getimaage-video">xscreensaver-getimage-video</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xscreensaver-gl-helper">
+        <term><command>xscreensaver-gl-helper</command></term>
+        <listitem>
+          <para>
+            is a helper program for the <command>xscreensaver</command>
+            OpenGL modules.
+          </para>
+          <indexterm zone="xscreensaver xscreensaver-gl-helper">
+            <primary sortas="b-xscreensaver-gl-helper">xscreensaver-gl-helper</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xscreensaver-text">
+        <term><command>xscreensaver-text</command></term>
+        <listitem>
+          <para>
+            prints some text to stdout, for use by screen savers.
+          </para>
+          <indexterm zone="xscreensaver xscreensaver-text">
+            <primary sortas="b-xscreensaver-text">xscreensaver-text</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
