Index: kde/add/kde-i18n.xml
===================================================================
--- kde/add/kde-i18n.xml	(revision 716ca8aa447ed19fb4379cb4d88a69f6efb6bc2a)
+++ kde/add/kde-i18n.xml	(revision df46eecc18db4422f4308b50581cbc9790eff4c7)
@@ -33,4 +33,6 @@
     packages to customize <application>KDE</application> for different
     languages and locales around the world.</para>
+
+    <para>This section has not been tested by the BLFS Editors.</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/add/kdeaddons.xml
===================================================================
--- kde/add/kdeaddons.xml	(revision 716ca8aa447ed19fb4379cb4d88a69f6efb6bc2a)
+++ kde/add/kdeaddons.xml	(revision df46eecc18db4422f4308b50581cbc9790eff4c7)
@@ -4,13 +4,13 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-  <!ENTITY kdeaddons-download-http "&kde-download-http;/kdeaddons-&kde-version;.tar.bz2">
-  <!ENTITY kdeaddons-download-ftp  "&kde-download-ftp;/kdeaddons-&kde-version;.tar.bz2">
-  <!ENTITY kdeaddons-md5sum        "c69d082407b2c1bb46d078f8ac5d2bea">
-  <!ENTITY kdeaddons-size          "1.7 MB">
-  <!ENTITY kdeaddons-buildsize     "42 MB">
-  <!ENTITY kdeaddons-time          "3.5 SBU">
+  <!ENTITY kdeaddons-download-http "&trinity-repo-http;/kdeaddons-&trinity-version;.tar.gz">
+  <!ENTITY kdeaddons-download-ftp  "&trinity-repo-ftp;/kdeaddons-&trinity-version;.tar.gz">
+  <!ENTITY kdeaddons-md5sum        "f5fa96a5d99d1bc33600f609881eaee6">
+  <!ENTITY kdeaddons-size          "1.5 MB">
+  <!ENTITY kdeaddons-buildsize     "209 MB">
+  <!ENTITY kdeaddons-time          "2.2 SBU">
 ]>
 
-<sect1 id="kdeaddons" xreflabel="kdeaddons-&kde-version;">
+<sect1 id="kdeaddons" xreflabel="kdeaddons-&trinity-version;">
   <?dbhtml filename="kdeaddons.html"?>
 
@@ -20,5 +20,5 @@
   </sect1info>
 
-  <title>Kdeaddons-&kde-version;</title>
+  <title>Kdeaddons-&trinity-version;</title>
 
   <indexterm zone="kdeaddons">
@@ -32,4 +32,6 @@
     <application>konqueror</application>, <application>kate</application>, and
     <application>kicker</application>.</para>
+
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -58,18 +60,24 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="kdebase"/></para>
+    <para role="required">
+      <xref linkend="kdebase"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/> and
-    <xref linkend="libxml2"/></para>
+    <para role="recommended">
+      <xref linkend="libjpeg"/> and
+      <xref linkend="libxml2"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="kdenetwork"/>,
-    <xref linkend="kdemultimedia"/>,
-    <xref linkend="kdepim"/>,
-    <xref linkend="kdegames"/>,
-    <xref linkend="db"/>,
-    <!-- <xref linkend="xmms"/>, -->and
-    <xref linkend="sdl"/></para>
+    <para role="optional">
+      <xref linkend="kdenetwork"/>,
+      <xref linkend="kdemultimedia"/>,
+      <xref linkend="kdepim"/>,
+      <xref linkend="kdegames"/>,
+      <xref linkend="db"/>,
+      <!-- <xref linkend="xmms"/>, -->and
+      <xref linkend="sdl"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -83,6 +91,16 @@
     <para>Install <application>kdeaddons</application> with:</para>
 
