Bringing order to the presentation of patches.

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

19 files changed, 27 insertions, 27 deletions

diff --git a/entities/bash.ent b/entities/bash.ent
index 45fd23288..60f868c1f 100644
--- a/entities/bash.ent
+++ b/entities/bash.ent
@@ -20,7 +20,7 @@
 <!ENTITY bash-package "bash-&bash-version;.tar.bz2">
 <!ENTITY bash-size "1,910 KB">
 
-<!ENTITY bash-patch-version "2.05b-2">
+<!ENTITY bash-patch "bash-&bash-version;-2.patch">
 <!ENTITY bash-patch-size "7 KB">
 
 <!ENTITY bash-compsize-static "24 MB">
diff --git a/entities/bison.ent b/entities/bison.ent
index af7e94252..83f7601ef 100644
--- a/entities/bison.ent
+++ b/entities/bison.ent
@@ -16,7 +16,7 @@
 <!ENTITY bison-package "bison-&bison-version;.tar.bz2">
 <!ENTITY bison-size "796 KB">
 
-<!ENTITY bison-patch-version "1.875-attribute">
+<!ENTITY bison-patch "bison-&bison-version;-attribute.patch">
 <!ENTITY bison-patch-size "2 KB">
 
 <!ENTITY bison-compsize "6 MB">
diff --git a/entities/coreutils.ent b/entities/coreutils.ent
index 339d1c760..b0172cbc5 100644
--- a/entities/coreutils.ent
+++ b/entities/coreutils.ent
@@ -20,10 +20,10 @@
 <!ENTITY coreutils-package "coreutils-&coreutils-version;.tar.bz2">
 <!ENTITY coreutils-size "3,860 KB">
 
+<!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname.patch">
 <!ENTITY coreutils-uname-patch-size "1 KB">
-<!ENTITY coreutils-uname-patch-version "5.0-uname">
+<!ENTITY coreutils-hostname-patch "coreutils-&coreutils-version;-hostname-2.patch">
 <!ENTITY coreutils-hostname-patch-size "1 KB">
-<!ENTITY coreutils-hostname-patch-version "5.0-hostname-2">
 
 <!ENTITY coreutils-compsize-static "17 MB">
 <!ENTITY coreutils-time-static "0.8 SBU">
diff --git a/entities/ed.ent b/entities/ed.ent
index 6df9a6ec3..4a5660727 100644
--- a/entities/ed.ent
+++ b/entities/ed.ent
@@ -17,8 +17,8 @@
 <!ENTITY ed-package "ed-&ed-version;.tar.bz2">
 <!ENTITY ed-size "182 KB">
 
+<!ENTITY ed-patch "ed-&ed-version;.patch">
 <!ENTITY ed-patch-size "1 KB">
-<!ENTITY ed-patch-version "0.2">
 
 <!ENTITY ed-compsize "3 MB">
 <!ENTITY ed-time "0.1 SBU">
diff --git a/entities/expect.ent b/entities/expect.ent
index 63abf8b61..296a5c8c2 100644
--- a/entities/expect.ent
+++ b/entities/expect.ent
@@ -17,7 +17,7 @@
 <!ENTITY expect-package "expect-&expect-version;.tar.bz2">
 <!ENTITY expect-size "508 KB">
 
-<!ENTITY expect-patch-version "5.39.0">
+<!ENTITY expect-patch "expect-&expect-version;.patch">
 <!ENTITY expect-patch-size "6 KB">
 
 <!ENTITY expect-compsize-static "24 MB">
diff --git a/entities/gawk.ent b/entities/gawk.ent
index 6ccadf3be..702929f94 100644
--- a/entities/gawk.ent
+++ b/entities/gawk.ent
@@ -20,8 +20,8 @@
 <!ENTITY gawk-package "gawk-&gawk-version;.tar.bz2">
 <!ENTITY gawk-size "1,596 KB">
 
+<!ENTITY gawk-patch "gawk-&gawk-version;.patch">
 <!ENTITY gawk-patch-size "1 KB">
-<!ENTITY gawk-patch-version "3.1.3">
 
 <!ENTITY gawk-compsize-static "17 MB">
 <!ENTITY gawk-time-static "0.2 SBU">
diff --git a/entities/gcc-2953.ent b/entities/gcc-2953.ent
index 00864368e..0151e5689 100644
--- a/entities/gcc-2953.ent
+++ b/entities/gcc-2953.ent
@@ -17,11 +17,11 @@
 <!ENTITY gcc-2953-package "gcc-&gcc-2953-version;.tar.bz2">
 <!ENTITY gcc-2953-size "9,618 KB">
 
-<!ENTITY gcc-2953-patch-version "2.95.3-2">
+<!ENTITY gcc-2953-patch "gcc-&gcc-2953-version;-2.patch">
 <!ENTITY gcc-2953-patch-size "16 KB">
