man patch --> sed

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

Attic/appendixc/man-patch.xml

@@ -1,4 +0,0 @@
-Man Patch (&man-version;):
-<ulink url="&ftp;/">&ftp;/</ulink>
-<ulink url="&http;/">&http;/</ulink>
-

Attic/appendixc/packages.xml

@@ -39,7 +39,6 @@ package quicker.</para>
 &ac-less;
 &ac-groff;
 &ac-man;
-&ac-man-patch;
 &ac-perl;
 &ac-m4;
 &ac-autoconf;

chapter01/changelog.xml

@@ -27,6 +27,8 @@
 
 </para></listitem>
 
+<listitem><para>Man patch replaced with sed command.</para></listitem>
+
 <listitem><para>Changed tar patch to use -j for bzip2 files instead of
 -y in order to be compatible with next tar release.  Also renamed patch
 file to tar-1.13.patch</para></listitem>

chapter04/man-patch.xml

@@ -1,4 +0,0 @@
-Man Patch (&man-version;) - &man-patch-size;:
-<ulink url="&ftp;/man-&man-version;.patch.bz2">&ftp;/man-&man-version;.patch.bz2</ulink>
-<ulink url="&http;/man-&man-version;.patch.bz2">&http;/man-&man-version;.patch.bz2</ulink>
-

chapter04/packages.xml

@@ -40,7 +40,6 @@
 &c3-less;
 &c3-groff;
 &c3-man;
-&c3-man-patch;
 &c3-perl;
 &c3-m4;
 &c3-autoconf;

chapter06/man-exp.xml

@@ -1,7 +1,7 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>patch -Np1 -i ../man-1.5i2.patch:</userinput> This patch
+<para><userinput>for ... sed ... done:</userinput> This construct
 changes man so that it uses awk instead of gawk which is the default.
 We use this as LFS uses awk instead of gawk.</para>
 

chapter06/man-inst.xml

@@ -1,9 +1,12 @@
 <sect2>
 <title>Installation of Man</title>
 
-<para>Before Man is installed, the man patch file needs to be unpacked.</para>
+<para>Run the following commands to install man:</para>
 
-<para><screen><userinput>patch -Np1 -i ../man-&man-version;.patch &amp;&amp;</userinput>
+<para><screen><userinput>for i in configure src/Makefile.in src/makewhatis.sh</userinput>
+<userinput>do sed s/gawk/awk/g $i &gt; $i.fixed</userinput>
+<userinput>mv $i.fixed $i</userinput>
+<userinput>done</userinput>
 <userinput>./configure -default &amp;&amp;</userinput>
 <userinput>make &amp;&amp;</userinput>
 <userinput>make install</userinput></screen></para>

chapter06/shadowpwd-inst.xml

@@ -4,8 +4,9 @@
 <para>Install the Shadow Password Suite by running the 
 following commands:</para>
 
-<para><screen><userinput>mv src/useradd.c useradd.c.temp &amp;&amp;</userinput>
-<userinput>sed 's/\(.*\) (nflg || \(.*\))\(.*\)/\1\2\3/' useradd.c.temp &gt; src/useradd.c &amp;&amp;</userinput>
+
+<para><screen><userinput>sed 's/\(.*\) (nflg || \(.*\))\(.*\)/\1\2\3/' src/useradd.c &gt; useradd.c.temp &amp;&amp;</userinput>
+<userinput>mv useradd.c.temp src/useradd.c &amp;&amp;</userinput>
 <userinput>./configure --prefix=/usr &amp;&amp;</userinput>
 <userinput>make &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</userinput>

chapter06/sysvinit-inst.xml

@@ -12,9 +12,9 @@ processes started by init the TERM signal".</para>
 
 <para>Install Sysvinit by running the following commands:</para>
 
-<para><screen><userinput>mv src/init.c init.c.temp &amp;&amp;</userinput>
-<userinput>sed 's/\(.*\)\(Sending processes\)\(.*\) \</userinput>
-<userinput>	/\1\2 started by init\3/' init.c.temp &gt; src/init.c &amp;&amp;</userinput>
+<para><screen><userinput>sed 's/\(.*\)\(Sending processes\)\(.*\) \</userinput>
+<userinput>	/\1\2 started by init\3/' src/init.c &gt; init.c.temp &amp;&amp;</userinput>
+<userinput>mv init.c.temp src/init.c &amp;&amp;</userinput>
 <userinput>make -C src &amp;&amp;</userinput>
 <userinput>make -C src install</userinput></screen></para>
 

index.xml

@@ -104,7 +104,6 @@
 <!ENTITY c3-less SYSTEM "chapter3/less.xml">
 <!ENTITY c3-groff SYSTEM "chapter3/groff.xml">
 <!ENTITY c3-man SYSTEM "chapter3/man.xml">
-<!ENTITY c3-man-patch SYSTEM "chapter3/man-patch.xml">
 <!ENTITY c3-perl SYSTEM "chapter3/perl.xml">
 <!ENTITY c3-m4 SYSTEM "chapter3/m4.xml">
 <!ENTITY c3-autoconf SYSTEM "chapter3/autoconf.xml">
@@ -491,7 +490,6 @@
 <!ENTITY ac-less SYSTEM "appendixc/less.xml">
 <!ENTITY ac-groff SYSTEM "appendixc/groff.xml">
 <!ENTITY ac-man SYSTEM "appendixc/man.xml">
-<!ENTITY ac-man-patch SYSTEM "appendixc/man-patch.xml">
 <!ENTITY ac-perl SYSTEM "appendixc/perl.xml">
 <!ENTITY ac-m4 SYSTEM "appendixc/m4.xml">
 <!ENTITY ac-autoconf SYSTEM "appendixc/autoconf.xml">
@@ -705,7 +703,6 @@
 
 <!ENTITY man-version "1.5i2">
 <!ENTITY man-size "158 KB">
-<!ENTITY man-patch-size "1 KB">
 <!ENTITY man-compsize "man MB">
 <!ENTITY man-time "man minutes">