Appendix A and Entities cleanup.

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

7 files changed, 22 insertions, 17 deletions

diff --git a/entities/binutils.ent b/entities/binutils.ent
index 6a0721ead..c31a9a758 100644
--- a/entities/binutils.ent
+++ b/entities/binutils.ent
@@ -18,7 +18,7 @@
 <!ENTITY binutils-version "2.14">
 <!ENTITY binutils-depversion "2.11.2">
 <!ENTITY binutils-contversion "2.12.1">
-<!ENTITY binutils-size "9,534 KB">
+<!ENTITY binutils-size "10,665 KB">
 <!ENTITY binutils-package "binutils-&binutils-version;.tar.bz2">
 <!ENTITY binutils-dir "binutils-&binutils-version;">
 
diff --git a/entities/dejagnu.ent b/entities/dejagnu.ent
index adb1bd484..ec8ea9a45 100644
--- a/entities/dejagnu.ent
+++ b/entities/dejagnu.ent
@@ -14,7 +14,7 @@
 <!ENTITY dejagnu-contversion "1.4.3">
 <!ENTITY dejagnu-package "dejagnu-&dejagnu-version;.tar.bz2">
 <!ENTITY dejagnu-dir "dejagnu-&dejagnu-version;">
-<!ENTITY dejagnu-size "">
+<!ENTITY dejagnu-size "1,774 KB">
 
 <!ENTITY dejagnu-compsize-static "24 MB">
 <!ENTITY dejagnu-time-static "0.1 SBU">
diff --git a/entities/expect.ent b/entities/expect.ent
index bb7af2110..a29801c49 100644
--- a/entities/expect.ent
+++ b/entities/expect.ent
@@ -13,10 +13,11 @@
 <!ENTITY expect-version "5.39.0">
 <!ENTITY expect-depversion "5.39.0">
 <!ENTITY expect-contversion "5.39.0">
-<!ENTITY expect-patch-version "5.39.0">
 <!ENTITY expect-package "expect-&expect-version;.tar.bz2">
 <!ENTITY expect-dir "expect-&expect-version;">
 <!ENTITY expect-size "508 KB">
+
+<!ENTITY expect-patch-version "5.39.0">
 <!ENTITY expect-patch-size "6.5 KB">
 
 <!ENTITY expect-compsize-static "24 MB">
diff --git a/entities/gcc-2953.ent b/entities/gcc-2953.ent
index 88325afe6..81f1dd55b 100644
--- a/entities/gcc-2953.ent
+++ b/entities/gcc-2953.ent
@@ -14,12 +14,14 @@
 <!ENTITY gcc-2953-depversion "2.95.3">
 <!ENTITY gcc-2953-contversion "2.95.3">
 <!ENTITY gcc-2953-size "2520 KB">
+
 <!ENTITY gcc-2953-patch-version "2.95.3-2">
-<!ENTITY gcc-2953-patch-size "4 KB">
+<!ENTITY gcc-2953-patch-size "16 KB">
 <!ENTITY gcc-2953-no-fixinc-patch-version "2.95.3">
 <!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-size "1 KB">
+
 <!ENTITY gcc-2953-package "gcc-&gcc-2953-version;.tar.bz2">
 <!ENTITY gcc-2953-dir "gcc-&gcc-2953-version;">
 
diff --git a/entities/gcc.ent b/entities/gcc.ent
index c41eaf2fe..eb33aae5f 100644
--- a/entities/gcc.ent
+++ b/entities/gcc.ent
@@ -17,19 +17,23 @@
 <!ENTITY aa-gcc-down SYSTEM "../appendixa/gcc-down.xml">
 
 <!ENTITY gcc-version "3.3.1">
-<!ENTITY gcc-specs-version "3.3.1-specs-2">
 <!ENTITY gcc-depversion "2.95.3">
 <!ENTITY gcc-contversion "3.1">
-<!ENTITY gcc-core-size "13,140 KB">
-<!ENTITY gcc-gpp-size "2564 KB">
-<!ENTITY gcc-testsuite-size "1180 KB">
-<!ENTITY gcc-patch-version "3.2.1">
-<!ENTITY gcc-patch-size "4 KB">
+<!ENTITY gcc-core-size "10,969 KB">
+<!ENTITY gcc-gpp-size "2,016 KB">
+<!ENTITY gcc-testsuite-size "1,033 KB">
 <!ENTITY gcc-core-package "gcc-core-&gcc-version;.tar.bz2">
 <!ENTITY gcc-gpp-package "gcc-g++-&gcc-version;.tar.bz2">
 <!ENTITY gcc-testsuite-package "gcc-testsuite-&gcc-version;.tar.bz2">
 <!ENTITY gcc-dir "gcc-&gcc-version;">
 
+<!ENTITY gcc-nofixincludes-patch-version "3.3.1-no_fixincludes-2">
+<!ENTITY gcc-nofixincludes-patch-size "1 KB">
+<!ENTITY gcc-specs-patch-version "3.3.1-specs-2">
+<!ENTITY gcc-specs-patch-size "10 KB">
+<!ENTITY gcc-suppress-libiberty-patch-version "3.3.1-suppress-libiberty">
+<!ENTITY gcc-suppress-libiberty-patch-size "1 KB">
+
 <!ENTITY gcc-compsize-pass1-stage1 "326 MB">
 <!ENTITY gcc-time-pass1-stage1 "3.9 SBU">
 
diff --git a/entities/glibc.ent b/entities/glibc.ent
index 380e18d16..d29f24c0b 100644
--- a/entities/glibc.ent
+++ b/entities/glibc.ent
@@ -18,13 +18,11 @@
 <!ENTITY glibc-version "2.3.2">
 <!ENTITY glibc-depversion "2.2.5">
 <!ENTITY glibc-contversion "2.2.5">
-<!ENTITY glibc-size "17,463 KB">
-<!ENTITY glibc-threads-size "238 KB">
+<!ENTITY glibc-size "13,063 KB">
+<!ENTITY glibc-threads-size "211 KB">
 
-<!ENTITY glibc-rootperl-patch-size "1 KB">
-<!ENTITY glibc-rootperl-patch-version "2.3.1">
-<!ENTITY glibc-libnss-patch-size "1 KB">
-<!ENTITY glibc-libnss-patch-version "2.3.1">
+<!ENTITY glibc-sscanf-patch-version "2.3.2-sscanf-1">
+<!ENTITY glibc-sscanf-patch-size "2 KB">
 
 <!ENTITY glibc-dir "glibc-&glibc-version;">
 <!ENTITY glibc-threads-dir "linuxthreads, linuxthreads_db">
diff --git a/entities/tcl.ent b/entities/tcl.ent
index 3ffae00bc..7bf226685 100644
--- a/entities/tcl.ent
+++ b/entities/tcl.ent
@@ -14,7 +14,7 @@
 <!ENTITY tcl-contversion "8.4.4">
 <!ENTITY tcl-package "tcl-&tcl-version;.tar.bz2">
 <!ENTITY tcl-dir "tcl-&tcl-version;">
-<!ENTITY tcl-size "3,370 KB">
+<!ENTITY tcl-size "3,291 KB">
 
 <!ENTITY tcl-compsize-static "24 MB">
 <!ENTITY tcl-time-static "0.6 SBU">