-<!ENTITY gcc-2953-no-fixinc-patch-version "2.95.3-no-fixinc">
+<!ENTITY gcc-2953-no-fixinc-patch "gcc-&gcc-2953-version;-no-fixinc.patch">
 <!ENTITY gcc-2953-no-fixinc-patch-size "1 KB">
-<!ENTITY gcc-2953-returntype-fix-patch-version "2.95.3-returntype-fix">
+<!ENTITY gcc-2953-returntype-fix-patch "gcc-&gcc-2953-version;-returntype-fix.patch">
 <!ENTITY gcc-2953-returntype-fix-patch-size "1 KB">
 
 
diff --git a/entities/gcc.ent b/entities/gcc.ent
index 39a33c664..92dc528a9 100644
--- a/entities/gcc.ent
+++ b/entities/gcc.ent
@@ -27,11 +27,11 @@
 <!ENTITY gcc-gpp-size "2,017 KB">
 <!ENTITY gcc-testsuite-size "1,033 KB">
 
-<!ENTITY gcc-nofixincludes-patch-version "3.3.1-no_fixincludes-2">
+<!ENTITY gcc-nofixincludes-patch "gcc-&gcc-version;-no_fixincludes-2.patch">
 <!ENTITY gcc-nofixincludes-patch-size "1 KB">
-<!ENTITY gcc-specs-patch-version "3.3.1-specs-2">
+<!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-2.patch">
 <!ENTITY gcc-specs-patch-size "10 KB">
-<!ENTITY gcc-suppress-libiberty-patch-version "3.3.1-suppress-libiberty">
+<!ENTITY gcc-suppress-libiberty-patch "gcc-&gcc-version;-suppress-libiberty.patch">
 <!ENTITY gcc-suppress-libiberty-patch-size "1 KB">
 
 <!ENTITY gcc-compsize-pass1-stage1 "326 MB">
diff --git a/entities/glibc.ent b/entities/glibc.ent
index 78a6677ef..eb473a6e4 100644
--- a/entities/glibc.ent
+++ b/entities/glibc.ent
@@ -25,7 +25,7 @@
 <!ENTITY glibc-size "13,064 KB">
 <!ENTITY glibc-threads-size "211 KB">
 
-<!ENTITY glibc-sscanf-patch-version "2.3.2-sscanf-1">
+<!ENTITY glibc-sscanf-patch "glibc-&glibc-version;-sscanf-1.patch">
 <!ENTITY glibc-sscanf-patch-size "2 KB">
 
 <!ENTITY glibc-compsize "369 MB">
diff --git a/entities/grub.ent b/entities/grub.ent
index b1a928801..b9d3df919 100644
--- a/entities/grub.ent
+++ b/entities/grub.ent
@@ -18,7 +18,7 @@
 <!ENTITY grub-package "grub-&grub-version;.tar.bz2">
 <!ENTITY grub-size "870 KB">
 
-<!ENTITY grub-patch-version "0.93-gcc33-1">
+<!ENTITY grub-patch "grub-&grub-version;-gcc33-1.patch">
 <!ENTITY grub-patch-size "1 KB">
 
 <!ENTITY grub-compsize "9 MB">
diff --git a/entities/kbd.ent b/entities/kbd.ent
index d8bebf62c..f3a5121f1 100644
--- a/entities/kbd.ent
+++ b/entities/kbd.ent
@@ -17,7 +17,7 @@
 <!ENTITY kbd-package "kbd-&kbd-version;.tar.bz2">
 <!ENTITY kbd-size "801 KB">
 
-<!ENTITY kbd-patch-version "1.08">
+<!ENTITY kbd-patch "kbd-&kbd-version;.patch">
 <!ENTITY kbd-patch-size "1 KB">
 
 <!ENTITY kbd-compsize "8 MB">
diff --git a/entities/libtool.ent b/entities/libtool.ent
index a13fc63d5..566976603 100644
--- a/entities/libtool.ent
+++ b/entities/libtool.ent
@@ -16,8 +16,8 @@
 <!ENTITY libtool-package "libtool-&libtool-version;.tar.bz2">
 <!ENTITY libtool-size "2,751 KB">
 
+<!ENTITY libtool-patch "libtool-&libtool-version;.patch">
 <!ENTITY libtool-patch-size "11 KB">
-<!ENTITY libtool-patch-version "1.4.2">
 
 <!ENTITY libtool-compsize "7 MB">
 <!ENTITY libtool-time "1.1 SBU">
diff --git a/entities/man.ent b/entities/man.ent
index 6d12ca1f0..352caa358 100644
--- a/entities/man.ent
+++ b/entities/man.ent
@@ -17,11 +17,11 @@
 <!ENTITY man-package "man-&man-version;.tar.bz2">
 <!ENTITY man-size "196 KB">
 
