cvs commit: LFS/BOOK/entities man.ent

gerard at linuxfromscratch.org gerard at linuxfromscratch.org
Sat Sep 28 17:07:32 PDT 2002


gerard      02/09/28 17:07:32

  Modified:    BOOK     index.xml
               BOOK/appendixa man-down.xml
               BOOK/chapter01 changelog.xml
               BOOK/chapter03 gcc-patch.xml packages.xml
               BOOK/chapter05 gcc-exp.xml gcc-inst.xml
               BOOK/chapter06 man-exp.xml man-inst.xml
               BOOK/entities man.ent
  Log:
  added man patch to replace sed, and added gcc-3.2-nofixincludes.patch
  
  Revision  Changes    Path
  1.493     +1 -1      LFS/BOOK/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/index.xml,v
  retrieving revision 1.492
  retrieving revision 1.493
  diff -u -r1.492 -r1.493
  --- index.xml	28 Sep 2002 18:46:59 -0000	1.492
  +++ index.xml	29 Sep 2002 00:07:31 -0000	1.493
  @@ -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">
   
  
  
  
  1.3       +5 -1      LFS/BOOK/appendixa/man-down.xml
  
  Index: man-down.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/man-down.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- man-down.xml	11 May 2002 13:26:17 -0000	1.2
  +++ man-down.xml	29 Sep 2002 00:07:31 -0000	1.3
  @@ -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>
  
  
  
  1.386     +10 -0     LFS/BOOK/chapter01/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/changelog.xml,v
  retrieving revision 1.385
  retrieving revision 1.386
  diff -u -r1.385 -r1.386
  --- changelog.xml	28 Sep 2002 23:35:47 -0000	1.385
  +++ changelog.xml	29 Sep 2002 00:07:31 -0000	1.386
  @@ -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>
  @@ -58,6 +60,14 @@
   <listitem><para>reiserfsprogs-3.x.1b</para></listitem>
   </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
  
  
  
  1.8       +4 -0      LFS/BOOK/chapter03/gcc-patch.xml
  
  Index: gcc-patch.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter03/gcc-patch.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- gcc-patch.xml	26 Aug 2002 23:43:23 -0000	1.7
  +++ gcc-patch.xml	29 Sep 2002 00:07:31 -0000	1.8
  @@ -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"/>
  
  
  
  1.58      +1 -0      LFS/BOOK/chapter03/packages.xml
  
  Index: packages.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter03/packages.xml,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- packages.xml	12 Sep 2002 23:16:37 -0000	1.57
  +++ packages.xml	29 Sep 2002 00:07:31 -0000	1.58
  @@ -45,6 +45,7 @@
   &c3-make;
   &c3-makedev;
   &c3-man;
  +&c3-man-patch;
   &c3-manpages;
   &c3-modutils;
   &c3-ncurses;
  
  
  
  1.34      +3 -0      LFS/BOOK/chapter05/gcc-exp.xml
  
  Index: gcc-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/gcc-exp.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- gcc-exp.xml	28 Sep 2002 21:08:28 -0000	1.33
  +++ gcc-exp.xml	29 Sep 2002 00:07:31 -0000	1.34
  @@ -6,6 +6,9 @@
   "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
  
  
  
  1.38      +1 -0      LFS/BOOK/chapter05/gcc-inst.xml
  
  Index: gcc-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/gcc-inst.xml,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- gcc-inst.xml	28 Sep 2002 21:08:28 -0000	1.37
  +++ gcc-inst.xml	29 Sep 2002 00:07:31 -0000	1.38
  @@ -15,6 +15,7 @@
   <para>Install GCC by running the following commands:</para>
   
   <para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch &&
  +patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch &&
   mkdir ../gcc-build &&
   cd ../gcc-build &&
   ../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \
  
  
  
  1.11      +6 -4      LFS/BOOK/chapter06/man-exp.xml
  
  Index: man-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/man-exp.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- man-exp.xml	2 Sep 2002 15:46:18 -0000	1.10
  +++ man-exp.xml	29 Sep 2002 00:07:31 -0000	1.11
  @@ -8,10 +8,12 @@
   ./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>
   
  
  
  
  1.30      +2 -5      LFS/BOOK/chapter06/man-inst.xml
  
  Index: man-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/man-inst.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- man-inst.xml	28 Sep 2002 21:08:29 -0000	1.29
  +++ man-inst.xml	29 Sep 2002 00:07:31 -0000	1.30
  @@ -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 &&
  +PATH=$PATH:/usr/bin:/bin \
       ./configure -default -confdir=/etc &&
   make &&
  -cp src/man.conf{,.backup} &&
  -sed -e '/^PAGER/s/-is/-isR/' \
  -    -e 's%MANPATH[[:space:]]/usr/man%#MANPATH /usr/man%' \
  -    src/man.conf.backup > src/man.conf &&
   make install</userinput></screen></para>
   
   <para>Note: If you wish to disable SGR escape sequences, you should
  
  
  
  1.6       +3 -0      LFS/BOOK/entities/man.ent
  
  Index: man.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/entities/man.ent,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- man.ent	13 Sep 2002 19:31:54 -0000	1.5
  +++ man.ent	29 Sep 2002 00:07:32 -0000	1.6
  @@ -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">
   
  
  
  
-- 
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