Index: general.ent
===================================================================
--- general.ent	(revision 3863533e16db4d68f9190565077f52102363555a)
+++ general.ent	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
@@ -40,4 +40,6 @@
 <!ENTITY sourceforge-repo2    "http://sourceforge.net">
 <!ENTITY gentoo-ftp-repo      "ftp://mirror.ovh.net/gentoo-distfiles/distfiles">
+<!ENTITY trinity-repo-ftp     "ftp://anduin.&lfs-domainname;/trinity">
+<!ENTITY trinity-repo-http    "http://anduin.&lfs-domainname;/sources/trinity">
 <!ENTITY publisher            "Unknown">
 
@@ -552,5 +554,5 @@
 
 <!-- Chapter 26 -->
-<!ENTITY qt-version                   "3.3.8b">
+<!ENTITY qt-version                   "3.3.8d">
 <!ENTITY qt4-version                  "4.7.1">
 <!ENTITY GTK-version                  "1.2.10">
@@ -592,4 +594,6 @@
 <!-- Part VIII -->
 <!-- Chapter 28 & 29 -->
+<!-- Chapter 28 & 29 -->
+<!ENTITY trinity-version              "3.5.13">
 <!ENTITY kde-version                  "3.5.10">
 <!ENTITY arts-version                 "1.5.10">
Index: general/sysutils/dbus-bindings.xml
===================================================================
--- general/sysutils/dbus-bindings.xml	(revision 3863533e16db4d68f9190565077f52102363555a)
+++ general/sysutils/dbus-bindings.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
@@ -19,10 +19,10 @@
   <!ENTITY dbus-python-time          "0.2 SBU">
 
-  <!ENTITY dbus-qt3-download-http "&files-anduin;/sources/dbus-qt3-&dbus-qt3-version;.tar.bz2">
-  <!ENTITY dbus-qt3-download-ftp  " ">
-  <!ENTITY dbus-qt3-md5sum        "307e119f501c207a437d1dd087c9af80">
-  <!ENTITY dbus-qt3-size          "390 KB">
+  <!ENTITY dbus-qt3-download-http "&trinity-repo-http;/dbus-tqt-&trinity-version;.tar.gz">
+  <!ENTITY dbus-qt3-download-ftp  "&trinity-repo-ftp;/dbus-tqt-&trinity-version;.tar.gz">
+  <!ENTITY dbus-qt3-md5sum        "46ae165c068271485c827f6fc6687a9a">
+  <!ENTITY dbus-qt3-size          "234 KB">
   <!ENTITY dbus-qt3-buildsize     "4 MB">
-  <!ENTITY dbus-qt3-time          "0.1 SBU">
+  <!ENTITY dbus-qt3-time          "less than 0.1 SBU">
 
   <!ENTITY eggdbus-download-http   "http://hal.freedesktop.org/releases/eggdbus-&eggdbus-version;.tar.gz">
@@ -329,6 +329,6 @@
 
   <!-- Begin D-Bus Qt3 Bindings -->
-  <sect2 id="dbus-qt3" xreflabel="D-Bus Qt3 Bindings-&dbus-qt3-version;">
-  <title>D-Bus Qt3 Bindings</title>
+  <sect2 id="dbus-qt3" xreflabel="D-Bus Trinity Qt3 Bindings-&dbus-qt3-version;">
+  <title>Trinity D-Bus Qt3 Bindings</title>
 
   <indexterm zone="dbus-qt3">
@@ -364,6 +364,8 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="dbus"/> and
-      <xref linkend="qt"/></para>
+      <para role="required">
+        <xref linkend="dbus"/> and
+        <xref linkend="qt"/>
+      </para>
 
       <para condition="html" role="usernotes">User Notes:
@@ -373,10 +375,24 @@
 
     <sect3 role="installation">
-      <title>Installation of D-Bus Qt3 Bindings</title>
-
-      <para>Install <application>D-Bus Qt3 Bindings</application> by
+      <title>Installation of D-Bus Trinity/Qt3 Bindings</title>
+
+      <note><para>Be sure your environment is set up as described in 
+      <xref linkend='kde-pre-install-config'/></para></note>
+
+      <para>Install <application>D-Bus Trinity/Qt3 Bindings</application> by
       running the following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>
+BUILD=/tmp/build-dbus-tqt &amp;&amp;
+DBUSTQT=`pwd`             &amp;&amp;
+rm -rf   $BUILD           &amp;&amp;
+mkdir -p $BUILD           &amp;&amp;
+cd       $BUILD           &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX \
+      -DCMAKE_VERBOSE_MAKEFILE=ON            \
+      $DBUSTQT            &amp;&amp;
+
+unset BUILD DBUSTQT       &amp;&amp;
 make</userinput></screen>
 
@@ -395,10 +411,10 @@
         <segtitle>Installed Programs</segtitle>
         <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directories</segtitle>
+        <segtitle>Installed Directory</segtitle>
 
         <seglistitem>
           <seg>None</seg>
-          <seg>libdbus-qt-1.so</seg>
-          <seg>None</seg>
+          <seg>libdbus-tqt-1.so</seg>
+          <seg>$TRINITY_PREFIX/include/dbus-1.0</seg>
         </seglistitem>
       </segmentedlist>
@@ -410,10 +426,10 @@
 
         <varlistentry id="libdbus-qt-1">
-          <term><filename class='libraryfile'>libdbus-qt-1.{so,a}</filename></term>
+          <term><filename class='libraryfile'>libdbus-tqt-1.so</filename></term>
           <listitem>
-            <para>contains <application>Qt3</application> interface functions
+            <para>contains <application>Trinity/Qt3</application> interface functions
             to the D-Bus API.</para>
             <indexterm zone="dbus-qt3 libdbus-qt-1">
-              <primary sortas="c-libdbus-qt-1">libdbus-qt-1.{so,a}</primary>
+              <primary sortas="c-libdbus-qt-1">libdbus-tqt-1.so</primary>
             </indexterm>
           </listitem>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 3863533e16db4d68f9190565077f52102363555a)
+++ introduction/welcome/changelog.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
@@ -46,4 +46,9 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Changed KDE3 to Trinity-3.5.13.
+          The core files are done, but the additional and 
+          development packages have not been updated yet.</para>
+        </listitem>
+        <listitem>
           <para>[abenton] - Firefox and Xulrunner 9.0.</para>
         </listitem>
Index: kde/add/add.xml
===================================================================
--- kde/add/add.xml	(revision 3863533e16db4d68f9190565077f52102363555a)
+++ kde/add/add.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
@@ -16,6 +16,10 @@
   <title>KDE Additional Packages</title>
 
+  <warning><para>The Trinity/KDE3 update to BLFS is a work in progress.
+  The packages below have not yet been updated.</para></warning>
+
+
   <para>Each of the packages in this chapter depend on the base
-  <application>KDE</application> installation procedures, but each is an
+  <application>Trinity/KDE3</application> installation procedures, but each is an
   independent group of programs that can be optionally installed.  Few users
   will want to install every package, but instead review and install only the
@@ -29,10 +33,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeedu.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdesdk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdevelop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdewebdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdebindings.xml"/>
-  -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeaccessibility.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdetoys.xml"/>
Index: kde/core/arts.xml
===================================================================
--- kde/core/arts.xml	(revision 3863533e16db4d68f9190565077f52102363555a)
+++ kde/core/arts.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY arts-download-http "&kde-download-http;/arts-&arts-version;.tar.bz2">
-  <!ENTITY arts-download-ftp  "&kde-download-ftp;/arts-&arts-version;.tar.bz2">
-  <!ENTITY arts-md5sum        "6da172aab2a4a44929b5fdfc30fa3efc">
-  <!ENTITY arts-size          "956 KB">
-  <!ENTITY arts-buildsize     "28 MB">
-  <!ENTITY arts-time          "1.4 SBU">
+  <!ENTITY arts-download-http "&trinity-repo-http;/arts-&trinity-version;.tar.gz">
+  <!ENTITY arts-download-ftp  "&trinity-repo-ftp;/arts-&trinity-version;.tar.gz">
+  <!ENTITY arts-md5sum        "109124dabb1aaa9d44eb32e43b549142">
+  <!ENTITY arts-size          "920 KB">
+  <!ENTITY arts-buildsize     "36 MB">
+  <!ENTITY arts-time          "0.6 SBU">
 ]>
 
