Index: index.xml
===================================================================
--- index.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ index.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "20030914">
-<!ENTITY releasedate "September 14th, 2003">
+<!ENTITY version "20030915">
+<!ENTITY releasedate "September 15th, 2003">
 
 <!ENTITY % book SYSTEM "book/book.ent">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ introduction/welcome/changelog.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -11,4 +11,7 @@
 <itemizedlist>
 
+<listitem><para>September 15th, 2003 [igor]: update to ffmpeg-0.4.7
+and xvid-0.9.2.</para></listitem>
+    
 <listitem><para>September 14th, 2003 [larry]: added patch to SVGAlib for
 gcc-3.3.1 compile error. Bug 346.</para></listitem>
Index: multimedia/libdriv/nas.xml
===================================================================
--- multimedia/libdriv/nas.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ multimedia/libdriv/nas.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -1,5 +1,5 @@
-<sect1 id="nas" xreflabel="nas-&nas-version;">
+<sect1 id="nas" xreflabel="NAS-&nas-version;">
 <?dbhtml filename="nas.html" dir="multimedia"?>
-<title>nas-&nas-version;</title>
+<title>NAS-&nas-version;</title>
 
 &nas-intro;
Index: multimedia/libdriv/nas/nas-config.xml
===================================================================
--- multimedia/libdriv/nas/nas-config.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ multimedia/libdriv/nas/nas-config.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring nas</title>
+<title>Configuring <acronym>NAS</acronym></title>
 
 <sect3><title>Configuration Information</title>
Index: multimedia/libdriv/nas/nas-desc.xml
===================================================================
--- multimedia/libdriv/nas/nas-desc.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ multimedia/libdriv/nas/nas-desc.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The nas package contains <application>nas</application> utils, headers and libraries.</para>
+<para>The <acronym>NAS</acronym> package contains <acronym>NAS</acronym> utils, headers and libraries.</para>
 
 </sect2>
Index: multimedia/libdriv/nas/nas-exp.xml
===================================================================
--- multimedia/libdriv/nas/nas-exp.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ multimedia/libdriv/nas/nas-exp.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -2,10 +2,11 @@
 <title>Command explanations</title>
 
-<para><userinput>xmkmf...</userinput> : Compile using the standard way
+<para><command>xmkmf...</command> : Compile using the standard way
 for compiling X based apps.</para>
 
-<para><userinput>make INCROOT=...</userinput> : Install with
-<filename>/usr</filename> prefix
-instead of the default <filename>/usr/X11R6</filename>. Also install man pages.</para>
+<para><command>make INCROOT=...</command> : Install with
+<filename class="directory">/usr</filename> prefix
+instead of the default <filename class="directory">/usr/X11R6</filename>. 
+Also install man pages.</para>
 
 </sect2>
Index: multimedia/libdriv/nas/nas-inst.xml
===================================================================
--- multimedia/libdriv/nas/nas-inst.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ multimedia/libdriv/nas/nas-inst.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -1,8 +1,8 @@
 <sect2>
-<title>Installation of nas</title>
+<title>Installation of <application><acronym>NAS</acronym></application></title>
 
-<para>Install nas by running the following commands:</para>
+<para>Install <application><acronym>NAS</acronym></application> by running the following commands:</para>
 
-<para><screen><userinput>xmkmf &amp;&amp;
+<screen><userinput><command>xmkmf &amp;&amp;
 make Makefiles &amp;&amp;
 make includes &amp;&amp;
@@ -12,5 +12,5 @@
 MANPATH=/usr/share/man BINDIR=/usr/bin \
 LIBDIR=/usr/lib CONFIGDIR=/usr/X11R6/lib/X11/config \
-install install.man</userinput></screen></para>
+install install.man</command></userinput></screen>
 
 </sect2>
Index: multimedia/libdriv/nas/nas-intro.xml
===================================================================
--- multimedia/libdriv/nas/nas-intro.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ multimedia/libdriv/nas/nas-intro.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -1,10 +1,4 @@
 <sect2>
