Index: multimedia/libdriv/libmikmod.xml
===================================================================
--- multimedia/libdriv/libmikmod.xml	(revision 593d6440192834f39228c1a4354b98752c54555b)
+++ multimedia/libdriv/libmikmod.xml	(revision 1aaf29e25e1ba8badb5d1e0ba114f3cfd3969f89)
@@ -1,2 +1,3 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
@@ -13,70 +14,72 @@
 
 <sect1 id="libmikmod" xreflabel="libmikmod-&libmikmod-version;">
-<sect1info>
-  <othername>$LastChangedBy$</othername>
-  <date>$Date$</date>
-</sect1info>
+  <?dbhtml filename="libmikmod.html"?>
 
-<?dbhtml filename="libmikmod.html"?>
-<title>libmikmod-&libmikmod-version;</title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<indexterm zone="libmikmod">
-  <primary sortas="a-libmikmod">libmikmod</primary>
-</indexterm>
+  <title>Libmikmod-&libmikmod-version;</title>
 
-<sect2>
-<title>Introduction to <application>libmikmod</application></title>
+  <indexterm zone="libmikmod">
+    <primary sortas="a-Libmikmod">Libmikmod</primary>
+  </indexterm>
 
-<para>
-<application>libmikmod</application> is a sound library capable of
-playing audio samples as well as tracker modules. Supported module
-formats include <acronym>MOD</acronym>, <acronym>S3M</acronym>,
-<acronym>XM</acronym>, <acronym>IT</acronym>, <acronym>MED</acronym>,
-<acronym>MTM</acronym> and <acronym>669</acronym>.</para>
+  <sect2 role="package">
+    <title>Introduction to Libmikmod</title>
 
-<sect3>
-<title>Package information</title>
-  <itemizedlist spacing='compact'>
-  <listitem><para>Download (HTTP): <ulink url="&libmikmod-download-http;"/></para></listitem>
-  <listitem><para>Download (FTP): <ulink url="&libmikmod-download-ftp;"/></para></listitem>
-  <listitem><para>Download MD5 sum: &libmikmod-md5sum;</para></listitem>
-  <listitem><para>Download size: &libmikmod-size;</para></listitem>
-  <listitem><para>Estimated disk space required: &libmikmod-buildsize;</para></listitem>
-  <listitem><para>Estimated build time: &libmikmod-time;</para></listitem>
-</itemizedlist>
-</sect3>
+    <para><application>libmikmod</application> is a sound library capable of
+    playing audio samples as well as tracker modules. Supported module formats 
+    include MOD, S3M, XM, IT, MED, MTM and 669.</para>
 
-<sect3>
-<title><application>libmikmod</application> dependencies</title>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libmikmod-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libmikmod-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libmikmod-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libmikmod-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libmikmod-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libmikmod-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect4>
-<title>Optional</title>
-<para><xref linkend="alsa"/>, 
-      <xref linkend="esound"/>, 
-      <ulink url="http://www.perex.cz/~perex/ultra/">libGUS</ulink>, 
-      <ulink url="http://osalp.sourceforge.net/">AFlib</ulink> and 
-      <ulink url="http://www.anime.net/~sam9407/">SAM9407 driver</ulink></para>
-</sect4>
-</sect3>
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Recommended Patch: <ulink 
+        url="http://mikmod.raphnet.net/files/libmikmod-3.1.11-a.diff"/></para>
+      </listitem>
+    </itemizedlist>
 
-<sect3>
-<title>Additional downloads</title>
+    <bridgehead renderas="sect3">Libmikmod Dependencies</bridgehead>
 
-<itemizedlist spacing='compact'>
-  <listitem><para>Recommended Patch: <ulink 
-     url="http://mikmod.raphnet.net/files/libmikmod-3.1.11-a.diff"/></para>
-  </listitem>
-</itemizedlist>
-</sect3>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="alsa"/>, 
+    <xref linkend="esound"/>, 
+    <ulink url="http://www.perex.cz/~perex/ultra/">libGUS</ulink>, 
+    <ulink url="http://osalp.sourceforge.net/">AFlib</ulink> and 
+    <ulink url="http://www.anime.net/~sam9407/">SAM9407 driver</ulink></para>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Installation of <application>libmikmod</application></title>
+  <sect2 role="installation">
+    <title>Installation of Libmikmod</title>
 
