Index: general.ent
===================================================================
--- general.ent	(revision cc0ba25dad908c943bc211b4d0ef51a467b8be6d)
+++ general.ent	(revision 62e5e8f815e0e15f7abd31dfe5bdcd45080d75c9)
@@ -439,5 +439,5 @@
 <!ENTITY llvm-version                 "3.1">
 <!ENTITY mercurial-version            "2.1.2">
-<!ENTITY NASM-version                 "2.10.01">
+<!ENTITY NASM-version                 "2.10.04">
 <!ENTITY php-version                  "5.4.5">
 <!ENTITY pkgconfig-version            "0.27">
Index: general/graphlib/aalib.xml
===================================================================
--- general/graphlib/aalib.xml	(revision cc0ba25dad908c943bc211b4d0ef51a467b8be6d)
+++ general/graphlib/aalib.xml	(revision 62e5e8f815e0e15f7abd31dfe5bdcd45080d75c9)
@@ -33,5 +33,5 @@
     ASCII Art.</para>
 
-    &lfs70_checked;
+    &lfs72_checked;
  
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,5 +75,8 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --infodir=/usr/share/info \
+            --mandir=/usr/share/man \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
Index: general/prog/nasm.xml
===================================================================
--- general/prog/nasm.xml	(revision cc0ba25dad908c943bc211b4d0ef51a467b8be6d)
+++ general/prog/nasm.xml	(revision 62e5e8f815e0e15f7abd31dfe5bdcd45080d75c9)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY NASM-download-http "http://www.nasm.us/pub/nasm/releasebuilds/&NASM-version;/nasm-&NASM-version;.tar.bz2">
+  <!ENTITY NASM-download-http "http://www.nasm.us/pub/nasm/releasebuilds/&NASM-version;/nasm-&NASM-version;.tar.xz">
   <!ENTITY NASM-download-ftp  " ">
-  <!ENTITY NASM-md5sum        "2e02cb6e90f52950eaaa8cce7a9f2327">
-  <!ENTITY NASM-size          "800 KB">
-  <!ENTITY NASM-buildsize     "19 MB" >
+  <!ENTITY NASM-md5sum        "0a676909137bddfeebff09a9381cceb2">
+  <!ENTITY NASM-size          "668 KB">
+  <!ENTITY NASM-buildsize     "16 MB" >
   <!ENTITY NASM-time          "0.1 SBU">
 ]>
@@ -34,5 +34,5 @@
     disassembler as well.</para>
 
-    &lfs71_checked;
+    &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -62,5 +62,5 @@
       <listitem>
         <para>Optional documentation: <ulink
-        url="http://www.nasm.us/pub/nasm/releasebuilds/&NASM-version;/nasm-&NASM-version;-xdoc.tar.bz2"/></para>
+        url="http://www.nasm.us/pub/nasm/releasebuilds/&NASM-version;/nasm-&NASM-version;-xdoc.tar.xz"/></para>
       </listitem>
     </itemizedlist>
@@ -146,11 +146,8 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>nasm, ndisasm, ldrdf, rdf2bin, rdf2com, rdf2ihx, rdf2ith, rdf2srec,
-        rdfdump, rdflib, and rdx</seg>
-        <seg>None</seg>
+        <seg>nasm and ndisasm</seg>
         <seg>/usr/share/doc/nasm-&NASM-version;</seg>
       </seglistitem>
@@ -181,5 +178,5 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="ldrdf">
         <term><command>ldrdf</command></term>
@@ -230,5 +227,5 @@
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry> -->
 
     </variablelist>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision cc0ba25dad908c943bc211b4d0ef51a467b8be6d)
+++ introduction/welcome/changelog.xml	(revision 62e5e8f815e0e15f7abd31dfe5bdcd45080d75c9)
@@ -97,4 +97,7 @@
           Mobile Broadband Provider Info.</para>
         </listitem>
+        <listitem>
+          <para>[krejzi] - NASM 2.10.04.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: multimedia/libdriv/flac.xml
===================================================================
--- multimedia/libdriv/flac.xml	(revision cc0ba25dad908c943bc211b4d0ef51a467b8be6d)
+++ multimedia/libdriv/flac.xml	(revision 62e5e8f815e0e15f7abd31dfe5bdcd45080d75c9)
@@ -34,5 +34,5 @@
     information.</para>
 
-    &lfs70_checked; <!-- tested on x86_64, nasm not used -->
+    &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -92,5 +92,7 @@
     examples/cpp/encode/file/main.cpp &amp;&amp;
 
-./configure --prefix=/usr --disable-thorough-tests &amp;&amp;
+./configure --prefix=/usr \
+            --mandir=/usr/share/man \
+            --disable-thorough-tests &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/liba52.xml
===================================================================
--- multimedia/libdriv/liba52.xml	(revision cc0ba25dad908c943bc211b4d0ef51a467b8be6d)
+++ multimedia/libdriv/liba52.xml	(revision 62e5e8f815e0e15f7abd31dfe5bdcd45080d75c9)
@@ -35,5 +35,5 @@
     in a variety of applications, including digital television and DVD.</para>
 
-    &lfs71_checked;
+    &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -73,6 +73,9 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --enable-shared --disable-static \
-  CFLAGS="-g -O2 $([ $(uname -m) = x86_64 ] &amp;&amp; echo -fPIC)" &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --mandir=/usr/share/man \
+            --enable-shared \
+            --disable-static \
+           CFLAGS="-g -O2 $([ $(uname -m) = x86_64 ] &amp;&amp; echo -fPIC)" &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/libmad.xml
===================================================================
--- multimedia/libdriv/libmad.xml	(revision cc0ba25dad908c943bc211b4d0ef51a467b8be6d)
+++ multimedia/libdriv/libmad.xml	(revision 62e5e8f815e0e15f7abd31dfe5bdcd45080d75c9)
@@ -33,5 +33,5 @@
     MPEG audio decoder capable of 24-bit output.</para>
 
-    &lfs70_checked;
+    &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
