More patch related cleanups.

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

appendixa/bash-down.xml

@@ -5,6 +5,6 @@
 <ulink url="ftp://ftp.gnu.org/gnu/bash/"/>
 
 Bash Patch (&bash-version;):
-<ulink url="&patches-root;/"/></literallayout></para>
+<ulink url="&patches-root;"/></literallayout></para>
 </sect2>
 

appendixa/ed-down.xml

@@ -5,5 +5,5 @@
 <ulink url="ftp://ftp.gnu.org/gnu/ed/"/>
 
 Ed Patch (&ed-patch-version;):
-<ulink url="&patches-root;/"/></literallayout></para>
+<ulink url="&patches-root;"/></literallayout></para>
 </sect2>

appendixa/expect-down.xml

@@ -5,5 +5,5 @@
 <ulink url="http://expect.nist.gov/src/"/>
 
 Expect Patch (&expect-patch-version;):
-<ulink url="&patches-root;/"/></literallayout></para>
+<ulink url="&patches-root;"/></literallayout></para>
 </sect2>

appendixa/gawk-down.xml

@@ -5,5 +5,5 @@
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gawk/"/>
 
 Gawk Patch (&gawk-patch-version;):
-<ulink url="&patches-root;/"/></literallayout></para>
+<ulink url="&patches-root;"/></literallayout></para>
 </sect2>

appendixa/gcc-down.xml

@@ -5,20 +5,20 @@
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/>
 
 GCC No Fixincludes Patch (&gcc-nofixincludes-patch-version;):
-<ulink url="&patches-root;/"/>
+<ulink url="&patches-root;"/>
 
 GCC Specs Patch (&gcc-specs-patch-version;):
-<ulink url="&patches-root;/"/>
+<ulink url="&patches-root;"/>
 
 GCC Suppress Libiberty Patch (&gcc-suppress-libiberty-patch-version;):
-<ulink url="&patches-root;/"/>
+<ulink url="&patches-root;"/>
 
 GCC-2 Patch (&gcc-2953-patch-version;):
-<ulink url="&patches-root;/"/>
+<ulink url="&patches-root;"/>
 
 GCC-2 No Fixincludes Patch (&gcc-2953-no-fixinc-patch-version;):
-<ulink url="&patches-root;/"/>
+<ulink url="&patches-root;"/>
 
 GCC-2 Return Type Patch (&gcc-2953-returntype-fix-patch-version;):
-<ulink url="&patches-root;/"/></literallayout></para>
+<ulink url="&patches-root;"/></literallayout></para>
 </sect2>

appendixa/glibc-down.xml

@@ -8,5 +8,5 @@ Glibc-linuxthreads (&glibc-version;):
 <ulink url="ftp://ftp.gnu.org/gnu/glibc/"/>
 
 Glibc Sscanf Patch (&glibc-sscanf-patch-version;):
-<ulink url="&patches-root;/"/></literallayout></para>
+<ulink url="&patches-root;"/></literallayout></para>
 </sect2>

appendixa/kbd-down.xml

@@ -5,5 +5,5 @@
 <ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/"/>
 
 Kbd Patch (&kbd-patch-version;):
-<ulink url="&patches-root;/"/></literallayout></para>
+<ulink url="&patches-root;"/></literallayout></para>
 </sect2>

appendixa/man-down.xml

@@ -5,11 +5,11 @@
 <ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/"/>
 
 Man 80Cols Patch (&man-80cols-patch-version;):
-<ulink url="&patches-root;/"/>
+<ulink url="&patches-root;"/>
 
 Man Manpath Patch (&man-manpath-patch-version;):
-<ulink url="&patches-root;/"/>
+<ulink url="&patches-root;"/>
 
 Man Pager Patch (&man-pager-patch-version;):
-<ulink url="&patches-root;/"/></literallayout></para>
+<ulink url="&patches-root;"/></literallayout></para>
 </sect2>

appendixa/zlib-down.xml

@@ -7,5 +7,5 @@
 <ulink url="http://www.gzip.org/zlib/"/>
 
 Zlib Patch (&zlib-version;):
-<ulink url="&patches-root;/"/></literallayout></para>
+<ulink url="&patches-root;"/></literallayout></para>
 </sect2>

chapter04/chapter04.xml

@@ -242,82 +242,82 @@ following:</para>
 
 <literallayout>
 Bash Patch (&bash-patch-version;) - &bash-patch-size;:
