Index: multimedia/libdriv/alsa-oss.xml
===================================================================
--- multimedia/libdriv/alsa-oss.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/alsa-oss.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="alsa-oss" xreflabel="ALSA OSS-&alsa-oss-version;">
+<sect1 id="alsa-oss" xreflabel="alsa-oss-&alsa-oss-version;">
   <?dbhtml filename="alsa-oss.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>ALSA OSS-&alsa-oss-version;</title>
+  <title>alsa-oss-&alsa-oss-version;</title>
 
   <indexterm zone="alsa-oss">
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs76_built;
+    &lfs76_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/libdriv/alsa-utils-systemd.xml
===================================================================
--- multimedia/libdriv/alsa-utils-systemd.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
+++ multimedia/libdriv/alsa-utils-systemd.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -0,0 +1,423 @@
+<?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 alsa-utils-download-http "&alsa-download-http;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
+  <!ENTITY alsa-utils-download-ftp  "&alsa-download-ftp;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
+  <!ENTITY alsa-utils-md5sum        "361552d5b1cacd0a1e7ba09e69990211">
+  <!ENTITY alsa-utils-size          "1.1 MB">
+  <!ENTITY alsa-utils-buildsize     "11 MB">
+  <!ENTITY alsa-utils-time          "0.1 SBU">
+]>
+
+<sect1 id="alsa-utils" xreflabel="alsa-utils-&alsa-utils-version;">
+  <?dbhtml filename="alsa-utils.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>alsa-utils-&alsa-utils-version;</title>
+
+  <indexterm zone="alsa-utils">
+    <primary sortas="a-alsa-utils">alsa-utils</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to ALSA Utilities</title>
+
+    <para>
+      The <application>ALSA Utilities</application> package contains
+      various utilities which are useful for controlling your sound
+      card.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&alsa-utils-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&alsa-utils-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &alsa-utils-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &alsa-utils-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &alsa-utils-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &alsa-utils-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">ALSA Utilities Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="alsa-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libsamplerate"/>,
+      <xref linkend="xmlto"/> and
+      <ulink url="http://hightek.org/dialog/">Dialog</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/alsa-utils"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of ALSA Utilities</title>
+
+    <para>
+      Install <application>ALSA Utilities</application> by
+      running the following commands:
+    </para>
+
+<screen><userinput>./configure --disable-alsaconf --disable-xmlto &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>
+      <option>--disable-alsaconf</option>: This switch disables building the
+      <command>alsaconf</command> configuration tool which is incompatible with
+      <application>Udev</application>.
+    </para>
+
+    <para>
+      <option>--disable-xmlto</option>: Omit this switch if you have installed
+      <xref linkend="xmlto"/> and don't wish to install pregenerated man pages.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring ALSA Utilities</title>
+
+    <sect3 id="alsa-utils-config">
+      <title>Config Files</title>
+
+      <para>
+        <filename>/var/lib/alsa/asound.state</filename>
+      </para>
+
+      <indexterm zone="alsa-utils alsa-utils-config">
+        <primary sortas="e-var-lib-alsa-asound.state">/var/lib/alsa/asound.state</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>
+        Note that all channels of your sound card are muted by default.
+        You can use the <command>alsamixer</command> program to change
+        this. Use <command>speaker-test</command> to check that your
+        settings have been applied correctly. You should hear
+        <quote>pink noise</quote> on your speakers.
+      </para>
+
+      <para>
+        The <filename>alsactl</filename> program is normally run from a
+        standard <application>udev</application> rule. The first time it
+        is run, it will complain that there is no state in
+        <filename>/var/lib/alsa/asound.state</filename>. You can prevent
+        this by running the following commands as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>touch /var/lib/alsa/asound.state &amp;&amp;
+alsactl store</userinput></screen>
+
+      <para>
+        The volume settings should be restored from the saved state by
+        <application>Udev</application> when the device is detected
+        (during boot or when plugged in for USB devices).
+      </para>
+
+      <para>
+        All sound devices are not accessible for any user except
+        <systemitem class="username">root</systemitem> and members of the
+        <systemitem class="groupname">audio</systemitem> group. Add any
+        users that might use the sound devices to that group:
+      </para>
+
+<screen role="root"><userinput>usermod -a -G audio <replaceable>&lt;username&gt;</replaceable></userinput></screen>
+
+      <note>
+        <para>
+          You may need to log out and back in again to refresh your group
+          memberships. '<command>su <replaceable>&lt;username&gt;</replaceable></command>'
+          should work as well.
+        </para>
+      </note>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          aconnect, alsactl, alsaloop, alsamixer,
+          alsaucm, amidi, amixer, aplay, aplaymidi, arecord (symlink),
+          arecordmidi, aseqdump, aseqnet, iecset and
+          speaker-test
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/sounds/alsa and /var/lib/alsa
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="aconnect">
+        <term><command>aconnect</command></term>
+        <listitem>
+          <para>
+            is a utility for connecting and disconnecting two
+            existing ports in the ALSA sequencer system.
+          </para>
+          <indexterm zone="alsa-utils aconnect">
+            <primary sortas="b-aconnect">aconnect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="alsactl">
+        <term><command>alsactl</command></term>
+        <listitem>
+          <para>
+            is used to control advanced settings for the
+            ALSA sound card drivers.
+          </para>
+          <indexterm zone="alsa-utils alsactl">
+            <primary sortas="b-alsactl">alsactl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="alsaloop">
+        <term><command>alsaloop</command></term>
+        <listitem>
+          <para>
+            allows creation of a PCM loopback between a PCM capture
+            device and a PCM playback device.
+          </para>
+          <indexterm zone="alsa-utils alsaloop">
+            <primary sortas="b-alsaloop">alsaloop</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="alsamixer">
+        <term><command>alsamixer</command></term>
+        <listitem>
+          <para>
+            is an Ncurses based mixer program for use with
+            the ALSA sound card drivers.
+          </para>
+          <indexterm zone="alsa-utils alsamixer">
+            <primary sortas="b-alsamixer">alsamixer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="alsaucm">
+        <term><command>alsaucm</command></term>
+        <listitem>
+          <para>
+          allows applications to access the hardware in an abstracted manner
+          </para>
+          <indexterm zone="alsa-utils alsaucm">
+            <primary sortas="b-alsaucm">alsaucm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="amidi">
+        <term><command>amidi</command></term>
+        <listitem>
+          <para>
+            is used to read from and write to ALSA
+            RawMIDI ports.
+          </para>
+          <indexterm zone="alsa-utils amidi">
+            <primary sortas="b-amidi">amidi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="amixer">
+        <term><command>amixer</command></term>
+        <listitem>
+          <para> allows command-line control of the mixers for the
+          ALSA sound card drivers.</para>
+          <indexterm zone="alsa-utils amixer">
+            <primary sortas="b-amixer">amixer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aplay">
+        <term><command>aplay</command></term>
+        <listitem>
+          <para>
+            is a command-line soundfile player for the
+            ALSA sound card drivers.
+          </para>
+          <indexterm zone="alsa-utils aplay">
+            <primary sortas="b-aplay">aplay</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aplaymidi">
+        <term><command>aplaymidi</command></term>
+        <listitem>
+          <para>
+            is a command-line utility that plays the specified
+            MIDI file(s) to one or more ALSA sequencer ports.
+          </para>
+          <indexterm zone="alsa-utils aplaymidi">
+            <primary sortas="b-aplaymidi">aplaymidi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="arecord">
+        <term><command>arecord</command></term>
+        <listitem>
+          <para>
+            is a command-line soundfile recorder for the
+            ALSA sound card drivers.
+          </para>
+          <indexterm zone="alsa-utils arecord">
+            <primary sortas="b-arecord">arecord</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="arecordmidi">
+        <term><command>arecordmidi</command></term>
+        <listitem>
+          <para>
+            is a command-line utility that records a standard
+            MIDI file from one or more ALSA sequencer ports.
+          </para>
+          <indexterm zone="alsa-utils arecordmidi">
+            <primary sortas="b-arecordmidi">arecordmidi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aseqdump">
+        <term><command>aseqdump</command></term>
+        <listitem>
+          <para>
+            is a command-line utility that prints the sequencer events it
+            receives as text.
+          </para>
+          <indexterm zone="alsa-utils aseqdump">
+            <primary sortas="b-aseqdump">aseqdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aseqnet">
+        <term><command>aseqnet</command></term>
+        <listitem>
+          <para>
+            is an ALSA sequencer client which sends and
+            receives event packets over a network.
+          </para>
+          <indexterm zone="alsa-utils aseqnet">
+            <primary sortas="b-aseqnet">aseqnet</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="iecset">
+        <term><command>iecset</command></term>
+        <listitem>
+          <para>
+            is a small utility to set or dump the IEC958 (or so-called
+            <quote>S/PDIF</quote>) status bits of the specified sound
+            card via the ALSA control API.
+          </para>
+          <indexterm zone="alsa-utils iecset">
+            <primary sortas="b-iecset">iecset</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="speaker-test">
+        <term><command>speaker-test</command></term>
+        <listitem>
+          <para>
+            is a command-line speaker test tone generator for ALSA.
+          </para>
+          <indexterm zone="alsa-utils speaker-test">
+            <primary sortas="b-speaker-test">speaker-test</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: multimedia/libdriv/alsa-utils.xml
===================================================================
--- multimedia/libdriv/alsa-utils.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ 	(revision )
@@ -1,441 +1,0 @@
-<?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 alsa-utils-download-http "&alsa-download-http;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
-  <!ENTITY alsa-utils-download-ftp  "&alsa-download-ftp;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
-  <!ENTITY alsa-utils-md5sum        "361552d5b1cacd0a1e7ba09e69990211">
-  <!ENTITY alsa-utils-size          "1.1 MB">
-  <!ENTITY alsa-utils-buildsize     "11 MB">
-  <!ENTITY alsa-utils-time          "0.1 SBU">
-]>
-
-<sect1 id="alsa-utils" xreflabel="alsa-utils-&alsa-utils-version;">
-  <?dbhtml filename="alsa-utils.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>alsa-utils-&alsa-utils-version;</title>
-
-  <indexterm zone="alsa-utils">
-    <primary sortas="a-alsa-utils">alsa-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ALSA Utilities</title>
-
-    <para>
-      The <application>ALSA Utilities</application> package contains
-      various utilities which are useful for controlling your sound
-      card.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&alsa-utils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&alsa-utils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &alsa-utils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &alsa-utils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &alsa-utils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &alsa-utils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ALSA Utilities Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libsamplerate"/>,
-      <xref linkend="xmlto"/> and
-      <ulink url="http://hightek.org/dialog/">Dialog</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/alsa-utils"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ALSA Utilities</title>
-
-    <para>
-      Install <application>ALSA Utilities</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --disable-alsaconf --disable-xmlto &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>
-      <option>--disable-alsaconf</option>: This switch disables building the
-      <command>alsaconf</command> configuration tool which is incompatible with
-      <application>Udev</application>.
-    </para>
-
-    <para>
-      <option>--disable-xmlto</option>: Omit this switch if you have installed
-      <xref linkend="xmlto"/> and don't wish to install pregenerated man pages.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ALSA Utilities</title>
-
-    <sect3 id="alsa-utils-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/var/lib/alsa/asound.state</filename>
-      </para>
-
-      <indexterm zone="alsa-utils alsa-utils-config">
-        <primary sortas="e-var-lib-alsa-asound.state">/var/lib/alsa/asound.state</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Note that all channels of your sound card are muted by default.
-        You can use the <command>alsamixer</command> program to change
-        this. Use <command>speaker-test</command> to check that your
-        settings have been applied correctly. You should hear
-        <quote>pink noise</quote> on your speakers.
-      </para>
-
-      <para>
-        The <filename>alsactl</filename> program is normally run from a
-        standard <application>udev</application> rule. The first time it
-        is run, it will complain that there is no state in
-        <filename>/var/lib/alsa/asound.state</filename>. You can prevent
-        this by running the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>touch /var/lib/alsa/asound.state &amp;&amp;
-alsactl store</userinput></screen>
-
-      <para>
-        The volume settings should be restored from the saved state by
-        <application>Udev</application> when the device is detected
-        (during boot or when plugged in for USB devices).
-      </para>
-
-      <para>
-        All sound devices are not accessible for any user except
-        <systemitem class="username">root</systemitem> and members of the
-        <systemitem class="groupname">audio</systemitem> group. Add any
-        users that might use the sound devices to that group:
-      </para>
-
-<screen role="root"><userinput>usermod -a -G audio <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-      <note>
-        <para>
-          You may need to log out and back in again to refresh your group
-          memberships. '<command>su <replaceable>&lt;username&gt;</replaceable></command>'
-          should work as well.
-        </para>
-      </note>
-
-    </sect3>
-
-    <sect3 id="alsa-utils-init">
-      <title>Boot Script</title>
-
-      <indexterm zone="alsa-utils alsa-utils-init">
-        <primary sortas="f-alsa">alsa</primary>
-      </indexterm>
-
-      <para>
-        To automatically store and restore volume settings (if udev rule doesn't
-        work for you) when the system is rebooted, install the
-        <filename>/etc/rc.d/init.d/alsa</filename> boot script from the <xref
-        linkend="bootscripts"/> package.
-      </para>
-
-<screen role="root"><userinput>make install-alsa</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          aconnect, alsactl, alsaloop, alsamixer,
-          alsaucm, amidi, amixer, aplay, aplaymidi, arecord (symlink),
-          arecordmidi, aseqdump, aseqnet, iecset and
-          speaker-test
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/sounds/alsa and /var/lib/alsa
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="aconnect">
-        <term><command>aconnect</command></term>
-        <listitem>
-          <para>
-            is a utility for connecting and disconnecting two
-            existing ports in the ALSA sequencer system.
-          </para>
-          <indexterm zone="alsa-utils aconnect">
-            <primary sortas="b-aconnect">aconnect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="alsactl">
-        <term><command>alsactl</command></term>
-        <listitem>
-          <para>
-            is used to control advanced settings for the
-            ALSA sound card drivers.
-          </para>
-          <indexterm zone="alsa-utils alsactl">
-            <primary sortas="b-alsactl">alsactl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="alsaloop">
-        <term><command>alsaloop</command></term>
-        <listitem>
-          <para>
-            allows creation of a PCM loopback between a PCM capture
-            device and a PCM playback device.
-          </para>
-          <indexterm zone="alsa-utils alsaloop">
-            <primary sortas="b-alsaloop">alsaloop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="alsamixer">
-        <term><command>alsamixer</command></term>
-        <listitem>
-          <para>
-            is an Ncurses based mixer program for use with
-            the ALSA sound card drivers.
-          </para>
-          <indexterm zone="alsa-utils alsamixer">
-            <primary sortas="b-alsamixer">alsamixer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="alsaucm">
-        <term><command>alsaucm</command></term>
-        <listitem>
-          <para>
-          allows applications to access the hardware in an abstracted manner
-          </para>
-          <indexterm zone="alsa-utils alsaucm">
-            <primary sortas="b-alsaucm">alsaucm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="amidi">
-        <term><command>amidi</command></term>
-        <listitem>
-          <para>
-            is used to read from and write to ALSA
-            RawMIDI ports.
-          </para>
-          <indexterm zone="alsa-utils amidi">
-            <primary sortas="b-amidi">amidi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="amixer">
-        <term><command>amixer</command></term>
-        <listitem>
-          <para> allows command-line control of the mixers for the
-          ALSA sound card drivers.</para>
-          <indexterm zone="alsa-utils amixer">
-            <primary sortas="b-amixer">amixer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aplay">
-        <term><command>aplay</command></term>
-        <listitem>
-          <para>
-            is a command-line soundfile player for the
-            ALSA sound card drivers.
-          </para>
-          <indexterm zone="alsa-utils aplay">
-            <primary sortas="b-aplay">aplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aplaymidi">
-        <term><command>aplaymidi</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that plays the specified
-            MIDI file(s) to one or more ALSA sequencer ports.
-          </para>
-          <indexterm zone="alsa-utils aplaymidi">
-            <primary sortas="b-aplaymidi">aplaymidi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="arecord">
-        <term><command>arecord</command></term>
-        <listitem>
-          <para>
-            is a command-line soundfile recorder for the
-            ALSA sound card drivers.
-          </para>
-          <indexterm zone="alsa-utils arecord">
-            <primary sortas="b-arecord">arecord</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="arecordmidi">
-        <term><command>arecordmidi</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that records a standard
-            MIDI file from one or more ALSA sequencer ports.
-          </para>
-          <indexterm zone="alsa-utils arecordmidi">
-            <primary sortas="b-arecordmidi">arecordmidi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aseqdump">
-        <term><command>aseqdump</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that prints the sequencer events it
-            receives as text.
-          </para>
-          <indexterm zone="alsa-utils aseqdump">
-            <primary sortas="b-aseqdump">aseqdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aseqnet">
-        <term><command>aseqnet</command></term>
-        <listitem>
-          <para>
-            is an ALSA sequencer client which sends and
-            receives event packets over a network.
-          </para>
-          <indexterm zone="alsa-utils aseqnet">
-            <primary sortas="b-aseqnet">aseqnet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iecset">
-        <term><command>iecset</command></term>
-        <listitem>
-          <para>
-            is a small utility to set or dump the IEC958 (or so-called
-            <quote>S/PDIF</quote>) status bits of the specified sound
-            card via the ALSA control API.
-          </para>
-          <indexterm zone="alsa-utils iecset">
-            <primary sortas="b-iecset">iecset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="speaker-test">
-        <term><command>speaker-test</command></term>
-        <listitem>
-          <para>
-            is a command-line speaker test tone generator for ALSA.
-          </para>
-          <indexterm zone="alsa-utils speaker-test">
-            <primary sortas="b-speaker-test">speaker-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/flac.xml
===================================================================
--- multimedia/libdriv/flac.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/flac.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -89,6 +89,5 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --disable-thorough-tests &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-thorough-tests &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/grilo-plugins-systemd.xml
===================================================================
--- multimedia/libdriv/grilo-plugins-systemd.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
+++ multimedia/libdriv/grilo-plugins-systemd.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -0,0 +1,146 @@
+<?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 grilo-plugins-download-http "&gnome-download-http;/grilo-plugins/0.2/grilo-plugins-&grilo-plugins-version;.tar.xz">
+  <!ENTITY grilo-plugins-download-ftp  "&gnome-download-ftp;/grilo-plugins/0.2/grilo-plugins-&grilo-plugins-version;.tar.xz">
+  <!ENTITY grilo-plugins-md5sum        "45030aab3f21b561b1c899ebb7dce54d">
+  <!ENTITY grilo-plugins-size          "980 KB">
+  <!ENTITY grilo-plugins-buildsize     "25 MB (all plugins)">
+  <!ENTITY grilo-plugins-time          "0.3 SBU">
+]>
+
+<sect1 id="grilo-plugins" xreflabel="Grilo-Plugins-&grilo-plugins-version;">
+  <?dbhtml filename="grilo-plugins.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Grilo-Plugins-&grilo-plugins-version;</title>
+
+  <indexterm zone="grilo-plugins">
+    <primary sortas="a-Grilo-Plugins">Grilo-Plugins</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Grilo-Plugins</title>
+
+    <para><application>Grilo-Plugins</application> is a collection of plugins
+    (Apple Trailers, Blip.tv, Bookmarks, Filesystem, Flickr, Jamendo, Magnatune,
+    Rai.tv, Tracker, Youtube, between others) to make media discovery and
+    browsing easy for applications that support <application>Grilo</application>
+    framework, such as <application>Totem</application> (some plugins are
+    disabled in <application>Totem</application>).</para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&grilo-plugins-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&grilo-plugins-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &grilo-plugins-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &grilo-plugins-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &grilo-plugins-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &grilo-plugins-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Grilo-Plugins Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="grilo"/>,
+      <xref linkend="libgcrypt"/> and
+      <xref linkend="sqlite"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libsoup"/>,
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="totem-pl-parser"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="avahi"/>,
+      <xref linkend="gmime"/> (Podcasts),
+      <xref linkend="gnome-online-accounts"/> (Flickr),
+      <xref linkend="json-glib"/> (TMDB),
+      <xref linkend="libgdata"/> (YouTube),
+      <xref linkend="libmediaart"/> (local-art),
+      <xref linkend="liboauth"/> (to configure Flickr personal accounts),
+      <xref linkend="lua"/> (Lua Factory),
+      <xref linkend="tracker"/> (Tracker),
+      <ulink url="&gnome-download-http;/gom/">GOM</ulink>,
+      <ulink url="&gnome-download-http;/gupnp-av/">GuPNP-AV</ulink> (GUPnP),
+      <ulink url="https://www.flyn.org/projects/libdmapsharing/">libdmapsharing</ulink> (DMAP) and
+      <ulink url="http://sourceforge.net/projects/quvi">libquvi (version 0.9)</ulink> (Youtube)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/grilo-plugins"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Grilo-Plugins</title>
+
+    <para>Install <application>Grilo-Plugins</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      To test which plugins are installed and that <xref linkend="grilo"/> is
+      working, issue  <command>grl-inspect-0.2</command> or 
+      <command>grilo-test-ui-0.2</command> (the latter, from an X terminal).
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>Several under /usr/lib/grilo-0.2, with names related to the
+          respective plugins.</seg>
+        <seg>/usr/lib/grilo-0.2,
+             /usr/share/help/C/grilo-plugins and
+             /usr/share/grilo-plugins</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: multimedia/libdriv/grilo-plugins.xml
===================================================================
--- multimedia/libdriv/grilo-plugins.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ 	(revision )
@@ -1,149 +1,0 @@
-<?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 grilo-plugins-download-http "&gnome-download-http;/grilo-plugins/0.2/grilo-plugins-&grilo-plugins-version;.tar.xz">
-  <!ENTITY grilo-plugins-download-ftp  "&gnome-download-ftp;/grilo-plugins/0.2/grilo-plugins-&grilo-plugins-version;.tar.xz">
-  <!ENTITY grilo-plugins-md5sum       "45030aab3f21b561b1c899ebb7dce54d">
-  <!ENTITY grilo-plugins-size         "980 KB">
-  <!ENTITY grilo-plugins-buildsize    "24 MB (all plugins)">
-  <!ENTITY grilo-plugins-time         "0.3 SBU">
-]>
-
-<sect1 id="grilo-plugins" xreflabel="Grilo-Plugins-&grilo-plugins-version;">
-  <?dbhtml filename="grilo-plugins.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy: bdubbs $</othername>
-    <date>$Date: 2013-10-21 18:39:03 -0300 (Seg, 21 Out 2013) $</date>
-  </sect1info>
-
-  <title>Grilo-Plugins-&grilo-plugins-version;</title>
-
-  <indexterm zone="grilo-plugins">
-    <primary sortas="a-Grilo-Plugins">Grilo-Plugins</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Grilo-Plugins</title>
-
-    <para><application>Grilo-Plugins</application> is a collection of plugins
-    (Apple Trailers, Blip.tv, Bookmarks, Filesystem, Flickr, Jamendo, Magnatune,
-    Rai.tv, Tracker, Youtube, between others) to make media discovery and
-    browsing easy for applications that support <application>Grilo</application>
-    framework, such as <application>Totem</application> (some plugins are
-    disabled in <application>Totem</application>).</para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&grilo-plugins-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&grilo-plugins-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &grilo-plugins-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &grilo-plugins-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &grilo-plugins-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &grilo-plugins-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Grilo-Plugins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="grilo"/> and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libsoup"/>,
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="totem-pl-parser"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="gmime"/> (Podcasts),
-      <xref linkend="json-glib"/> (TMDB),
-      <xref linkend="lua"/> (Lua Factory),
-      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/gnome-online-accounts/">gnome-online-accounts</ulink> (Flickr, Pocket),
-      <ulink url="http://ftp.gnome.org/pub/gnome/sources/gom">gom</ulink> (Bookmarks),
-      <ulink url="https://www.flyn.org/projects/libdmapsharing/">libdmapsharing</ulink> (DMAP),
-      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/libgdata/">libgdata</ulink> (YouTube),
-      <ulink url="http://sourceforge.net/projects/quvi">libquvi (version 0.9)</ulink> (YouTube),
-      <ulink url="http://sourceforge.net/projects/liboauth/files/">liboauth</ulink>
-      (to configure Flickr personal accounts),
-      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/libmediaart/">MEDIAART</ulink> (local-art),
-      <ulink url="https://launchpad.net/python-dbusmock/trunk">python-dbusmock</ulink> (dLeyna runtime tests), and
-      <ulink url="https://download.gnome.org/sources/tracker/">tracker</ulink> (Tracker)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/grilo-plugins"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Grilo-Plugins</title>
-
-    <para>Install <application>Grilo-Plugins</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue:
-      <command>make check 2&gt;&amp;1 | tee check.log</command>.
-      A summary can be obtained with
-      <command>grep -E 'PASS|FAIL' check.log</command>.
-    </para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      To test which plugins are installed and that <xref linkend="grilo"/> is
-      working, issue  <command>grl-inspect-0.2</command> or 
-      <command>grilo-test-ui-0.2</command> (the latter, from an X terminal).
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>Several under /usr/lib/grilo-0.2, with names related to the
-          respective plugins.</seg>
-        <seg>/usr/lib/grilo-0.2,
-             /usr/share/help/C/{examples,grilo-plugins} and
-             /usr/share/grilo-plugins</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/grilo.xml
===================================================================
--- multimedia/libdriv/grilo.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/grilo.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -9,5 +9,5 @@
   <!ENTITY grilo-md5sum       "65ac9100dab7f93c4df41cfad58dccba">
   <!ENTITY grilo-size         "600 KB">
