Index: general/genlib/js52.xml
===================================================================
--- general/genlib/js52.xml	(revision 776e52d93e74bd512491377ac7e3e130f229d88b)
+++ general/genlib/js52.xml	(revision a11089586776706fa138c97bce3370e4733ae046)
@@ -111,5 +111,4 @@
             --with-system-nspr  \
             --with-system-icu   \
-            --enable-threadsafe \
             --enable-readline   &amp;&amp;
 make</userinput></screen>
@@ -140,11 +139,11 @@
       support in the JS shell.
     </para>
-    
-    <para>
-      <parameter>--enable-threadsafe</parameter>: This switch enables support
+<!--    
+    <para>
+      <parameter>- -enable-threadsafe</parameter>: This switch enables support
       for multiple threads at one time. This increases performance as well as
       stability.
     </para>
-
+-->
   </sect2>
 
Index: general/graphlib/sassc.xml
===================================================================
--- general/graphlib/sassc.xml	(revision 776e52d93e74bd512491377ac7e3e130f229d88b)
+++ general/graphlib/sassc.xml	(revision a11089586776706fa138c97bce3370e4733ae046)
@@ -79,5 +79,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Package Information</bridgehead>
+    <bridgehead renderas="sect3">Library Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
Index: general/prog/lua52.xml
===================================================================
--- general/prog/lua52.xml	(revision a11089586776706fa138c97bce3370e4733ae046)
+++ general/prog/lua52.xml	(revision a11089586776706fa138c97bce3370e4733ae046)
@@ -0,0 +1,268 @@
+<?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 lua-download-http "http://www.lua.org/ftp/lua-&lua52-version;.tar.gz">
+  <!ENTITY lua-download-ftp  " ">
+  <!ENTITY lua-md5sum        "913fdb32207046b273fdb17aad70be13">
+  <!ENTITY lua-size          "248 KB">
+  <!ENTITY lua-buildsize     "3.6  MB">
+  <!ENTITY lua-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="lua52" xreflabel="Lua-&lua52-version;">
+  <?dbhtml filename="lua52.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Lua-&lua52-version;</title>
+
+  <indexterm zone="lua">
+    <primary sortas="a-Lua">Lua</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Lua 5.2</title>
+
+    <para>
+      <application>Lua</application> is a powerful light-weight programming
+      language designed for extending applications. It is also frequently used
+      as a general-purpose, stand-alone language. <application>Lua</application>
+      is implemented as a small library of C functions, written in ANSI C, and
+      compiles unmodified in all known platforms. The implementation goals are
+      simplicity, efficiency, portability, and low embedding cost. The result is
+      a fast language engine with small footprint, making it ideal in embedded
+      systems too.
+    </para>
+
+    <para>
+      This is an older verion of <application>Lua</application> needed only
+      for compatibility with other programs such as <xref linkend='wireshark'/>.
+    </para>
+
+    &lfs84_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&lua-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&lua-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &lua-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &lua-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &lua-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &lua-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/lua-&lua52-version;-shared_library-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/lua"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Lua 5.2</title>
+
+    <para>Some packages check for the <application>pkg-config</application> file
+    for <application>Lua</application>, which is created with:</para>
+
+<screen><userinput>cat &gt; lua.pc &lt;&lt; "EOF"
+<literal>V=5.2
+R=&lua52-version;
+
+prefix=/usr
+INSTALL_BIN=${prefix}/bin
+INSTALL_INC=${prefix}/include/lua5.2
+INSTALL_LIB=${prefix}/lib
+INSTALL_MAN=${prefix}/share/man/man1
+INSTALL_LMOD=${prefix}/share/lua/${V}
+INSTALL_CMOD=${prefix}/lib/lua/${V}
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include/lua5.2
+
+Name: Lua
+Description: An Extensible Extension Language
+Version: ${R}
+Requires:
+Libs: -L${libdir} -llua -lm -ldl
+Cflags: -I${includedir}</literal>
+EOF</userinput></screen>
+
+    <para>
+      Install <application>Lua</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../lua-&lua52-version;-shared_library-1.patch &amp;&amp;
+
+sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h &amp;&amp;
+
+sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.2/' \
+       -e '/^LUAC_T=/ s/luac/luac5.2/'     \
+       -i src/Makefile &amp;&amp;
+
+make MYCFLAGS="-fPIC" linux</userinput></screen>
+<!--
+    <para>
+      To test the results, issue: <command>make test</command>.
+      <quote>This will run the interpreter and print its version.</quote>.
+      More comprehensive tests can be performed if you downloaded the "Test
+      suite" tarball. Those tests need to be executed after the package is
+      installed, thus we defer to the description below.
+    </para>
+-->
+    <para>
+      The installation of this package is complex, so we will use
+      the DESTDIR method of installation:
+    </para>
+
+<screen><userinput>make TO_BIN='lua5.2 luac5.2'                     \
+     TO_LIB="liblua5.2.so liblua5.2.so.5.2 liblua5.2.so.&lua52-version;" \
+     INSTALL_DATA="cp -d"                        \
+     INSTALL_TOP=$PWD/install/usr                \
+     INSTALL_INC=$PWD/install/usr/include/lua5.2 \
+     INSTALL_MAN=$PWD/install/usr/share/man/man1 \
+     install &amp;&amp;
+
+install -Dm644 lua.pc install/usr/lib/pkgconfig/lua52.pc &amp;&amp;
+
+mkdir -pv install/usr/share/doc/lua-&lua52-version; &amp;&amp;
+cp -v doc/*.{html,css,gif,png} install/usr/share/doc/lua-&lua52-version; &amp;&amp;
+
+ln -s liblua5.2.so install/usr/lib/liblua.so.5.2   &amp;&amp;
+ln -s liblua5.2.so install/usr/lib/liblua.so.&lua52-version; &amp;&amp;
+
+mv install/usr/share/man/man1/{lua.1,lua52.1} &amp;&amp;
+mv install/usr/share/man/man1/{luac.1,luac52.1}</userinput></screen>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>chown -R root:root install  &amp;&amp;
+cp -a install/* /</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i ... src/luaconf.h</command>: This command changes the
+      <application>Lua</application> search path to match the install path.
+    </para>
+
+    <para>
+      <command>sed -i ... src/Makefile</command>: This command deconflicts
+      this installation with the latest version of lua.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          lua52 and luac52
+        </seg>
+        <seg>
+          liblua5.2.so
+        </seg>
+        <seg>
+          /usr/include/lua5.2,
+          /usr/lib/lua/5.2,
+          /usr/share/doc/lua-&lua52-version;, and
+          /usr/share/lua/5.2
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="lua52-prog">
+        <term><command>lua52</command></term>
+        <listitem>
+          <para>
+            is the standalone Lua version 5.2 interpreter.
+          </para>
+          <indexterm zone="lua52 lua-prog">
+            <primary sortas="b-lua52">lua52</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="luac52">
+        <term><command>luac52</command></term>
+        <listitem>
+          <para>
+            is the Lua version 5.2 compiler.
+          </para>
+          <indexterm zone="lua52 luac52">
+            <primary sortas="b-luac52">luac52</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="liblua52">
+        <term><filename class="libraryfile">liblua5.2.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Lua</application> version 5.2 API functions.
+          </para>
+          <indexterm zone="lua52 liblua52">
+            <primary sortas="c-liblua52">liblua5.2.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision 776e52d93e74bd512491377ac7e3e130f229d88b)
+++ general/prog/prog.xml	(revision a11089586776706fa138c97bce3370e4733ae046)
@@ -45,4 +45,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="llvm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lua.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lua52.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mercurial.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nasm.xml"/>
Index: general/sysutils/colord.xml
===================================================================
--- general/sysutils/colord.xml	(revision 776e52d93e74bd512491377ac7e3e130f229d88b)
+++ general/sysutils/colord.xml	(revision a11089586776706fa138c97bce3370e4733ae046)
@@ -7,8 +7,8 @@
   <!ENTITY colord-download-http "https://www.freedesktop.org/software/colord/releases/colord-&colord-version;.tar.xz">
   <!ENTITY colord-download-ftp  " ">
-  <!ENTITY colord-md5sum        "f032ecac927e9078c41fff97800441e8">
+  <!ENTITY colord-md5sum        "32c2709a6002d9ee750483aaed6379c8">
   <!ENTITY colord-size          "1.8 MB">
-  <!ENTITY colord-buildsize     "22 MB (with tests)">
-  <!ENTITY colord-time          "0.2 SBU (with tests)">
+  <!ENTITY colord-buildsize     "23 MB (with tests)">
+  <!ENTITY colord-time          "0.1 SBU (with tests)">
 ]>
 
@@ -97,8 +97,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="docbook-utils"/>,
       <xref linkend="gnome-desktop"/> and
       <xref linkend="colord-gtk"/> (to build the example tools),
-      <xref linkend="gtk-doc"/>,
       <xref linkend="libxslt"/>,
       <xref linkend="sane"/>,
