Index: content/databases/mysql/mysql-desc.xml
===================================================================
--- content/databases/mysql/mysql-desc.xml	(revision 05ecbec4531dd731cefcc66e3d122449f5e59961)
+++ content/databases/mysql/mysql-desc.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -2,29 +2,58 @@
 <title>Contents</title>
 
-<para>The mysql package contains
-<userinput>mysql</userinput>,<userinput>
-mysqladmin</userinput>,<userinput> mysqlcheck</userinput>,<userinput>
-mysqlshow</userinput>,<userinput> mysqldump</userinput>,<userinput>
-mysqlimport</userinput>,<userinput> mysqltest</userinput>,<userinput>
-mysqlbinlog</userinput>,<userinput> replace</userinput>,<userinput>
-comp_err</userinput>,<userinput> perror</userinput>,<userinput>
-resolveip</userinput>,<userinput>
-my_print_defaults</userinput>,<userinput>
-resolve_stack_dump</userinput>,<userinput>
-isamchk</userinput>,<userinput> isamlog</userinput>,<userinput>
-pack_isam</userinput>,<userinput> myisamchk</userinput>,<userinput>
-myisamlog</userinput>,<userinput> myisampack</userinput>,<userinput>
-safe_mysqld</userinput>,<userinput>
-mysql_install_db</userinput>,<userinput>
-msql2mysql</userinput>,<userinput> mysql_config</userinput>,<userinput>
-mysql_fix_privilege_tables</userinput>,<userinput>
-mysql_setpermission</userinput>,<userinput>
-mysql_zap</userinput>,<userinput> mysqlacess</userinput>,<userinput>
-mysqlbug</userinput>,<userinput>
-mysql_convert_table_format</userinput>,<userinput>
-mysql_find_rows</userinput>,<userinput>
-mysqlhotcopy</userinput>,<userinput>
-mysqldumbslow</userinput>,<userinput>
-mysqld_multi</userinput> and<userinput> mysqld</userinput></para>
+<para>The mysql package contains <command>
+comp_err</command>, <command>
+isamchk</command>, <command>
+isamlog</command>, <command>
+msql2mysql</command>, <command>
+my_print_defaults</command>, <command>
+myisamchk</command>, <command>
+myisamlog</command>, <command>
+myisampack</command>, <command>
+mysql</command>, <command>
+mysql_config</command>, <command>
+mysql_convert_table_format</command>, <command>
+mysql_explain_log</command>, <command>
+mysql_find_rows</command>, <command>
+mysql_fix_extensions</command>, <command>
+mysql_fix_privilege_tables</command>, <command>
+mysql_install</command>, <command>
+mysql_install_db</command>, <command>
+mysql_secure_installation</command>, <command>
+mysql_setpermission</command>, <command>
+mysql_tableinfo</command>, <command>
+mysql_waitpid</command>, <command>
+mysql_zap</command>, <command>
+mysqlacess</command>,<command>
+mysqladmin</command>, <command>
+mysqlbinlog</command>, <command>
+mysqlbug</command>, <command>
+mysqlcheck</command>, <command>
+mysqld</command>, <command>
+mysqld_multi</command>, <command>
+mysqld_safe</command>, <command>
+mysqldump</command>, <command>
+mysqldumpslow</command>, <command>
+mysqlhotcopy</command>, <command>
+mysqlimport</command>, <command>
+mysqlmanager-pwgen</command>, <command>
+mysqlmanagerc</command>, <command>
+mysqlshow</command>, <command>
+mysqltest</command>, <command>
+pack_isam</command>, <command>
+perror</command>, <command>
+replace</command>, <command>
+resolve_stack_dump</command>, <command>
+resolveip</command>, <filename class="libraryfile">
+libdbug</filename>, <filename class="libraryfile">
+libheap</filename>, <filename class="libraryfile">
+libmerge</filename>, <filename class="libraryfile">
+libmyisam</filename>, <filename class="libraryfile">
+libmyisammrg</filename>, <filename class="libraryfile">
+libmysqlclient</filename>, <filename class="libraryfile">
+libmystrings</filename>, <filename class="libraryfile">
+libmysys</filename>, <filename class="libraryfile">
+libnisam</filename> and <filename class="libraryfile">
+libvio</filename>.</para>
 
 </sect2>
@@ -33,7 +62,7 @@
 
 <para>A package listing would be several pages long, we suggest
-consulting the mysql documentation for full details, instead.</para>
+consulting the MySQL documentation for full details, instead.</para>
 
-<para>Certain mysql support programs may require the perl DBI modules to be installed to function properly.</para>
+<para>Certain MySQL support programs may require the perl DBI modules to be installed to function properly.</para>
 
 </sect2>
