fix all patches to use -patch-version entities and remove hard-coding of patch versions. sorry to timothy for breaking his run of changelog entries\!

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

24 files changed, 29 insertions, 17 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 81db9a072..bf64c7fce 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -46,6 +46,10 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>July 2nd, 2002 [markh]: Internal change - Made all
+patches use a &amp;package-patch-version; entity and removed all
+hardcoding of patch versions.</para></listitem>
+
 <listitem><para>June 30th, 2002 [timothy]: Updated to man-pages-1.51 and
 automake-1.6.2</para></listitem>
 
diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml
index 9f0c94a52..89deed1f9 100644
--- a/chapter05/fileutils-inst.xml
+++ b/chapter05/fileutils-inst.xml
@@ -21,7 +21,7 @@ machines, run the following command. Do <emphasis>not</emphasis>
 attempt this fix if you don't have Glibc-2.2.3 installed. It will more 
 than likely result in all kinds of compile time problems.</para>
 
-<para><screen><userinput>patch -Np1 -i ../fileutils-&fileutils-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../fileutils-&fileutils-patch-version;.patch</userinput></screen></para>
 
 <para>Install Fileutils by running the following commands:</para>
 
diff --git a/chapter05/findutils-exp.xml b/chapter05/findutils-exp.xml
index d7eba25bb..174cf2db7 100644
--- a/chapter05/findutils-exp.xml
+++ b/chapter05/findutils-exp.xml
@@ -1,7 +1,7 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>patch -Np1 -i ../findutils-4.1.patch</userinput>: This 
+<para><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch</userinput>: This 
 patch is to fix some compilation errors by
 avoiding a variable conflict and changing some bad syntax.</para>
 
diff --git a/chapter05/findutils-inst.xml b/chapter05/findutils-inst.xml
index f79ad3a88..2247dedf1 100644
--- a/chapter05/findutils-inst.xml
+++ b/chapter05/findutils-inst.xml
@@ -7,7 +7,7 @@ commands.</para>
 
 <para>Install Findutils by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../findutils-4.1.patch &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch &amp;&amp;
 CPPFLAGS=-Dre_max_failures=re_max_failures2 \
 ./configure --prefix=$LFS/static &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
diff --git a/chapter05/tar-inst.xml b/chapter05/tar-inst.xml
index bec453e4a..ec0e9a671 100644
--- a/chapter05/tar-inst.xml
+++ b/chapter05/tar-inst.xml
@@ -8,7 +8,7 @@ for gzip files).</para>
 
 <para>Apply the patch by running the following command:</para>
 
-<para><screen><userinput>patch -Np1 -i ../tar-1.13.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../tar-&tar-patch-version;.patch</userinput></screen></para>
 
 <para>Install Tar by running the following commands:</para>
 
diff --git a/chapter06/ed-inst.xml b/chapter06/ed-inst.xml
index 38ca3d528..4ffb7407f 100644
--- a/chapter06/ed-inst.xml
+++ b/chapter06/ed-inst.xml
@@ -12,7 +12,7 @@ days.</para>
 
 <para>Install Ed by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../ed-&ed-version;.patch &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../ed-&ed-patch-version;.patch &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
diff --git a/chapter06/findutils-exp.xml b/chapter06/findutils-exp.xml
index d7eba25bb..174cf2db7 100644
--- a/chapter06/findutils-exp.xml
+++ b/chapter06/findutils-exp.xml
@@ -1,7 +1,7 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>patch -Np1 -i ../findutils-4.1.patch</userinput>: This 
+<para><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch</userinput>: This 
 patch is to fix some compilation errors by
 avoiding a variable conflict and changing some bad syntax.</para>
 
diff --git a/chapter06/findutils-inst.xml b/chapter06/findutils-inst.xml
index b8c48bdf0..b32686595 100644
--- a/chapter06/findutils-inst.xml
+++ b/chapter06/findutils-inst.xml
@@ -7,7 +7,7 @@ commands.</para>
 
 <para>Install Findutils by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-version;.patch &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
 make libexecdir=/usr/bin &amp;&amp;
 make libexecdir=/usr/bin install</userinput></screen></para>
@@ -21,7 +21,7 @@ If you would rather be FHS compliant, you may wish to use another
 location.  The following commands use the database file 
 <filename>/var/lib/misc/locatedb</filename> which is FHS compliant.</para>
 
-<para><screen><userinput>patch -Np1 -i ../findutils-4.1.patch &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
 make localstatedir=/var/lib/misc libexecdir=/usr/bin &amp;&amp;
 make localstatedir=/var/lib/misc libexecdir=/usr/bin install</userinput></screen></para>
