Author: matthew
Date: 2007-12-08 16:45:02 -0700 (Sat, 08 Dec 2007)
New Revision: 8436

Modified:
   trunk/BOOK/chapter01/changelog.xml
   trunk/BOOK/chapter01/whatsnew.xml
   trunk/BOOK/chapter03/patches.xml
   trunk/BOOK/chapter06/man-db.xml
   trunk/BOOK/packages.ent
   trunk/BOOK/patches.ent
Log:
Updated to Man-DB-2.5.0. Fixes #2109.

Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml  2007-12-08 23:44:26 UTC (rev 8435)
+++ trunk/BOOK/chapter01/changelog.xml  2007-12-08 23:45:02 UTC (rev 8436)
@@ -40,6 +40,10 @@
       <para>2007-12-08</para>
       <itemizedlist>
         <listitem>
+          <para>[matthew] - Upgraded to Man-DB-2.5.0. Fixes
+          <ulink url="&lfs-ticket-root;2109">#2109</ulink>.</para>
+        </listitem
+        <listitem>
           <para>[matthew] - Upgraded to Linux-2.6.23.9. Fixes
           <ulink url="&lfs-ticket-root;2106">#2106</ulink>.</para>
         </listitem>

Modified: trunk/BOOK/chapter01/whatsnew.xml
===================================================================
--- trunk/BOOK/chapter01/whatsnew.xml   2007-12-08 23:44:26 UTC (rev 8435)
+++ trunk/BOOK/chapter01/whatsnew.xml   2007-12-08 23:45:02 UTC (rev 8436)
@@ -128,9 +128,9 @@
     <!--<listitem>
       <para>Make &make-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Man-DB &man-db-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Man-pages &man-pages-version;</para>
     </listitem>
@@ -246,6 +246,10 @@
     </listitem>
 
     <listitem>
+      <para>man-db-2.4.4-fixes-1.patch</para>
+    </listitem>
+
+    <listitem>
       <para>readline-5.4-fixes-4.patch</para>
     </listitem>
 

Modified: trunk/BOOK/chapter03/patches.xml
===================================================================
--- trunk/BOOK/chapter03/patches.xml    2007-12-08 23:44:26 UTC (rev 8435)
+++ trunk/BOOK/chapter03/patches.xml    2007-12-08 23:45:02 UTC (rev 8436)
@@ -123,14 +123,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Man-DB Fix Patch - <token>&man-db-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink 
url="&patches-root;&man-db-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&man-db-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Mktemp Tempfile Patch - 
<token>&mktemp-tempfile-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink 
url="&patches-root;&mktemp-tempfile-patch;"/></para>

Modified: trunk/BOOK/chapter06/man-db.xml
===================================================================
--- trunk/BOOK/chapter06/man-db.xml     2007-12-08 23:44:26 UTC (rev 8435)
+++ trunk/BOOK/chapter06/man-db.xml     2007-12-08 23:45:02 UTC (rev 8436)
@@ -41,26 +41,16 @@
   <sect2 role="installation">
     <title>Installation of Man-DB</title>
 
-    <para>Four 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 one changes the location of translated manual pages that 
come
-    with Man-DB, in order for them to be accessible in both traditional and
-    UTF-8 locales:</para>
-
-<screen><userinput remap="pre">mv man/de{_DE.88591,}
-mv man/es{_ES.88591,}
-mv man/it{_IT.88591,}
-mv man/ja{_JP.eucJP,}
-sed -i 's,\*_\*,??,' man/Makefile.in</userinput></screen>
-
-    <para>The second change is a <command>sed</command> substitution to delete
+    <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>
 
 <screen><userinput remap="pre">sed -i -e '\%\t/usr/man%d' -e 
'\%\t/usr/local/man%d' src/man_db.conf.in</userinput></screen>
 
-    <para>The third change accounts for programs that Man-DB should be able
+    <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>
 
 <screen><userinput remap="pre">cat &gt;&gt; include/manconfig.h.in &lt;&lt; 
"EOF"
@@ -79,11 +69,6 @@
     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>Finally, patch the sources to fix output errors if the man page is
-    prematurely aborted by pressing the 'q' key:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i 
../&man-db-fixes-patch;</userinput></screen>
-
     <para>Prepare Man-DB for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr 
--enable-mb-groff --disable-setuid</userinput></screen>

Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent     2007-12-08 23:44:26 UTC (rev 8435)
+++ trunk/BOOK/packages.ent     2007-12-08 23:45:02 UTC (rev 8436)
@@ -333,10 +333,10 @@
 <!ENTITY make-ch6-du "9.6 MB">
 <!ENTITY make-ch6-sbu "0.1 SBU">
 
-<!ENTITY man-db-version "2.4.4">
-<!ENTITY man-db-size "877 KB">
+<!ENTITY man-db-version "2.5.0">
+<!ENTITY man-db-size "955 KB">
 <!ENTITY man-db-url 
"http://savannah.nongnu.org/download/man-db/man-db-&man-db-version;.tar.gz";>
-<!ENTITY man-db-md5 "9d7952de1aeb9121497a8204c59c56d7">
+<!ENTITY man-db-md5 "c23b59726cebe0e0820ced2becf5f52d">
 <!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">

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent      2007-12-08 23:44:26 UTC (rev 8435)
+++ trunk/BOOK/patches.ent      2007-12-08 23:45:02 UTC (rev 8436)
@@ -62,10 +62,6 @@
 <!ENTITY kbd-gcc4_fixes-patch-size "1.4 KB">
 
 
-<!ENTITY man-db-fixes-patch "man-db-&man-db-version;-fixes-1.patch">
-<!ENTITY man-db-fixes-patch-md5 "f75b3c44bb801778cf188b87454ff9c1">
-<!ENTITY man-db-fixes-patch-size "2.0 KB">
-
 <!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-3.patch">
 <!ENTITY mktemp-tempfile-patch-md5 "65d73faabe3f637ad79853b460d30a19">
 <!ENTITY mktemp-tempfile-patch-size "3.5 KB">

-- 
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page

Reply via email to