-<sect1 id="aRts" xreflabel="aRts-&arts-version;">
+<sect1 id="aRts" xreflabel="aRts-&trinity-version;">
   <?dbhtml filename="aRts.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>aRts-&arts-version;</title>
+  <title>aRts-&trinity-version;</title>
 
   <indexterm zone='aRts'>
@@ -31,6 +31,6 @@
 
     <para>The Analog Real-time Synthesizer (<application>aRts</application>)
-    provides sound support for <application>KDE</application> and necessary
-    libraries for <application>kdelibs</application>.</para>
+    provides sound support for <application>Trinity</application> programs 
+    and libraries.</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -59,19 +59,13 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="qt"/> and
-    <xref linkend="glib2"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libvorbis"/>,
-    <xref linkend="alsa"/>,
-    <xref linkend="audiofile"/>,
-    <xref linkend="libmad"/>,
-    <xref linkend="esound"/>,
-<!--    <xref linkend="nas"/>, -->
-    <ulink url="http://www.mediaapplicationserver.net/">MAS</ulink>, and
-    <ulink url="http://jackit.sourceforge.net/">JACK</ulink></para>
+    <para role="required">
+      <xref linkend="alsa"/>,
+      <xref linkend="audiofile"/>,
+      <xref linkend="cmake"/>,
+      <xref linkend="glib2"/>
+      <xref linkend="libmad"/>,
+      <xref linkend="libvorbis"/>, and
+      <xref linkend="qt"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -83,13 +77,25 @@
     <title>Installation of aRts</title>
 
+    <note><para>When extracted, the <application>aRts</application> tar 
+    file expands into the directory 
+    <filename class='directory'>dependencies/arts</filename>.</para></note>
+
     <para>Install <application>aRts</application> by running
     the following commands:</para>
 
-<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking --enable-final &amp;&amp;
+<screen><userinput>BUILD=/tmp/buildarts &amp;&amp;
+ARTS=`pwd`           &amp;&amp;
+rm -rf   $BUILD      &amp;&amp;
+mkdir -p $BUILD      &amp;&amp;
+cd       $BUILD      &amp;&amp;
+
+cmake $ARTS                              \
+  -DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX \
+  -DCMAKE_VERBOSE_MAKEFILE=ON &amp;&amp;
+
+unset ARTS BUILD     &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite that works with
-    <application>GCC</application>-&gcc-version;.</para>
+    <para>This package does not come with a test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -102,19 +108,19 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--prefix=&kde-dir;</parameter>: This option
-    tells the process to install the package in
-    <filename class="directory">&kde-dir;</filename>.
-    <application>aRts</application> is installed here as it's required
-    before installing <application>KDE</application>.</para>
-
-    <para><parameter>--disable-debug</parameter>: This option causes the
-    package to be compiled without debugging code.</para>
-
-    <para><parameter>--disable-dependency-tracking</parameter>: This option
-    speeds up one time builds.</para>
-
-    <para><parameter>--enable-final</parameter>: This option combines
-    source code during compilation speeding up the build.  It also
-    avoids a problem with missing headers in some files.</para>
+    <para><userinput>ARTS=`pwd`</userinput>: This command saves the 
+    location of the <application>aRts</application> source code.</para>
+
+    <para><userinput>rm -rf /tmp/buildarts; mkdir -p /tmp/buildarts; cd
+    /tmp/buildarts</userinput>:  The developers strongly recommend building
+    Trinity components in a directory separate from the source code.  These
+    commands ensure a clean starting location for the build process.</para>
+
+    <para><option>-DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX</option>: This option
+    is the equivalent of the ./configure <option>--prefix</option>
+    option.</para>
+
+    <para><option>-DCMAKE_VERBOSE_MAKEFILE=ON</option>: This option
+    provides verrbose messages when <userinput>make</userinput> is
+    run.</para>
 
   </sect2>
@@ -129,9 +135,11 @@
 
       <seglistitem>
-        <seg>artsd, artswrapper, artsshell, artsplay, artsdsp, artscat, artscontrol,
-        artsc-config, and mcopidl</seg>
+        <seg>artsc-config, artscat, artsd, artsdsp, artsplay, artsrec, 
+        artsshell, artswrapper, and mcopidl </seg>
+
         <seg>aRts libraries</seg>
-        <seg>The following subdirectories of &kde-dir;/: bin, include/arts,
-        include/artsc, and lib/mcop</seg>
+        
+        <seg>The following subdirectories of $TRINITY_PREFIX: bin, 
+        include/arts, include/artsc, and lib/mcop</seg>
       </seglistitem>
     </segmentedlist>
@@ -142,4 +150,25 @@
       <?dbhtml list-presentation="table"?>
 
+      <varlistentry id="artsc-config">
+        <term><command>artsc-config</command></term>
+        <listitem>
+          <para>is a utility to assist developers using the
+          <application>aRts</application> C API.</para>
+          <indexterm zone="aRts  artsc-config">
+            <primary sortas="b-artsc-config">artsc-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="artscat">
+        <term><command>artscat</command></term>
+        <listitem>
+          <para>is a simple utility to send raw audio data to the sound server.</para>
+          <indexterm zone="aRts artscat">
+            <primary sortas="b-artscat">artscat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="artsd">
         <term><command>artsd</command></term>
@@ -148,4 +177,57 @@
           <indexterm zone="aRts artsd">
             <primary sortas="b-artsd">artsd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="artsdsp">
+        <term><command>artsdsp</command></term>
+        <listitem>
+          <para>provides an interim solution that allows most of legacy
+          sound applications to run unchanged.</para>
+          <indexterm zone="aRts artsdsp">
+            <primary sortas="b-artsdsp">artsdsp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libaRts">
+        <term><filename class='libraryfile'>aRts Libraries</filename></term>
+        <listitem>
+          <para>contains functions that support <application>aRts</application>
+          programs.</para>
+          <indexterm zone="aRts libaRts">
+            <primary sortas="c-libaRts">aRts Libraries</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="artsplay">
+        <term><command>artsplay</command></term>
+        <listitem>
+          <para>is a simple utility to play a sound file.</para>
+          <indexterm zone="aRts artsplay">
+            <primary sortas="b-artsplay">artsplay</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="artsrec">
+        <term><command>artsrec</command></term>
+        <listitem>
+          <para>is a simple utility to record audio input.</para>
+          <indexterm zone="aRts artsrec">
+            <primary sortas="b-artsrec">artsrec</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="artsshell">
+        <term><command>artsshell</command></term>
+        <listitem>
+          <para>is intended as a utility to perform miscellaneous functions
+          related to the sound server.</para>
+          <indexterm zone="aRts artsshell">
+            <primary sortas="b-artsshell">artsshell</primary>
           </indexterm>
         </listitem>
@@ -164,68 +246,4 @@
       </varlistentry>
 
-      <varlistentry id="artsshell">
-        <term><command>artsshell</command></term>
-        <listitem>
-          <para>is intended as a utility to perform miscellaneous functions
-          related to the sound server.</para>
-          <indexterm zone="aRts artsshell">
-            <primary sortas="b-artsshell">artsshell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="artsplay">
-        <term><command>artsplay</command></term>
-        <listitem>
-          <para>is a simple utility to play a sound file.</para>
-          <indexterm zone="aRts artsplay">
-            <primary sortas="b-artsplay">artsplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="artsdsp">
-        <term><command>artsdsp</command></term>
-        <listitem>
-          <para>provides an interim solution that allows most of legacy
-          sound applications to run unchanged.</para>
-          <indexterm zone="aRts artsdsp">
-            <primary sortas="b-artsdsp">artsdsp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="artscat">
-        <term><command>artscat</command></term>
-        <listitem>
-          <para>is a simple utility to send raw audio data to the sound server.</para>
-          <indexterm zone="aRts artscat">
-            <primary sortas="b-artscat">artscat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="artscontrol">
-        <term><command>artscontrol</command></term>
-        <listitem>
-          <para>is a graphical utility for performing a number of tasks
-          related to the sound server.</para>
-          <indexterm zone="aRts  artscontrol">
-            <primary sortas="b-artscontrol">artscontrol</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="artsc-config">
-        <term><command>artsc-config</command></term>
-        <listitem>
-          <para>is a utility to assist developers using the
-          <application>aRts</application> C API.</para>
-          <indexterm zone="aRts  artsc-config">
-            <primary sortas="b-artsc-config">artsc-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="mcopidl">
         <term><command>mcopidl</command></term>