-  <!ENTITY grilo-buildsize    "14 MB">
+  <!ENTITY grilo-buildsize    "28 MB">
   <!ENTITY grilo-time         "0.2 SBU">
 ]>
@@ -62,12 +62,15 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk3"/>
+      <xref linkend="glib2"/> and
+      <xref linkend="libxml2"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="grilo-plugins"/> (runtime),
+      <xref linkend="gtk3"/>,
       <xref linkend="libsoup"/>,
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="grilo-plugins"/> (runtime), and
+      <xref linkend="totem-pl-parser"/>, and
       <xref linkend="vala"/>
     </para>
@@ -75,10 +78,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="avahi"/> (if installed at build time, make sure
-      avahi-daemon is running as a system daemon, started by
-      bootscript/systemd unit),
+      <xref linkend="avahi"/>,
       <xref linkend="docbook-utils"/>, and
-      <ulink url="http://sourceforge.net/projects/liboauth/files/">liboauth</ulink>
-      (to configure flickr personal accounts)
+      <xref linkend="liboauth"/>
     </para>
 
@@ -94,10 +94,11 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>./configure --prefix=/usr     \
+            --libdir=/usr/lib \
             --disable-static &amp;&amp;
 make</userinput></screen>
 
     <!-- testsuite exists, but does nothing -->
