Index: multimedia/libdriv/libogg/libogg-desc.xml
===================================================================
--- multimedia/libdriv/libogg/libogg-desc.xml	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
+++ multimedia/libdriv/libogg/libogg-desc.xml	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application>libogg</application> package contains <filename
+class="libraryfile">libogg</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>ogg libraries</title>
+<para><filename class="libraryfile">libogg</filename> libraries provide the functions for programs 
+wishing to read or write <filename>OGG</filename> formatted bitstreams.</para>
+</sect3>
+
+
+</sect2>
+
Index: multimedia/libdriv/libogg/libogg-inst.xml
===================================================================
--- multimedia/libdriv/libogg/libogg-inst.xml	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
+++ multimedia/libdriv/libogg/libogg-inst.xml	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of <application>libogg</application></title>
+
+<para>Install <application>libogg</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/libogg/libogg-intro.xml
===================================================================
--- multimedia/libdriv/libogg/libogg-intro.xml	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
+++ multimedia/libdriv/libogg/libogg-intro.xml	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
@@ -0,0 +1,22 @@
+<sect2>
+<title>Introduction to <application>libogg</application></title>
+
+<para>The <application>libogg</application> package contains the Ogg file 
+structure. This is useful for creating (encoding) or playing (decoding) a 
+single physical bitstream.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libogg-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libogg-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libogg-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&libogg-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libogg-time;</para></listitem></itemizedlist>
+</sect3>
+
+
+</sect2>
Index: multimedia/libdriv/libogg/libogg.ent
===================================================================
--- multimedia/libdriv/libogg/libogg.ent	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
+++ multimedia/libdriv/libogg/libogg.ent	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
@@ -0,0 +1,10 @@
+<!ENTITY libogg SYSTEM "../libogg.xml">
+<!ENTITY libogg-intro SYSTEM "libogg-intro.xml">
+<!ENTITY libogg-inst SYSTEM "libogg-inst.xml">
+<!ENTITY libogg-desc SYSTEM "libogg-desc.xml">
+<!ENTITY libogg-version "1.0">
+<!ENTITY libogg-download-http "http://fatpipe.vorbis.com/files/1.0/unix/libogg-&libogg-version;.tar.gz">
+<!ENTITY libogg-download-ftp "ftp://ftp.yars.free.net/pub/software/unix/util/sound/ogg/libogg-&libogg-version;.tar.gz">
+<!ENTITY libogg-size "224 KB">
+<!ENTITY libogg-buildsize "1.6 MB">
+<!ENTITY libogg-time "0.03 SBU">
Index: multimedia/libdriv/libvorbis/libvorbis-desc.xml
===================================================================
--- multimedia/libdriv/libvorbis/libvorbis-desc.xml	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
+++ multimedia/libdriv/libvorbis/libvorbis-desc.xml	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application>libvorbis</application> package contains
+<filename class="libraryfile">
+libvorbis</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>vorbis libraries</title>
+<para><filename class="libraryfile">libvorbis</filename> libraries provide the functions to read and write 
+sound files.</para></sect3>
+
+
+</sect2>
+
Index: multimedia/libdriv/libvorbis/libvorbis-inst.xml
===================================================================
--- multimedia/libdriv/libvorbis/libvorbis-inst.xml	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
+++ multimedia/libdriv/libvorbis/libvorbis-inst.xml	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
@@ -0,0 +1,22 @@
+<sect2>
+<title>Installation of <application>libvorbis</application></title>
+
+<para>Install <application>libvorbis</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+<para><application>libvorbis</application> is known to cause compiler errors 
+on certain machines. If you get errors, try these commands to install libvorbis:
+</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+cd lib &amp;&amp;
+cp Makefile Makefile.bak &amp;&amp;
+sed s/-mno-ieee-fp// Makefile.bak > Makefile &amp;&amp;
+cd .. &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: multimedia/libdriv/libvorbis/libvorbis-intro.xml
===================================================================
--- multimedia/libdriv/libvorbis/libvorbis-intro.xml	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
+++ multimedia/libdriv/libvorbis/libvorbis-intro.xml	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
@@ -0,0 +1,26 @@
+<sect2>
+<title>Introduction to <application>libvorbis</application></title>
+
+<para>The <application>libvorbis</application> package contains a general 
+purpose audio and music encoding format. This is useful for creating (encoding) 
+and playing (decoding) sound in an open (patent free) format.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libvorbis-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libvorbis-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libvorbis-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&libvorbis-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libvorbis-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>libvorbis</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="libogg"/></para></sect4>
+</sect3>
+
+</sect2>
Index: multimedia/libdriv/libvorbis/libvorbis.ent
===================================================================
--- multimedia/libdriv/libvorbis/libvorbis.ent	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
+++ multimedia/libdriv/libvorbis/libvorbis.ent	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
@@ -0,0 +1,10 @@
+<!ENTITY libvorbis SYSTEM "../libvorbis.xml">
+<!ENTITY libvorbis-intro SYSTEM "libvorbis-intro.xml">
+<!ENTITY libvorbis-inst SYSTEM "libvorbis-inst.xml">
+<!ENTITY libvorbis-desc SYSTEM "libvorbis-desc.xml">
+<!ENTITY libvorbis-version "1.0">
+<!ENTITY libvorbis-download-http "http://fatpipe.vorbis.com/files/1.0/unix/libvorbis-&libvorbis-version;.tar.gz">
+<!ENTITY libvorbis-download-ftp "ftp://ftp.yars.free.net/pub/software/unix/util/sound/ogg/libvorbis-&libvorbis-version;.tar.gz">
+<!ENTITY libvorbis-size "736 KB">
+<!ENTITY libvorbis-buildsize "24 MB">
+<!ENTITY libvorbis-time "0.57 SBU">
Index: multimedia/multimedia.ent
===================================================================
--- multimedia/multimedia.ent	(revision c38707f017cc195dae3f13262d6f991bcceecf68)
+++ multimedia/multimedia.ent	(revision e6e27f8aba83698d32203dbc74876c449d9fa297)
@@ -10,5 +10,6 @@
 <!ENTITY % sdl SYSTEM "libdriv/sdl/sdl.ent">
 <!ENTITY % libao SYSTEM "libdriv/libao/libao.ent">
-<!ENTITY % ogg SYSTEM "libdriv/ogg/ogg.ent">
+<!ENTITY % libogg SYSTEM "libdriv/libogg/libogg.ent">
+<!ENTITY % libvorbis SYSTEM "libdriv/libvorbis/libvorbis.ent">
 <!ENTITY % nas SYSTEM "libdriv/nas/nas.ent">
 <!ENTITY % libmpeg3 SYSTEM "libdriv/libmpeg3/libmpeg3.ent">
@@ -29,5 +30,6 @@
 %sdl;
 %libao;
-%ogg;
+%libogg;
+%libvorbis;
 %nas;
 %libmpeg3;