@@ -239,17 +257,6 @@
       </varlistentry>
 
-      <varlistentry id="libaRts">
-        <term><filename class='libraryfile'>aRts Libraries</filename></term>
-        <listitem>
-          <para>contains functions that support <application>aRts</application>
-          programs.</para>
-          <indexterm zone="aRts libaRts">
-            <primary sortas="c-libaRts">aRts Libraries</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
-
+<!--
     <para>To find out information about <application>aRts</application> and the
     various programs included in the package, see <ulink
@@ -259,5 +266,5 @@
     Documentation</ulink> and navigate to the <application>aRts</application>
     documentation in your language.</para>
-
+-->
   </sect2>
 
Index: kde/core/config.xml
===================================================================
--- kde/core/config.xml	(revision 3863533e16db4d68f9190565077f52102363555a)
+++ kde/core/config.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
@@ -14,9 +14,9 @@
   </sect1info>
 
-  <title>Configuring the Core KDE Packages</title>
+  <title>Configuring the Core Trinity/KDE3 Packages</title>
 
   <para>Back up your existing <filename>~/.xinitrc</filename> file
   and create a new <filename>.xinitrc</filename> file to start
-  <application>KDE</application>:</para>
+  <application>Trinity/KDE3</application>:</para>
 
 <screen><userinput>echo "exec startkde" &gt; ~/.xinitrc</userinput></screen>
@@ -29,5 +29,5 @@
   <application>D-BUS</application> session daemon here as well. Starting the
   session daemon here has the added bonus that it will exit when you log out
-  of your <application>KDE</application> session. If you wish to start the
+  of your <application>Trinity/KDE3</application> session. If you wish to start the
   daemon here, use the following command instead of the one shown above:</para>
 
@@ -53,7 +53,36 @@
 <screen role="root"><userinput>ldconfig</userinput></screen>
 
-  <para>At this point you can bring up <application>KDE</application> with:</para>
+  <para>At this point you can bring up <application>Trinity/KDE3</application> with:</para>
 
 <screen><userinput>startx</userinput></screen>
 
+   <para>Set the PATHs used for the installation in the login startup
+   files.  If you installed <application>Trinity/KDE3</application> in the
+   recommended versioned directory, /opt/trinity-&trinity-version;, create a
+   generic symbiolic link as the <systemitem class="username">root</systemitem>
+   user:</para>
+
+<screen role='root'><userinput>ln -sf trinity-&trinity-version; /opt/trinity</userinput></screen>
+
+   <para>Now update the search path for dynamic libraries and update the cache.  
+   As the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role='root'><userinput>echo "/opt/trinity/lib" &gt;&gt; /etc/ld.so.conf &amp;&amp;
+ldconfig</userinput></screen>
+
+   <para>Set the paths.  Thee are several ways to do this.  You can edit
+   <filename>/etc/profile</filename>, or <filename>~/.bash_/profile</filename>
+   to add the paths.  If you used the recommended procedure in <xref
+   linkend='postlfs-config-profile'/>, run the following as the <systemitem
+   class="username">root</systemitem> user:</para>
+
+<screen role='root'><userinput>cat &gt; /etc/profile.d/extrapaths.sh &lt;&lt; "EOF"
+<literal>
+pathprepend /opt/trinity/bin                   PATH
+pathappend  /opt/trinity/share/man             MANPATH
+pathappend  /opt/trinity/lib/pkgconfig         PKG_CONFIG_PATH</literal>
+EOF</userinput></screen>
+
+  <para>To set the paths immediately, run <userinput>source /etc/profile</userinput>.</para>
+
 </sect1>
Index: kde/core/core.xml
===================================================================
--- kde/core/core.xml	(revision 3863533e16db4d68f9190565077f52102363555a)
+++ kde/core/core.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
@@ -14,8 +14,9 @@
   <?dbhtml filename="core.html"?>
 
-  <title>KDE Core Packages</title>
+  <title>Trinity/KDE3 Core Packages</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="arts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tqtinterface.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdelibs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdebase.xml"/>
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision 3863533e16db4d68f9190565077f52102363555a)
+++ kde/core/kdebase.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY kdebase-download-http "&kde-download-http;/kdebase-&kde-version;.tar.bz2">
-  <!ENTITY kdebase-download-ftp  "&kde-download-ftp;/kdebase-&kde-version;.tar.bz2">
-  <!ENTITY kdebase-md5sum        "88237188271fbf1e6bcd40180a75d953">
-  <!ENTITY kdebase-size          "23.2 MB">
-  <!ENTITY kdebase-buildsize     "185 MB (additional 8.4 MB for API docs)">
-  <!ENTITY kdebase-time          "15.6 SBU (additional 0.1 SBU for API docs)">
+  <!ENTITY kdebase-download-http "&trinity-repo-http;/kdebase-&kde-version;.tar.gz">
+  <!ENTITY kdebase-download-ftp  "&trinity-repo-ftp;/kdebase-&kde-version;.tar.gz">
+  <!ENTITY kdebase-md5sum        "d1f7e1f94eeb46b981fe1ba144179840">
+  <!ENTITY kdebase-size          "28.3 MB">
+  <!ENTITY kdebase-buildsize     "179 MB">
+  <!ENTITY kdebase-time          "6.6 SBU">
 ]>
 
@@ -31,5 +31,5 @@
 
     <para><application>kdebase</application> is the last mandatory package
-    required for the <application>K Desktop Environment</application>. It
+    required for the <application>Trinity/KDE3 Desktop Environment</application>. It
     provides various applications, infrastructure files and libraries.</para>
 
@@ -59,32 +59,35 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="kdelibs"/></para>
+    <para role="required">
+      <xref linkend="kdelibs"/> and
+      <xref linkend="dbus-qt3"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/>,
-    <xref linkend="libart_lgpl"/>,
-    <xref linkend="libxml2"/>,
-    <xref linkend="openssl"/>, and
-    either <xref linkend="icedtea6"/> or <xref linkend="jdk"/></para>
+    <para role="recommended">
+      <xref linkend="aRts"/>,
+      <xref linkend="libart_lgpl"/>, and
+      <xref linkend="openssl"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libusb-compat"/>,
-    <xref linkend="linux-pam"/>,
-    <xref linkend="openldap"/>,
-    <xref linkend="cyrus-sasl"/>,
-    <xref linkend="samba3"/>,
-    <xref linkend="hal"/> and
-    <xref linkend="dbus-qt3"/>,
-    <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
-    <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
-    <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
-    <ulink url="http://www.linux1394.org/">libraw1394</ulink>,
-    <ulink url="http://www.lm-sensors.org/">lm_sensors</ulink>
-    (requires <ulink url="http://sourceforge.net/projects/linux-diag">Sysfs
-    Utilities</ulink>),
-    <ulink url="http://www.opensource.apple.com/darwinsource/tarballs/apsl/">mDNSResponder</ulink>,
-    <xref linkend="sudo"/>,
-    <xref linkend="graphviz"/>, and
-    <xref linkend="doxygen"/></para>
+    <para role="optional">
+      <xref linkend="cyrus-sasl"/>,
+      <xref linkend="hal"/>,
+      <xref linkend="libusb-compat"/>,
+      <xref linkend="linux-pam"/>,
+      <xref linkend="openldap"/>,
+      <xref linkend="samba3"/>,
+      <xref linkend="sudo"/>,
+      <ulink url="http://www.openexr.com/">OpenEXR</ulink>, and
+      <ulink url="http://sourceforge.net/projects/libraw1394/">libraw1394</ulink>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (for api documentation)</bridgehead>
+    <para role="optional">
+      <xref linkend="libxml2"/>,
+      <xref linkend="graphviz"/>, and
+      <xref linkend="doxygen"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -109,5 +112,5 @@
     <para>One additional package that can be used at run time is <xref
     linkend="pciutils"/>.  This enables the <application>KDE Info
