Index: kde/add/add.xml
===================================================================
--- kde/add/add.xml	(revision 35bf1ea20df802d3b5c1a49062c0eeb6b8f61d92)
+++ kde/add/add.xml	(revision a8e7b72584cbea73271e9722d2a1c8923ed23d29)
@@ -17,5 +17,5 @@
 
   <warning><para>The Trinity/KDE3 update to BLFS is a work in progress.
-  The packages below have not yet been updated.</para></warning>
+  Some of the packages below have not yet been updated.</para></warning>
 
 
@@ -29,4 +29,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdenetwork.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdepim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeakode.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdemultimedia.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdegraphics.xml"/>
Index: kde/add/kdeakode.xml
===================================================================
--- kde/add/kdeakode.xml	(revision a8e7b72584cbea73271e9722d2a1c8923ed23d29)
+++ kde/add/kdeakode.xml	(revision a8e7b72584cbea73271e9722d2a1c8923ed23d29)
@@ -0,0 +1,158 @@
+<?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 akode-version       "2.0.2">
+  <!ENTITY akode-download-http "&trinity-repo-http;/akode-&akode-version;.tar.bz2">
+  <!ENTITY akode-download-ftp  "&trinity-repo-ftp;/akode-&akode-version;.tar.bz2">
+  <!ENTITY akode-md5sum        "659ced0c9c735cb3e55b9138ff02342c">
+  <!ENTITY akode-size          "468 KB">
+  <!ENTITY akode-buildsize     "6.6 MB">
+  <!ENTITY akode-time          "0.3 SBU">
+]>
+
+<sect1 id="kdeakode" xreflabel="kdeakode-&akode-version;">
+  <?dbhtml filename="kdeakode.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: bdubbs $</othername>
+    <date>$Date: 2011-12-12 18:02:58 -0600 (Mon, 12 Dec 2011) $</date>
+  </sect1info>
+
+  <title>Akode-&akode-version;</title>
+
+  <indexterm zone="kdeakode">
+    <primary sortas="a-kdeakode">Akode</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Akode</title>
+
+    <para>In the current version of <application>Kdemultimedia</application>, some
+    of the functionality provided by the package has been moved into a
+    separate project named <application>Akode</application>. In order for
+    <application>Kdemultimedia</application> to provide the removed
+    functionality, you must install the <application>Akode</application>
+    package first. </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kdemultimedia"/></para>
+
+  </sect2>
+
+  <sect2 role="package" id="akode" xreflabel="Akode-&akode-version;">
+    <title>Akode-&akode-version;</title>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Download (HTTP): <ulink url="&akode-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&akode-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &akode-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &akode-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &akode-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &akode-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch (for FFmpeg support): <ulink
+        url="&patch-root;/akode-&akode-version;-consolidated_fixes-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Akode Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+     <para role="optional">
+       <xref linkend="pkgconfig"/>
+       <xref linkend="flac"/>,
+       <xref linkend="speex"/>,
+       <xref linkend="libmad"/>,
+       <xref linkend="alsa"/>,
+       <xref linkend="libvorbis"/>,
+       <xref linkend="pulseaudio"/>,
+       <xref linkend="ffmpeg"/> (support is experimental), 
+       <ulink url="http://www.mega-nerd.com/libsamplerate/">Secret Rabbit
+         Code</ulink> (a.k.a. libsamplerate), and
+       <ulink url="http://jackit.sourceforge.net/">JACK</ulink>
+    </para>
+
+    <bridgehead renderas="sect3">Installation of Akode</bridgehead>
+
+<screen><userinput>patch -Np1 -i ../akode-&akode-version;-consolidated_fixes-1.patch &amp;&amp;
+./configure --prefix=$TRINITY_PREFIX --without-ffmpeg   &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><parameter>--without-ffmpeg</parameter>: This option disables the
+    experimental <application>FFmpeg</application> support in
+    <application>Akode</application>, as the build fails if it is enabled.
+    You can remove this switch to enable
+    the experimental <application>FFmpeg</application> support, however, the
+    functionality of <application>Akode</application> built with
+    <application>FFmpeg</application> support has not been tested by the
+    BLFS editors.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>akode-config and akodeplay</seg>
+        <seg>libakode.so, libakode_alsa_sink.so, libakode_mpc_decoder.so,
+        libakode_mpeg_decoder.so, libakode_oss_sink.so, and libakode_xiph_decoder.so</seg>
+        <seg>include/akode</seg>
+      </seglistitem>
+    </segmentedlist>
+<!--
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="artsbuilder">
+        <term><command>artsbuilder</command></term>
+        <listitem>
+          <para>is a tool to create new structures of small connected
+          <application>aRts</application> modules.</para>
+          <indexterm zone="kdemultimedia artsbuilder">
+            <primary sortas="b-artsbuilder">artsbuilder</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+-->
+  </sect2>
+
+</sect1>
Index: kde/add/kdemultimedia.xml
===================================================================
--- kde/add/kdemultimedia.xml	(revision 35bf1ea20df802d3b5c1a49062c0eeb6b8f61d92)
+++ kde/add/kdemultimedia.xml	(revision a8e7b72584cbea73271e9722d2a1c8923ed23d29)
@@ -5,21 +5,13 @@
   %general-entities;
 