diff --git a/chapter06/gawk-exp.xml b/chapter06/gawk-exp.xml
index f76aa456c..47da69290 100644
--- a/chapter06/gawk-exp.xml
+++ b/chapter06/gawk-exp.xml
@@ -1,7 +1,7 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>patch -Np1 -i ../gawk-&gawk-version;.patch:</userinput> This
+<para><userinput>patch -Np1 -i ../gawk-&gawk-patch-version;.patch:</userinput> This
 patch alters the code that determines the location of the
 <filename class="directory">libexec</filename> directory. This patch will
 allow us to override it by passing <emphasis>--libexecdir</emphasis> to the
diff --git a/chapter06/gawk-inst.xml b/chapter06/gawk-inst.xml
index f480e1ea4..29c1b421f 100644
--- a/chapter06/gawk-inst.xml
+++ b/chapter06/gawk-inst.xml
@@ -17,7 +17,7 @@ class="directory">/usr/bin</filename> it'll run <userinput>rm -rf
 
 <para>Install Gawk by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../gawk-&gawk-version;.patch &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../gawk-&gawk-patch-version;.patch &amp;&amp;
 ./configure --prefix=/usr --libexecdir=/usr/bin &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
diff --git a/chapter06/glibc-exp.xml b/chapter06/glibc-exp.xml
index c3e474308..9c40d702e 100644
--- a/chapter06/glibc-exp.xml
+++ b/chapter06/glibc-exp.xml
@@ -1,7 +1,7 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>patch -Np1 -i ../glibc-&glibc-version;.patch:</userinput>
+<para><userinput>patch -Np1 -i ../glibc-&glibc-patch-version;.patch:</userinput>
 This patch converts all occurances of <filename>$(PERL)</filename> to
 <filename>/usr/bin/perl</filename> in the
 <filename>malloc/Makefile</filename> file. This is done because Glibc can't
diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml
index 31b7bda77..caaacb802 100644
--- a/chapter06/glibc-inst.xml
+++ b/chapter06/glibc-inst.xml
@@ -26,7 +26,7 @@ is putting your system at very high risk.</para>
 
 <para>Install Glibc by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../glibc-&glibc-version;.patch &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../glibc-&glibc-patch-version;.patch &amp;&amp;
 touch /etc/ld.so.conf &amp;&amp;
 mkdir ../glibc-build &amp;&amp;
 cd ../glibc-build &amp;&amp;
diff --git a/chapter06/perl-exp.xml b/chapter06/perl-exp.xml
index 01b4140c7..c41ccb921 100644
--- a/chapter06/perl-exp.xml
+++ b/chapter06/perl-exp.xml
@@ -1,7 +1,7 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>patch -Np1 -i ../perl-&perl-version;.patch:</userinput> This
+<para><userinput>patch -Np1 -i ../perl-&perl-patch-version;.patch:</userinput> This
 patch fixes a compile problem with GCC-3.1.</para>
 
 </sect2>
diff --git a/chapter06/perl-inst.xml b/chapter06/perl-inst.xml
index c14b4ef0e..bac124b7c 100644
--- a/chapter06/perl-inst.xml
+++ b/chapter06/perl-inst.xml
@@ -7,7 +7,7 @@ commands.</para>
 
 <para>Install Perl by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../perl-&perl-version;.patch &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../perl-&perl-patch-version;.patch &amp;&amp;
 ./configure.gnu --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
diff --git a/chapter06/tar-inst.xml b/chapter06/tar-inst.xml
index 665e69de7..07ab9fb4b 100644
--- a/chapter06/tar-inst.xml
+++ b/chapter06/tar-inst.xml
@@ -9,7 +9,7 @@ for gzip files).</para>
  
 <para>Apply the patch by running the following command:</para>
 
-<para><screen><userinput>patch -Np1 -i ../tar-1.13.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../tar-&tar-patch-version;.patch</userinput></screen></para>
 
 <para>Install Tar by running the following commands:</para>
 
diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml
index 5514109b4..26f5ecc12 100644
--- a/chapter06/vim-inst.xml
+++ b/chapter06/vim-inst.xml
@@ -13,7 +13,7 @@ Currently there are hints for Emacs, joe, and nano.</para>
 
 <para>Install Vim by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../vim-&vim-version;.patch &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../vim-&vim-patch-version;.patch &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
 make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &amp;&amp;
 make install &amp;&amp;
@@ -35,7 +35,7 @@ for their temporary state files, like temporary save files for example.
 If you wish vim to conform to the FHS, you should use this command set 
 instead of the one presented above:</para>
 
-<para><screen><userinput>patch -Np1 -i ../vim-&vim-version;.patch &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../vim-&vim-patch-version;.patch &amp;&amp;
 ./configure --prefix=/usr --localstatedir=/var/lib/vim &amp;&amp;
 make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &amp;&amp;
 make install &amp;&amp;