-    <para>This package does not have a testsuite.</para>
+    <para>This package does not come with a testsuite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
Index: multimedia/libdriv/gst-ffmpeg.xml
===================================================================
--- multimedia/libdriv/gst-ffmpeg.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/gst-ffmpeg.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -109,6 +109,8 @@
     </para>
 
-<screen><userinput>patch -p1 &lt; ../gst-ffmpeg-&gst-ffmpeg-version;-gcc-4.7-1.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+<screen><userinput>patch -Np1 -i ../gst-ffmpeg-&gst-ffmpeg-version;-gcc-4.7-1.patch &amp;&amp;
+./configure --prefix=/usr \
+            --with-package-name="GStreamer FFMpeg Plugins &gst-ffmpeg-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/gst-plugins-bad.xml
===================================================================
--- multimedia/libdriv/gst-plugins-bad.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/gst-plugins-bad.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -105,6 +105,6 @@
       <xref linkend="neon"/>,
       <xref linkend="sdl"/>,
-      <xref linkend="soundtouch"/>
-      <ulink url="http://www.celt-codec.org/">celt</ulink>,
+      <xref linkend="soundtouch"/>,
+      <ulink url="http://www.celt-codec.org/">Celt</ulink>,
       <ulink url="http://diracvideo.org/">Dirac</ulink>,
       <ulink url="http://www.directfb.org/">DirectFB</ulink>,
