added man patch to replace sed, and added gcc-3.2-nofixincludes.patch

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2142 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

10 files changed, 36 insertions, 11 deletions

diff --git a/appendixa/man-down.xml b/appendixa/man-down.xml
index 091d0b142..47916e03a 100644
--- a/appendixa/man-down.xml
+++ b/appendixa/man-down.xml
@@ -2,5 +2,9 @@
 <title>Official Download Location</title>
 
 <para><literallayout>Man (&man-version;): 
-<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/"/></literallayout></para>
+<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/"/>
+
+Man Patch (&man-patch-version;):
+<ulink url="&ftp;/"/>
+<ulink url="&http;/"/></literallayout></para>
 </sect2>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 32a4f72d0..1b9fa7e59 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,9 +40,11 @@
 <listitem><para>fileutils-4.1.patch</para></listitem>
 <listitem><para>gawk-3.1.1-2.patch</para></listitem>
 <listitem><para>gcc-3.2.patch</para></listitem>
+<listitem><para>gcc-3.2-nofixincludes.patch</para></listitem>
 <listitem><para>glibc-2.2.5-2.patch</para></listitem>
 <listitem><para>gzip-1.2.4b.patch</para></listitem>
 <listitem><para>kbd-1.06-3.patch</para></listitem>
+<listitem><para>man-1.5k.patch</para></listitem>
 <listitem><para>ncurses-5.2.patch</para></listitem>
 <listitem><para>procps-2.0.7.patch</para></listitem>
 <listitem><para>sh-utils-2.0-hostname.patch</para></listitem>
@@ -59,6 +61,14 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>September 28th, 2002 [gerard]: Chapter 05 - GCC: Added the
+nofixincludes patch to prevent that script from running in Chapter
+05. It should run in Chapter 06, so we need it to be a seperate
+patch.</para></listitem>
+
+<listitem><para>September 28th, 2002 [gerard]: Chapter 06 - Man: Replaced
+the sed contruction with a regular patch.</para></listitem>
+
 <listitem><para>September 28th, 2002 [gerard]: Chapter 06 - Bzip2: Removed
 the <emphasis>PREFIX=/usr</emphasis> from the
 <userinput>make install</userinput> command because the
diff --git a/chapter04/gcc-patch.xml b/chapter04/gcc-patch.xml
index f93b6248e..b1b7d2779 100644
--- a/chapter04/gcc-patch.xml
+++ b/chapter04/gcc-patch.xml
@@ -1,3 +1,7 @@
 GCC Patch (&gcc-patch-version;) - &gcc-patch-size;:
 <ulink url="&ftp;/gcc-&gcc-patch-version;.patch.bz2"/>
 <ulink url="&http;/gcc-&gcc-patch-version;.patch.bz2"/>
+
+GCC nofixincludes Patch:
+<ulink url="&ftp;/gcc-&gcc-version;-nofixincludes.patch.bz2"/>
+<ulink url="&http;/gcc-&gcc-version;-nofixincludes.patch.bz2"/>
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index 341c5209b..702492849 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -45,6 +45,7 @@
 &c3-make;
 &c3-makedev;
 &c3-man;
+&c3-man-patch;
 &c3-manpages;
 &c3-modutils;
 &c3-ncurses;
diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml
index 6a95c53f3..c64f22f6c 100644
--- a/chapter05/gcc-exp.xml
+++ b/chapter05/gcc-exp.xml
@@ -6,6 +6,9 @@ This patch fixes a few bugs. In particular it contains the "copy fix" and
 "var fix" documented at 
 <ulink url="http://www.zipworld.com.au/~gschafer/lfs-tweaks.html"/>.</para>
 
+<para><userinput>patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch:</userinput>
+This patch prevents the fixincludes script from running.</para>
+
 <para><userinput>--prefix=/static:</userinput> This is NOT a typo. GCC hard
 codes some paths while compiling and so we need to pass /static as the
 prefix during ./configure. We pass the real install prefix during the
diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml
index 63565f160..36662b95d 100644
--- a/chapter05/gcc-inst.xml
+++ b/chapter05/gcc-inst.xml
@@ -15,6 +15,7 @@ been warned.</para>
 <para>Install GCC by running the following commands:</para>
 
 <para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch &amp;&amp;
+patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch &amp;&amp;
 mkdir ../gcc-build &amp;&amp;
 cd ../gcc-build &amp;&amp;
 ../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \
diff --git a/chapter06/man-exp.xml b/chapter06/man-exp.xml
index fc09310b2..b5e88a17a 100644
--- a/chapter06/man-exp.xml
+++ b/chapter06/man-exp.xml
@@ -8,10 +8,12 @@ where a program is found. By appending /usr/bin:/bin to PATH for the
 ./configure command, we make sure that man doesn't use the /static versions
 of our programs.</para>
 
-<para><userinput>sed '/^PAGER/s/-is/-isR/'</userinput>:
-The version of groff we installed supports SGR (Set Graphics Rendition)
-escape sequences. In order for our man pages to display properly, we
-add the R argument to the call for the less pager.</para>
+<para><userinput>patch -Np1 -i ../man-&man-patch-version;.patch:</userinput>
+This patch comments out one of the files in the <filename>man.conf</filename>
+file (MANPATH /usr/man) because it will create redundant results when using
+programs like <userinput>whatis</userinput>. It also adds the
+<emphasis>-R</emphasis> option to the <emphasis>PAGER</emphasis> variable so
+man pages are displayed properly.</para>
 
 </sect2>
 
diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml
index 350228636..ad73cabdb 100644
--- a/chapter06/man-inst.xml
+++ b/chapter06/man-inst.xml
@@ -3,13 +3,10 @@
 
 <para>Run the following commands to install man:</para>
 
-<para><screen><userinput>PATH=$PATH:/usr/bin:/bin \
+<para><screen><userinput>patch -Np1 -i ../man-&man-patch-version;.patch &amp;&amp;
+PATH=$PATH:/usr/bin:/bin \
 &nbsp;&nbsp;&nbsp;&nbsp;./configure -default -confdir=/etc &amp;&amp;
 make &amp;&amp;
-cp src/man.conf{,.backup} &amp;&amp;
-sed -e '/^PAGER/s/-is/-isR/' \
-&nbsp;&nbsp;&nbsp;&nbsp;-e 's%MANPATH[[:space:]]/usr/man%#MANPATH /usr/man%' \
-&nbsp;&nbsp;&nbsp;&nbsp;src/man.conf.backup > src/man.conf &amp;&amp;
 make install</userinput></screen></para>
 
 <para>Note: If you wish to disable SGR escape sequences, you should
diff --git a/entities/man.ent b/entities/man.ent
index 9173794bc..7ffe254ac 100644
--- a/entities/man.ent
+++ b/entities/man.ent
@@ -1,4 +1,5 @@
 <!ENTITY c3-man SYSTEM "../chapter03/man.xml">
+<!ENTITY c3-man-patch SYSTEM "../chapter03/man-patch.xml">
 
 <!ENTITY c6-man SYSTEM "../chapter06/man.xml">
 <!ENTITY c6-man-inst SYSTEM "../chapter06/man-inst.xml">
@@ -13,6 +14,8 @@
 <!ENTITY man-depversion "1.5i2">
 <!ENTITY man-contversion "1.5k">
 <!ENTITY man-size "168 KB">
+<!ENTITY man-patch-version "1.5k">
+<!ENTITY man-patch-size "1 KB">
 <!ENTITY man-dir "man-&man-version;">
 <!ENTITY man-package "man-&man-version;.tar.bz2">
 
diff --git a/index.xml b/index.xml
index fe2537a94..57b3d2f7b 100644
--- a/index.xml
+++ b/index.xml
@@ -15,7 +15,7 @@
 <!ENTITY hints-index "http://hints.linuxfromscratch.org/hints.shtml">
 <!ENTITY blfs-root "http://beyond.linuxfromscratch.org/">
 
-<!ENTITY all-version "cvs-20020912-1602">
+<!ENTITY all-version "cvs-20020928-1704">
 <!ENTITY all-size-kb "105,560 KB">
 <!ENTITY all-size-mb "103.88 MB">