-<ulink url="&patches-root;/bash-&bash-patch-version;.patch"/>
+<ulink url="&patches-root;bash-&bash-patch-version;.patch"/>
 
-Bison Attribute Patch:
-<ulink url="&patches-root;/bison-1.875-attribute.patch"/>
+Bison Attribute Patch (&bison-patch-version;) - &bison-patch-size;:
+<ulink url="&patches-root;bison-&bison-patch-version;.patch"/>
 
 Coreutils Hostname Patch (&coreutils-hostname-patch-version;) - &coreutils-hostname-patch-size;:
-<ulink url="&patches-root;/coreutils-&coreutils-hostname-patch-version;.patch"/>
+<ulink url="&patches-root;coreutils-&coreutils-hostname-patch-version;.patch"/>
 
 Coreutils Uname Patch (&coreutils-uname-patch-version;) - &coreutils-uname-patch-size;:
-<ulink url="&patches-root;/coreutils-&coreutils-uname-patch-version;.patch"/>
+<ulink url="&patches-root;coreutils-&coreutils-uname-patch-version;.patch"/>
 
 Ed Patch (&ed-patch-version;) - &ed-patch-size;:
-<ulink url="&patches-root;/ed-&ed-patch-version;.patch"/>
+<ulink url="&patches-root;ed-&ed-patch-version;.patch"/>
 
 Expect Patch (&expect-patch-version;) - &expect-patch-size;:
-<ulink url="&patches-root;/expect-&expect-patch-version;.patch"/>
+<ulink url="&patches-root;expect-&expect-patch-version;.patch"/>
 
 Gawk Patch (&gawk-patch-version;) - &gawk-patch-size;:
-<ulink url="&patches-root;/gawk-&gawk-patch-version;.patch"/>
+<ulink url="&patches-root;gawk-&gawk-patch-version;.patch"/>
 
 GCC No Fixincludes Patch: (&gcc-nofixincludes-patch-version;) - &gcc-nofixincludes-patch-size;:
-<ulink url="&patches-root;/gcc-&gcc-nofixincludes-patch-version;.patch"/>
+<ulink url="&patches-root;gcc-&gcc-nofixincludes-patch-version;.patch"/>
 
 GCC Specs Patch: (&gcc-specs-patch-version;) - &gcc-specs-patch-size;:
-<ulink url="&patches-root;/gcc-&gcc-specs-patch-version;.patch"/>
+<ulink url="&patches-root;gcc-&gcc-specs-patch-version;.patch"/>
 
 GCC Suppress Libiberty Patch: (&gcc-suppress-libiberty-patch-version;) - &gcc-suppress-libiberty-patch-size;:
-<ulink url="&patches-root;/gcc-&gcc-suppress-libiberty-patch-version;.patch"/>
+<ulink url="&patches-root;gcc-&gcc-suppress-libiberty-patch-version;.patch"/>
 
 GCC-2 Patch (&gcc-2953-patch-version;) - &gcc-2953-patch-size;:
-<ulink url="&patches-root;/gcc-&gcc-2953-patch-version;.patch"/>
+<ulink url="&patches-root;gcc-&gcc-2953-patch-version;.patch"/>
 
 GCC-2 No Fixincludes Patch (&gcc-2953-no-fixinc-patch-version;) - &gcc-2953-no-fixinc-patch-size;:
-<ulink url="&patches-root;/gcc-&gcc-2953-no-fixinc-patch-version;-no-fixinc.patch"/>
+<ulink url="&patches-root;gcc-&gcc-2953-no-fixinc-patch-version;.patch"/>
 
 GCC-2 Return Type Patch (&gcc-2953-returntype-fix-patch-version;) - &gcc-2953-returntype-fix-patch-size;:
-<ulink url="&patches-root;/gcc-&gcc-2953-returntype-fix-patch-version;-returntype-fix.patch"/>
+<ulink url="&patches-root;gcc-&gcc-2953-returntype-fix-patch-version;.patch"/>
 
-Glibc Sscanf Patch: - &glibc-sscanf-patch-size;:
-<ulink url="&patches-root;/glibc-&glibc-sscanf-patch-version;.patch"/>
+Glibc Sscanf Patch: (&glibc-sscanf-patch-version;) - &glibc-sscanf-patch-size;:
+<ulink url="&patches-root;glibc-&glibc-sscanf-patch-version;.patch"/>
 
 Grub Patch (&grub-patch-version;) - &grub-patch-size;:
-<ulink url="&patches-root;/grub-&grub-patch-version;.patch"/>
+<ulink url="&patches-root;grub-&grub-patch-version;.patch"/>
 
 Kbd Patch (&kbd-patch-version;) - &kbd-patch-size;:
-<ulink url="&patches-root;/kbd-&kbd-patch-version;.patch"/>
+<ulink url="&patches-root;kbd-&kbd-patch-version;.patch"/>
 
 Man 80Cols Patch (&man-80cols-patch-version;) - &man-80cols-patch-size;:
-<ulink url="&patches-root;/man-&man-80cols-patch-version;-80cols.patch"/>
+<ulink url="&patches-root;man-&man-80cols-patch-version;.patch"/>
 
 Man Manpath Patch (&man-manpath-patch-version;) - &man-manpath-patch-size;:
-<ulink url="&patches-root;/man-&man-manpath-patch-version;-manpath.patch"/>
+<ulink url="&patches-root;man-&man-manpath-patch-version;.patch"/>
 
 Man Pager Patch (&man-pager-patch-version;) - &man-pager-patch-size;:
-<ulink url="&patches-root;/man-&man-pager-patch-version;-pager.patch"/>
+<ulink url="&patches-root;man-&man-pager-patch-version;.patch"/>
 
 Ncurses Etip Patch (&ncurses-etip-patch-version;) - &ncurses-etip-patch-size;:
-<ulink url="&patches-root;/ncurses-5.3-etip-2.patch"/>
+<ulink url="&patches-root;ncurses-&ncurses-etip-patch-version;.patch"/>
 
 Ncurses Vsscanf Patch (&ncurses-vsscanf-patch-version;) - &ncurses-vsscanf-patch-size;:
-<ulink url="&patches-root;/ncurses-5.3-vsscanf.patch"/>
+<ulink url="&patches-root;ncurses-&ncurses-vsscanf-patch-version;.patch"/>
 
-Net-Tools mii-tool Patch (1.60) - 2k:
-<ulink url="&patches-root;/net-tools-1.60-miitool-gcc33-1.patch"/>
+Net-Tools Mii-Tool Patch (&net-tools-mii-patch-version;) - &net-tools-mii-patch-size;:
+<ulink url="&patches-root;net-tools-&net-tools-mii-patch-version;.patch"/>
 
 Perl Libc Patch (&perl-libc-patch-version;) - &perl-libc-patch-size;:
-<ulink url="&patches-root;/perl-&perl-libc-patch-version;.patch"/>
+<ulink url="&patches-root;perl-&perl-libc-patch-version;.patch"/>
 
 Procps Patch (&procps-patch-version;) - &procps-patch-size;:
-<ulink url="&patches-root;/procps-&procps-patch-version;.patch"/>
+<ulink url="&patches-root;procps-&procps-patch-version;.patch"/>
 
 Shadow Patch (&shadow-patch-version;) - &shadow-patch-size;:
-<ulink url="&patches-root;/shadow-&shadow-patch-version;.patch"/> 
+<ulink url="&patches-root;shadow-&shadow-patch-version;.patch"/> 
 
 Zlib Patch (&zlib-patch-version;) - &zlib-patch-size;:
-<ulink url="&patches-root;/zlib-&zlib-patch-version;.patch"/>
+<ulink url="&patches-root;zlib-&zlib-patch-version;.patch"/>
 </literallayout>
 
 <para>In addition, there are a number of optional patches that have been

entities/bash.ent

@@ -20,7 +20,7 @@
 <!ENTITY bash-dir "bash-&bash-version;">
 <!ENTITY bash-size "1,766 KB">
 <!ENTITY bash-patch-version "2.05b-2">
-<!ENTITY bash-patch-size "7.6 KB">
+<!ENTITY bash-patch-size "7 KB">
 
 <!ENTITY bash-compsize-static "24 MB">
 <!ENTITY bash-time-static "0.8 SBU">

entities/bison.ent

@@ -15,6 +15,8 @@
 <!ENTITY bison-size "796 KB">
 <!ENTITY bison-dir "bison-&bison-version;">
 <!ENTITY bison-package "bison-&bison-version;.tar.bz2">