-<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
+<screen><userinput>cp -v /usr/share/aclocal/libtool.m4       admin/libtool.m4.in &amp;&amp;
+cp -v /usr/share/libtool/config/ltmain.sh admin/ltmain.sh     &amp;&amp;
+sed -i -e "s@/usr/include/tqt@$TRINITY_PREFIX/include/tqt@"   \
+          admin/acinclude.m4.in                               &amp;&amp;
+make -f admin/Makefile.common                                 &amp;&amp;
+
+./configure --prefix=$TRINITY_PREFIX \
+            --enable-closure         \
+            --sysconfdir=/etc        \
+            --localstatedir=/var     \
+            --with-extra-libs=$TRINITY_PREFIX/lib &amp;&amp;
+
 make</userinput></screen>
 
Index: kde/add/kdeedu.xml
===================================================================
--- kde/add/kdeedu.xml	(revision 716ca8aa447ed19fb4379cb4d88a69f6efb6bc2a)
+++ kde/add/kdeedu.xml	(revision df46eecc18db4422f4308b50581cbc9790eff4c7)
@@ -4,13 +4,13 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-  <!ENTITY kdeedu-download-http "&kde-download-http;/kdeedu-&kde-version;.tar.bz2">
-  <!ENTITY kdeedu-download-ftp  "&kde-download-ftp;/kdeedu-&kde-version;.tar.bz2">
-  <!ENTITY kdeedu-md5sum        "1b1466bf4cb0a59b1abd8613a2588142">
-  <!ENTITY kdeedu-size          "28.8 MB">
-  <!ENTITY kdeedu-buildsize     "198 MB">
-  <!ENTITY kdeedu-time          "7.7 SBU">
+  <!ENTITY kdeedu-download-http "&trinity-repo-http;/kdeedu-&trinity-version;.tar.gz">
+  <!ENTITY kdeedu-download-ftp  "&trinity-repo-ftp;/kdeedu-&trinity-version;.tar.gz">
+  <!ENTITY kdeedu-md5sum        "37a14a67c4d00babc3015c6a31698cb0">
+  <!ENTITY kdeedu-size          "29.6 MB">
+  <!ENTITY kdeedu-buildsize     "825 MB">
+  <!ENTITY kdeedu-time          "6.6 SBU">
 ]>
 
-<sect1 id="kdeedu" xreflabel="kdeedu-&kde-version;">
+<sect1 id="kdeedu" xreflabel="kdeedu-&trinity-version;">
   <?dbhtml filename="kdeedu.html"?>
 
@@ -20,5 +20,5 @@
   </sect1info>
 
-  <title>Kdeedu-&kde-version;</title>
+  <title>Kdeedu-&trinity-version;</title>
 
   <indexterm zone="kdeedu">
@@ -34,4 +34,6 @@
     desktop planetarium, an application to study Spanish verbforms, and the
     classic hangman game for children.</para>
+
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -67,18 +69,20 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="kdebase"/></para>
+    <para role="required">
+      <xref linkend="kdebase"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/> and
-    <xref linkend="libxml2"/></para>
+    <para role="recommended">
+      <xref linkend="libjpeg"/> and
+      <xref linkend="libxml2"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libusb-compat"/>,
-    <ulink
-    url="http://www.boost.org/libs/python/doc/index.html">Boost.Python</ulink>,
-    <ulink url="http://pauillac.inria.fr/ocaml/">OCaml</ulink>, and
-    <ulink url="http://www.recherche.enac.fr/opti/facile/">FaCiLe module
-    for OCaml</ulink>.
-
+    <para role="optional">
+      <xref linkend="libusb-compat"/>,
+      <ulink url="http://www.boost.org/libs/python/doc/index.html">Boost.Python</ulink>,
+      <ulink url="http://pauillac.inria.fr/ocaml/">OCaml</ulink>, and
+      <ulink url="http://www.recherche.enac.fr/opti/facile/">FaCiLe module for OCaml</ulink>.
     </para>
 
@@ -93,6 +97,18 @@
     <para>Install <application>kdeedu</application> with:</para>
 