-    Center</application> to  use <application>lspci</application> for its "pci"
+    Center</application> to use <application>lspci</application> for its "pci"
     info section.</para>
 
@@ -121,23 +124,49 @@
     <title>Installation of Kdebase</title>
 
-    <note>
-      <para>You should ensure a <systemitem
-      class="groupname">nogroup</systemitem> group exists on your system before
-      performing the <command>configure</command> command, as
-      <application>kdebase</application> installs a program
-      (<filename>$KDE_PREFIX/bin/kdesud</filename>) with group ownership of
-      <systemitem class="groupname">nogroup</systemitem>.</para>
-    </note>
-
-    <para>This package does not come with a test suite.</para>
-
     <para>Install <application>kdebase</application> with:</para>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/kde-sysconfdir.xml"/> -->
-
-<screen><userinput>./configure --prefix=&kde-dir; --sysconfdir=/etc/kde \
-    --disable-debug --disable-dependency-tracking &amp;&amp;
-make</userinput></screen>
+<screen><userinput>MAKEDIR=/tmp/buildbase &amp;&amp;
+KDEBASE=`pwd`          &amp;&amp;
+rm -rf   $MAKEDIR      &amp;&amp;
+mkdir -p $MAKEDIR      &amp;&amp;
+cd       $MAKEDIR      &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX \
+      -DCMAKE_VERBOSE_MAKEFILE=ON            \
+      -DWITH_ARTS=ON                         \
+      -DWITH_SHADOW=ON                       \
+      -DWITH_XCURSOR=ON                      \
+      -DWITH_XFIXES=ON                       \
+      -DWITH_XRANDR=ON                       \
+      -DWITH_XRENDER=ON                      \
+      -DWITH_XDAMAGE=ON                      \
+      -DWITH_XEXT=ON                         \
+      -DWITH_XDMCP=ON                        \
+      -DWITH_XINERAMA=ON                     \
+      -DWITH_SAMBA=ON                        \
+      -DWITH_LIBUSB=ON                       \
+      -DWITH_SUDO_KDESU_BACKEND=ON           \
+      -DBUILD_ALL=ON                         \
+      -DWITH_XCOMPOSITE=ON                   \
+      $KDEBASE         &amp;&amp;
+
+unset KDEBASE MAKEDIR</userinput></screen>
+
+    <para>Some of the optional support programs for <application>kdebase</application>
+    must be specified by the user.  The option is in the form "-DWITH_PKG=ON" and
+    the following options are recognozed for 'PKG': , SAMBA, LIBUSB,
+    SUDO_KDESU_BACKEND, LDAP, OPENEXR, SASL, LIBRAW1394, HAL, PAM, and I8K (Dell 
+    Laptop Extensions).</para>
+
+    <para>The <userinput>cmake</userinput> step does not pick up all the required 
+    libraries and paths.  One special problem is that libtirpc.so is required
+    for nfs and is not detected.  Fix these problems with:</para>
+
+<screen><userinput>export LIBRARY_PATH=$XORG_PREFIX/lib:/lib &amp;&amp;
+find -name link.txt -exec sed -i -e "s@-lICE@&amp; -lX11 -lXrender -ltirpc@" {} \;</userinput></screen>
+
+    <para>Now, continue with the build:</para>
+
+<screen><userinput>make</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -149,24 +178,7 @@
 
   </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    This is not true.  If KDE is configured correctly according to the
-    instructions, the libraries are found just fine.  See the
-    KDE Pre-installation Configuration section.
-
-    <para><parameter>LD_LIBRARY_PATH="$KDE_PREFIX/lib" make</parameter>: A bug in
-    the <application>kdebase</application> build system prevents
-    <application>kdelibs</application> from being found by the Makefiles when
-    <application>kdelibs</application> is installed in
-    <filename class='directory'>/opt</filename>. Setting LD_LIBRARY_PATH works
-    around the problem.</para>
-
-  </sect2>
--->
+
   <sect2 role="configuration">
     <title>Configuring Kdebase</title>
-
 
     <sect3><title>Configuration Information</title>
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 3863533e16db4d68f9190565077f52102363555a)
+++ kde/core/kdelibs.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY kdelibs-download-http "&kde-download-http;/kdelibs-&kde-version;.tar.bz2">
-  <!ENTITY kdelibs-download-ftp  "&kde-download-ftp;/kdelibs-&kde-version;.tar.bz2">
-  <!ENTITY kdelibs-md5sum        "43cd55ed15f63b5738d620ef9f9fd568">
-  <!ENTITY kdelibs-size          "14.9 MB">
-  <!ENTITY kdelibs-buildsize     "254 MB (additional 426 MB for API docs)">
-  <!ENTITY kdelibs-time          "13.1 SBU (additional 3.0 SBU for API docs)">
+  <!ENTITY kdelibs-download-http "&trinity-repo-http;/kdelibs-&trinity-version;.tar.gz">
+  <!ENTITY kdelibs-download-ftp  "&trinity-repo-ftp;/kdelibs-&trinity-version;.tar.gz">
+  <!ENTITY kdelibs-md5sum        "f62eefb63b4ba2141b4c576f859806dd">
+  <!ENTITY kdelibs-size          "16.6 MB">
+  <!ENTITY kdelibs-buildsize     "408 MB">
+  <!ENTITY kdelibs-time          "5.5 SBU">
 ]>
 
@@ -31,7 +31,7 @@
 
     <para>This package includes programs and libraries that are central to the
-    development and execution of a <application>KDE</application> program,
+    development and execution of a <application>Trinity/KDE3</application> program,
     as well as internationalization files for these libraries, miscellaneous
-    HTML documentation, theme modules and regression tests.</para>
+    HTML documentation, and theme modules.</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -56,5 +56,5 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -64,38 +64,29 @@
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">Kdelibs Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="qt"/></para>
+    <para role="required"><xref linkend="tqtinterface"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="aRts"/>,
-    <xref linkend="libjpeg"/>,
-    <xref linkend="libart_lgpl"/>,
-    <xref linkend="libxml2"/>,
-    <xref linkend="libxslt"/>,
-    <xref linkend="pcre"/>,
-    <xref linkend="gamin"/>,
-    <xref linkend="openssl"/>, and
-    <xref linkend="libidn"/></para>
+    <para role="recommended">
+      <xref linkend="aRts"/>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libart_lgpl"/>,
+      <xref linkend="libidn"/>, and
+      <xref linkend="openssl"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libtiff"/>,
-    <xref linkend="aspell"/>,
-    <xref linkend="cups"/>,
-    <xref linkend="alsa"/>,
-    <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
-    <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
-    <xref linkend="jasper"/>,
-    <ulink url="http://www.lua.org/">Lua</ulink> (version &lt; 5.1),
-    <ulink url="http://www.opensource.apple.com/darwinsource/tarballs/apsl/">mDNSResponder</ulink>,
-    <ulink url="http://sourceforge.net/projects/libthai">LibThai</ulink>,
-    <ulink url="http://www.ivrix.org.il/projects/spell-checker/">Hspell</ulink>,
-    <ulink url="ftp://oss.sgi.com/projects/xfs/cmd_tars/">libacl</ulink>
-    (requires <ulink url="ftp://oss.sgi.com/projects/xfs/cmd_tars/">libattr</ulink>),
-    <xref linkend="sudo"/>,
-    <xref linkend="graphviz"/>, and
-    <xref linkend="doxygen"/></para>
+    <para role="optional">
+      <xref linkend="aspell"/>,
+      <xref linkend="cups"/>,
+      <xref linkend="libtiff"/>,
+      <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
+      <ulink url="http://www.ivrix.org.il/projects/spell-checker/">Hspell</ulink>, 
+      <xref linkend="sudo"/>, and 
+      <ulink url="http://packages.debian.org/sid/libutempter">utempter</ulink>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -108,5 +99,5 @@
     <title>Run-Time Dependencies</title>
 