-<title>Introduction to nas</title>
-
-<screen>Download location (HTTP):       <ulink url="&nas-download-http;"/>
-Download location (FTP):        <ulink url="&nas-download-ftp;"/>
-Version used:                   &nas-version;
-Package size:                   &nas-size;
-Estimated Disk space required:  &nas-buildsize;</screen>
+<title>Introduction to <application><acronym>NAS</acronym></application></title>
 
 <para>The Network Audio System is a network transparent, client/server audio
@@ -12,5 +6,12 @@
 server.</para>
 
-<para>Download the nas patch from <ulink url="&hfile-root;"/>.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&nas-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&nas-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &nas-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &nas-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &nas-time;</para></listitem></itemizedlist>
+</sect3>
 
 </sect2>
Index: multimedia/libdriv/nas/nas.ent
===================================================================
--- multimedia/libdriv/nas/nas.ent	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ multimedia/libdriv/nas/nas.ent	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -5,7 +5,8 @@
 <!ENTITY nas-exp SYSTEM "nas-exp.xml">
 <!ENTITY nas-config SYSTEM "nas-config.xml">
-<!ENTITY nas-buildsize "12 MB">
+<!ENTITY nas-buildsize "13 MB">
 <!ENTITY nas-version "1.6">
 <!ENTITY nas-download-http "http://radscan.com/nas/nas-&nas-version;.src.tar.gz">
 <!ENTITY nas-download-ftp "">
-<!ENTITY nas-size "2 MB">
+<!ENTITY nas-size "1.0 MB">
+<!ENTITY nas-time "0.30 SBU">
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ multimedia/videoutils/ffmpeg.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -5,4 +5,5 @@
 &ffmpeg-intro;
 &ffmpeg-inst;
+&ffmpeg-exp;
 &ffmpeg-config;
 &ffmpeg-desc;
Index: multimedia/videoutils/ffmpeg/ffmpeg-config.xml
===================================================================
--- multimedia/videoutils/ffmpeg/ffmpeg-config.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ multimedia/videoutils/ffmpeg/ffmpeg-config.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -6,6 +6,6 @@
 <para><filename>~/.ffmpeg/ffserver-config</filename></para>
 
-<para>You'll find a sample ffserver configuration file 
-<ulink url="http://ffmpeg.sourceforge.net/sample.html">here</ulink></para>
+<para>You'll find a sample ffserver configuration file at
+<ulink url="http://ffmpeg.sourceforge.net/sample.html"/></para>
 
 </sect3>
Index: multimedia/videoutils/ffmpeg/ffmpeg-desc.xml
===================================================================
--- multimedia/videoutils/ffmpeg/ffmpeg-desc.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ multimedia/videoutils/ffmpeg/ffmpeg-desc.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -2,8 +2,8 @@
 <title>Contents</title>
 
-<para>The ffmpeg package contains <userinput>ffmpeg</userinput>,
-<userinput>ffserver</userinput>, <filename>libavcodec</filename>
-libraries and 
-<filename>libavformat</filename> libraries.</para>
+<para>The ffmpeg package contains <command>ffmpeg</command>,
+<command>ffserver</command>, <command>ffplay</command>, <filename
+class="libraryfile">libavcodec</filename> and 
+<filename class="libraryfile">libavformat</filename>.</para>
 
 </sect2>
@@ -12,13 +12,20 @@
 
 <sect3><title>ffmpeg</title>
-<para>ffmpeg is a command line tool to convert video files, network streams,
+<para><command>ffmpeg</command> is a command line tool to convert video files, network streams,
 input from a TV card to several video formats.</para></sect3>
 
 <sect3><title>ffserver</title>
-<para>ffserver is a streaming server for everything that ffmpeg could use
+<para><command>ffserver</command> is a streaming server for everything
+that <command>ffmpeg</command> could use
 as input (files, streams, TV card input, webcam, etc.).</para></sect3>
 
