cvs commit: LFS/BOOK/chapter06 diffutils-inst.xml vim-exp.xml vim-inst.xml

markh at linuxfromscratch.org markh at linuxfromscratch.org
Fri Mar 29 15:49:45 PST 2002


markh       02/03/29 15:49:45

  Modified:    BOOK     index.xml
               BOOK/chapter01 changelog.xml
               BOOK/chapter05 diffutils-exp.xml diffutils-inst.xml
               BOOK/chapter06 diffutils-inst.xml vim-exp.xml vim-inst.xml
  Log:
  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)
  
  Revision  Changes    Path
  1.382     +11 -11    LFS/BOOK/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/index.xml,v
  retrieving revision 1.381
  retrieving revision 1.382
  diff -u -r1.381 -r1.382
  --- index.xml	26 Mar 2002 06:32:13 -0000	1.381
  +++ index.xml	29 Mar 2002 23:49:44 -0000	1.382
  @@ -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">
  
  
  
  1.250     +9 -1      LFS/BOOK/chapter01/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/changelog.xml,v
  retrieving revision 1.249
  retrieving revision 1.250
  diff -u -r1.249 -r1.250
  --- changelog.xml	27 Mar 2002 00:37:40 -0000	1.249
  +++ changelog.xml	29 Mar 2002 23:49:44 -0000	1.250
  @@ -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,14 +25,21 @@
   <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>
  
  
  
  1.6       +0 -5      LFS/BOOK/chapter05/diffutils-exp.xml
  
  Index: diffutils-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/diffutils-exp.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- diffutils-exp.xml	22 Jan 2002 00:16:57 -0000	1.5
  +++ diffutils-exp.xml	29 Mar 2002 23:49:44 -0000	1.6
  @@ -9,10 +9,5 @@
   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>
   
  
  
  
  1.10      +2 -2      LFS/BOOK/chapter05/diffutils-inst.xml
  
  Index: diffutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/diffutils-inst.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- diffutils-inst.xml	10 Dec 2001 13:42:42 -0000	1.9
  +++ diffutils-inst.xml	29 Mar 2002 23:49:44 -0000	1.10
  @@ -10,14 +10,14 @@
   <para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&
   ./configure --prefix=$LFS/usr &&
   unset CPPFLAGS &&
  -make LDFLAGS=-static PR_PROGRAM=/usr/bin/pr &&
  +make LDFLAGS=-static &&
   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 &&
  -make LDFLAGS=-static PR_PROGRAM=/usr/bin/pr &&
  +make LDFLAGS=-static &&
   make install</userinput></screen></para>
   
   </sect2>
  
  
  
  1.7       +1 -1      LFS/BOOK/chapter06/diffutils-inst.xml
  
  Index: diffutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/diffutils-inst.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- diffutils-inst.xml	10 Dec 2001 13:42:42 -0000	1.6
  +++ diffutils-inst.xml	29 Mar 2002 23:49:44 -0000	1.7
  @@ -4,7 +4,7 @@
   <para>Install Diffutils by running the following commands:</para>
   
   <para><screen><userinput>./configure --prefix=/usr &&
  -make PR_PROGRAM=/usr/bin/pr &&
  +make &&
   make install</userinput></screen></para>
   
   </sect2>
  
  
  
  1.4       +0 -5      LFS/BOOK/chapter06/vim-exp.xml
  
  Index: vim-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/vim-exp.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- vim-exp.xml	8 Oct 2001 01:31:48 -0000	1.3
  +++ vim-exp.xml	29 Mar 2002 23:49:44 -0000	1.4
  @@ -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
  
  
  
  1.22      +2 -22     LFS/BOOK/chapter06/vim-inst.xml
  
  Index: vim-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/vim-inst.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- vim-inst.xml	10 Dec 2001 15:23:46 -0000	1.21
  +++ vim-inst.xml	29 Mar 2002 23:49:44 -0000	1.22
  @@ -9,17 +9,7 @@
   
   <para>Install Vim by running the following commands:</para>
   
  -<para><screen><userinput>cp runtime/syntax/sh.vim runtime/syntax/sh.vim.backup &&
  -sed '/shUntil\|link shRepeat/{
  -   /shUntil/N
  -   /^/i\
  -   if exists("b:is_kornshell") || exists("b:is_bash")
  -   p
  -   /$/i\
  -   endif
  -   d
  -   }' runtime/syntax/sh.vim.backup > runtime/syntax/sh.vim &&
  -./configure --prefix=/usr &&
  +<para><screen><userinput>./configure --prefix=/usr &&
   make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &&
   make install &&
   cd /usr/bin &&
  @@ -41,17 +31,7 @@
   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 &&
  -sed '/shUntil\|link shRepeat/{
  -   /shUntil/N
  -   /^/i\
  -   if exists("b:is_kornshell") || exists("b:is_bash")
  -   p
  -   /$/i\
  -   endif
  -   d
  -   }' runtime/syntax/sh.vim.backup > runtime/syntax/sh.vim &&
  -./configure --prefix=/usr --localstatedir=/var/lib/vim &&
  +<para><screen><userinput>./configure --prefix=/usr --localstatedir=/var/lib/vim &&
   make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &&
   make install &&
   cd /usr/bin &&
  
  
  
-- 
Unsubscribe: send email to listar at linuxfromscratch.org
and put 'unsubscribe lfs-book' in the subject header of the message



More information about the lfs-book mailing list