-<para>Install <application>libmikmod</application> by running the
-following commands:</para>
+    <para>Install <application>libmikmod</application> by running the
+    following commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../libmikmod-3.1.11-a.diff &amp;&amp;
+<screen><userinput>patch -Np1 -i ../libmikmod-3.1.11-a.diff &amp;&amp;
 sed -i -e "s/VERSION=10/VERSION=11/" \
        -e "s/sys_asoundlib/alsa_asoundlib/" \
@@ -87,73 +90,75 @@
 autoconf &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
-make</command></userinput></screen>
+make</userinput></screen>
 
-<para>Now, as the root user:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen><userinput role='root'><command>make install &amp;&amp;
+<screen role="root"><userinput>make install &amp;&amp;
 chmod 755 /usr/lib/libmikmod.so.2.0.4 &amp;&amp;
 install -v -m644 -D docs/mikmod.html \
-    /usr/share/doc/libmikmod-3.1.11/mikmod.html</command></userinput></screen>
+    /usr/share/doc/libmikmod-3.1.11/mikmod.html</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Command explanations</title>
+  <sect2 role="commands">
+    <title>Command Explanations</title>
 
-<para><command>sed -i -e ...</command>: This increments the package micro 
-version and also modifies the <application>ALSA</application> header search
-routine so that the package properly discovers the 
-<application>ALSA</application> library.  It also fixes a problem 
-which makes <application>autoconf</application> fail.</para>
+    <para><command>sed -i -e ...</command>: This increments the package micro 
+    version and also modifies the <application>ALSA</application> header search
+    routine so that the package properly discovers the 
+    <application>ALSA</application> library.  It also fixes a problem 
+    which makes <application>autoconf</application> fail.</para>
 
-<para><command>autoconf</command>: This generates a new 
-<command>configure</command> script, required because of the changes to
-<filename>configure.in</filename>.</para>
+    <para><command>autoconf</command>: This generates a new 
+    <command>configure</command> script, required because of the changes to
+    <filename>configure.in</filename>.</para>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Contents</title>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<segmentedlist>
-  <segtitle>Installed Program</segtitle>
-  <segtitle>Installed Library</segtitle>
-  <segtitle>Installed Directory</segtitle>
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
-  <seglistitem>
-    <seg>libmikmod-config</seg>
-    <seg>libmikmod.[so,a]</seg>
-    <seg>/usr/share/doc/libmikmod-&libmikmod-version;</seg>
-  </seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>libmikmod-config</seg>
+        <seg>libmikmod.[so,a]</seg>
+        <seg>/usr/share/doc/libmikmod-&libmikmod-version;</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<variablelist>
-  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-  <?dbfo list-presentation="list"?>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-<varlistentry id="libmikmod-config">
-  <term><command>libmikmod-config</command></term>
-  <listitem>
-    <para>provides version information, compiler, and linker flags 
-    to programs that utilize <application>libmikmod</application>.</para>
-    <indexterm zone="libmikmod libmikmod-config">
-      <primary sortas="b-libmikmod-config">libmikmod-config</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
+      <varlistentry id="libmikmod-config">
+        <term><command>libmikmod-config</command></term>
+        <listitem>
+          <para>provides version information, compiler, and linker flags 
+          to programs that utilize <application>libmikmod</application>.</para>
+          <indexterm zone="libmikmod libmikmod-config">
+            <primary sortas="b-libmikmod-config">libmikmod-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="libmikmod-lib">
-  <term><filename class='libraryfile'>libmikmod.[so,a]</filename></term>
-  <listitem>
-    <para>contains functions that are required to play various tracker module 
-      files.</para>
-    <indexterm zone="libmikmod libmikmod-lib">
-      <primary sortas="c-libmikmod">libmikmod.[so,a]</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
+      <varlistentry id="libmikmod-lib">
+        <term><filename class='libraryfile'>libmikmod.[so,a]</filename></term>
+        <listitem>
+          <para>contains functions that are required to play various tracker module 
+            files.</para>
+          <indexterm zone="libmikmod libmikmod-lib">
+            <primary sortas="c-libmikmod">libmikmod.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</variablelist>
+    </variablelist>
 
-</sect2>
+  </sect2>
+
 </sect1>
