Index: multimedia/libdriv/audiofile.xml
===================================================================
--- multimedia/libdriv/audiofile.xml	(revision e730427e32b89cae0531e61ec56038d5ee38eb89)
+++ multimedia/libdriv/audiofile.xml	(revision 41d241e6fb2dbda6a28fdc1d4440deeeefc999a9)
@@ -103,18 +103,36 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>. 
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
       Note that the tests will fail if the --disable-static
-      option is used.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
+      option is used and tests are executed before
+      <command>make install</command>. You have three options:
+    </para>
+
+    <para>
+     (a) configure without --disable-static, run the tests, but do not
+     install, then start a fresh build using --disable-static just for
+     installing the package.
+    </para>
+
+    <para>
+     (b) configure with --disable-static, but only run the tests after the
+     package is installed.
+    </para>
+
+    <para>
+     (b) configure with --disable-static, but only run the tests after a
+     DESTDIR install.
+    </para>
 
   </sect2>
Index: multimedia/libdriv/faac.xml
===================================================================
--- multimedia/libdriv/faac.xml	(revision e730427e32b89cae0531e61ec56038d5ee38eb89)
+++ multimedia/libdriv/faac.xml	(revision 41d241e6fb2dbda6a28fdc1d4440deeeefc999a9)
@@ -89,5 +89,7 @@
 
 <screen><userinput>patch -Np1 -i ../faac-&faac-version;-glibc_fixes-1.patch &amp;&amp;
+
 sed -i -e '/obj-type/d' -e '/Long Term/d' frontend/main.c &amp;&amp;
+
 ./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
Index: multimedia/libdriv/faad2.xml
===================================================================
--- multimedia/libdriv/faad2.xml	(revision e730427e32b89cae0531e61ec56038d5ee38eb89)
+++ multimedia/libdriv/faad2.xml	(revision 41d241e6fb2dbda6a28fdc1d4440deeeefc999a9)
@@ -92,7 +92,10 @@
 
 <screen><userinput>patch -Np1 -i ../faad2-&faad2-version;-mp4ff-1.patch &amp;&amp;
+
 sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g" configure.in &amp;&amp;
-sed -i "s:man_MANS:man1_MANS:g" frontend/Makefile.am &amp;&amp;
+sed -i "s:man_MANS:man1_MANS:g" frontend/Makefile.am         &amp;&amp;
+
 autoreconf -fi &amp;&amp;
+
 ./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
Index: multimedia/libdriv/libcanberra.xml
===================================================================
--- multimedia/libdriv/libcanberra.xml	(revision e730427e32b89cae0531e61ec56038d5ee38eb89)
+++ multimedia/libdriv/libcanberra.xml	(revision 41d241e6fb2dbda6a28fdc1d4440deeeefc999a9)
@@ -125,4 +125,12 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para><parameter>--disable-oss</parameter>: disable optional deprecated OSS
+    support</para>
+
+    <para><option>--disable-gtk</option>: disable optional GTK+ 2 support</para>
+
+    <para><option>--disable-gtk3</option>: disable optional GTK+ 3
+    support</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -149,5 +157,5 @@
         <seg>
           /usr/lib/libcanberra-&libcanberra-version;,
-          /usr/share/doc/libcanberra and
+          /usr/share/doc/libcanberra-&libcanberra-version; and
           /usr/share/gtk-doc/html/libcanberra
         </seg>
Index: multimedia/libdriv/libmpeg2.xml
===================================================================
--- multimedia/libdriv/libmpeg2.xml	(revision e730427e32b89cae0531e61ec56038d5ee38eb89)
+++ multimedia/libdriv/libmpeg2.xml	(revision 41d241e6fb2dbda6a28fdc1d4440deeeefc999a9)
@@ -37,5 +37,5 @@
     MPEG-1 video streams.</para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -79,5 +79,8 @@
 
 <screen><userinput>sed -i 's/static const/static/' libmpeg2/idct_mmx.c &amp;&amp;
-./configure --prefix=/usr                           &amp;&amp;
+
+./configure --prefix=/usr    \
+            --enable-shared  \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -89,4 +92,5 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
+
 install -v -m755 -d /usr/share/doc/mpeg2dec-&libmpeg2-version; &amp;&amp;
 install -v -m644 README doc/libmpeg2.txt \
@@ -100,4 +104,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>
 
@@ -112,7 +120,9 @@
       <seglistitem>
         <seg>corrupt_mpeg2, extract_mpeg2 and mpeg2dec</seg>
-        <seg>libmpeg2.{so,a} and libmpeg2convert.{so,a}</seg>
-        <seg>/usr/include/mpeg2dec and
-        /usr/share/doc/mpeg2dec-&libmpeg2-version;</seg>
+        <seg>libmpeg2.so and libmpeg2convert.so</seg>
+        <seg>
+          /usr/include/mpeg2dec and
+          /usr/share/doc/mpeg2dec-&libmpeg2-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: multimedia/libdriv/libogg.xml
===================================================================
--- multimedia/libdriv/libogg.xml	(revision e730427e32b89cae0531e61ec56038d5ee38eb89)
+++ multimedia/libdriv/libogg.xml	(revision 41d241e6fb2dbda6a28fdc1d4440deeeefc999a9)
@@ -69,5 +69,7 @@
     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/libquicktime.xml
===================================================================
--- multimedia/libdriv/libquicktime.xml	(revision e730427e32b89cae0531e61ec56038d5ee38eb89)
+++ multimedia/libdriv/libquicktime.xml	(revision 41d241e6fb2dbda6a28fdc1d4440deeeefc999a9)
@@ -136,4 +136,5 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
+
 install -v -m755 -d /usr/share/doc/libquicktime-&libquicktime-version; &amp;&amp;
 install -v -m644    README doc/{*.txt,*.html,mainpage.incl} \
@@ -151,6 +152,7 @@
 
     <para>
-      <parameter>--without-doxygen</parameter>: This is necessary if you do
-      not have <application>Doxygen</application>, omit this if installed.
+      <parameter>--without-doxygen</parameter>: This is necessary if you do not
+      have <application>Doxygen</application>, omit this if it is installed and
+      you wish the API documentation installed.
     </para>
 