@@ -149,8 +149,4 @@
     <title>Installation of GStreamer Bad Plug-ins</title>
 
-    <note><para>If you need a plugin for a given dependency, that dependency
-      needs to be installed before this application.
-    </para></note>
-
     <para>
       Install <application>Gstreamer Bad Plug-ins</application> by running the following
@@ -158,5 +154,10 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --with-gtk=3.0 --disable-examples &amp;&amp;
+<screen><userinput>./configure --prefix=/usr      \
+            --with-gtk=3.0     \
+            --disable-examples \
+            --disable-static   \
+            --with-package-name="GStreamer Bad Plugins &gst-plugins-bad-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/gst-plugins-base-systemd.xml
===================================================================
--- multimedia/libdriv/gst-plugins-base-systemd.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
+++ multimedia/libdriv/gst-plugins-base-systemd.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -0,0 +1,237 @@
+<?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 gst-plugins-base-download-http "&gnome-download-http;/gst-plugins-base/0.10/gst-plugins-base-&gst-plugins-base-version;.tar.xz">
+  <!ENTITY gst-plugins-base-download-ftp  "&gnome-download-ftp;/gst-plugins-base/0.10/gst-plugins-base-&gst-plugins-base-version;.tar.xz">
+  <!ENTITY gst-plugins-base-md5sum        "3d2337841b132fe996e5eb2396ac9438">
+  <!ENTITY gst-plugins-base-size          "2.3 MB">
+  <!ENTITY gst-plugins-base-buildsize     "105 MB">
+  <!ENTITY gst-plugins-base-time          "1.7 SBU">
+]>
+
+<sect1 id="gst-plugins-base"
+       xreflabel="gst-plugins-base-&gst-plugins-base-version;">
+  <?dbhtml filename="gst-plugins-base.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gst-plugins-base-&gst-plugins-base-version;</title>
+
+  <indexterm zone="gst-plugins-base">
+    <primary sortas="a-GStreamer-Base-Plug-ins">GStreamer Base Plug-ins</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GStreamer Base Plug-ins</title>
+
+    <para>
+      The <application>GStreamer Base Plug-ins</application> is a
+      well-groomed and well-maintained collection of
+      <application>GStreamer</application> plug-ins and elements, spanning the
+      range of possible types of elements one would want to write for
+      <application>GStreamer</application>. It also contains helper libraries
+      and base classes useful for writing elements. A wide range of video and
+      audio decoders, encoders, and filters are included. Also see the
+      <xref linkend="gst-plugins-bad"/>, <xref linkend="gst-plugins-good"/>,
+      <xref linkend="gst-plugins-ugly"/>, and <xref linkend="gst-ffmpeg"/>
+      packages.
+    </para>
+
+    &lfs76_checked;
+
+    &gst-compat;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gst-plugins-base-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gst-plugins-base-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gst-plugins-base-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gst-plugins-base-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gst-plugins-base-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gst-plugins-base-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Optional patch:
+          <ulink url="&patch-root;/gst-plugins-base-&gst-plugins-base-version;-gcc_4_9_0_i686-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GStreamer Base Plug-ins Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gstreamer"/> and
+      <xref linkend="pango"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="libogg"/>,
+      <xref linkend="libtheora"/>,
+      <xref linkend="libvorbis"/>,
+      <xref linkend="systemd"/> (for GUdev), and
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="cdparanoia"/>,
+      <xref linkend="gtk3"/> (required to build the examples),
+      <ulink url="http://sourceforge.net/projects/libvisual/">libvisual</ulink>,
+      <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>,
+      <xref linkend="check"/> (required to run the unit regression tests), and
+      <xref linkend="valgrind"/>
+      (optionaly used during the unit regression tests)
+    </para>
+
+    <bridgehead renderas="sect4">Optional (Required to Rebuild the API
+    Documentation)</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="python2"/> 
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gst-plugins-base"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GStreamer Base Plug-ins</title>
+
+    <para>
+      First, if you are using i686, fix a compile problem inroduced by
+      <application>&gcc-490;</application>:
+    </para>
+
+<screen role="nodump"><userinput>patch -Np1 -i ../gst-plugins-base-&gst-plugins-base-version;-gcc_4_9_0_i686-1.patch</userinput></screen>
+
+    <para>
+      Install <application>GStreamer Base Plug-ins</application> by running
+      the following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --with-package-name="GStreamer Base Plugins &gst-plugins-base-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To run the unit regression tests, issue: <command>make check</command>.
+      There are many other <filename>Makefile</filename> targets you can specify
+      for running the tests, issue <command>make -C tests/check help</command>
+      to see the complete list.
+    </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>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gst-visualise-0.10
+        </seg>
+        <seg>
+          libgstapp-0.10.so, libgstaudio-0.10.so, libgstcdda-0.10.so, libgstfft-0.10.so,
+          libgstinterfaces-0.10.so, libgstnetbuffer-0.10.so, libgstpbutils-0.10.so,
+          libgstriff-0.10.so, libgstrtp-0.10.so, libgstrtsp-0.10.so, libgstsdp-0.10.so,
+          libgsttag-0.10.so and libgstvideo-0.10.so
+        </seg>
+        <seg>
+          /usr/include/gstreamer-0.10/gst/{app,audio,cdda,fft,floatcast,interfaces,netbuffer}
+          /usr/include/gstreamer-0.10/gst/{pbutils,riff,rtp,rtsp,sdp,tag,video},
+          /usr/share/gst-plugins-base,
+          /usr/share/gtk-doc/html/gst-plugins-base-libs-0.10 and
+          /usr/share/gtk-doc/html/gst-plugins-base-plugins-0.10
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gst-visualise">
+        <term><command>gst-visualise-0.10</command></term>
+        <listitem>
+          <para>
+            is used to run a basic <application>GStreamer</application>
+            pipeline to display a graphical visualisation of an audio stream.
+          </para>
+          <indexterm zone="gst-plugins-base gst-visualise">
+            <primary sortas="b-gst-visualise">gst-visualise-0.10</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: multimedia/libdriv/gst-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst-plugins-base.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ 	(revision )
@@ -1,238 +1,0 @@
-<?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 gst-plugins-base-download-http "&gnome-download-http;/gst-plugins-base/0.10/gst-plugins-base-&gst-plugins-base-version;.tar.xz">
-  <!ENTITY gst-plugins-base-download-ftp  "&gnome-download-ftp;/gst-plugins-base/0.10/gst-plugins-base-&gst-plugins-base-version;.tar.xz">
-  <!ENTITY gst-plugins-base-md5sum        "3d2337841b132fe996e5eb2396ac9438">
-  <!ENTITY gst-plugins-base-size          "2.3 MB">
-  <!ENTITY gst-plugins-base-buildsize     "105 MB">
-  <!ENTITY gst-plugins-base-time          "1.7 SBU">
-]>
-
-<sect1 id="gst-plugins-base"
-       xreflabel="gst-plugins-base-&gst-plugins-base-version;">
-  <?dbhtml filename="gst-plugins-base.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gst-plugins-base-&gst-plugins-base-version;</title>
-
-  <indexterm zone="gst-plugins-base">
-    <primary sortas="a-GStreamer-Base-Plug-ins">GStreamer Base Plug-ins</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GStreamer Base Plug-ins</title>
-
-    <para>
-      The <application>GStreamer Base Plug-ins</application> is a
-      well-groomed and well-maintained collection of
-      <application>GStreamer</application> plug-ins and elements, spanning the
-      range of possible types of elements one would want to write for
-      <application>GStreamer</application>. It also contains helper libraries
-      and base classes useful for writing elements. A wide range of video and
-      audio decoders, encoders, and filters are included. Also see the
-      <xref linkend="gst-plugins-bad"/>, <xref linkend="gst-plugins-good"/>,
-      <xref linkend="gst-plugins-ugly"/>, and <xref linkend="gst-ffmpeg"/>
-      packages.
-    </para>
-
-    &lfs76_checked;
-
-    &gst-compat;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gst-plugins-base-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gst-plugins-base-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gst-plugins-base-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gst-plugins-base-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gst-plugins-base-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gst-plugins-base-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch :
-          <ulink url="&patch-root;/gst-plugins-base-&gst-plugins-base-version;-gcc_4_9_0_i686-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GStreamer Base Plug-ins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gstreamer"/> and
-      <xref linkend="pango"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="libogg"/>,
-      <xref linkend="libtheora"/>,
-      <xref linkend="libvorbis"/>,
-      <xref linkend="systemd"/> (for gudev), and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cdparanoia"/>,
-      <xref linkend="gtk3"/> (required to build the examples),
-      <ulink url="http://sourceforge.net/projects/libvisual/">libvisual</ulink>,
-      <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>,
-      <xref linkend="check"/> (required to run the unit regression tests), and
-      <xref linkend="valgrind"/>
-      (optionaly used during the unit regression tests)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required to Rebuild the API
-    Documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="python2"/> 
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gst-plugins-base"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GStreamer Base Plug-ins</title>
-
-    <note><para>If you need a plugin for a given dependency, that dependency
-      needs to be installed before this application.
-    </para></note>
-
-    <para>
-      First, if you are using i686, fix a compile problem inroduced by
-      <application>&gcc-490;</application>:
-    </para>
-
-<screen role="nodump"><userinput>patch -Np1 -i ../gst-plugins-base-&gst-plugins-base-version;-gcc_4_9_0_i686-1.patch</userinput></screen>
-
-    <para>
-      Install <application>GStreamer Base Plug-ins</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run the unit regression tests, issue: <command>make check</command>.
-      There are many other <filename>Makefile</filename> targets you can specify
-      for running the tests, issue <command>make -C tests/check help</command>
-      to see the complete list.
-    </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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gst-visualise-0.10
-        </seg>
-        <seg>
-          libgstapp-0.10.so, libgstaudio-0.10.so, libgstcdda-0.10.so, libgstfft-0.10.so,
-          libgstinterfaces-0.10.so, libgstnetbuffer-0.10.so, libgstpbutils-0.10.so,
-          libgstriff-0.10.so, libgstrtp-0.10.so, libgstrtsp-0.10.so, libgstsdp-0.10.so,
-          libgsttag-0.10.so and libgstvideo-0.10.so
-        </seg>
-        <seg>
-          /usr/include/gstreamer-0.10/gst/{app,audio,cdda,fft,floatcast,interfaces,netbuffer}
-          /usr/include/gstreamer-0.10/gst/{pbutils,riff,rtp,rtsp,sdp,tag,video},
-          /usr/share/gst-plugins-base,
-          /usr/share/gtk-doc/html/gst-plugins-base-libs-0.10 and
-          /usr/share/gtk-doc/html/gst-plugins-base-plugins-0.10
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gst-visualise">
-        <term><command>gst-visualise-0.10</command></term>
-        <listitem>
-          <para>
-            is used to run a basic <application>GStreamer</application>
-            pipeline to display a graphical visualisation of an audio stream.
-          </para>
-          <indexterm zone="gst-plugins-base gst-visualise">
-            <primary sortas="b-gst-visualise">gst-visualise-0.10</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/gst-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst-plugins-good.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/gst-plugins-good.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -113,6 +113,6 @@
       <ulink url="http://www.jackaudio.org">JACK</ulink>,
       <ulink url="http://sourceforge.net/projects/libavc1394/">libavc1394</ulink>
