From f2f15e598755465cfaf93b1dec48b2956693c636 Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Thu, 9 Oct 2008 14:21:09 +0000
Subject: Updated Man-DB to 2.5.2

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8610 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  3 +++
 chapter06/man-db.xml    | 37 ++++++++++++++++++++++++++++++++-----
 packages.ent            | 12 ++++++------
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 128928e7f..0770bc366 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,9 @@
     <listitem>
       <para>2008-10-09</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated Man-DB to 2.5.2.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated Iproute to 2.6.26.</para>
         </listitem>
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index ce0ef20bb..bb1fefced 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -41,15 +41,23 @@
   <sect2 role="installation">
     <title>Installation of Man-DB</title>
 
-    <para>Two adjustments need to be made to the sources of Man-DB.</para>
+    <!-- <para>Two adjustments need to be made to the sources of Man-DB.</para> 
 
     <para>The first change is a <command>sed</command> substitution to delete
     the <quote>/usr/man</quote> and <quote>/usr/local/man</quote> lines in
     the <filename>man_db.conf</filename> file to prevent redundant results
+    when using programs such as <command>whatis</command>:</para> -->
+
+    <para>Use a <command>sed</command> substitution to delete
+    the <quote>/usr/man</quote> and <quote>/usr/local/man</quote> lines in
+    the <filename>man_db.conf</filename> file to prevent redundant results
     when using programs such as <command>whatis</command>:</para>
 
 <screen><userinput remap="pre">sed -i -e '\%\t/usr/man%d' -e '\%\t/usr/local/man%d' src/man_db.conf.in</userinput></screen>
 
+    <!-- This is removed and the same thing is done using the configure
+         command, which seems to be the more proper method
+
     <para>The second change accounts for programs that Man-DB should be able
     to find at runtime, but that haven't been installed yet:</para>
 
@@ -69,10 +77,14 @@ EOF</userinput></screen>
     manual pages. They are not part of LFS or BLFS, but you should be able
     to install them yourself after finishing LFS if you wish to do so.</para>
 
+    -->
+
     <para>Prepare Man-DB for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
-    --disable-setuid</userinput></screen>
+    --disable-setuid --with-browser=/usr/bin/lynx \
+    --with-col=/usr/bin/col --with-vgrind=/usr/bin/vgrind \
+    --with-grap=/usr/bin/grap</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -85,6 +97,21 @@ EOF</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--with-...</parameter></term>
+        <listitem>
+          <para>These four parameters are used to set some default programs.
+          The <command>col</command> program is a part of the Util-linux-ng
+          package, <command>lynx</command> is a text-based web browser (see BLFS
+          for installation instructions), <command>vgrind</command> converts
+          program sources to Groff input, and <command>grap</command> is useful
+          for typesetting graphs in Groff documents. The <command>vgrind</command>
+          and <command>grap</command> programs are not normally needed for viewing
+          manual pages. They are not part of LFS or BLFS, but you should be able
+          to install them yourself after finishing LFS if you wish to do so.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>Compile the package:</para>
@@ -318,7 +345,7 @@ make install</userinput></screen>
       <segtitle>Installed programs</segtitle>
 
       <seglistitem>
-        <seg>accessdb, apropos, catman, convert-mans, lexgrog, man, mandb,
+        <seg>apropos, catman, convert-mans, lexgrog, man, mandb,
         manpath, whatis, and zsoelim</seg>
       </seglistitem>
     </segmentedlist>
@@ -328,7 +355,7 @@ make install</userinput></screen>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="accessdb">
+      <!-- <varlistentry id="accessdb">
         <term><command>accessdb</command></term>
         <listitem>
           <para>Dumps the <command>whatis</command> database contents in
@@ -337,7 +364,7 @@ make install</userinput></screen>
             <primary sortas="b-accessdb">accessdb</primary>
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry> -->
 
       <varlistentry id="apropos">
         <term><command>apropos</command></term>
diff --git a/packages.ent b/packages.ent
index 796ffe04b..b1a304faf 100644
--- a/packages.ent
+++ b/packages.ent
@@ -346,13 +346,13 @@
 <!ENTITY make-ch6-du "9.6 MB">
 <!ENTITY make-ch6-sbu "0.1 SBU">
 
-<!ENTITY man-db-version "2.5.1">
-<!ENTITY man-db-size "1,624 KB">
-<!ENTITY man-db-url "http://savannah.nongnu.org/download/man-db/man-db-&man-db-version;.tar.gz">
-<!ENTITY man-db-md5 "e592eefd14679575b776f60c6a48e781">
+<!ENTITY man-db-version "2.5.2">
+<!ENTITY man-db-size "1,772 KB">
+<!ENTITY man-db-url "http://download.savannah.gnu.org/releases/man-db/man-db-&man-db-version;.tar.gz">
+<!ENTITY man-db-md5 "9529aadae273566a170dee4e18aad6c1">
 <!ENTITY man-db-home "http://www.nongnu.org/man-db/">
-<!ENTITY man-db-ch6-du "9 MB">
-<!ENTITY man-db-ch6-sbu "0.2 SBU">
+<!ENTITY man-db-ch6-du "20 MB">
+<!ENTITY man-db-ch6-sbu "0.3 SBU">
 
 <!ENTITY man-pages-version "3.11">
 <!ENTITY man-pages-size "987 KB">
-- 
cgit v1.2.3-54-g00ecf