Changeset 3eeef443
- Timestamp:
- Jan 9, 2011, 1:48:06 AM (14 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- f42e5c1
- Parents:
- ecc1136
- Files:
-
- 1 deleted
- 8 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
BOOK/final-system/common/man.xml
recc1136 r3eeef443 29 29 30 30 <screen os="p2"><userinput>patch -Np1 -i ../&man-i18n-patch;</userinput></screen> 31 32 <para os="p3">The following patch will add support for new compressors like XZ Utils:</para>33 34 <screen os="p4"><userinput>patch -Np1 -i ../&man-new_compressors-patch;</userinput></screen>35 31 36 32 <para os="a">A few adjustments need to be made to the sources of Man.</para> -
BOOK/final-system/common/tar.xml
recc1136 r3eeef443 32 32 <para os="a">Prepare Tar for compilation:</para> 33 33 34 <screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen> 34 <screen os="b"><userinput>FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr \ 35 --bindir=/bin --libexecdir=/usr/sbin</userinput></screen> 35 36 36 37 <para os="c">Compile the package:</para> -
BOOK/final-system/multilib/man.xml
recc1136 r3eeef443 29 29 href="../common/man.xml" 30 30 xpointer="xpointer(//*[@os='p2'])"/> 31 32 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"33 href="../common/man.xml"34 xpointer="xpointer(//*[@os='p3'])"/>35 36 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"37 href="../common/man.xml"38 xpointer="xpointer(//*[@os='p4'])"/>39 31 40 32 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" -
BOOK/final-system/multilib/tar.xml
recc1136 r3eeef443 34 34 xpointer="xpointer(//*[@os='a'])"/> 35 35 36 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \ 37 --bindir=/bin --libexecdir=/usr/sbin</userinput></screen> 36 <screen os="b"><userinput>FORCE_UNSAFE_CONFIGURE=1 CC="gcc ${BUILD64}" \ 37 ./configure --prefix=/usr \ 38 --bindir=/bin --libexecdir=/usr/sbin</userinput></screen> 38 39 39 40 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" -
BOOK/introduction/common/changelog.xml
recc1136 r3eeef443 41 41 <para>January 8, 2011</para> 42 42 <itemizedlist> 43 <listitem> 44 <para>[jciccone] - Updated Man to 1.6g.</para> 45 </listitem> 43 46 <listitem> 44 47 <para>[jciccone] - Updated IPutils to s20101006.</para> -
BOOK/materials/common/patches.xml
recc1136 r3eeef443 92 92 93 93 <varlistentry> 94 <term>Man New Compressors Patch - <token>&man-new_compressors-patch-size;</token>:</term>95 <listitem>96 <para>Download: <ulink97 url="&patches-root;&man-new_compressors-patch;"/></para>98 <para>MD5 sum: <literal>&man-new_compressors-patch-md5;</literal></para>99 </listitem>100 </varlistentry>101 102 <varlistentry>103 94 <term>Ncurses Bash Patch - <token>&ncurses-bashfix-patch-size;</token>:</term> 104 95 <listitem> -
BOOK/packages.ent
recc1136 r3eeef443 268 268 <!ENTITY make-home "&gnu-software;make"> 269 269 270 <!ENTITY man-version "1.6 f">271 <!ENTITY man-size "2 48KB">270 <!ENTITY man-version "1.6g"> 271 <!ENTITY man-size "252 KB"> 272 272 <!ENTITY man-url "http://primates.ximian.com/~flucifredi/man/man-&man-version;.tar.gz"> 273 <!ENTITY man-md5 " 67aaaa6df35215e812fd7d89472c44b6">273 <!ENTITY man-md5 "ba154d5796928b841c9c69f0ae376660"> 274 274 <!ENTITY man-home "http://primates.ximian.com/~flucifredi/man"> 275 275 -
BOOK/patches.ent
recc1136 r3eeef443 38 38 39 39 <!ENTITY man-i18n-patch "man-&man-version;-i18n-1.patch"> 40 <!ENTITY man-i18n-patch-md5 "8b189d6500461797250ae9f3e5638dd5"> 41 <!ENTITY man-i18n-patch-size "10 KB"> 42 43 <!ENTITY man-new_compressors-patch "man-&man-version;-new_compressors-1.patch"> 44 <!ENTITY man-new_compressors-patch-md5 "efebe29737e80c2f6de4833182f1edb6"> 45 <!ENTITY man-new_compressors-patch-size "2 KB"> 40 <!ENTITY man-i18n-patch-md5 "a5aba0cb5a95a7945db8c882334b7dab"> 41 <!ENTITY man-i18n-patch-size "12 KB"> 46 42 47 43 <!ENTITY ncurses-bashfix-patch "ncurses-&ncurses-version;-bash_fix-1.patch"> -
patches/man-1.6g-i18n-1.patch
recc1136 r3eeef443 1 Submitted By: J im Gifford <jim at cross-lfs dot org>2 Date: 20 09-01-081 Submitted By: Joe Ciccone <jciccone@gmail.com> 2 Date: 2011-01-08 3 3 Initial Package Version: 1.6f 4 4 Upstream Status: Unkown … … 6 6 Description: i18n Updates 7 7 8 diff -Naur man-1.6 f.orig/catopen/catopen.c man-1.6f/catopen/catopen.c9 --- man-1.6 f.orig/catopen/catopen.c 2005-08-20 16:26:06.000000000 -070010 +++ man-1.6 f/catopen/catopen.c 2009-01-08 22:01:17.000000000 -08008 diff -Naur man-1.6g.orig/catopen/catopen.c man-1.6g/catopen/catopen.c 9 --- man-1.6g.orig/catopen/catopen.c 2005-08-20 19:26:06.000000000 -0400 10 +++ man-1.6g/catopen/catopen.c 2011-01-08 20:29:31.874658039 -0500 11 11 @@ -9,22 +9,63 @@ 12 12 extern char *index (const char *, int); /* not always in <string.h> */ … … 140 140 141 141 free(path0); 142 diff -Naur man-1.6 f.orig/configure man-1.6f/configure143 --- man-1.6 f.orig/configure 2007-08-20 21:15:21.000000000 -0700144 +++ man-1.6 f/configure 2009-01-08 22:29:17.000000000 -0800145 @@ -41 2,9 +412,9 @@142 diff -Naur man-1.6g.orig/configure man-1.6g/configure 143 --- man-1.6g.orig/configure 2010-12-31 15:28:46.000000000 -0500 144 +++ man-1.6g/configure 2011-01-08 20:29:31.874658039 -0500 145 @@ -416,9 +416,9 @@ 146 146 fi 147 147 done … … 156 156 neqn="" 157 157 jneqn="" 158 @@ -47 2,29 +472,32 @@158 @@ -476,29 +476,32 @@ 159 159 done 160 160 # -Tlatin1 is bad when utf8 is used, but needed for groff, not for nroff … … 196 196 col="$Fcol" 197 197 vgrind="$Fvgrind" 198 @@ -96 0,7 +963,7 @@198 @@ -964,7 +967,7 @@ 199 199 200 200 # What sections do we anticipate? … … 205 205 if [ x$default = x ]; then 206 206 echo "" 207 diff -Naur man-1.6 f.orig/msgs/inst.sh man-1.6f/msgs/inst.sh208 --- man-1.6 f.orig/msgs/inst.sh 2005-08-20 16:26:06.000000000 -0700209 +++ man-1.6 f/msgs/inst.sh 2009-01-08 22:01:46.000000000 -0800207 diff -Naur man-1.6g.orig/msgs/inst.sh man-1.6g/msgs/inst.sh 208 --- man-1.6g.orig/msgs/inst.sh 2005-08-20 19:26:06.000000000 -0400 209 +++ man-1.6g/msgs/inst.sh 2011-01-08 20:29:31.874658039 -0500 210 210 @@ -27,8 +27,7 @@ 211 211 for j in $M; do … … 218 218 mkdir -p `dirname $dest`; 219 219 echo "install -c -m 644 $j $dest" 220 diff -Naur man-1.6 f.orig/src/apropos.sh man-1.6f/src/apropos.sh221 --- man-1.6 f.orig/src/apropos.sh 2005-08-20 16:26:06.000000000 -0700222 +++ man-1.6 f/src/apropos.sh 2009-01-08 22:02:47.000000000 -0800220 diff -Naur man-1.6g.orig/src/apropos.sh man-1.6g/src/apropos.sh 221 --- man-1.6g.orig/src/apropos.sh 2005-08-20 19:26:06.000000000 -0400 222 +++ man-1.6g/src/apropos.sh 2011-01-08 20:29:31.874658039 -0500 223 223 @@ -60,16 +60,56 @@ 224 224 esac … … 281 281 # But it is better to give all 282 282 # break 283 diff -Naur man-1.6 f.orig/src/makewhatis.sh man-1.6f/src/makewhatis.sh284 --- man-1.6 f.orig/src/makewhatis.sh 2007-09-17 11:35:14.000000000 -0700285 +++ man-1.6 f/src/makewhatis.sh 2009-01-08 22:02:47.000000000 -0800283 diff -Naur man-1.6g.orig/src/makewhatis.sh man-1.6g/src/makewhatis.sh 284 --- man-1.6g.orig/src/makewhatis.sh 2007-09-17 14:35:14.000000000 -0400 285 +++ man-1.6g/src/makewhatis.sh 2011-01-08 20:29:31.878656601 -0500 286 286 @@ -55,6 +55,9 @@ 287 287 dc= … … 311 311 $1 ~ /^STRUCTURES/ || $1 ~ /^INTRODUCTION/ || 312 312 $0 ~ /^[^ ]/))) { 313 diff -Naur man-1.6 f.orig/src/manpath.c man-1.6f/src/manpath.c314 --- man-1.6 f.orig/src/manpath.c 2006-08-03 14:18:33.000000000 -0700315 +++ man-1.6 f/src/manpath.c 2009-01-08 22:01:17.000000000 -0800313 diff -Naur man-1.6g.orig/src/manpath.c man-1.6g/src/manpath.c 314 --- man-1.6g.orig/src/manpath.c 2006-08-03 17:18:33.000000000 -0400 315 +++ man-1.6g/src/manpath.c 2011-01-08 20:29:31.878656601 -0500 316 316 @@ -282,13 +282,14 @@ 317 317 /* We cannot use "lang = setlocale(LC_MESSAGES, NULL)" or so:
Note:
See TracChangeset
for help on using the changeset viewer.