-    <para>The <application>KDE</application> libraries access other programs at
+    <para>The <application>Trinity/KDE3</application> libraries access other programs at
     run time. One additional package that has not been mentioned already is
     <ulink url="http://packages.debian.org/unstable/source/pmount/">
@@ -124,18 +115,32 @@
     <para>Install <application>kdelibs</application> with:</para>
 
-<screen><userinput>patch -Np1 -i ../kdelibs-&kde-version;-charset-1.patch &amp;&amp;
-sed -i -e 's|linux/inotify|sys/inotify|'                 \
-       -e '/^static inline int inotify_init/,/^}/d'      \
-       -e '/^static inline int inotify_add_watch/,/^}/d' \
-       -e '/^static inline int inotify_rm_watch/,/^}/d'  \
-       kio/kio/kdirwatch.cpp &amp;&amp;
-./configure --prefix=$KDE_PREFIX  \
-            --sysconfdir=/etc/kde \
-            --disable-debug       \
-            --disable-dependency-tracking &amp;&amp;
-make</userinput></screen>
+<screen><userinput>MAKEDIR=/tmp/buildlibs &amp;&amp;
+KDELIBS=`pwd`          &amp;&amp;
+rm -rf   $MAKEDIR      &amp;&amp;
+mkdir -p $MAKEDIR      &amp;&amp;
+cd       $MAKEDIR      &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX \
+      -DCMAKE_VERBOSE_MAKEFILE=ON            \
+      $KDELIBS         &amp;&amp;
+unset KDELIBS MAKEDIR</userinput></screen>
+
+    <para>Some of the optional support programs for <application>kdelibs</application>
+    must be specified by the user.  The option is in the form "-DWITH_PKG=ON" and
+    the following options are recognozed for 'PKG': TIFF, LIBIDN, LIBART,
+    OPENEXR, UTEMPTER, ASPELL, HSPELL, and AVAHI. Other optional support 
+    programs such as CUPS are automatically recognized if present.</para>
+
+    <para>If your installation of <application>Xorg</application> is
+    not in the <filename class='directory'>/usr</filename> hierarchy,
+    ensure the linking commands search in the correct place:</para>
+   
+<screen><userinput>find -name link.txt -exec sed -i -e "s@-lX11@&amp; -L$XORG_PREFIX/lib@" {} \;</userinput></screen>
+
+    <para>Continue with the build:</para>
+
+<screen><userinput>make</userinput></screen>
 
     <note>
-
       <para>If you wish to create the API documentation and you have
       <application>Doxygen</application> and
@@ -143,16 +148,4 @@
       <command>make install</command>. This applies to all packages which can
       utilize <application>Doxygen</application>.</para>
-
-      <para><emphasis>The usual building of the API documentation in this package
-      will run forever because of a bug in <application>doxygen</application>
-      versions 1.5.8 and earlier.</emphasis>  There is a symbolic link in the
-      <filename class='directory'>kdeprint</filename> directory that is not
-      handled properly.  To fix this, either update to the current version of
-      <application>doxygen</application> or delete the link, generate the
-      documentation, and recreate the symbolic link:</para>
-
-      <screen><userinput>rm kdeprint/kdeprint &amp;&amp;
-make apidox &amp;&amp;
-ln -s  management kdeprint/kdeprint</userinput></screen>
 
       <para>The <command>make apidox</command> command generates a lot of
@@ -167,10 +160,9 @@
 
       <para>The documents generated are HTML and are found in <filename
-      class='directory'>&kde-dir;/share/doc/HTML/en/kdelibs-apidocs</filename>.
+      class='directory'>$TRINITY_PREFIX/share/doc/HTML/en/kdelibs-apidocs</filename>.
       </para>
     </note>
 
-    <para>This package does not come with a test suite that works with
-    <application>GCC</application>-&gcc-version;.</para>
+    <para>This package does not come with a test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -179,5 +171,5 @@
 
   </sect2>
-
+<!--
   <sect2 role="commands">
     <title>Command Explanations</title>
@@ -187,14 +179,14 @@
     instructions that are deleted are now within glibc.</para>
 
-    <para><parameter>--prefix=&kde-dir;</parameter>: This option tells the process
+    <para><parameter>- -prefix=&kde-dir;</parameter>: This option tells the process
     to install the package in <filename class="directory">&kde-dir;</filename>.</para>
 
-    <para><parameter>--disable-debug</parameter>: This option causes the
+    <para><parameter>- -disable-debug</parameter>: This option causes the
     package to be compiled without debugging code.</para>
 
-    <para><parameter>--disable-dependency-tracking</parameter>: This option
+    <para><parameter>- -disable-dependency-tracking</parameter>: This option
     speeds up one time builds.</para>
 
-    <para><parameter>--sysconfdir=/etc/kde</parameter>: This option places
+    <para><parameter>- -sysconfdir=/etc/kde</parameter>: This option places
     configuration files in compliance with the <ulink
     url='http://www.pathname.com/fhs/pub/fhs-2.3.html#ETCHOSTSPECIFICSYSTEMCONFIGURATION'
@@ -205,5 +197,5 @@
 
   </sect2>
-
+-->
   <sect2 role="content">
     <title>Contents</title>
@@ -270,6 +262,5 @@
     <para>The number of programs and libraries installed by
     <application>kdelibs</application> prohibits an explanation of each one
-    in this section. Instead, see the <ulink url="http://docs.kde.org/">KDE
-    Documentation</ulink>.</para>
+    in this section.</para>
 
   </sect2>
Index: kde/core/pre-install-config.xml
===================================================================
--- kde/core/pre-install-config.xml	(revision 3863533e16db4d68f9190565077f52102363555a)
+++ kde/core/pre-install-config.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
@@ -14,79 +14,60 @@
   </sect1info>
 
-  <title>KDE Pre-installation Configuration</title>
+  <title>Trinity/KDE3 Pre-installation Configuration</title>
 
-  <para>Based on your preference, set <envar>KDE_PREFIX</envar>.</para>
+  <para>Based on your preference, set TRINITY_PREFIX.</para>
+  
+  <para>One option is to put <application>Trinity/KDE3</application> into the
+  <filename class='directory'>/usr</filename> hierarchy.  This creates a
+  simpler setup but is more difficult to try multiple versions of
+  <application>Trinity/KDE3</application>.</para>
 
-  <para>One option is to put <application>KDE</application> into the
-  <filename class='directory'>/usr</filename> hierarchy.  This creates
-  a simpler setup but is more difficult to try multiple versions
-  of <application>KDE</application>.</para>
+<screen><userinput>export TRINITY_PREFIX=/usr</userinput></screen>
 
-<screen><userinput>export KDE_PREFIX=/usr</userinput></screen>
+  <para>The Trinty developers and BLFS editors recommend installing Trinity in
+  the <filename class='directory'>/opt</filename> directory in order to support
+  using one version while building another.</para>
 
-  <para>A method of building multiple versions installs
-  <application>KDE</application> in the <filename
-  class='directory'>/opt</filename> hierarchy:</para>
+<screen><userinput>export TRINITY_PREFIX=/opt/trinity-&trinity-version;</userinput></screen>
 
-<screen><userinput>export KDE_PREFIX=/opt/kde-&kde-version;</userinput></screen>
+  <para>Using this option requires updates to the PATH, PKG_CONFIG_PATH, and 
+  library search path:</para>
 
