Changeset 3eeef443


Ignore:
Timestamp:
Jan 8, 2011, 5:48:06 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f42e5c1
Parents:
ecc1136
Message:

Updated Man to 1.6g.

Files:
1 deleted
8 edited
1 moved

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/common/man.xml

    recc1136 r3eeef443  
    2929
    3030<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>
    3531
    3632    <para os="a">A few adjustments need to be made to the sources of Man.</para>

  • BOOK/final-system/common/tar.xml

    recc1136 r3eeef443  
    3232    <para os="a">Prepare Tar for compilation:</para>
    3333
    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>
    3536
    3637    <para os="c">Compile the package:</para>

  • BOOK/final-system/multilib/man.xml

    recc1136 r3eeef443  
    2929    href="../common/man.xml"
    3030    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'])"/>
    3931
    4032    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/final-system/multilib/tar.xml

    recc1136 r3eeef443  
    3434    xpointer="xpointer(//*[@os='a'])"/>
    3535
    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>
    3839
    3940    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/introduction/common/changelog.xml

    recc1136 r3eeef443  
    4141      <para>January 8, 2011</para>
    4242      <itemizedlist>
     43        <listitem>
     44          <para>[jciccone] - Updated Man to 1.6g.</para>
     45        </listitem>
    4346        <listitem>
    4447          <para>[jciccone] - Updated IPutils to s20101006.</para>

  • BOOK/materials/common/patches.xml

    recc1136 r3eeef443  
    9292
    9393    <varlistentry>
    94       <term>Man New Compressors Patch - <token>&man-new_compressors-patch-size;</token>:</term>
    95       <listitem>
    96         <para>Download: <ulink
    97         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>
    10394      <term>Ncurses Bash Patch - <token>&ncurses-bashfix-patch-size;</token>:</term>
    10495      <listitem>

  • BOOK/packages.ent

    recc1136 r3eeef443  
    268268<!ENTITY make-home "&gnu-software;make">
    269269
    270 <!ENTITY man-version "1.6f">
    271 <!ENTITY man-size "248 KB">
     270<!ENTITY man-version "1.6g">
     271<!ENTITY man-size "252 KB">
    272272<!ENTITY man-url "http://primates.ximian.com/~flucifredi/man/man-&man-version;.tar.gz">
    273 <!ENTITY man-md5 "67aaaa6df35215e812fd7d89472c44b6">
     273<!ENTITY man-md5 "ba154d5796928b841c9c69f0ae376660">
    274274<!ENTITY man-home "http://primates.ximian.com/~flucifredi/man">
    275275

  • BOOK/patches.ent

    recc1136 r3eeef443  
    3838
    3939<!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">
    4642
    4743<!ENTITY ncurses-bashfix-patch "ncurses-&ncurses-version;-bash_fix-1.patch">

  • patches/man-1.6g-i18n-1.patch

    recc1136 r3eeef443  
    1 Submitted By: Jim Gifford <jim at cross-lfs dot org>
    2 Date: 2009-01-08
     1Submitted By: Joe Ciccone <jciccone@gmail.com>
     2Date: 2011-01-08
    33Initial Package Version: 1.6f
    44Upstream Status: Unkown
    … …  
    66Description: i18n Updates
    77
    8 diff -Naur man-1.6f.orig/catopen/catopen.c man-1.6f/catopen/catopen.c
    9 --- man-1.6f.orig/catopen/catopen.c     2005-08-20 16:26:06.000000000 -0700
    10 +++ man-1.6f/catopen/catopen.c  2009-01-08 22:01:17.000000000 -0800
     8diff -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
    1111@@ -9,22 +9,63 @@
    1212 extern char *index (const char *, int);         /* not always in <string.h> */
    … …  
    140140 
    141141   free(path0);
    142 diff -Naur man-1.6f.orig/configure man-1.6f/configure
    143 --- man-1.6f.orig/configure     2007-08-20 21:15:21.000000000 -0700
    144 +++ man-1.6f/configure  2009-01-08 22:29:17.000000000 -0800
    145 @@ -412,9 +412,9 @@
     142diff -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 @@
    146146       fi
    147147     done
    … …  
    156156   neqn=""
    157157   jneqn=""
    158 @@ -472,29 +472,32 @@
     158@@ -476,29 +476,32 @@
    159159   done
    160160 # -Tlatin1 is bad when utf8 is used, but needed for groff, not for nroff
    … …  
    196196   col="$Fcol"
    197197   vgrind="$Fvgrind"
    198 @@ -960,7 +963,7 @@
     198@@ -964,7 +967,7 @@
    199199 
    200200 # What sections do we anticipate?
    … …  
    205205 if [ x$default = x ]; then
    206206   echo ""
    207 diff -Naur man-1.6f.orig/msgs/inst.sh man-1.6f/msgs/inst.sh
    208 --- man-1.6f.orig/msgs/inst.sh  2005-08-20 16:26:06.000000000 -0700
    209 +++ man-1.6f/msgs/inst.sh       2009-01-08 22:01:46.000000000 -0800
     207diff -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
    210210@@ -27,8 +27,7 @@
    211211 for j in $M; do
    … …  
    218218     mkdir -p `dirname $dest`;
    219219     echo "install -c -m 644 $j $dest"
    220 diff -Naur man-1.6f.orig/src/apropos.sh man-1.6f/src/apropos.sh
    221 --- man-1.6f.orig/src/apropos.sh        2005-08-20 16:26:06.000000000 -0700
    222 +++ man-1.6f/src/apropos.sh     2009-01-08 22:02:47.000000000 -0800
     220diff -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
    223223@@ -60,16 +60,56 @@
    224224     esac
    … …  
    281281 # But it is better to give all
    282282 #               break
    283 diff -Naur man-1.6f.orig/src/makewhatis.sh man-1.6f/src/makewhatis.sh
    284 --- man-1.6f.orig/src/makewhatis.sh     2007-09-17 11:35:14.000000000 -0700
    285 +++ man-1.6f/src/makewhatis.sh  2009-01-08 22:02:47.000000000 -0800
     283diff -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
    286286@@ -55,6 +55,9 @@
    287287 dc=
    … …  
    311311                     $1 ~ /^STRUCTURES/ || $1 ~ /^INTRODUCTION/ ||
    312312                     $0 ~ /^[^ ]/))) {
    313 diff -Naur man-1.6f.orig/src/manpath.c man-1.6f/src/manpath.c
    314 --- man-1.6f.orig/src/manpath.c 2006-08-03 14:18:33.000000000 -0700
    315 +++ man-1.6f/src/manpath.c      2009-01-08 22:01:17.000000000 -0800
     313diff -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
    316316@@ -282,13 +282,14 @@
    317317                /* We cannot use "lang = setlocale(LC_MESSAGES, NULL)" or so:
Note: See TracChangeset for help on using the changeset viewer.