-  <!ENTITY kdemultimedia-download-http "&kde-download-http;/kdemultimedia-&kde-version;.tar.bz2">
-  <!ENTITY kdemultimedia-download-ftp  "&kde-download-ftp;/kdemultimedia-&kde-version;.tar.bz2">
-  <!ENTITY kdemultimedia-md5sum        "8e8cd7f41d37f7da8bd239048abf3516">
-  <!ENTITY kdemultimedia-size          "6.0 MB">
-  <!ENTITY kdemultimedia-buildsize     "122 MB">
-  <!ENTITY kdemultimedia-time          "9.7 SBU">
-
-  <!ENTITY akode-version       "2.0.2">
-  <!ENTITY akode-download-http "http://www.kde-apps.org/CONTENT/content-files/30375-akode-&akode-version;.tar.bz2">
-  <!ENTITY akode-download-ftp  "&sources-anduin-ftp;/a/30375-akode-&akode-version;.tar.bz2">
-  <!ENTITY akode-md5sum        "659ced0c9c735cb3e55b9138ff02342c">
-  <!ENTITY akode-size          "462 KB">
-  <!ENTITY akode-buildsize     "6.5 MB">
-  <!ENTITY akode-time          "0.2 SBU">
+  <!ENTITY kdemultimedia-download-http "&trinity-repo-http;/kdemultimedia-&trinity-version;.tar.gz">
+  <!ENTITY kdemultimedia-download-ftp  "&trinity-repo-ftp;/kdemultimedia-&trinity-version;.tar.gz">
+  <!ENTITY kdemultimedia-md5sum        "6d906b8a8fd0928e01ecd600175381c0">
+  <!ENTITY kdemultimedia-size          "5.7 MB">
+  <!ENTITY kdemultimedia-buildsize     "534 MB">
+  <!ENTITY kdemultimedia-time          "6.7 SBU">
 ]>
 
-<sect1 id="kdemultimedia" xreflabel="kdemultimedia-&kde-version;">
+<sect1 id="kdemultimedia" xreflabel="kdemultimedia-&trinity-version;">
   <?dbhtml filename="kdemultimedia.html"?>
 
@@ -29,5 +21,5 @@
   </sect1info>
 
-  <title>Kdemultimedia-&kde-version;</title>
+  <title>Kdemultimedia-&trinity-version;</title>
 
   <indexterm zone="kdemultimedia">
@@ -44,120 +36,4 @@
     <application>aRts</application>.</para>
 