-  <para>Remember to execute <command>ldconfig</command> after installation
-  of libraries to update the library cache.</para>
+  <itemizedlist>
+    <listitem>
+    <para>Update PATH</para>
+<screen><userinput>export PATH=$TRINITY_PREFIX/bin:$PATH</userinput></screen>
+    </listitem>
 
-  <para>If you are not installing <application>KDE</application> in
-  <filename class="directory">/usr</filename>, you will need to make some
-  configuration changes:</para>
+    <listitem>
+    <para>Update PKG_CONFIG_PATH</para>
+<screen><userinput>export PKG_CONFIG_PATH=$TRINITY_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH</userinput></screen>
+    </listitem>
 
-  <para>You should consider installing the <xref linkend="desktop-file-utils"/>
+    <listitem>
+    <para>Update the library search path</para>
+<screen><userinput>export LD_LIBRARY_PATH=$TRINITY_PREFIX/lib:$LD_LIBRARY_PATH</userinput></screen>
+    </listitem>
+
+  </itemizedlist>
+
+  <para>The instructions for making these changes permanent are in 
+  <xref linkend='kde-core-config'/>.</para>
+
+  <para>There are two other environment variables that need to be set to build
+  <application>Trinity/KDE3</application>. These are needed for all the 
+  <userinput>cmake</userinput> based packages:</para>
+
+<screen><userinput>export CMAKE_PREFIX_PATH=/opt/qt:$TRINITY_PREFIX         &amp;&amp;
+
+CMAKE_INCLUDE_PATH=/opt/qt/include:/usr/include/dbus-1.0 &amp;&amp;
+export CMAKE_INCLUDE_PATH=$CMAKE_INCLUDE_PATH:$TRINITY_PREFIX/include</userinput></screen>
+
+  <para>You should also consider installing the <xref linkend="desktop-file-utils"/>
   package. Though not required, this package will allow you to easily use
   existing <filename>.desktop</filename> files in
   <filename class='directory'>/usr/share/applications</filename> (and any other
   locations identified by <envar>XDG_DATA_DIRS</envar>), and automatically add
-  these applications to the <application>KDE</application> menu system.</para>
-
-  <para>Add to your system or personal profile:</para>
-
-<screen><literal>export PATH=$PATH:/opt/kde-&kde-version;/bin
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/kde-&kde-version;/lib/pkgconfig</literal></screen>
-
-  <para>Add to your <filename>/etc/ld.so.conf</filename>:</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"
-<literal># Begin kde addition to /etc/ld.so.conf
-
-/opt/kde-&kde-version;/lib
-
-# End kde addition</literal>
-EOF</userinput></screen>
-
-  <indexterm zone="kde-pre-install-config">
-    <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-  </indexterm>
-
-  <para>Add to your <filename>/etc/man_db.conf</filename>:</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF"
-<literal># Begin kde addition to man_db.conf
-
-MANDATORY_MANPATH /opt/kde-&kde-version;/man
-
-# End kde addition to man_db.conf</literal>
-EOF</userinput></screen>
-
-  <indexterm zone="kde-pre-install-config">
-    <primary sortas="e-etc-man_db.conf">/etc/man_db.conf</primary>
-  </indexterm>
-
-  <tip>
-    <para>If you prefer installing KDE in <filename
-    class="directory">/opt</filename>, one trick to avoid the above configuration
-    changes every time you install a new version is to replace <filename
-    class="directory">/opt/kde-&kde-version;</filename> with <filename
-    class="directory">/opt/kde</filename> and to create a symlink from <filename
-    class="directory">/opt/kde-&kde-version;</filename> to <filename
-    class="directory">/opt/kde</filename>.</para>
-
-<screen role="root"><userinput>ln -v -sf kde-&kde-version; /opt/kde</userinput></screen>
-  </tip>
+  these applications to the menu system.</para>
 
 </sect1>
Index: kde/core/tqtinterface.xml
===================================================================
--- kde/core/tqtinterface.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
+++ kde/core/tqtinterface.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
@@ -0,0 +1,270 @@
+<?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 tqtinterface-download-http "&trinity-repo-http;/tqtinterface-&trinity-version;.tar.gz">
+  <!ENTITY tqtinterface-download-ftp  "&trinity-repo-ftp;/tqtinterface-&trinity-version;.tar.gz">
+  <!ENTITY tqtinterface-md5sum        "d54cc9fd0b35555298efd17c32471a2b">
+  <!ENTITY tqtinterface-size          "1 MB">
+  <!ENTITY tqtinterface-buildsize     "10 MB">
+  <!ENTITY tqtinterface-time          "0.6 SBU">
+]>
+
+<sect1 id="tqtinterface" xreflabel="tqtinterface-&trinity-version;">
+  <?dbhtml filename="tqtinterface.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: dj $</othername>
+    <date>$Date: 2011-03-07 22:45:56 -0600 (Mon, 07 Mar 2011) $</date>
+  </sect1info>
+
+  <title>tqtinterface-&trinity-version;</title>
+
+  <indexterm zone='tqtinterface'>
+    <primary sortas='a-tqtinterface'>tqtinterface</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to tqtinterface</title>
+
+    <para>The <application>tqtinterface</application> package  includes
+    libraries that abstract the underlying Qt system from the actual Trinity
+    code, allowing easy, complete upgrades to new versions of Qt.  </para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Download (HTTP): <ulink url="&tqtinterface-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&tqtinterface-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &tqtinterface-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &tqtinterface-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &tqtinterface-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &tqtinterface-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">tqtinterface Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="qt"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/tqtinterface"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of tqtinterface</title>
+
+    <note><para>When extracted, the <application>tqtinterfac</application> tar
+    file expands into the directory <filename
+    class='directory'>dependencies/tqtinterface</filename>.</para></note>
+
+    <para>Install <application>tqtinterface</application> by running
+    the following commands:</para>
+
+<screen><userinput>sed -i -e '/PKG/s@/usr@${EXEC_INSTALL_PREFIX}@' CMakeLists.txt &amp;&amp;
+BUILD=/tmp/tqt   &amp;&amp;
+TQT=`pwd`        &amp;&amp;
+rm -rf   $BUILD  &amp;&amp;
+mkdir -p $BUILD  &amp;&amp;
+cd       $BUILD  &amp;&amp;
+
+cmake $TGT                               \
+  -DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX \
+  -DCMAKE_VERBOSE_MAKEFILE=ON            \
+  -DQT_VERSION=3 &amp;&amp;
+
+unset TQT BUILD  &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><userinput>sed ... CMakeLists.txt</userinput>: This command changes
+    the location of <filename>tqt.pc</filename> to the $TRINITY_PREFIX
+    directory hierarchy.</para>
+
+    <para><userinput>TQT=`pwd`</userinput>: This command saves the 
+    location of the source code.</para>
+
+    <para><userinput>rm -rf $BUIL; mkdir -p $BUILD; cd $BUILD</userinput>:  The
+    developers strongly recommend building Trinity components in a directory
+    separate from the source code.  These commands ensure a clean starting
+    location for the build process.</para>
+
+    <para><option>-QT_VERSION=3</option>: This option is required for this 
+    package.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>convert_qt_tqt1,
+        convert_qt_tqt2,
+        convert_qt_tqt3,
+        dcopidl-tqt,
+        dcopidl2cpp-tqt,
+        dcopidlng-tqt,
+        mcopidl-tqt,
+        moc-tqt,
+        tmoc,
+        tqt-replace,
+        tqt-replace-stream,
+        uic-tqt
+        </seg>
+
+        <seg>libtqassistantclient.so and libtqt.so</seg>
+        
+        <seg>$TRINITY_PREFIX/include/tqt</seg>
+      </seglistitem>
+    </segmentedlist>
+
+<!--
+    TODO
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="tqtinterfacec-config">
+        <term><command>tqtinterfacec-config</command></term>
+        <listitem>
+          <para>is a utility to assist developers using the
+          <application>aRts</application> C API.</para>
+          <indexterm zone="aRts  tqtinterfacec-config">
+            <primary sortas="b-tqtinterfacec-config">tqtinterfacec-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tqtinterfacecat">
+        <term><command>tqtinterfacecat</command></term>
+        <listitem>
+          <para>is a simple utility to send raw audio data to the sound server.</para>
+          <indexterm zone="aRts tqtinterfacecat">
+            <primary sortas="b-tqtinterfacecat">tqtinterfacecat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tqtinterfaced">
+        <term><command>tqtinterfaced</command></term>
+        <listitem>
+          <para>is a daemon that provides access to the sound hardware resources.</para>
+          <indexterm zone="aRts tqtinterfaced">
+            <primary sortas="b-tqtinterfaced">tqtinterfaced</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tqtinterfacedsp">
+        <term><command>tqtinterfacedsp</command></term>
+        <listitem>
+          <para>provides an interim solution that allows most of legacy
+          sound applications to run unchanged.</para>
+          <indexterm zone="aRts tqtinterfacedsp">
+            <primary sortas="b-tqtinterfacedsp">tqtinterfacedsp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libaRts">
+        <term><filename class='libraryfile'>aRts Libraries</filename></term>
+        <listitem>
+          <para>contains functions that support <application>aRts</application>
+          programs.</para>
+          <indexterm zone="aRts libaRts">
+            <primary sortas="c-libaRts">aRts Libraries</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tqtinterfaceplay">
+        <term><command>tqtinterfaceplay</command></term>
+        <listitem>
+          <para>is a simple utility to play a sound file.</para>
+          <indexterm zone="aRts tqtinterfaceplay">
+            <primary sortas="b-tqtinterfaceplay">tqtinterfaceplay</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tqtinterfacerec">
+        <term><command>tqtinterfacerec</command></term>
+        <listitem>
+          <para>is a simple utility to record audio input.</para>
+          <indexterm zone="aRts tqtinterfacerec">
+            <primary sortas="b-tqtinterfacerec">tqtinterfacerec</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tqtinterfaceshell">
+        <term><command>tqtinterfaceshell</command></term>
+        <listitem>
+          <para>is intended as a utility to perform miscellaneous functions
+          related to the sound server.</para>
+          <indexterm zone="aRts tqtinterfaceshell">
+            <primary sortas="b-tqtinterfaceshell">tqtinterfaceshell</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tqtinterfacewrapper">
+        <term><command>tqtinterfacewrapper</command></term>
+        <listitem>
+          <para>is a small wrapper program which simply sets real-time priority
+          (running as <systemitem class="username">root</systemitem>)
+          and then executes <command>tqtinterfaced</command> as a non-root user.</para>
+          <indexterm zone="aRts tqtinterfacewrapper">
+            <primary sortas="b-tqtinterfacewrapper">tqtinterfacewrapper</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mcopidl">
+        <term><command>mcopidl</command></term>
+        <listitem>
+          <para>is the Interface Definition Language (IDL) file compiler for MCOP, the
+          Multimedia Communication Protocol used by <application>aRts</application>.</para>
+          <indexterm zone="aRts  mcopidl">
+            <primary sortas="b-mcopidl">mcopidl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+    -->
+  </sect2>
+
+</sect1>
Index: kde/kde-intro.xml
===================================================================
--- kde/kde-intro.xml	(revision 3863533e16db4d68f9190565077f52102363555a)
+++ kde/kde-intro.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
@@ -12,55 +12,51 @@
 
 <partintro>