-<!ENTITY man-80cols-patch-version "1.5m2-80cols">
+<!ENTITY man-80cols-patch "man-&man-version;-80cols.patch">
 <!ENTITY man-80cols-patch-size "1 KB">
-<!ENTITY man-manpath-patch-version "1.5m2-manpath">
+<!ENTITY man-manpath-patch "man-&man-version;-manpath.patch">
 <!ENTITY man-manpath-patch-size "1 KB">
-<!ENTITY man-pager-patch-version "1.5m2-pager">
+<!ENTITY man-pager-patch "man-&man-version;-pager.patch">
 <!ENTITY man-pager-patch-size "1 KB">
 
 
diff --git a/entities/ncurses.ent b/entities/ncurses.ent
index a3b6cc7ed..2717598d5 100644
--- a/entities/ncurses.ent
+++ b/entities/ncurses.ent
@@ -20,9 +20,9 @@
 <!ENTITY ncurses-package "ncurses-&ncurses-version;.tar.bz2">
 <!ENTITY ncurses-size "2,019 KB">
 
-<!ENTITY ncurses-etip-patch-version "5.3-etip-2">
+<!ENTITY ncurses-etip-patch "ncurses-&ncurses-version;-etip-2.patch">
 <!ENTITY ncurses-etip-patch-size "1 KB">
-<!ENTITY ncurses-vsscanf-patch-version "5.3-vsscanf">
+<!ENTITY ncurses-vsscanf-patch "ncurses-&ncurses-version;-vsscanf.patch">
 <!ENTITY ncurses-vsscanf-patch-size "1 KB">
 
 <!ENTITY ncurses-compsize "22 MB">
diff --git a/entities/nettools.ent b/entities/nettools.ent
index 593424d5d..54eeec8b6 100644
--- a/entities/nettools.ent
+++ b/entities/nettools.ent
@@ -16,7 +16,7 @@
 <!ENTITY net-tools-package "net-tools-&net-tools-version;.tar.bz2">
 <!ENTITY net-tools-size "194 KB">
 
-<!ENTITY net-tools-mii-patch-version "1.60-miitool-gcc33-1">
+<!ENTITY net-tools-mii-patch "net-tools-&net-tools-version;-miitool-gcc33-1.patch">
 <!ENTITY net-tools-mii-patch-size "2 KB">
 
 <!ENTITY net-tools-compsize "5 MB">
diff --git a/entities/perl.ent b/entities/perl.ent
index 0a579eea7..71af5e446 100644
--- a/entities/perl.ent
+++ b/entities/perl.ent
@@ -20,7 +20,7 @@
 <!ENTITY perl-package "perl-&perl-version;.tar.bz2">
 <!ENTITY perl-size "10,765 KB">
 
-<!ENTITY perl-libc-patch-version "5.8.0-libc-3">
+<!ENTITY perl-libc-patch "perl-&perl-version;-libc-3.patch">
 <!ENTITY perl-libc-patch-size "1 KB">
 
 <!ENTITY perl-compsize-static "52 MB">
diff --git a/entities/procps.ent b/entities/procps.ent
index cdfda3146..010f4e488 100644
--- a/entities/procps.ent
+++ b/entities/procps.ent
@@ -17,7 +17,7 @@
 <!ENTITY procps-package "procps-&procps-version;.tar.bz2">
 <!ENTITY procps-size "242 KB">
 
-<!ENTITY procps-patch-version "3.1.11">
+<!ENTITY procps-patch "procps-&procps-version;.patch">
 <!ENTITY procps-patch-size "1 KB">
 
 <!ENTITY procps-compsize "2 MB">
diff --git a/entities/shadow.ent b/entities/shadow.ent
index 82b89f8a8..5c41eae92 100644
--- a/entities/shadow.ent
+++ b/entities/shadow.ent
@@ -17,7 +17,7 @@
 <!ENTITY shadow-package "shadow-&shadow-version;.tar.bz2">
 <!ENTITY shadow-size "760 KB">
 
-<!ENTITY shadow-patch-version "4.0.3-newgrp-fix">
+<!ENTITY shadow-patch "shadow-&shadow-version;-newgrp-fix.patch">
 <!ENTITY shadow-patch-size "1 KB">
 
 <!ENTITY shadow-compsize "7 MB">
diff --git a/entities/zlib.ent b/entities/zlib.ent
index 575874d86..e20ad827f 100644
--- a/entities/zlib.ent
+++ b/entities/zlib.ent
@@ -17,7 +17,7 @@
 <!ENTITY zlib-package "zlib-&zlib-version;.tar.bz2">
 <!ENTITY zlib-size "144 KB">
 
-<!ENTITY zlib-patch-version "1.1.4-vsnprintf">
+<!ENTITY zlib-patch "zlib-&zlib-version;-vsnprintf.patch">
 <!ENTITY zlib-patch-size "10 KB">
 
 <!ENTITY zlib-compsize "1 MB">