-      (requires 
-         <ulink url="http://www.kernel.org/pub/linux/libs/ieee1394/"> libraw1394</ulink>),
+      (requires
+      <ulink url="http://www.kernel.org/pub/linux/libs/ieee1394/"> libraw1394</ulink>),
       <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>,
       <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>,
@@ -145,8 +145,4 @@
     <title>Installation of GStreamer Good Plug-ins</title>
 
-    <note><para>If you need a plugin for a given dependency, that dependency
-      needs to be installed before this application.
-    </para></note>
-
     <para>
       Install <application>GStreamer Good Plug-ins</application> by running the
@@ -158,5 +154,7 @@
 ./configure --prefix=/usr \
             --sysconfdir=/etc \
-            --with-gtk=3.0 &amp;&amp;
+            --with-gtk=3.0 \
+            --with-package-name="GStreamer Good Plugins &gst-plugins-good-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/gst-plugins-ugly.xml
===================================================================
--- multimedia/libdriv/gst-plugins-ugly.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/gst-plugins-ugly.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -140,8 +140,4 @@
     <title>Installation of GStreamer Ugly Plug-ins</title>
 
-    <note><para>If you need a plugin for a given dependency, that dependency
-      needs to be installed before this application.
-    </para></note>
-
     <para>
       Install <application>GStreamer Ugly Plug-ins</application> by running
@@ -150,5 +146,7 @@
 
 <screen><userinput>patch -Np1 -i ../gst-plugins-ugly-&gst-plugins-ugly-version;-libcdio_fixes-1.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+./configure --prefix=/usr \
+            --with-package-name="GStreamer Ugly Plugins &gst-plugins-ugly-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/gst10-libav.xml
===================================================================
--- multimedia/libdriv/gst10-libav.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/gst10-libav.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -9,5 +9,5 @@
   <!ENTITY gst10-libav-md5sum        "248b6aae752710bbae77af01f74a082d">
   <!ENTITY gst10-libav-size          "5 MB">
-  <!ENTITY gst10-libav-buildsize     "249 MB (adittional 1 MB for the tests)">
+  <!ENTITY gst10-libav-buildsize     "250 MB">
   <!ENTITY gst10-libav-time          "2.2 SBU">
 ]>
@@ -108,5 +108,5 @@
 <screen><userinput>./configure --prefix=/usr \
             --with-package-name="GStreamer Libav Plugins &gst10-libav-version; BLFS" \
-            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &amp;&amp;
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/gst10-plugins-bad.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-bad.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/gst10-plugins-bad.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -96,8 +96,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="bluez"/>,
+      <xref linkend="clutter"/>,
       <xref linkend="curl"/>,
       <xref linkend="faac"/>,
       <xref linkend="faad2"/>,
+      <xref linkend="glu"/>,
       <xref linkend="gnutls"/>,
       <xref linkend="gtk-doc"/>,
@@ -108,5 +109,9 @@
       <xref linkend="libgcrypt"/>,
       <xref linkend="libmpeg2"/>,
+      <xref linkend="libpng"/>,
+      <xref linkend="librsvg"/>,
+      <xref linkend="libusb"/>,
       <xref linkend="libvdpau"/>,
+      <xref linkend="libwebp"/>,
       <xref linkend="mesalib"/>,
       <xref linkend="mpg123"/>,
@@ -114,16 +119,24 @@
       <xref linkend="openjpeg"/>,
       <xref linkend="openssl"/>,
+      <xref linkend="opus"/>,
+      <xref linkend="sbc"/>,
       <xref linkend="sdl"/>,
       <xref linkend="valgrind"/>,
       <xref linkend="xorg7-lib"/>,
-      <ulink url="http://celt-codec.org/">Celt</ulink>,
+      <xref linkend="wayland"/>,
+      <ulink url="http://acoustid.org/chromaprint/">Chromaprint</ulink>,
+      <ulink url="http://directfb.org/">DirectFB</ulink>,
       <ulink url="http://www.speech.cs.cmu.edu/flite/">Flite</ulink>,
       <ulink url="http://code.google.com/p/game-music-emu/">Game Music Emu</ulink>,
       <ulink url="http://www.quut.com/gsm/">GSM</ulink>,
       <ulink url="http://www.videolan.org/developers/libdca.html">libdca</ulink>,
+      <ulink url="http://code.google.com/p/libkate/">libkate</ulink>,
       <ulink url="http://sourceforge.net/projects/farsight/files/libmimic/">libmimic</ulink>,
       <ulink url="http://sourceforge.net/projects/libmms/">libmms</ulink>,
+      <ulink url="http://modplug-xmms.sourceforge.net/">libmodplug</ulink>,
       <ulink url="http://code.google.com/p/musicip-libofa/">libofa</ulink>,
+      <ulink url="http://www.libssh2.org/">libssh2</ulink>,
       <ulink url="http://sourceforge.net/projects/mjpeg/">MJPEG Tools</ulink>,
+      <ulink url="http://www.musepack.net/">MusePack</ulink>,
       <ulink url="http://kcat.strangesoft.net/openal.html">OpenAL</ulink>,
       <ulink url="http://code.entropywave.com/orc/">ORC</ulink>,
@@ -132,23 +145,14 @@
       <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-aacenc/">VO AAC</ulink>,
       <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/">VO AMRWB</ulink>,
-      <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>, and
+      <ulink url="http://sourceforge.net/projects/wildmidi/">WildMidi</ulink>, and
       <ulink url="http://sourceforge.net/projects/zbar/">ZBAR</ulink>
       <!-- Not ported
-      <xref linkend="jasper"/>,
-      <xref linkend="libmusicbrainz"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="librsvg"/>,
       <xref linkend="libsndfile"/>,
       <xref linkend="sdl"/>,
       <xref linkend="xvid"/>,
       <ulink url="http://sourceforge.net/projects/dirac/">Dirac</ulink>
-      <ulink url="http://directfb.org/">DirectFB</ulink>
       <ulink url="http://www.ladspa.org/">LADSPA SDK</ulink>
       <ulink url="http://sourceforge.net/projects/libdc1394/">libdc1394</ulink>
-      <ulink url="http://code.google.com/p/libkate/">libkate</ulink>
-      <ulink url="http://modplug-xmms.sourceforge.net/">libmodplug</ulink>
-      <ulink url="http://www.musepack.net/">MusePack</ulink>
       <ulink url="http://sourceforge.net/projects/nas/">NAS</ulink>