-  <title>Introduction to KDE</title>
+  <title>Introduction to Trinity/KDE3</title>
 
-  <note><para>A preliminary set of instructions for building KDE-4.3.x
-  are in the BLFS wiki:
-  <ulink url="&blfs-wiki;/KDE-4.3.x"/>.</para></note>
+  <para>Trinity is a project that aims to keep the KDE 3.5 computing style
+  alive, as well as keeping the existing code base current.  It is a
+  comprehensive desktop environment that builds on an <application>X Window
+  System</application> and <application>Qt</application> version 3 to provide a
+  window manager and many user tools, including a browser, word processor,
+  spreadsheet, presentation package, games, and numerous other utilities. It
+  provides extensive capabilities for customization.</para>
 
-
-  <para><application>KDE</application> is a comprehensive desktop environment
-  that builds on an <application>X Window System</application> and
-  <application>Qt</application> to provide a window manager and many user tools,
-  including a browser, word processor, spreadsheet, presentation package, games,
-  and numerous other utilities. It provides extensive capabilities for customization.</para>
-
-  <para>The <application>KDE</application> instructions are divided into
+  <para>The <application>Trinity/KDE3</application> instructions are divided into
   three parts. The first part, the core packages, are needed for the rest of
-  <application>KDE</application> to work. The second part presents additional
+  <application>Trinity/KDE3</application> to work. The second part presents additional
   packages which provide functionality in various areas (multimedia, graphics, etc.)
   The third part provides resources for software and web developers.</para>
 
-  <para>There are two alternatives for installing <application>KDE</application>.
-  Option one, that is used by most of the commercial distributions, is to install
-  <application>KDE</application> in the standard system prefix:
+  <para>There are two alternatives for installing
+  <application>Trinity/KDE3</application>.  Option one, that is used by most of
+  the commercial distributions, is to install
+  <application>Trinity/KDE3</application> in the standard system prefix:
   <filename class="directory">/usr</filename>. This option allows the use of
-  <application>KDE</application> without the need for any additional configuration such
-  as modification of various environment variables or configuration files. Option two is
-  to install it in a unique prefix such as <filename class="directory">/opt/kde</filename> or
-  <filename class="directory">/opt/kde-&kde-version;</filename>. This option allows for
-  easy removal of the <application>KDE</application> version or maintenance of
-  multiple versions for testing.</para>
+  <application>Trinity/KDE3</application> without the need for any additional
+  configuration such as modification of various environment variables or
+  configuration files. Option two, recommended by the Trinity developers and
+  BLFS Editors is to install it in a unique prefix such as <filename
+  class="directory">/opt/trinity</filename> or <filename
+  class="directory">/opt/trinity-&trinity-version;</filename>. This option
+  allows for easy removal of the <application>Trinity/KDE3</application>
+  version or maintenance of multiple versions for testing.</para>
+
+  <para>The <application>Trinity/KDE3</application> pakages are undergoing 
+  constant upgrades.  With the 3.5.13 version, the core packages are
+  configured with <userinput>cmake</userinput> and the rest are built using the 
+  traditional <userinput>configure</userinput> command.</para>
 
   <tip>
-    <para>All the <application>KDE</application> packages are comprised of various
-    components. The default is to install most of the components. If specific components
-    are to be eliminated, the official way is to set the variable
+    <para>All the <application>Trinity/KDE3</application> packages that are
+    built with <userinput>configure</userinput> are comprised of various
+    components. The default is to install most of the components. If specific
+    components are to be eliminated, the way is to set the variable
     <envar>DO_NOT_COMPILE</envar>. This comes in handy when there are problems
     compiling a particular component.</para>
 
 <screen><userinput>DO_NOT_COMPILE="component1 component2" \
-    ./configure --prefix=&kde-dir; ...</userinput></screen>
+    ./configure --prefix=$TRINITY_PREFIX ...</userinput></screen>
 
-    <para>The core <application>KDE</application> packages also honor this
-    variable, but omitting components from the core packages is not advisable since
-    it may result in an incomplete <application>KDE</application> installation.</para>
   </tip>
 
-  <note>
-    <para>In each of the packages, one other option to <command>configure</command>
-    can be added: <option>--enable-final</option>. This option can speed up the build
-    process, but requires a lot of memory. If you have less than 256MB of RAM,
-    this option may cause swapping and significantly slow compilation.</para>
-  </note>
-
 </partintro>
Index: kde/kde.xml
===================================================================
--- kde/kde.xml	(revision 3863533e16db4d68f9190565077f52102363555a)
+++ kde/kde.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
@@ -11,8 +11,8 @@
 -->
 
-<part id="kde" xreflabel="KDE">
+<part id="kde" xreflabel="Trinity/KDE3">
   <?dbhtml filename="kde.html" dir="kde"?>
 