diff --git a/entities/ed.ent b/entities/ed.ent
index 97d52e679..c9a088754 100644
--- a/entities/ed.ent
+++ b/entities/ed.ent
@@ -15,6 +15,7 @@
 <!ENTITY ed-contversion "0.2">
 <!ENTITY ed-size "158 KB">
 <!ENTITY ed-patch-size "1 KB">
+<!ENTITY ed-patch-version "0.2">
 <!ENTITY ed-dir "ed-&ed-version;">
 <!ENTITY ed-package "ed-&ed-version;.tar.bz2">
 
diff --git a/entities/fileutils.ent b/entities/fileutils.ent
index 3b8ef7336..58a0a4f37 100644
--- a/entities/fileutils.ent
+++ b/entities/fileutils.ent
@@ -18,6 +18,7 @@
 <!ENTITY fileutils-contversion "4.1">
 <!ENTITY fileutils-size "1,217 KB">
 <!ENTITY fileutils-patch-size "1 KB">
+<!ENTITY fileutils-patch-version "4.1">
 <!ENTITY fileutils-package "fileutils-&fileutils-version;.tar.bz2">
 <!ENTITY fileutils-dir "fileutils-&fileutils-version;">
 
diff --git a/entities/findutils.ent b/entities/findutils.ent
index 86955f245..d8319de4c 100644
--- a/entities/findutils.ent
+++ b/entities/findutils.ent
@@ -19,6 +19,7 @@
 <!ENTITY findutils-contversion "4.1">
 <!ENTITY findutils-size "226 KB">
 <!ENTITY findutils-patch-size "1 KB">
+<!ENTITY findutils-patch-version "4.1">
 <!ENTITY findutils-dir "findutils-&findutils-version;">
 <!ENTITY findutils-package "findutils-&findutils-version;.tar.bz2">
 
diff --git a/entities/gawk.ent b/entities/gawk.ent
index 470a27006..cb9f10b42 100644
--- a/entities/gawk.ent
+++ b/entities/gawk.ent
@@ -18,6 +18,7 @@
 <!ENTITY gawk-contversion "3.1.1">
 <!ENTITY gawk-size "1,420 KB">
 <!ENTITY gawk-patch-size "1 KB">
+<!ENTITY gawk-patch-version "3.1.1">
 <!ENTITY gawk-dir "gawk-&gawk-version;">
 <!ENTITY gawk-package "gawk&gawk-version;.tar.bz2">
 
diff --git a/entities/glibc.ent b/entities/glibc.ent
index b2243ef16..0b15eb6ce 100644
--- a/entities/glibc.ent
+++ b/entities/glibc.ent
@@ -18,6 +18,7 @@
 <!ENTITY glibc-size "12,114 KB">
 <!ENTITY glibc-threads-size "164 KB">
 <!ENTITY glibc-patch-size "1 KB">
+<!ENTITY glibc-patch-version "2.2.5">
 <!ENTITY glibc-dir "glibc-&glibc-version;">
 <!ENTITY glibc-threads-dir "linuxthreads, linuxthreads_db">
 <!ENTITY glibc-package "glibc-&glibc-version;.tar.bz2">
diff --git a/entities/perl.ent b/entities/perl.ent
index 44b5a9835..ac1e633e0 100644
--- a/entities/perl.ent
+++ b/entities/perl.ent
@@ -15,6 +15,7 @@
 <!ENTITY perl-contversion "5.6.1">
 <!ENTITY perl-size "4,750 KB">
 <!ENTITY perl-patch-size "4 KB">
+<!ENTITY perl-patch-version "5.6.1">
 <!ENTITY perl-dir "perl-&perl-version;">
 <!ENTITY perl-package "perl-&perl-version;.tar.bz2">
 
diff --git a/entities/tar.ent b/entities/tar.ent
index 4dc14afab..5d98a7b0c 100644
--- a/entities/tar.ent
+++ b/entities/tar.ent
@@ -16,6 +16,7 @@
 <!ENTITY tar-contversion "1.13">
 <!ENTITY tar-size "730 KB">
 <!ENTITY tar-patch-size "1 KB">
+<!ENTITY tar-patch-version "1.13">
 <!ENTITY tar-package "tar-&tar-version;.tar.bz2">
 <!ENTITY tar-dir "tar-&tar-version;">
 
diff --git a/entities/vim.ent b/entities/vim.ent
index a11ca628a..657243126 100644
--- a/entities/vim.ent
+++ b/entities/vim.ent
@@ -16,6 +16,7 @@
 <!ENTITY vim-contversion "6.1">
 <!ENTITY vim-size "2,823 KB">
 <!ENTITY vim-patch-size "1 KB">
+<!ENTITY vim-patch-version "6.1">
 <!ENTITY vim-dir "vim&vim-version;">
 <!ENTITY vim-package "vim-&vim-version;.tar.bz2">