Index: kde/add/kdeadmin.xml
===================================================================
--- kde/add/kdeadmin.xml	(revision e36f9d9046b05fc1c66ca9bded82152c2f7c7dcd)
+++ kde/add/kdeadmin.xml	(revision 7df66ff5e891cb7a58085d3d3b712a9c552ad748)
@@ -34,4 +34,6 @@
     and network connections.</para>
 
+    &lfs70_checked;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing='compact'>
Index: kde/add/kdeartwork.xml
===================================================================
--- kde/add/kdeartwork.xml	(revision e36f9d9046b05fc1c66ca9bded82152c2f7c7dcd)
+++ kde/add/kdeartwork.xml	(revision 7df66ff5e891cb7a58085d3d3b712a9c552ad748)
@@ -4,13 +4,13 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-  <!ENTITY kdeartwork-download-http "&kde-download-http;/kdeartwork-&kde-version;.tar.bz2">
-  <!ENTITY kdeartwork-download-ftp  "&kde-download-ftp;/kdeartwork-&kde-version;.tar.bz2">
-  <!ENTITY kdeartwork-md5sum        "6e6f089dc0f1dabb0f138641600d0b59">
-  <!ENTITY kdeartwork-size          "15.8 MB">
-  <!ENTITY kdeartwork-buildsize     "97 MB">
-  <!ENTITY kdeartwork-time          "1.3 SBU">
+  <!ENTITY kdeartwork-download-http "&trinity-repo-http;/kdeartwork-&trinity-version;.tar.bz2">
+  <!ENTITY kdeartwork-download-ftp  "&trinity-repo-ftp;/kdeartwork-&trinity-version;.tar.bz2">
+  <!ENTITY kdeartwork-md5sum        "24f85eb3e5a9106de48a3e81d2575ffe">
+  <!ENTITY kdeartwork-size          "26.6 MB">
+  <!ENTITY kdeartwork-buildsize     "132 MB">
+  <!ENTITY kdeartwork-time          "0.5 SBU">
 ]>
 
-<sect1 id="kdeartwork" xreflabel="kdeartwork-&kde-version;">
+<sect1 id="kdeartwork" xreflabel="kdeartwork-&trinity-version;">
   <?dbhtml filename="kdeartwork.html"?>
 
@@ -20,5 +20,5 @@
   </sect1info>
 
-  <title>Kdeartwork-&kde-version;</title>
+  <title>Kdeartwork-&trinity-version;</title>
 
   <indexterm zone="kdeartwork">
@@ -32,4 +32,6 @@
     <application>KDE</application> themes, screensavers, sounds, wallpapers,
     widget styles, and window styles.</para>
+
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -58,13 +60,19 @@
 
     <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"/>,
-    <xref linkend="libxml2"/>, and
-    <xref linkend="libart_lgpl"/></para>
+    <para role="recommended">
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libxml2"/>, and
+      <xref linkend="libart_lgpl"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="xscreensaver"/></para>
+    <para role="optional">
+      <xref linkend="xscreensaver"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -78,6 +86,20 @@
     <para>Install <application>kdeartwork</application> with:</para>
 