-      <ulink url="http://sourceforge.net/projects/wildmidi/">WildMidi</ulink>
       <ulink url="http://sourceforge.net/projects/zapping/">ZVBI</ulink> -->
     </para>
@@ -162,8 +166,4 @@
     <title>Installation of GStreamer Bad Plug-ins</title>
 
-    <note><para>If you need a plugin for a given dependency, that dependency
-      needs to be installed before this application.
-    </para></note>
-
     <para>
       Install <application>GStreamer Bad Plug-ins</application> by running the
@@ -173,5 +173,5 @@
 <screen><userinput>./configure --prefix=/usr \
             --with-package-name="GStreamer Bad Plugins &gst10-plugins-bad-version; BLFS" \
-            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &amp;&amp;
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/gst10-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-base.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/gst10-plugins-base.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -122,8 +122,4 @@
     <title>Installation of GStreamer Base Plug-ins</title>
 
-    <note><para>If you need a plugin for a given dependency, that dependency
-      needs to be installed before this application.
-    </para></note>
-
     <para>
       Install <application>GStreamer Base Plug-ins</application> by running the
@@ -133,5 +129,5 @@
 <screen><userinput>./configure --prefix=/usr \
             --with-package-name="GStreamer Base Plugins &gst10-plugins-base-version; BLFS" \
-            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &amp;&amp;
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/gst10-plugins-good-systemd.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-good-systemd.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
+++ multimedia/libdriv/gst10-plugins-good-systemd.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -0,0 +1,179 @@
+<?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 gst10-plugins-good-download-http
+           "&gstreamer-dl;/gst-plugins-good/gst-plugins-good-&gst10-plugins-good-version;.tar.xz">
+  <!ENTITY gst10-plugins-good-download-ftp  " ">
+  <!ENTITY gst10-plugins-good-md5sum        "534ca03c00361d940008d36ac5c45966">
+  <!ENTITY gst10-plugins-good-size          "2.9 MB">
+  <!ENTITY gst10-plugins-good-buildsize     "105 MB (additional 10 MB to run the test suite)">
+  <!ENTITY gst10-plugins-good-time          "1.3 SBU (additional 1 SBU to run the test suite)">
+]>
+
+<sect1 id="gst10-plugins-good" xreflabel="gst-plugins-good-&gst10-plugins-good-version;">
+  <?dbhtml filename="gst10-plugins-good.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gst-plugins-good-&gst10-plugins-good-version;</title>
+
+  <indexterm zone="gst10-plugins-good">
+    <primary sortas="a-gst-plugins-good">gst-plugins-good</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GStreamer Good Plug-ins</title>
+
+    <para>
+      The <application>GStreamer Good Plug-ins</application> is a set of plug-ins
+      considered by the <application>GStreamer</application> developers to have
+      good quality code, correct functionality, and the preferred license (LGPL
+      for the plug-in code, LGPL or LGPL-compatible for the supporting library).
+      A wide range of video and audio decoders, encoders, and filters are included.
+    </para>
+
+    &lfs76_checked;
+
+    &gst-compat;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gst10-plugins-good-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gst10-plugins-good-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gst10-plugins-good-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gst10-plugins-good-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gst10-plugins-good-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gst10-plugins-good-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GStreamer Good Plug-ins Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gst10-plugins-base"/>
+    </para>
+
+    <!-- Common formats, output and input codecs and requirements
+    for GNOME apps. What's a multimedia framework useful if it
+    can't be used to play anything (common)? -->
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="cairo"/>,
+      <xref linkend="flac"/>,
+      <xref linkend="gdk-pixbuf"/>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libpng"/>,
+      <xref linkend="libsoup"/>,
+      <xref linkend="libvpx"/>, and
+      <xref linkend="xorg7-lib"/> <!-- build time requirements only,
+      you don't need either apps, fonts or xorg server to build this
+      package. You'll need xserver for any X app that wants to play
+      something though, but that should be obvious. -->
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="aalib"/>,
+      <xref linkend="gtk3"/>,
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="libdv"/>,
+      <xref linkend="pulseaudio"/>,
+      <xref linkend="speex"/>,
+      <xref linkend="taglib"/>,
+      <xref linkend="systemd"/> (for GUdev),
+      <xref linkend="valgrind"/>,
+      <ulink url="http://jackaudio.org/">JACK</ulink>,
+      <ulink url="http://caca.zoy.org/wiki/libcaca">libcaca</ulink>,
+      <ulink url="http://sourceforge.net/projects/libraw1394/">libiec61883</ulink>,
+      <ulink url="http://sourceforge.net/projects/libraw1394/">libraw1394</ulink>,
+      <ulink url="http://www.icecast.org/download.php">libshout</ulink>,
+      <ulink url="http://code.entropywave.com/orc/">ORC</ulink>,
+      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>, and
+      <ulink url="http://wavpack.com/">WavPack</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/gst10-plugins-good"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GStreamer Good Plug-ins</title>
+
+    <para>
+      Install <application>GStreamer Good Plug-ins</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer Good Plugins &gst10-plugins-good-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make -k check</command>. Some tests
+      are known to fail.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          Several plugins under /usr/lib/gstreamer-1.0
+        </seg>
+        <seg>
+          /usr/share/gstreamer-1.0/presets and
+          /usr/share/gtk-doc/html/gst-plugins-good-plugins-1.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: multimedia/libdriv/gst10-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-good.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ 	(revision )
@@ -1,183 +1,0 @@
-<?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 gst10-plugins-good-download-http
-           "&gstreamer-dl;/gst-plugins-good/gst-plugins-good-&gst10-plugins-good-version;.tar.xz">
-  <!ENTITY gst10-plugins-good-download-ftp  " ">
-  <!ENTITY gst10-plugins-good-md5sum        "534ca03c00361d940008d36ac5c45966">
-  <!ENTITY gst10-plugins-good-size          "2.9 MB">
-  <!ENTITY gst10-plugins-good-buildsize     "105 MB (additional 10 MB to run the test suite)">
-  <!ENTITY gst10-plugins-good-time          "1.3 SBU (additional 1 SBU to run the test suite)">
-]>
-
-<sect1 id="gst10-plugins-good" xreflabel="gst-plugins-good-&gst10-plugins-good-version;">
-  <?dbhtml filename="gst10-plugins-good.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gst-plugins-good-&gst10-plugins-good-version;</title>
-
-  <indexterm zone="gst10-plugins-good">
-    <primary sortas="a-gst-plugins-good">gst-plugins-good</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GStreamer Good Plug-ins</title>
-
-    <para>
-      The <application>GStreamer Good Plug-ins</application> is a set of plug-ins
-      considered by the <application>GStreamer</application> developers to have
-      good quality code, correct functionality, and the preferred license (LGPL
-      for the plug-in code, LGPL or LGPL-compatible for the supporting library).
-      A wide range of video and audio decoders, encoders, and filters are included.
-    </para>
-
-    &lfs76_checked;
-
-    &gst-compat;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gst10-plugins-good-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gst10-plugins-good-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gst10-plugins-good-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gst10-plugins-good-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gst10-plugins-good-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gst10-plugins-good-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GStreamer Good Plug-ins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst10-plugins-base"/>
-    </para>
-
-    <!-- Common formats, output and input codecs and requirements
-    for GNOME apps. What's a multimedia framework useful if it
-    can't be used to play anything (common)? -->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cairo"/>,
-      <xref linkend="flac"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libsoup"/>,
-      <xref linkend="libvpx"/>, and
-      <xref linkend="xorg7-lib"/> <!-- build time requirements only,
-      you don't need either apps, fonts or xorg server to build this
-      package. You'll need xserver for any X app that wants to play
-      something though, but that should be obvious. -->
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="aalib"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libdv"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="speex"/>,
-      <xref linkend="taglib"/>,
-      <xref linkend="systemd"/> (for GUdev),
-      <xref linkend="valgrind"/>,
-      <ulink url="http://jackaudio.org/">JACK</ulink>,
-      <ulink url="http://caca.zoy.org/wiki/libcaca">libcaca</ulink>,
-      <ulink url="http://sourceforge.net/projects/libraw1394/">libiec61883</ulink>,
-      <ulink url="http://sourceforge.net/projects/libraw1394/">libraw1394</ulink>,
-      <ulink url="http://www.icecast.org/download.php">libshout</ulink>,
-      <ulink url="http://code.entropywave.com/orc/">ORC</ulink>,
-      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>, and
-      <ulink url="http://wavpack.com/">WavPack</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gst10-plugins-good"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GStreamer Good Plug-ins</title>
-
-    <note><para>If you need a plugin for a given dependency, that dependency
-      needs to be installed before this application.
-    </para></note>
-
-    <para>
-      Install <application>GStreamer Good Plug-ins</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --with-package-name="GStreamer Good Plugins &gst10-plugins-good-version; BLFS" \
-            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/"  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>. Some tests
-      are known to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          Several plugins under /usr/lib/gstreamer-1.0
-        </seg>
-        <seg>
-          /usr/share/gstreamer-1.0/presets and
-          /usr/share/gtk-doc/html/gst-plugins-good-plugins-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/gst10-plugins-ugly.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-ugly.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/gst10-plugins-ugly.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -10,5 +10,5 @@
   <!ENTITY gst10-plugins-ugly-md5sum        "239f055afb4ec0cf5ff8cde5a4a5bb9b">
   <!ENTITY gst10-plugins-ugly-size          "828 KB">