-    <para>In this version of <application>Kdemultimedia</application>, some
-    of the functionality provided by the package has been moved into a
-    separate project named <application>Akode</application>. In order for
-    <application>Kdemultimedia</application> to provide the removed
-    functionality, you must install the <application>Akode</application>
-    package first. Instructions to install <application>Akode</application>
-    follow. If you wish to skip the <application>Akode</application>
-    installation, go straight to the
-    <xref linkend="kdemultimedia-instructions"/>.</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdemultimedia"/></para>
-
-  </sect2>
-
-  <sect2 role="package" id="akode" xreflabel="Akode-&akode-version;">
-    <title>Akode-&akode-version;</title>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&akode-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&akode-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &akode-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &akode-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &akode-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &akode-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch (for FFmpeg support): <ulink
-        url="&patch-root;/akode-&akode-version;-FFmpeg_fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Akode Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-     <para role="optional">
-     <!-- <xref linkend="pkgconfig"/>, -->
-     <xref linkend="flac"/>,
-     <xref linkend="speex"/>,
-     <xref linkend="libmad"/>,
-     <xref linkend="alsa"/>,
-     <xref linkend="libvorbis"/>,
-     <xref linkend="pulseaudio"/>,
-     <xref linkend="ffmpeg"/> (support is experimental), 
-      <ulink url="http://www.mega-nerd.com/libsamplerate/">Secret Rabbit
-        Code</ulink> (a.k.a. libsamplerate), and
-      <ulink url="http://jackit.sourceforge.net/">JACK</ulink>
-    </para>
-
-    <bridgehead renderas="sect3">Installation of Akode</bridgehead>
-
-<screen><userinput>sed -i "s/#include &lt;iostream&gt;/&amp;\n#include &lt;cstdlib&gt;/" \
-    akode/lib/auto_sink.cpp  &amp;&amp;
-
-sed -i 's@#include "../lib/decoder.h"@&amp;\n#include &lt;cstdlib&gt;@' \
-    akode/akodeplay/akodeplay.cpp  &amp;&amp;
-
-sed -i "s/&lt;assert.h&gt;/&amp;\n#include &lt;string.h&gt;\n/" \
-    akode/lib/player.cpp  &amp;&amp;
-
-sed -i "s/&lt;iostream&gt;/&amp;\n#include &lt;string.h&gt;\n/" \
-     akode/lib/magic.cpp  &amp;&amp;
-
-./configure --prefix=&kde-dir; --without-ffmpeg \
-    --disable-debug --disable-dependency-tracking &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><command>sed ...</command>: The four sed commands insert headers
-    needed by <application>gcc-4.3</application> and above because the C++ header
-    dependencies have been cleaned up.</para>
-
-    <para><parameter>--without-ffmpeg</parameter>: This option disables the
-    experimental <application>FFmpeg</application> support in
-    <application>Akode</application>, as the build fails if it is enabled.
-    You can install the patch listed above and remove this switch to enable
-    the experimental <application>FFmpeg</application> support, however, the
-    functionality of <application>Akode</application> built with
-    <application>FFmpeg</application> support has not been tested by the
-    BLFS editors. To install the patch, issue the following command before
-    beginning the build:</para>
-
-<screen><userinput>patch -Np1 -i ../akode-&akode-version;-FFmpeg_fixes-1.patch</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="package" id="kdemultimedia-instructions"
-         xreflabel="Kdemultimedia Instructions">
-    <title>Resuming the Kdemultimedia Instructions</title>
-
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing='compact'>
@@ -197,38 +73,33 @@
 
     <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="alsa"/></para>