-<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
+<screen><userinput>MAKEDIR=/tmp/buildkdeart &amp;&amp;
+KDEART=`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_XSCREENSAVER=ON                 \
+      -DWITH_LIBART=ON                       \
+      -DWITH_OPENGL=ON                       \
+      -DWITH_ARTS=ON                         \
+      -DBUILD_ALL=ON                         \
+      $KDEART            &amp;&amp;
+
+unset KDEART MAKEDIR     &amp;&amp;
 make</userinput></screen>
 
Index: kde/add/kdegames.xml
===================================================================
--- kde/add/kdegames.xml	(revision e36f9d9046b05fc1c66ca9bded82152c2f7c7dcd)
+++ kde/add/kdegames.xml	(revision 7df66ff5e891cb7a58085d3d3b712a9c552ad748)
@@ -31,4 +31,6 @@
     <para><application>Kdegames</application> provides many interesting
     games.</para>
+
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/add/kdegraphics.xml
===================================================================
--- kde/add/kdegraphics.xml	(revision e36f9d9046b05fc1c66ca9bded82152c2f7c7dcd)
+++ kde/add/kdegraphics.xml	(revision 7df66ff5e891cb7a58085d3d3b712a9c552ad748)
@@ -4,13 +4,13 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-  <!ENTITY kdegraphics-download-http "&kde-download-http;/kdegraphics-&kde-version;.tar.bz2">
-  <!ENTITY kdegraphics-download-ftp  "&kde-download-ftp;/kdegraphics-&kde-version;.tar.bz2">
-  <!ENTITY kdegraphics-md5sum        "09094b5357d8cd5c49d45b5d291dcfe">
-  <!ENTITY kdegraphics-size          "7.1 MB">
-  <!ENTITY kdegraphics-buildsize     "115 MB (additional 37 MB for API docs)">
-  <!ENTITY kdegraphics-time          "7.0 SBU (additional 0.1 SBU for API docs)">
+  <!ENTITY kdegraphics-download-http "&trinity-repo-http;/kdegraphics-&trinity-version;.tar.gz">
+  <!ENTITY kdegraphics-download-ftp  "&trinity-repo-ftp;/kdegraphics-&trinity-version;.tar.gz">
+  <!ENTITY kdegraphics-md5sum        "349f197c9af4bf0d9b8773f26829415e">
+  <!ENTITY kdegraphics-size          "8.6 MB">
+  <!ENTITY kdegraphics-buildsize     "98 MB">
+  <!ENTITY kdegraphics-time          "5.1 SBU">
 ]>
 
-<sect1 id="kdegraphics" xreflabel="kdegraphics-&kde-version;">
+<sect1 id="kdegraphics" xreflabel="kdegraphics-&trinity-version;">
   <?dbhtml filename="kdegraphics.html"?>
 
@@ -20,5 +20,5 @@
   </sect1info>
 
-  <title>Kdegraphics-&kde-version;</title>
+  <title>Kdegraphics-&trinity-version;</title>
 
   <indexterm zone="kdegraphics">
@@ -35,4 +35,6 @@
     application to generate POV-Ray scenes, and a scanner application.</para>
 
+    &lfs70_checked;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing='compact'>
@@ -61,6 +63,7 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Required Patch: <ulink
-        url="ftp://ftp.kde.org/pub/kde/security_patches/post-&kde-version;-kdegraphics-CAN-2005-3193.diff"/></para>
+        <para>Required Patch: 
+          <ulink url=""/>
+        </para>
       </listitem>
     </itemizedlist>
@@ -70,37 +73,40 @@
 
     <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"/>,
-    <xref linkend="libxml2"/>, and
-    <xref linkend="libart_lgpl"/></para>
+    <para role="recommended">
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libxml2"/>, and
+      <xref linkend="libart_lgpl"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libtiff"/>,
-    <ulink url="http://ftp.gnome.org/pub/gnome/sources/imlib/1.9/">Imlib</ulink>
-    (not recommended: obsolete, abandoned upstream,
-    <ulink url="http://bugs.debian.org/448360">buggy</ulink>,
-    needed only for the
-    <command>kuickshow</command> image viewer, to which
-    <command>kview</command> is a better alternative),
-    <xref linkend="lcms"/>,
-    <xref linkend="poppler"/>
-    (<filename class='libraryfile'>libpoppler-qt.so</filename> must have
-    been built),
-    <xref linkend="sane"/>,
-    <!-- There is an internal copy of Xpdf and there are *no* hooks to any
-         outside version. Commenting this out for now
-    <xref linkend="xpdf"/>, -->
-    <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/>,
-    <xref linkend="fribidi"/>,
-    <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
-    <ulink url="http://www.sfr-fresh.com/linux/misc/t1lib">t1lib</ulink>,
-    <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
-    <ulink url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink>,
-    <ulink url="http://www.rerecognition.com/">KADMOS</ulink> (a commercial
-    OCR engine),
-    <xref linkend="graphviz"/>, and
-    <xref linkend="doxygen"/></para>
+    <para role="optional">
+      <xref linkend="libtiff"/>,
+      <ulink url="http://ftp.gnome.org/pub/gnome/sources/imlib/1.9/">Imlib</ulink>
+         (not recommended: obsolete, abandoned upstream,
+         needed only for the <command>kuickshow</command> image viewer, 
+      <xref linkend="lcms"/>,
+      <xref linkend="poppler"/>
+        (<filename class='libraryfile'>libpoppler-qt.so</filename> must have
+        been built),
+      <xref linkend="sane"/>,
+      <!-- There is an internal copy of Xpdf and there are *no* hooks to any
+           outside version. Commenting this out for now <xref linkend="xpdf"/>, -->
+      <xref linkend="texlive"/>,
+      <xref linkend="fribidi"/>,
+      <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
+      <ulink url="http://www.sfr-fresh.com/linux/misc/t1lib">t1lib</ulink>,
+      <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
+      <ulink url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink>,
+      <ulink url="http://www.rerecognition.com/">KADMOS</ulink> (a commercial
+        OCR engine),
+      <ulink url="http://pages.cs.wisc.edu/~ghost/gv/index.htm">Ghostview</ulink>,
+      <xref linkend="graphviz"/>, and
+      <xref linkend="doxygen"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -122,6 +128,5 @@
 
     <para>The <command>kghostview</command> program requires a ghostscript
-    interpreter from <xref linkend="gs"/><!-- or <xref linkend="espgs"/> --> to
-    process PS or PDF files.</para>
+    interpreter from <xref linkend="gs"/> to process PS or PDF files.</para>
 
     <para>The <command>kpovmodeler</command> program requires
@@ -135,6 +140,26 @@
     <para>Install <application>kdegraphics</application> with:</para>
 
-<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
+<screen><userinput>KDEGRAPHICS=`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            \
+          -DQT_VERSION=3                         \
+          -DCMAKE_CXX_FLAGS="-fpermissive"       \
+          -DWITH_TIFF=ON                         \
+          -DWITH_PAM=ON                          \
+          -DBUILD_ALL=ON                         \
+          -DBUILD_KAMERA=OFF                     \
+          -DBUILD_KSVG=OFF                       \
+          -DBUILD_KUICKSHOW=OFF                  \
+          -DBUILD_LIBKSCAN=OFF                   \
+          -DBUILD_KOOKA=OFF                      \
+          -DBUILD_KGHOSTVIEW=OFF                 \
+          -DBUILD_KFILE_PLUGINS=OFF              \
+          $KDEGRAPHICS                          &amp;&amp;
+
+unset KDEGRAPHICS MAKEDIR &amp;&amp;
 make</userinput></screen>
 