-  <!ENTITY gst10-plugins-ugly-buildsize     "16 MB (additional 1 MB for the tests)">
+  <!ENTITY gst10-plugins-ugly-buildsize     "17 MB">
   <!ENTITY gst10-plugins-ugly-time          "0.2 SBU">
 ]>
@@ -115,8 +115,4 @@
     <title>Installation of GStreamer Ugly Plug-ins</title>
 
-    <note><para>If you need a plugin for a given dependency, that dependency
-      needs to be installed before this application.
-    </para></note>
-
     <para>
       Install <application>GStreamer Ugly Plug-ins</application> by running the following
@@ -126,5 +122,5 @@
 <screen><userinput>./configure --prefix=/usr \
             --with-package-name="GStreamer Ugly Plugins &gst10-plugins-ugly-version; BLFS" \
-            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &amp;&amp;
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/gstreamer.xml
===================================================================
--- multimedia/libdriv/gstreamer.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/gstreamer.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -134,6 +134,8 @@
             gst/parse/grammar.y &amp;&amp;
 
-./configure --prefix=/usr \
-            --disable-static &amp;&amp;
+./configure --prefix=/usr    \
+            --disable-static \
+            --with-package-name="GStreamer &gstreamer-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/gstreamer10.xml
===================================================================
--- multimedia/libdriv/gstreamer10.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/gstreamer10.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -112,5 +112,5 @@
 <screen><userinput>./configure --prefix=/usr \
             --with-package-name="GStreamer &gstreamer10-version; BLFS" \
-            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &amp;&amp;
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/libcanberra-systemd.xml
===================================================================
--- multimedia/libdriv/libcanberra-systemd.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
+++ multimedia/libdriv/libcanberra-systemd.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -0,0 +1,240 @@
+<?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 libcanberra-download-http
+           "&fedora-http-repo;/libcanberra/libcanberra-&libcanberra-version;.tar.xz/&libcanberra-md5sum;/libcanberra-&libcanberra-version;.tar.xz">
+           <!--"http://0pointer.de/lennart/projects/libcanberra/libcanberra-&libcanberra-version;.tar.xz">-->
+  <!ENTITY libcanberra-download-ftp  " ">
+  <!ENTITY libcanberra-md5sum        "34cb7e4430afaf6f447c4ebdb9b42072">
+  <!ENTITY libcanberra-size          "312 KB">
+  <!ENTITY libcanberra-buildsize     "7.5 MB">
+  <!ENTITY libcanberra-time          "0.1 SBU">
+]>
+
+<sect1 id="libcanberra" xreflabel="libcanberra-&libcanberra-version;">
+  <?dbhtml filename="libcanberra.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libcanberra-&libcanberra-version;</title>
+
+  <indexterm zone="libcanberra">
+    <primary sortas="a-libcanberra">libcanberra</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libcanberra</title>
+
+    <para>
+      <application>libcanberra</application> is an implementation of the XDG Sound
+      Theme and Name Specifications, for generating event sounds on free desktops,
+      such as <application>GNOME</application>.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libcanberra-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libcanberra-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libcanberra-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libcanberra-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libcanberra-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libcanberra-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libcanberra Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libvorbis"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="gstreamer10"/> and
+      <xref linkend="gtk3"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk2"/>,
+      <xref linkend="gtk-doc"/>,
+      <xref linkend='pulseaudio'/> and
+      <ulink url="http://tdb.samba.org/">tdb</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libcanberra"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libcanberra</title>
+
+    <para>
+      Install <application>libcanberra</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-oss &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 docdir=/usr/share/doc/libcanberra-&libcanberra-version; install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Libcanberra</title>
+    
+    <sect3  id="libcanberra-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>canberra-boot</command> service at boot,
+        enable the previously installed systemd unit by
+        running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <indexterm zone="libcanberra libcanberra-init">
+        <primary sortas="f-libcanberra">libcanberra</primary>
+      </indexterm>
+
+<screen role="root"><userinput>systemctl enable canberra-system-bootup</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          canberra-boot and canberra-gtk-play
+        </seg>
+        <seg>
+          libcanberra-gtk.so, libcanberra-gtk3.so and
+          libcanberra.so
+        </seg>
+        <seg>
+          /usr/lib/libcanberra-&libcanberra-version;,
+          /usr/share/doc/libcanberra and
+          /usr/share/gtk-doc/html/libcanberra
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="canberra-gtk-play">
+        <term><command>canberra-gtk-play</command></term>
+        <listitem>
+          <para>
+            is an application used for playing sound events.
+          </para>
+          <indexterm zone="libcanberra canberra-gtk-play">
+            <primary sortas="b-canberra-gtk-play">canberra-gtk-play</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcanberra-gtk">
+        <term><filename class="libraryfile">libcanberra-gtk.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libcanberra</application> bindings
+            for <application>GTK+ 2</application>.
+          </para>
+          <indexterm zone="libcanberra libcanberra-gtk">
+            <primary sortas="c-libcanberra-gtk">libcanberra-gtk.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcanberra-gtk3">
+        <term><filename class="libraryfile">libcanberra-gtk3.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libcanberra</application> bindings
+            for <application>GTK+ 3</application>.
+          </para>
+          <indexterm zone="libcanberra libcanberra-gtk3">
+            <primary sortas="c-libcanberra-gtk3">libcanberra-gtk3.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcanberra-lib">
+        <term><filename class='libraryfile'>libcanberra.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libcanberra</application> API functions.
+          </para>
+          <indexterm zone="libcanberra libcanberra-lib">
+            <primary sortas="c-libcanberra">libcanberra.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: multimedia/libdriv/libcanberra.xml
===================================================================
--- multimedia/libdriv/libcanberra.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ 	(revision )
@@ -1,217 +1,0 @@
-<?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 libcanberra-download-http
-           "&fedora-http-repo;/libcanberra/libcanberra-&libcanberra-version;.tar.xz/&libcanberra-md5sum;/libcanberra-&libcanberra-version;.tar.xz">
-           <!--"http://0pointer.de/lennart/projects/libcanberra/libcanberra-&libcanberra-version;.tar.xz">-->
-  <!ENTITY libcanberra-download-ftp  " ">
-  <!ENTITY libcanberra-md5sum        "34cb7e4430afaf6f447c4ebdb9b42072">
-  <!ENTITY libcanberra-size          "312 KB">
-  <!ENTITY libcanberra-buildsize     "7.5 MB">
-  <!ENTITY libcanberra-time          "0.1 SBU">
-]>
-
-<sect1 id="libcanberra" xreflabel="libcanberra-&libcanberra-version;">
-  <?dbhtml filename="libcanberra.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libcanberra-&libcanberra-version;</title>
-
-  <indexterm zone="libcanberra">
-    <primary sortas="a-libcanberra">libcanberra</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcanberra</title>
-
-    <para>
-      <application>libcanberra</application> is an implementation of the XDG Sound
-      Theme and Name Specifications, for generating event sounds on free desktops,
-      such as <application>GNOME</application>.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libcanberra-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libcanberra-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libcanberra-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libcanberra-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libcanberra-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libcanberra-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libcanberra Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libvorbis"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="gstreamer10"/> and
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk2"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend='pulseaudio'/> and
-      <ulink url="http://tdb.samba.org/">tdb</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libcanberra"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcanberra</title>
-
-    <para>
-      Install <application>libcanberra</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-oss &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 docdir=/usr/share/doc/libcanberra-&libcanberra-version; install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          canberra-boot and canberra-gtk-play
-        </seg>
-        <seg>
-          libcanberra-gtk.so, libcanberra-gtk3.so and
-          libcanberra.so
-        </seg>
-        <seg>
-          /usr/lib/libcanberra-&libcanberra-version;,
-          /usr/share/doc/libcanberra and
-          /usr/share/gtk-doc/html/libcanberra
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="canberra-gtk-play">
-        <term><command>canberra-gtk-play</command></term>
-        <listitem>
-          <para>
-            is an application used for playing sound events.
-          </para>
-          <indexterm zone="libcanberra canberra-gtk-play">
-            <primary sortas="b-canberra-gtk-play">canberra-gtk-play</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcanberra-gtk">
-        <term><filename class="libraryfile">libcanberra-gtk.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libcanberra</application> bindings
-            for <application>GTK+ 2</application>.
-          </para>
-          <indexterm zone="libcanberra libcanberra-gtk">
-            <primary sortas="c-libcanberra-gtk">libcanberra-gtk.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcanberra-gtk3">
-        <term><filename class="libraryfile">libcanberra-gtk3.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libcanberra</application> bindings
-            for <application>GTK+ 3</application>.
-          </para>
-          <indexterm zone="libcanberra libcanberra-gtk3">
-            <primary sortas="c-libcanberra-gtk3">libcanberra-gtk3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcanberra-lib">
-        <term><filename class='libraryfile'>libcanberra.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libcanberra</application> API functions.
-          </para>
-          <indexterm zone="libcanberra libcanberra-lib">
-            <primary sortas="c-libcanberra">libcanberra.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/libdriv.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -25,5 +25,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-lib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-plugins.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-utils-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-firmware.xml"/>
@@ -36,7 +36,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flac.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grilo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grilo-plugins.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grilo-plugins-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gstreamer.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst-plugins-base.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst-plugins-base-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst-plugins-good.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst-plugins-bad.xml"/>
@@ -45,5 +45,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gstreamer10.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-base.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-good.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-good-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-bad.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-ugly.xml"/>
@@ -53,5 +53,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libao.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libass.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcanberra.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcanberra-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdiscid.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdvdcss.xml"/>
Index: multimedia/libdriv/libmpeg2.xml
===================================================================
--- multimedia/libdriv/libmpeg2.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/libmpeg2.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -79,5 +79,5 @@
 
 <screen><userinput>sed -i 's/static const/static/' libmpeg2/idct_mmx.c &amp;&amp;