-  <title>KDE</title>
+  <title>Trinity/KDE3</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-intro.xml"/>
Index: multimedia/libdriv/libmad.xml
===================================================================
--- multimedia/libdriv/libmad.xml	(revision 3863533e16db4d68f9190565077f52102363555a)
+++ multimedia/libdriv/libmad.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
@@ -33,5 +33,5 @@
     MPEG audio decoder capable of 24-bit output.</para>
 
-    &lfs65_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/lib/qt.xml
===================================================================
--- x/lib/qt.xml	(revision 3863533e16db4d68f9190565077f52102363555a)
+++ x/lib/qt.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY qt-download-http "http://get.qt.nokia.com/qt/source/qt-x11-free-&qt-version;.tar.gz">
-  <!ENTITY qt-download-ftp  "ftp://ftp.trolltech.com/qt/source/qt-x11-free-&qt-version;.tar.gz">
-  <!ENTITY qt-md5sum        "9f05b4125cfe477cc52c9742c3c09009">
-  <!ENTITY qt-size          "16.5 MB">
-  <!ENTITY qt-buildsize     "261 MB">
-  <!ENTITY qt-time          "11 SBU (full), 7.5 SBU (sub-tools)">
+  <!ENTITY qt-download-http "&trinity-repo-http;/qt3-3.3.8.d.tar.gz">
+  <!ENTITY qt-download-ftp  "&trinity-repo-ftp;/qt3-3.3.8.d.tar.gz ">
+  <!ENTITY qt-md5sum        "78dc675e84aed595375449818cbb589a">
+  <!ENTITY qt-size          "16.8 MB">
+  <!ENTITY qt-buildsize     "801 MB">
+  <!ENTITY qt-time          "8.6 SBU">
 ]>
 
@@ -35,5 +35,5 @@
     dynamically linked to the <application>Qt</application> library. Two of
     the major users of <application>Qt</application> are
-    <application>KDE</application> and its foolow on project, 
+    <application>KDE</application> and its follow on project, 
     <application>Trinity</application>.</para>
 
@@ -60,7 +60,12 @@
     </itemizedlist>
 
-
-
-
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required Patch: <ulink
+          url="&patch-root;/qt3-3.3.8.d-libpng15-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
 
     <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
@@ -70,6 +75,8 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/> and
-    <xref linkend="libmng"/></para>
+    <para role="recommended">
+      <xref linkend="libjpeg"/> and
+      <xref linkend="libmng"/>
+    </para>
 
     <para>Note: if for whatever reason you do not have the recommended
@@ -82,11 +89,11 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-<!--    <xref linkend="nas"/>, -->
-    <xref linkend="cups"/>,
-    <xref linkend="mysql"/>,
-    <xref linkend="postgresql"/>,
-    <xref linkend="unixodbc"/>,
-    <xref linkend="sqlite"/>, and
-    <ulink url="http://firebird.sourceforge.net/">Firebird</ulink></para>
+      <xref linkend="cups"/>,
+      <xref linkend="mysql"/>,
+      <xref linkend="postgresql"/>,
+      <xref linkend="unixodbc"/>,
+      <xref linkend="sqlite"/>, and
+      <ulink url="http://firebird.sourceforge.net/">Firebird</ulink>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -100,19 +107,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/X11R6_symlink.xml"/>
-
-    <!--<para>The <application>Qt</application> source hard codes the location
-    of the <application>X Window System</application> installation to
-    <filename class="directory">/usr/X11R6</filename>.  If you've installed
-    the <application>X Window System</application> in any prefix other than
-    <filename class="directory">/usr/X11R6</filename>, then you should correct
-    the <application>qmake</application> configuration files with the following
-    commands, replacing <replaceable>&lt;PREFIX&gt;</replaceable> with the
-    installation prefix of the
-    <application>X Window System</application>:</para>
-
-<screen><userinput>for file in $(grep -lr "X11R6" *)
-do
-    sed -i "s@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g" $file
-done</userinput></screen> -->
 
     <para>There are several ways to install a complicated package such as
@@ -158,16 +150,4 @@
       This is the method that most commercial distributions use.</para>
 
-<!--
-      <note>
-        <para>The installation incorrectly uses <command>cp</command> to
-        install the files. This causes problems if the
-        <application>Qt</application> libraries are already in use (e.g.,
-        you are logged into your <application>KDE</application> desktop
-        environment). To avoid problems, <command>cp -f</command> is
-        replaced by <command>install</command> in
-        <filename>qmake.conf</filename>.</para>
-      </note>
--->
-
       <note>
         <para>If <application>Qt</application> is being reinstalled, run the
@@ -180,24 +160,26 @@
 
 bash
-export PATH=$PWD/bin:$PATH &amp;&amp;
+export PATH=$PWD/bin:$PATH                       &amp;&amp;
 export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &amp;&amp;
 
-./configure -prefix /usr \
-            -docdir /usr/share/doc/qt \
-            -headerdir /usr/include/qt \
-            -plugindir /usr/lib/qt/plugins \
-            -datadir /usr/share/qt \
+patch -Np1 -i ../qt3-3.3.8.d-libpng15-1.patch    &amp;&amp;
+
+./configure -prefix     /usr                \
+            -docdir     /usr/share/doc/qt   \
+            -headerdir  /usr/include/qt     \
+            -plugindir  /usr/lib/qt/plugins \
+            -datadir    /usr/share/qt       \
+            -sysconfdir /etc/qt             \
             -translationdir /usr/share/qt/translations \
-            -sysconfdir /etc/qt \
-            -qt-gif \
-            -system-zlib \
-            -system-libpng \
-            -system-libjpeg \
-            -system-libmng \
-            -plugin-imgfmt-png \
-            -plugin-imgfmt-jpeg \
-            -plugin-imgfmt-mng \
-            -no-exceptions \
-            -thread \
+            -qt-gif                         \
+            -system-zlib                    \
+            -system-libpng                  \
+            -system-libjpeg                 \
+            -system-libmng                  \
+            -plugin-imgfmt-png              \
+            -plugin-imgfmt-jpeg             \
+            -plugin-imgfmt-mng              \
+            -no-exceptions                  \
+            -thread                         \
             -tablet &amp;&amp;
 
@@ -237,20 +219,22 @@
 
 <screen><userinput>bash
-export QTDIR=$PWD &amp;&amp;
+export QTDIR=$PWD                                &amp;&amp;
 export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &amp;&amp;
-export PATH=$PWD/bin:$PATH &amp;&amp;
+export PATH=$PWD/bin:$PATH                       &amp;&amp;
+
+patch -Np1 -i ../qt3-3.3.8.d-libpng15-1.patch    &amp;&amp;
 
 ./configure -prefix /opt/qt-&qt-version; \
-            -sysconfdir /etc/qt \
-            -qt-gif \
-            -system-zlib \
-            -system-libpng \
-            -system-libjpeg \
-            -system-libmng \
-            -plugin-imgfmt-png \
-            -plugin-imgfmt-jpeg \
-            -plugin-imgfmt-mng \
-            -no-exceptions \
-            -thread \
+            -sysconfdir /etc/qt   \
+            -qt-gif               \
+            -system-zlib          \
+            -system-libpng        \
+            -system-libjpeg       \
+            -system-libmng        \
+            -plugin-imgfmt-png    \
+            -plugin-imgfmt-jpeg   \
+            -plugin-imgfmt-mng    \
+            -no-exceptions        \
+            -thread               \
             -tablet &amp;&amp;
 
@@ -427,4 +411,9 @@
       <filename class='directory'>/opt/qt/bin</filename>.</para>
 
+      <tip><para>The PATH, MANPATH, and PKG_CONFIG_PATH can be updated in
+      the extrapaths.sh (or other script) in the /etc/profile.d directory
+      if you set up the startup files as recommended in 
+      <xref linkend='postlfs-config-profile'/>.</para></tip>
+
       <para>As with most libraries, there is no explicit configuration to do.
       After updating <filename>/etc/ld.so.conf</filename> as explained above,
