Bugs 44, 64 and 320

Update to: diffutils-2.8, modutils-2.4.15, vim-6.1
See chapter01/changelog.xml for details of changes to install procedures
(only diffutils and vim instructions were changed; modutils is same)


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

7 files changed, 25 insertions, 47 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5c78004af..447fbb6a4 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -15,6 +15,7 @@
 <listitem><para>binutils-2.12</para></listitem>
 <listitem><para>bison-1.34</para></listitem>
 <listitem><para>bzip2-1.0.2</para></listitem>
+<listitem><para>diffutils-2.8</para></listitem>
 <listitem><para>e2fsprogs-1.27</para></listitem>
 <listitem><para>gawk-3.1.0</para></listitem>
 <listitem><para>gettext-0.11.1</para></listitem>
@@ -24,15 +25,22 @@
 <listitem><para>lilo-22.2</para></listitem>
 <listitem><para>linux-2.4.18</para></listitem>
 <listitem><para>man-pages-1.48</para></listitem>
-<listitem><para>modutils-2.4.14</para></listitem>
+<listitem><para>modutils-2.4.15</para></listitem>
 <listitem><para>reiserfsprogs-3.x.1b</para></listitem>
 <listitem><para>shadow-4.0.3</para></listitem>
 <listitem><para>texinfo-4.1</para></listitem>
 <listitem><para>util-linux-2.11o</para></listitem>
+<listitem><para>vim-6.1</para></listitem>
 </itemizedlist>
 
 </para></listitem>
 
+<listitem><para>March 29th, 2002 [markh]: Chapter 05 and 06 - Updated to
+diffutils-2.8, modutils-2.4.15 and vim-6.1.  Removed PR_PROGRAM setting
+for diffutils as /usr/bin/pr is now detected by the configure script.
+Removed sed to fix problem with shell syntax highlighting in vim as that
+is fixed in the new version.</para></listitem>
+
 <listitem><para>March 26th, 2002 [markh]: Chapter 02 - Asking for help:
 Added reference to ESR's smart-questions document.</para></listitem>
 
diff --git a/chapter05/diffutils-exp.xml b/chapter05/diffutils-exp.xml
index d34805d31..4dc40ea07 100644
--- a/chapter05/diffutils-exp.xml
+++ b/chapter05/diffutils-exp.xml
@@ -9,10 +9,5 @@ before handing the source file to the compiler itself for compilation. This
 package has problems linking statically on systems that run an older
 Glibc version and this construction fixes that problem.</para>
 
-<para><userinput>PR_PROGRAM=/usr/bin/pr:</userinput> When 'diff' is called
-with the '-l' flag, it tries to find 'pr' at the location specified with the
-PR_PROGRAM variable. By default, this variable points to '/bin/pr', but since
-we install 'pr' in /usr/bin, we need to change this.</para>
-
 </sect2>
 
diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml
index f8b9e1521..d0266cf73 100644
--- a/chapter05/diffutils-inst.xml
+++ b/chapter05/diffutils-inst.xml
@@ -10,14 +10,14 @@ use the first version.</para>
 <para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
 ./configure --prefix=$LFS/usr &amp;&amp;
 unset CPPFLAGS &amp;&amp;
-make LDFLAGS=-static PR_PROGRAM=/usr/bin/pr &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 
 <para>If you are using a newer glibc version (2.2.x), you can use the following
 commands to install Diffutils:</para>
 
 <para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;
-make LDFLAGS=-static PR_PROGRAM=/usr/bin/pr &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 
 </sect2>
diff --git a/chapter06/diffutils-inst.xml b/chapter06/diffutils-inst.xml
index b8d1f0646..67f279bd9 100644
--- a/chapter06/diffutils-inst.xml
+++ b/chapter06/diffutils-inst.xml
@@ -4,7 +4,7 @@
 <para>Install Diffutils by running the following commands:</para>
 
 <para><screen><userinput>./configure --prefix=/usr &amp;&amp;
-make PR_PROGRAM=/usr/bin/pr &amp;&amp;
+make &amp;&amp;
 make install</userinput></screen></para>
 
 </sect2>
diff --git a/chapter06/vim-exp.xml b/chapter06/vim-exp.xml
index 9a4167468..62af4675a 100644
--- a/chapter06/vim-exp.xml
+++ b/chapter06/vim-exp.xml
@@ -1,11 +1,6 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>sed '/shUntil\|link shRepeat/{...:</userinput> This sed
-command fixes a bug in the <filename>syntax/sh.vim</filename> file that
-will cause an error message when you edit a shell script using syntax
-highlighting.</para>
-
 <para><userinput>make
 CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\":</userinput> Setting this will
 cause vim to look for the <filename>/etc/vimrc</filename> file that
diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml
index a4a73002d..8bf39c1c3 100644
--- a/chapter06/vim-inst.xml
+++ b/chapter06/vim-inst.xml
@@ -9,17 +9,7 @@ which are currently available are for Emacs, Joe and nano.</para>
 
 <para>Install Vim by running the following commands:</para>
 