@@ -147,4 +172,18 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><option>-DBUILD_KAMERA</option>: Requires libgphoto2.</para>
+    <para><option>-DBUILD_KSVG</option>: Requires fribidi.</para>
+    <para><option>-DBUILD_KUICKSHOW</option>: Requires imlib (obsolete).</para>
+    <para><option>-DBUILD_LIBKSCAN</option>: Requires sane.</para>
+    <para><option>-DBUILD_KFILE_PLUGINS</option>: Requires poppler.</para>
+    <para><option>-DBUILD_KOOKA</option>: Requires LIBKSCAN.</para>
+    <para><option>-DWITH_LIBPAPER</option>: Requires libpaper (manage paper characteristics).</para>
+    <para><option>-DWITH_T1LIB</option>: Requires t1lib (generate glyphs from Type 1 fonts).</para>
+    <para><option>-DWITH_OPENEXR</option>: Requires OpenEXR (High def image format).</para>
 
   </sect2>
Index: kde/add/kdenetwork.xml
===================================================================
--- kde/add/kdenetwork.xml	(revision e36f9d9046b05fc1c66ca9bded82152c2f7c7dcd)
+++ kde/add/kdenetwork.xml	(revision 7df66ff5e891cb7a58085d3d3b712a9c552ad748)
@@ -34,4 +34,6 @@
     messages, and similar programs.</para>
 
+    &lfs70_checked;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing='compact'>
@@ -111,5 +113,5 @@
     <para>Install <application>kdenetwork</application> with:</para>
 
-<screen><userinput>patch -Np1 -i ../kdenetwork&trinity-version;-upstream_fixes-1.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../kdenetwork-&trinity-version;-upstream_fixes-1.patch &amp;&amp;
 
 MAKEDIR=/tmp/buildkdenet &amp;&amp;