-./configure --prefix=/usr                           &amp;&amp;
+./configure --prefix=/usr --disable-static          &amp;&amp;
 make</userinput></screen>
 
@@ -100,4 +100,8 @@
     <para><command>sed -i ...</command>: This <command>sed</command> fixes
     problems with recent GCC compilers.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
   </sect2>
 
@@ -144,9 +148,9 @@
 
       <varlistentry id="libmpeg2-lib">
-        <term><filename class='libraryfile'>libmpeg2.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libmpeg2.so</filename></term>
         <listitem>
           <para>contains API functions used to decode MPEG video streams.</para>
           <indexterm zone="libmpeg2 libmpeg2-lib">
-            <primary sortas="c-libmpeg2">libmpeg2.{so,a}</primary>
+            <primary sortas="c-libmpeg2">libmpeg2.so</primary>
           </indexterm>
         </listitem>
@@ -159,5 +163,5 @@
           video streams.</para>
           <indexterm zone="libmpeg2 libmpeg2convert">
-            <primary sortas="c-libmpeg2convert">libmpeg2convert.{so,a}</primary>
+            <primary sortas="c-libmpeg2convert">libmpeg2convert.so</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/libmusicbrainz.xml
===================================================================
--- multimedia/libdriv/libmusicbrainz.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/libmusicbrainz.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -93,5 +93,5 @@
 
 <screen><userinput>patch -Np1 -i ../libmusicbrainz-&libmusicbrainz-version;-missing-includes-1.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -122,4 +122,12 @@
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
@@ -132,5 +140,5 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libmusicbrainz.{so,a}</seg>
+        <seg>libmusicbrainz.so</seg>
         <seg>/usr/include/musicbrainz and
         /usr/share/doc/libmusicbrainz-&libmusicbrainz-version;</seg>
@@ -144,10 +152,10 @@
 
       <varlistentry id="libmusicbrainz-lib">
-        <term><filename class='libraryfile'>libmusicbrainz.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libmusicbrainz.so</filename></term>
         <listitem>
           <para>contains API functions to access the MusicBrainz database, both
           for looking up data and also for submitting new data.</para>
           <indexterm zone="libmusicbrainz libmusicbrainz-lib">
-            <primary sortas="c-libmusicbrainz">libmusicbrainz.{so,a}</primary>
+            <primary sortas="c-libmusicbrainz">libmusicbrainz.so</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/libogg.xml
===================================================================
--- multimedia/libdriv/libogg.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/libogg.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -69,5 +69,8 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/libogg-&libogg-version; --disable-static &amp;&amp;
+<screen><userinput>
+./configure --prefix=/usr    \
+            --disable-static \
+            --docdir=/usr/share/doc/libogg-&libogg-version; &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/pulseaudio.xml
===================================================================
--- multimedia/libdriv/pulseaudio.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/pulseaudio.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -89,5 +89,4 @@
       <xref linkend="dbus"/>,
       <xref linkend="glib2"/>,
-      <xref linkend="libcap-pam"/>,
       <xref linkend="openssl"/>,
       <xref linkend="speex"/> and
@@ -100,5 +99,4 @@
       <xref linkend="bluez"/> (runtime),
       <xref linkend="check"/>,
-      <xref linkend="systemd"/> (runtime),
       <xref linkend="GConf"/>,
       <xref linkend="gtk3"/>,
@@ -158,5 +156,5 @@
     </para>
 
-<screen role="root"><userinput>rm /etc/dbus-1/system.d/pulseaudio-system.conf</userinput></screen>
+<screen role="root"><userinput>rm -fv /etc/dbus-1/system.d/pulseaudio-system.conf</userinput></screen>
 
   </sect2>
@@ -196,61 +194,4 @@
   </sect2>
 
-  <sect2 role="configuration">
-    <title>Configuring PulseAudio</title>
-
-    <sect3 id="pulseaudio-config">
-      <title>Config Files</title>
-      <para>
-        There are system wide configuration files:
-        <filename>/etc/pulse/daemon.conf</filename>,
-        <filename>/etc/pulse/client.conf</filename>,
-        <filename>/etc/pulse/default.pa</filename>, and user configuration
-        files with the same names in
-        <filename class="directory">~/.config/pulse</filename>. User
-        configuration files take precedence over system wide ones.
-      </para>
-
-      <indexterm zone="pulseaudio pulseaudio-config">
-        <primary sortas="e-AA.config-pulse">~/.config/pulse</primary>
-      </indexterm>
-
-      <indexterm zone="pulseaudio pulseaudio-config">
-        <primary
-        sortas="e-etc-pulse-daemon.conf">/etc/pulse/daemon.conf</primary>
-      </indexterm>
-
-      <indexterm zone="pulseaudio pulseaudio-config">
-        <primary
-        sortas="e-etc-pulse-client.conf">/etc/pulse/client.conf</primary>
-      </indexterm>
-
-      <indexterm zone="pulseaudio pulseaudio-config">
-        <primary
-        sortas="e-etc-pulse-default.pa">/etc/pulse/default.pa</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        The default configuration files allow to set up a working installation,
-        except that you need to remove a reference to Console-Kit if it is
-        not installed. For example, issue the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>sed '/load-module module-console-kit/s/^/#/' \
-                    -i /etc/pulse/default.pa</userinput></screen>
-
-      <para>
-        You may also have to configure the audio system. You may start
-        <application>pulseaudio</application> in command line mode using
-        <command>pulseaudio -C</command>. You can then list various
-        informations and change some settings. See
-        <command>man pulse-cli-syntax</command>.
-      </para>
-    </sect3>
-  </sect2>
-
   <sect2 role="content">
     <title>Contents</title>
@@ -265,6 +206,5 @@
           esdcompat, pacat, pacmd, pactl, padsp, pamon (symlink),
           paplay (symlink), parec (symlink), parecord (symlink), pasuspender,
-          pax11publish, pulseaudio,
-          <!-- it looks like the equalizer needs FFTW: qpaeq, -->
+          pax11publish, pulseaudio, qpaeq,
           start-pulseaudio-kde and start-pulseaudio-x11
         </seg>
@@ -277,5 +217,6 @@
           /usr/include/pulse,
           /usr/lib/cmake/PulseAudio,
-          /usr/lib/pulse, and
+          /usr/lib/pulse,
+          /usr/libexec/pulse and
           /usr/share/pulseaudio
         </seg>
@@ -440,5 +381,4 @@
       </varlistentry>
 
-<!-- only installed if FFTW is present
       <varlistentry id="qpaeq">
         <term><command>qpaeq</command></term>
@@ -453,5 +393,5 @@
         </listitem>
       </varlistentry>
--->
+
       <varlistentry id="start-pulseaudio-kde">
         <term><command>start-pulseaudio-kde</command></term>
Index: multimedia/libdriv/sbc.xml
===================================================================
--- multimedia/libdriv/sbc.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/sbc.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -108,11 +108,13 @@
     <title>Command Explanations</title>
 
-    <para><option>--disable-tester</option> This disables
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+       
+    <para>
+      <option>--disable-tester</option> This disables
       the SBC tester. Remove it if you have installed
       the optional <application>libsndfile</application>
-      package.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
+      package.
+    </para>
 
   </sect2>
@@ -143,5 +145,5 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-       
+
       <varlistentry id="libsbc">
         <term><filename class="libraryfile">libsbc.so</filename></term>
Index: multimedia/libdriv/sdl.xml
===================================================================
--- multimedia/libdriv/sdl.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/sdl.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -70,6 +70,6 @@
       <xref linkend="pth"/>,
       <ulink url="http://www.directfb.org/">DirectFB</ulink>,
-      <ulink url="http://www.ggi-project.org/">GGI</ulink>,
-      <ulink url="http://my.arava.co.il/~matan/svgalib/">SVGAlib-1.9.5</ulink>
+      <ulink url="http://sourceforge.net/projects/ggi/files/bundle/GGI-2.2.2/">GGI</ulink>,
+      <ulink url="http://mail.arava.co.il/~matan/svgalib/">SVGAlib-1.9.5</ulink>
       (<ulink url="&patch-root;/svgalib-1.9.25-megafixes-1.patch">patched</ulink>),
       <ulink url="http://caca.zoy.org/wiki/libcaca">libcaca</ulink> and
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ multimedia/libdriv/xine-lib.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
@@ -67,5 +67,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="x-window-system"/>,
+      <xref linkend="xorg7-lib"/>,
       <xref linkend="ffmpeg"/>, and at least one of:
         <xref linkend="alsa"/>,