Index: content/databases/mysql/mysql-exp.xml
===================================================================
--- content/databases/mysql/mysql-exp.xml	(revision 05ecbec4531dd731cefcc66e3d122449f5e59961)
+++ content/databases/mysql/mysql-exp.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -2,6 +2,7 @@
 <title>Command explanations</title>
 
-<para><userinput>sed -e "s%mysql-test/Makefile%%" -e "s% mysql-test%%" configure.old &gt; configure</userinput>:
-This sed is used to disable the mysql test suite.</para>
+<para><command>sed -e "s%mysql-test/Makefile%%" -e "s% mysql-test%%"
+configure.old &gt; configure</command> : This sed is used to disable 
+the mysql test suite.</para>
 
 </sect2>
Index: content/databases/mysql/mysql-inst.xml
===================================================================
--- content/databases/mysql/mysql-inst.xml	(revision 05ecbec4531dd731cefcc66e3d122449f5e59961)
+++ content/databases/mysql/mysql-inst.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -1,14 +1,14 @@
 <sect2>
-<title>Installation of mysql</title>
+<title>Installation of <application>MySQL</application></title>
 
 <para>For security reasons, running the server as an unpriviledged user 
 and group is strongly encouraged:</para>
 
-<screen><userinput>groupadd mysql &amp;&amp;
-useradd -c mysql -d /dev/null -g mysql -s /bin/false mysql</userinput></screen>
+<screen><userinput><command>groupadd mysql &amp;&amp;
+useradd -c mysql -d /dev/null -g mysql -s /bin/false mysql</command></userinput></screen>
 
-<para>Build and install mysql by running the following commands:</para>
+<para>Build and install <application>MySQL</application> by running the following commands:</para>
 
-<screen><userinput>cp configure configure.old &amp;&amp;
+<screen><userinput><command>cp configure configure.old &amp;&amp;
 sed -e "s%mysql-test/Makefile%%" -e "s% mysql-test%%" configure.old &gt; configure &amp;&amp;
 ./configure --prefix=/usr \
@@ -17,8 +17,9 @@
             --localstatedir=/var/lib/mysql \
             --enable-thread-safe-client \
+            --enable-local-infile \
             --without-debug \
             --without-bench &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen>
+make install</command></userinput></screen>
 
 </sect2>
Index: content/databases/mysql/mysql-intro.xml
===================================================================
--- content/databases/mysql/mysql-intro.xml	(revision 05ecbec4531dd731cefcc66e3d122449f5e59961)
+++ content/databases/mysql/mysql-intro.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -1,12 +1,25 @@
 <sect2>
-<title>Introduction to MySQL</title>
+<title>Introduction to <application>MySQL</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&mysql-download-http;" />
-Download location (FTP):        <ulink url="&mysql-download-ftp;" />
-Version used:                   &mysql-version;
-Package size:                   &mysql-size;
-Estimated Disk space required:  &mysql-buildsize;</screen>
+<para>The <application>MySQL</application> package contains the mysql library, server 
+and client utilities.</para>
 
-<para>The MySQL package contains the mysql library, server and client utilities.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&mysql-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&mysql-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &mysql-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &mysql-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &mysql-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>MySQL</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="readline"/>, <xref linkend="openssl"/>, 
+<ulink url="http://search.cpan.org/dist/DBI/">DBI</ulink>
+<ulink url="http://search.cpan.org/dist/DBD-mysql/">DBD-mysql</ulink>
+<ulink url="http://search.cpan.org/dist/Data-Dumper/">Data-Dumper</ulink>
+</para></sect4>
+</sect3>
 
 </sect2>
Index: content/databases/mysql/mysql.ent
===================================================================
--- content/databases/mysql/mysql.ent	(revision 05ecbec4531dd731cefcc66e3d122449f5e59961)
+++ content/databases/mysql/mysql.ent	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -5,7 +5,10 @@
 <!ENTITY mysql-config SYSTEM "mysql-config.xml">
 <!ENTITY mysql-desc SYSTEM "mysql-desc.xml">
-<!ENTITY mysql-version "3.23.55">
-<!ENTITY mysql-download-http "http://mysql.he.net/Downloads/MySQL-3.23/mysql-3.23.55.tar.gz">
-<!ENTITY mysql-download-ftp "ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/MySQL-3.23/mysql-3.23.55.tar.gz">
-<!ENTITY mysql-size "11 MB">
-<!ENTITY mysql-buildsize "70 MB">
+<!ENTITY mysql-version "4.0.14">
+<!ENTITY mysql-download-http
+"http://mysql.he.net/Downloads/MySQL-4.0/mysql-&mysql-version;.tar.gz">
+<!ENTITY mysql-download-ftp
+"ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/MySQL-4.0/mysql-&mysql-version;.tar.gz">
+<!ENTITY mysql-size "12 MB">
+<!ENTITY mysql-buildsize "104 MB">
+<!ENTITY mysql-time "4.43 SBU">
Index: general/general.ent
===================================================================
--- general/general.ent	(revision 05ecbec4531dd731cefcc66e3d122449f5e59961)
+++ general/general.ent	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -21,4 +21,5 @@
 <!ENTITY % gwrap SYSTEM "genlib/gwrap/gwrap.ent">
 <!ENTITY % STLport SYSTEM "genlib/stlport/stlport.ent">