-<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
+<screen><userinput>cp -v /usr/share/aclocal/libtool.m4       admin/libtool.m4.in &amp;&amp;
+cp -v /usr/share/libtool/config/ltmain.sh admin/ltmain.sh     &amp;&amp;
+sed -i -e "s@/usr/include/tqt@$TRINITY_PREFIX/include/tqt@"   \
+          admin/acinclude.m4.in
+make -f admin/Makefile.common                                 &amp;&amp;
+
+export LIBRARY_PATH=$TRINITY_PREFIX/lib                       &amp;&amp;
+
+./configure --prefix=$TRINITY_PREFIX \
+            --enable-closure         \
+            --sysconfdir=/etc        \
+            --localstatedir=/var     \
+            --with-extra-libs=$TRINITY_PREFIX/lib             &amp;&amp;
+
 make</userinput></screen>
 
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision 716ca8aa447ed19fb4379cb4d88a69f6efb6bc2a)
+++ kde/add/kdepim.xml	(revision df46eecc18db4422f4308b50581cbc9790eff4c7)
@@ -6,8 +6,8 @@
   <!ENTITY kdepim-download-http "&trinity-repo-http;/kdepim-&kde-version;.tar.gz">
   <!ENTITY kdepim-download-ftp  "&trinity-repo-ftp;/kdepim-&kde-version;.tar.gz">
-  <!ENTITY kdepim-md5sum        "fc93e458a8eec8131ede56cff30c28b2">
-  <!ENTITY kdepim-size          "13.9 MB">
-  <!ENTITY kdepim-buildsize     "267 MB (additional 245 MB for API docs)">
-  <!ENTITY kdepim-time          "24 SBU (additional 0.9 SBU for API docs)">
+  <!ENTITY kdepim-md5sum        "4488062d5400bdd99642fe0b72ebcf9a">
+  <!ENTITY kdepim-size          "12.8 MB">
+  <!ENTITY kdepim-buildsize     "347 MB">
+  <!ENTITY kdepim-time          "6.4 SBU">
 ]>
 
@@ -33,4 +33,6 @@
     Programs include a contact manager, calendar, mail utilities, newsreader,
     X.509 certificate manager, and sticky notes.</para>
+
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -88,6 +90,5 @@
       <xref linkend="pilot-link"/>,
       <xref linkend="gnupg"/> or 
-      <ulink url="http://www.gnupg.org/download/index.html#gpgme">GPGME</ulink>
-        (requires <xref linkend="gnupg2"/>),
+      <xref linkend="gpgme"/>,
       <ulink url="http://www.opensync.org">OpenSync</ulink>,
       <ulink url="http://jasonday.home.att.net/code/libmal/libmal.html">libmal</ulink>,
@@ -109,14 +110,17 @@
     <para>Install <application>kdepim</application> with:</para>
 
-<screen><userinput>sed -i "s@ \*/@&amp;\n#define HAVE_FOPENCOOKIE@" \
-    libkdenetwork/libgpgme-copy/{assuan,gpgme}/funopen.c &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'  \
-       kmail/editorwatcher.cpp &amp;&amp;
-patch -Np1 -i ../kdepim-&kde-version;-charset-1.patch &amp;&amp;
-./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
+<screen><userinput>KDEPIM=`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                         \
+      -DBUILD_ALL=ON                         \
+      -DBUILD_INDEXLIB=OFF                   \
+      $KDEPIM        &amp;&amp;
+
+unset KDEPIM MAKEDIR &amp;&amp;
 make</userinput></screen>
 
@@ -135,12 +139,6 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i ... funopen.c</command>: This prevents an error
-    during build that is caused by <command>configure</command> not
-    properly detecting a capability built into <filename>glibc</filename>.
-    </para>
-
-    <para><command>sed -i ... kmail/editorwatcher.cpp</command>: This This
-    command is necessary to prevent a conflict in linux headers. The equivalent
-    instructions that are deleted are now within glibc.</para>
+    <para><option>-DBUILD_INDEXLIB=OFF</option>: This option requires
+    <ulink url="http://www.boost.org">Boost</ulink>.</para>
 
   </sect2>
Index: kde/add/kdetoys.xml
===================================================================
--- kde/add/kdetoys.xml	(revision 716ca8aa447ed19fb4379cb4d88a69f6efb6bc2a)
+++ kde/add/kdetoys.xml	(revision df46eecc18db4422f4308b50581cbc9790eff4c7)
@@ -61,5 +61,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">i
+    <para role="required">
       <xref linkend="kdebase"/>
     </para>