-<para><screen><userinput>cp runtime/syntax/sh.vim runtime/syntax/sh.vim.backup &amp;&amp;
-sed '/shUntil\|link shRepeat/{
-&nbsp;&nbsp;&nbsp;/shUntil/N
-&nbsp;&nbsp;&nbsp;/^/i\
-&nbsp;&nbsp;&nbsp;if exists("b:is_kornshell") || exists("b:is_bash")
-&nbsp;&nbsp;&nbsp;p
-&nbsp;&nbsp;&nbsp;/$/i\
-&nbsp;&nbsp;&nbsp;endif
-&nbsp;&nbsp;&nbsp;d
-&nbsp;&nbsp;&nbsp;}' runtime/syntax/sh.vim.backup &gt; runtime/syntax/sh.vim &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
 make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &amp;&amp;
 make install &amp;&amp;
 cd /usr/bin &amp;&amp;
@@ -41,17 +31,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>cp runtime/syntax/sh.vim runtime/syntax/sh.vim.backup &amp;&amp;
-sed '/shUntil\|link shRepeat/{
-&nbsp;&nbsp;&nbsp;/shUntil/N
-&nbsp;&nbsp;&nbsp;/^/i\
-&nbsp;&nbsp;&nbsp;if exists("b:is_kornshell") || exists("b:is_bash")
-&nbsp;&nbsp;&nbsp;p
-&nbsp;&nbsp;&nbsp;/$/i\
-&nbsp;&nbsp;&nbsp;endif
-&nbsp;&nbsp;&nbsp;d
-&nbsp;&nbsp;&nbsp;}' runtime/syntax/sh.vim.backup &gt; runtime/syntax/sh.vim &amp;&amp;
-./configure --prefix=/usr --localstatedir=/var/lib/vim &amp;&amp;
+<para><screen><userinput>./configure --prefix=/usr --localstatedir=/var/lib/vim &amp;&amp;
 make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &amp;&amp;
 make install &amp;&amp;
 cd /usr/bin &amp;&amp;
diff --git a/index.xml b/index.xml
index a68992576..35cfdc263 100644
--- a/index.xml
+++ b/index.xml
@@ -4,8 +4,8 @@
 
 <!ENTITY book SYSTEM "book/book.xml">
 
-<!ENTITY version "20020326">
-<!ENTITY releasedate "March 26th, 2002">
+<!ENTITY version "20020329">
+<!ENTITY releasedate "March 29th, 2002">
 
 <!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
 <!ENTITY http-root "http://ftp.linuxfromscratch.org">
@@ -573,9 +573,9 @@
 <!ENTITY ab-howtoguides SYSTEM "appendixb/howtoguides.xml">
 <!ENTITY ab-other SYSTEM "appendixb/other.xml">
 
-<!ENTITY all-version "cvs-20020314-1628">
-<!ENTITY all-size-kb "86,750 KB">
-<!ENTITY all-size-mb "84.72 MB">
+<!ENTITY all-version "cvs-20020329-1535">
+<!ENTITY all-size-kb "87,260 KB">
+<!ENTITY all-size-mb "85.21 MB">
 
 <!ENTITY bash-version "2.05a">
 <!ENTITY bash-depversion "2.05a">
@@ -610,10 +610,10 @@
 <!ENTITY bzip2-package "bzip2-&bzip2-version;.tar.bz2">
 <!ENTITY bzip2-dir "bzip2-&bzip2-version;">
 
-<!ENTITY diffutils-version "2.7">
+<!ENTITY diffutils-version "2.8">
 <!ENTITY diffutils-depversion "2.7">
 <!ENTITY diffutils-contversion "2.7">
-<!ENTITY diffutils-size "247 KB">
+<!ENTITY diffutils-size "640 KB">
 <!ENTITY diffutils-compsize-static "4 MB">
 <!ENTITY diffutils-time-static "1 minute">
 <!ENTITY diffutils-compsize "2 MB">
@@ -836,10 +836,10 @@
 <!ENTITY ncurses-package "ncurses-&ncurses-version;.tar.bz2">
 <!ENTITY ncurses-dir "ncurses-&ncurses-version;">
 
-<!ENTITY vim-version "6.0">
+<!ENTITY vim-version "6.1">
 <!ENTITY vim-depversion "6.0">
 <!ENTITY vim-contversion "6.0">
-<!ENTITY vim-size "2,711 KB">
+<!ENTITY vim-size "2,890 KB">
 <!ENTITY vim-compsize "15 MB">
 <!ENTITY vim-time "2 minutes">
 <!ENTITY vim-package "vim-&vim-version;.tar.bz2">
@@ -991,10 +991,10 @@
 <!ENTITY lilo-package "lilo-&lilo-version;.tar.bz2">
 <!ENTITY lilo-dir "lilo-&lilo-version;">
 
-<!ENTITY modutils-version "2.4.14">
+<!ENTITY modutils-version "2.4.15">
 <!ENTITY modutils-depversion "2.4.12">
 <!ENTITY modutils-contversion "2.4.12">
-<!ENTITY modutils-size "210 KB">
+<!ENTITY modutils-size "211 KB">
 <!ENTITY modutils-compsize "2 MB">
 <!ENTITY modutils-time "1 minute">
 <!ENTITY modutils-package "modutils-&modutils-version;.tar.bz2">