+<!ENTITY bison-patch-version "1.875-attribute">
+<!ENTITY bison-patch-size "2 KB">
 
 <!ENTITY bison-compsize "6 MB">
 <!ENTITY bison-time "0.6 SBU">

entities/expect.ent

@@ -18,7 +18,7 @@
 <!ENTITY expect-size "508 KB">
 
 <!ENTITY expect-patch-version "5.39.0">
-<!ENTITY expect-patch-size "6.5 KB">
+<!ENTITY expect-patch-size "6 KB">
 
 <!ENTITY expect-compsize-static "24 MB">
 <!ENTITY expect-time-static "0.1 SBU">

entities/gcc-2953.ent

@@ -17,9 +17,9 @@
 
 <!ENTITY gcc-2953-patch-version "2.95.3-2">
 <!ENTITY gcc-2953-patch-size "16 KB">
-<!ENTITY gcc-2953-no-fixinc-patch-version "2.95.3">
+<!ENTITY gcc-2953-no-fixinc-patch-version "2.95.3-no-fixinc">
 <!ENTITY gcc-2953-no-fixinc-patch-size "1 KB">
-<!ENTITY gcc-2953-returntype-fix-patch-version "2.95.3">
+<!ENTITY gcc-2953-returntype-fix-patch-version "2.95.3-returntype-fix">
 <!ENTITY gcc-2953-returntype-fix-patch-size "1 KB">
 
 <!ENTITY gcc-2953-package "gcc-&gcc-2953-version;.tar.bz2">

entities/man.ent

@@ -15,11 +15,11 @@
 <!ENTITY man-contversion "1.5k">
 <!ENTITY man-size "222 KB">
 
-<!ENTITY man-80cols-patch-version "1.5m2">
+<!ENTITY man-80cols-patch-version "1.5m2-80cols">
 <!ENTITY man-80cols-patch-size "1 KB">
-<!ENTITY man-manpath-patch-version "1.5m2">
+<!ENTITY man-manpath-patch-version "1.5m2-manpath">
 <!ENTITY man-manpath-patch-size "1 KB">
-<!ENTITY man-pager-patch-version "1.5m2">
+<!ENTITY man-pager-patch-version "1.5m2-pager">
 <!ENTITY man-pager-patch-size "1 KB">
 
 <!ENTITY man-dir "man-&man-version;">

entities/ncurses.ent

@@ -17,9 +17,9 @@
 <!ENTITY ncurses-depversion "5.2">
 <!ENTITY ncurses-contversion "5.2">
 <!ENTITY ncurses-size "2,019 KB">
-<!ENTITY ncurses-etip-patch-version "5.3">
+<!ENTITY ncurses-etip-patch-version "5.3-etip-2">
 <!ENTITY ncurses-etip-patch-size "1 KB">
-<!ENTITY ncurses-vsscanf-patch-version "5.3">
+<!ENTITY ncurses-vsscanf-patch-version "5.3-vsscanf">
 <!ENTITY ncurses-vsscanf-patch-size "1 KB">
 <!ENTITY ncurses-dir "ncurses-&ncurses-version;">
 <!ENTITY ncurses-package "ncurses-&ncurses-version;.tar.bz2">

entities/nettools.ent

@@ -15,6 +15,8 @@
 <!ENTITY net-tools-size "194 KB">
 <!ENTITY net-tools-dir "net-tools-&net-tools-version;">
 <!ENTITY net-tools-package "net-tools-&net-tools-version;.tar.bz2">
+<!ENTITY net-tools-mii-patch-version "1.60-miitool-gcc33-1">
+<!ENTITY net-tools-mii-patch-size "2 KB">
 
 <!ENTITY net-tools-compsize "5 MB">
 <!ENTITY net-tools-time "0.1 SBU">

entities/shadow.ent

@@ -15,7 +15,7 @@
 <!ENTITY shadow-contversion "4.0.3">
 <!ENTITY shadow-size "1030 KB">
 <!ENTITY shadow-patch-version "4.0.3-newgrp-fix">
-<!ENTITY shadow-patch-size "836 Bytes">
+<!ENTITY shadow-patch-size "1 KB">
 
 <!ENTITY shadow-dir "shadow-&shadow-version;">
 <!ENTITY shadow-package "shadow-&shadow-version;.tar.bz2">