+<!ENTITY % LZO SYSTEM "genlib/lzo/lzo.ent">
 %openssl;
 %pcre;
@@ -39,4 +40,5 @@
 %gwrap;
 %STLport;
+%LZO;
 
 <!-- Graphics Libraries -->
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 05ecbec4531dd731cefcc66e3d122449f5e59961)
+++ general/genlib/genlib.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -53,3 +53,4 @@
 &gwrap;
 &STLport;
+&LZO;
 </chapter>
Index: general/genlib/lzo.xml
===================================================================
--- general/genlib/lzo.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ general/genlib/lzo.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -0,0 +1,9 @@
+<sect1 id="LZO" xreflabel="LZO-&LZO-version;">
+<?dbhtml filename="LZO.html" dir="general"?>
+<title>LZO-&LZO-version;</title>
+
+&LZO-intro;
+&LZO-inst;
+&LZO-desc;
+
+</sect1>
Index: general/genlib/lzo/lzo-desc.xml
===================================================================
--- general/genlib/lzo/lzo-desc.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ general/genlib/lzo/lzo-desc.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Contents</title>
+
+<para>LZO package provides 
+<filename class="libraryfile">liblzo</filename> library.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>liblzo</title>
+<para><filename class="libraryfile">liblzo</filename> 
+is a data compression and decompression library.</para></sect3>
+
+</sect2>
Index: general/genlib/lzo/lzo-inst.xml
===================================================================
--- general/genlib/lzo/lzo-inst.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ general/genlib/lzo/lzo-inst.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of <application>LZO</application></title>
+
+<para>Install <application>LZO</application> by running the
+following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: general/genlib/lzo/lzo-intro.xml
===================================================================
--- general/genlib/lzo/lzo-intro.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ general/genlib/lzo/lzo-intro.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to <application>LZO</application></title>
+
+<para><application>LZO</application> is a data compression library which is suitable for data
+decompression and compression in real-time. This means it favours
+speed over compression ratio.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&LZO-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&LZO-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &LZO-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &LZO-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &LZO-time;</para></listitem></itemizedlist>
+</sect3>
+
+</sect2>
Index: general/genlib/lzo/lzo.ent
===================================================================
--- general/genlib/lzo/lzo.ent	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ general/genlib/lzo/lzo.ent	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -0,0 +1,13 @@
+<!ENTITY LZO SYSTEM "../lzo.xml">
+<!ENTITY LZO-intro SYSTEM "lzo-intro.xml">
+<!ENTITY LZO-inst SYSTEM "lzo-inst.xml">
+<!ENTITY LZO-exp SYSTEM "lzo-exp.xml">
+<!ENTITY LZO-desc SYSTEM "lzo-desc.xml">
+<!ENTITY LZO-config SYSTEM "lzo-config.xml">
+<!ENTITY LZO-buildsize "5.4 MB">
+<!ENTITY LZO-version "1.08">
+<!ENTITY LZO-download-http
+"http://www.oberhumer.com/opensource/lzo/download/lzo-&LZO-version;.tar.gz">
+<!ENTITY LZO-download-ftp "">
+<!ENTITY LZO-size "421 KB">
+<!ENTITY LZO-time "0.22 SBU">
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision 05ecbec4531dd731cefcc66e3d122449f5e59961)
+++ multimedia/libdriv/libdriv.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -19,4 +19,5 @@
 &nas;
 &libmpeg3;
+&libmad;
 
 </chapter>