+<sect3><title>ffplay</title>
+<para><command>ffplay</command> is a very simple and portable media 
+player using the ffmpeg libraries and the <acronym>SDL</acronym> library.
+</para></sect3>
+
 <sect3><title>libavcodec/libavformat</title>
-<para>libavcodec and libavformats are libraries for encoding/decoding
+<para><filename class="libraryfile">libavcodec</filename> and <filename
+class="libraryfile">libavformats</filename> are libraries for encoding/decoding
 video streams and putting them into files or network packets. Since
 they're well documented, you can easily include them in your software,
@@ -26,3 +33,2 @@
 
 </sect2>
-
Index: multimedia/videoutils/ffmpeg/ffmpeg-exp.xml
===================================================================
--- multimedia/videoutils/ffmpeg/ffmpeg-exp.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
+++ multimedia/videoutils/ffmpeg/ffmpeg-exp.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><command>--enable-shared</command> : This switch is needed to
+build <filename class="libraryfile">libavcodec</filename> and <filename
+class="libraryfile">libavformat</filename> shared libraries.</para>
+
+</sect2>
Index: multimedia/videoutils/ffmpeg/ffmpeg-inst.xml
===================================================================
--- multimedia/videoutils/ffmpeg/ffmpeg-inst.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ multimedia/videoutils/ffmpeg/ffmpeg-inst.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -1,13 +1,13 @@
 <sect2>
-<title>Installation of ffmpeg</title>
+<title>Installation of <application>ffmpeg</application></title>
 
-<para>Install ffmpeg by running the following commands:</para>
+<para>Install <application>ffmpeg</application> by running the following commands:</para>
 
 <note><para>The package maintaners recommend compiling without any
 optimizations.</para></note>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --enable-shared &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: multimedia/videoutils/ffmpeg/ffmpeg-intro.xml
===================================================================
--- multimedia/videoutils/ffmpeg/ffmpeg-intro.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ multimedia/videoutils/ffmpeg/ffmpeg-intro.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -1,17 +1,24 @@
 <sect2>
-<title>Introduction to ffmpeg</title>
+<title>Introduction to <application>ffmpeg</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&ffmpeg-download-http;"/>
-Download location (FTP):        <ulink url="&ffmpeg-download-ftp;"/>
-Version used:                   &ffmpeg-version;
-Package size:                   &ffmpeg-size;
-Estimated Disk space required:  &ffmpeg-buildsize;
-Estimated build time            &ffmpeg-time;</screen>
+<para><application>ffmpeg</application> is a solution to record, convert and stream audio and
+video. Due to heavy development, not all of this functions will work.</para>
 
-<para>ffmpeg is a solution to record, convert and stream audio and
-video. Due to heavy development, not all of this functions will work.  </para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&ffmpeg-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&ffmpeg-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &ffmpeg-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &ffmpeg-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &ffmpeg-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>ffmpeg will utilize:
-<xref linkend="libvorbis"/>, <xref linkend="lame"/> and Imlib2</screen>
+<sect3><title><application>ffmpeg</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="libvorbis"/>, <xref linkend="lame"/>, <xref
+linkend="imlib2"/>, <xref linkend="SDL"/> and <xref
+linkend="freetype2"/>
+</para></sect4>
+</sect3>
 
 </sect2>
Index: multimedia/videoutils/ffmpeg/ffmpeg.ent
===================================================================
--- multimedia/videoutils/ffmpeg/ffmpeg.ent	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ multimedia/videoutils/ffmpeg/ffmpeg.ent	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -5,8 +5,8 @@
 <!ENTITY ffmpeg-desc SYSTEM "ffmpeg-desc.xml">
 <!ENTITY ffmpeg-config SYSTEM "ffmpeg-config.xml">
-<!ENTITY ffmpeg-buildsize "20.6 MB">
-<!ENTITY ffmpeg-version "0.4.6">
+<!ENTITY ffmpeg-buildsize "32 MB">
+<!ENTITY ffmpeg-version "0.4.7">
 <!ENTITY ffmpeg-download-http "http://telia.dl.sourceforge.net/sourceforge/ffmpeg/ffmpeg-&ffmpeg-version;.tar.gz">
 <!ENTITY ffmpeg-download-ftp "">