-    <!-- <xref linkend="libmad"/> moved to Akode -->
+    <para role="recommended">
+      <xref linkend="akode"/>,
+      <xref linkend="alsa"/>,
+      <xref linkend="libjpeg"/>, and
+      <xref linkend="libxml2"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="akode"/>,
-    <xref linkend="cdparanoia"/>,
-    <xref linkend="lame"/>,
-    <xref linkend="audiofile"/>,
-    <xref linkend="libvorbis"/>,
-    <xref linkend="xine-lib"/>,
-    <xref linkend="flac"/> (built with <xref linkend="libogg"/> support),
-    <xref linkend="gstreamer"/>,
-    <ulink url="http://www.theora.org/">Theora</ulink>,
-    <ulink url="http://developer.kde.org/~wheeler/taglib.html">TagLib</ulink>,
-    <ulink url="http://www.musicbrainz.org/products/tunepimp/download.html">TunePimp</ulink>
-    (requires <xref linkend="libmusicbrainz"/>),
-    <xref linkend="graphviz"/>, and
-    <xref linkend="doxygen"/></para>
-    <!-- moved to Akode
-    <ulink url="http://0pointer.de/lennart/projects/polypaudio/">polypaudio</ulink>
-    <ulink url="http://www.mega-nerd.com/libsamplerate/">Secret Rabbit Code</ulink>
-    <ulink url="http://jackit.sourceforge.net/">JACK</ulink>
-    <xref linkend="speex"/>, moved to Akode
-    -->
-    <!-- <xref linkend="sdl"/>, not used any longer -->
-    <!-- <xref linkend="libogg"/>, no good without vorbis, so is redundant -->
-    <!-- Uses internal copy now
-    <ulink url="http://www.musicbrainz.org/products/trmgen/download.html">TRM Generator</ulink>
-    -->
+    <para role="optional">
+      <xref linkend="cdparanoia"/>,
+      <xref linkend="lame"/>,
+      <xref linkend="audiofile"/>,
+      <xref linkend="libvorbis"/>,
+      <xref linkend="xine-lib"/>,
+      <xref linkend="flac"/> (built with <xref linkend="libogg"/> support),
+      <ulink url="http://gstreamer.freedesktop.org/src/gstreamer/">gstreamer-0.8 
+        (later versions are not supported)</ulink>,
+      <xref linkend="libtheora"/>,
+      <ulink url="http://developer.kde.org/~wheeler/taglib.html">TagLib</ulink>,
+      <ulink url="http://www.musicbrainz.org/products/tunepimp/download.html">TunePimp</ulink>
+        (requires <xref linkend="libmusicbrainz"/>),
+      <xref linkend="graphviz"/>, and
+      <xref linkend="doxygen"/>
+    </para>
 
   </sect2>
@@ -239,15 +110,34 @@
     <para>Install <application>kdemultimedia</application> with:</para>
 
-    <!-- <note>
-      <para> The -\-sysconfdir parameter must be the same as command used in
-      kdelibs.</para>
-    </note> -->
-
-<!--    <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;
+<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;
+
+sed -i -e 's@^gentable_LDADD.*$@&amp; -L$(TRINITY_PREFIX)/lib@' \
+          noatun/library/Makefile.in                          &amp;&amp;
+
+export LIBRARY_PATH=$TRINITY_PREFIX/lib                       &amp;&amp;
+
+./configure --prefix=$TRINITY_PREFIX                         \
+            --with-qt-dir=$QTDIR                             \
+            --enable-closure                                 \
+            --with-vorbis                                    \
+            --with-alsa                                      \
+            --with-audiofile                                 \
+            --with-flac                                      \
+            --with-akode                                     \
+            --with-cdparanoia                                \
+            --with-kscd-cdda                                 \
+            --with-lame                                      \
+            --with-xine                                      \
+            --with-theora                                    \
+            --with-extra-includes=$TRINITY_PREFIX/include    \
+            --with-extra-libs=$TRINITY_PREFIX/lib:$QTDIR/lib &amp;&amp;
+
 make</userinput></screen>
+
+    <para>Remove and '--with-' statements for those dependencies not installed.</para>
 
 <!--