Index: multimedia/libdriv/libmad.xml
===================================================================
--- multimedia/libdriv/libmad.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ multimedia/libdriv/libmad.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -0,0 +1,9 @@
+<sect1 id="libmad" xreflabel="libmad-&libmad-version;">
+<?dbhtml filename="libmad.html" dir="multimedia"?>
+<title>libmad-&libmad-version;</title>
+
+&libmad-intro;
+&libmad-inst;
+&libmad-desc;
+
+</sect1>
Index: multimedia/libdriv/libmad/libmad-desc.xml
===================================================================
--- multimedia/libdriv/libmad/libmad-desc.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ multimedia/libdriv/libmad/libmad-desc.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Contents</title>
+
+<para>This package provides
+<filename class="libraryfile">libmad</filename> library.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libmad</title>
+<para><filename class="libraryfile">libmad</filename> 
+is a <acronym>MPEG</acronym> audio decoder library.</para></sect3>
+
+</sect2>
Index: multimedia/libdriv/libmad/libmad-inst.xml
===================================================================
--- multimedia/libdriv/libmad/libmad-inst.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ multimedia/libdriv/libmad/libmad-inst.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of <application>libmad</application></title>
+
+<para>Install <application>libmad</application> by running the
+following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: multimedia/libdriv/libmad/libmad-intro.xml
===================================================================
--- multimedia/libdriv/libmad/libmad-intro.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ multimedia/libdriv/libmad/libmad-intro.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Introduction to <application>libmad</application></title>
+
+<para>
+<application>Libmad</application> is a high-quality
+<acronym>MPEG</acronym> audio decoder capable of 24-bit output.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&libmad-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&libmad-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libmad-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &libmad-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &libmad-time;</para></listitem></itemizedlist>
+</sect3>
+
+</sect2>
Index: multimedia/libdriv/libmad/libmad.ent
===================================================================
--- multimedia/libdriv/libmad/libmad.ent	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
+++ multimedia/libdriv/libmad/libmad.ent	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -0,0 +1,14 @@
+<!ENTITY libmad SYSTEM "../libmad.xml">
+<!ENTITY libmad-intro SYSTEM "libmad-intro.xml">
+<!ENTITY libmad-inst SYSTEM "libmad-inst.xml">
+<!ENTITY libmad-exp SYSTEM "libmad-exp.xml">
+<!ENTITY libmad-desc SYSTEM "libmad-desc.xml">
+<!ENTITY libmad-config SYSTEM "libmad-config.xml">
+<!ENTITY libmad-buildsize "3.8 MB">
+<!ENTITY libmad-version "0.15.0b">
+<!ENTITY libmad-download-http
+"http://flow.dl.sourceforge.net/sourceforge/mad/libmad-&libmad-version;.tar.gz">
+<!ENTITY libmad-download-ftp
+"ftp://ftp.mars.org/pub/mpeg/libmad-&libmad-version;.tar.gz">
+<!ENTITY libmad-size "398 KB">
+<!ENTITY libmad-time "0.09 SBU">
Index: multimedia/multimedia.ent
===================================================================
--- multimedia/multimedia.ent	(revision 05ecbec4531dd731cefcc66e3d122449f5e59961)
+++ multimedia/multimedia.ent	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -13,4 +13,5 @@
 <!ENTITY % nas SYSTEM "libdriv/nas/nas.ent">
 <!ENTITY % libmpeg3 SYSTEM "libdriv/libmpeg3/libmpeg3.ent">
+<!ENTITY % libmad SYSTEM "libdriv/libmad/libmad.ent">
 %alsa;
 <!-- %arts; -->
@@ -22,4 +23,5 @@
 %nas;
 %libmpeg3;
+%libmad;
 
 <!-- Audio utilities -->
Index: multimedia/videoutils/avifile/avifile-intro.xml
===================================================================
--- multimedia/videoutils/avifile/avifile-intro.xml	(revision 05ecbec4531dd731cefcc66e3d122449f5e59961)
+++ multimedia/videoutils/avifile/avifile-intro.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -26,7 +26,6 @@
 <para><xref linkend="qt"/> and <xref linkend="SDL"/></para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="ffmpeg"/>, <xref linkend="xvid"/>, <ulink
-url="http://www.underbit.com/products/mad">MAD</ulink>, <xref
-linkend="libvorbis"/> and <xref
+<para><xref linkend="ffmpeg"/>, <xref linkend="xvid"/>, <xref
+linkend="libmad"/>, <xref linkend="libvorbis"/> and <xref
 linkend="lame"/></para></sect4>
 </sect3>
Index: multimedia/videoutils/mplayer/mplayer-intro.xml
===================================================================
--- multimedia/videoutils/mplayer/mplayer-intro.xml	(revision 05ecbec4531dd731cefcc66e3d122449f5e59961)
+++ multimedia/videoutils/mplayer/mplayer-intro.xml	(revision ef0e45e490dd4e94808163f5c3bf83207bb83cf7)
@@ -44,8 +44,6 @@
 linkend="libvorbis"/>, <xref linkend="aalib"/>, <xref linkend="SDL"/>,
 <xref linkend="ffmpeg"/>, <xref linkend="xvid"/>, <xref
-linkend="arts"/>, <xref linkend="alsa"/>, <ulink
-url="http://www.oberhumer.com/opensource/lzo">LZO</ulink>, <ulink
-url="http://dvd.sourceforge.net">libdvdnav</ulink>, <ulink
-url="http://www.underbit.com/products/mad">MAD</ulink>, <xref
+linkend="arts"/>, <xref linkend="alsa"/>, <xref
+linkend="LZO"/>, <xref linkend="libmad"/>, <xref
 linkend="CDParanoia"/>, <xref linkend="lame"/> and <xref
 linkend="xmms"/>