-<!ENTITY ffmpeg-size "664 KB">
-<!ENTITY ffmpeg-time "3.32 SBU">
+<!ENTITY ffmpeg-size "1.2 MB">
+<!ENTITY ffmpeg-time "1.01 SBU">
Index: pst/printing/cups/cups-exp.xml
===================================================================
--- pst/printing/cups/cups-exp.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ pst/printing/cups/cups-exp.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -7,7 +7,3 @@
 class="directory">/var</filename> and <filename class="directory">/etc/cups</filename>.</para>
 
-<para><command>rm /etc/rc.d/rc*.d/*cups</command> : We want symbolic
-links to <filename>/etc/rc.d/init.d/cups</filename> instead of the initialization scripts
-which <acronym>CUPS</acronym> installs.</para>
-
 </sect2>
Index: pst/printing/cups/cups-inst.xml
===================================================================
--- pst/printing/cups/cups-inst.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ pst/printing/cups/cups-inst.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -8,6 +8,5 @@
 <screen><userinput><command>./configure &amp;&amp;
 make &amp;&amp;
-make install &amp;&amp;
-rm /etc/rc.d/rc*.d/*cups</command></userinput></screen>
+make install &amp;&amp;</command></userinput></screen>
 
 </sect2>
Index: pst/printing/gs/espgs-inst.xml
===================================================================
--- pst/printing/gs/espgs-inst.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ pst/printing/gs/espgs-inst.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -17,10 +17,22 @@
 make install</command></userinput></screen>
 
-<para>To install the shared library <filename>libgs.so</filename>, run
-the following commands additionally:</para>
+<para>To install the shared library <filename>libgs.so</filename> you
+have to build it first. If you unpacked the <acronym>OMNI</acronym> drivers then you
+have to install <xref linkend="GLib"/> and create these symlinks:</para>
+
+<screen><userinput><command>ln -s glib-1.2/glib.h /usr/include/glib.h &amp;&amp;
+ln -s glib-1.2/gmodule.h /usr/include/gmodule.h &amp;&amp;
+ln -s ../lib/glib/include/glibconfig.h /usr/include/glibconfig.h</command></userinput></screen>
+
+<para>Proceed with the following commands:</para>
 
 <screen><userinput><command>patch -Np1 -i ../espgs-7.07.1rc2-gdevpng.patch &amp;&amp;
 make so &amp;&amp;
 make soinstall</command></userinput></screen>
+
+<para>Remove the previously created symlinks since they are not needed
+any longer:</para>
+
+<screen><userinput><command>rm /usr/include/g{lib,module,libconfig}.h</command></userinput></screen>
 
 <note><para>The shared library is only used in external programs like
Index: pst/printing/gs/espgs-intro.xml
===================================================================
--- pst/printing/gs/espgs-intro.xml	(revision d7d440b0a2c2aee680496e31b2835a0c40d1c0f9)
+++ pst/printing/gs/espgs-intro.xml	(revision c5cc8b3246ae3553e38c6f5b5c0a16a9412e1233)
@@ -33,5 +33,5 @@
 </para></listitem>
 <listitem><para>Optional patch: <ulink
-url="http://downloads.linuxfromscratch.org/blfs-patches/espgs-7.07.1rc2-gdevpng.patch"/>
+url="&hfile-root;/espgs-7.07.1rc2-gdevpng.patch"/>
 </para></listitem>
 </itemizedlist></sect3>
@@ -41,8 +41,8 @@
 <sect4><title>Optional</title>
 <para><xref linkend="cups"/>, <xref linkend="libjpeg"/>, <xref
-linkend="libpng"/>, <xref linkend="xfree86"/> and <xref linkend="gimp"/>
+linkend="libpng"/>, <xref linkend="xfree86"/>, <xref
+linkend="GLib"/> and <xref linkend="gimp"/>
 </para></sect4>
 </sect3>
 
-
 </sect2>
