From c1f00d2596a81bcc5e957b90a1f015a788b069c7 Mon Sep 17 00:00:00 2001
From: Alex Gronenwoud <alex@linuxfromscratch.org>
Date: Mon, 6 Oct 2003 22:18:31 +0000
Subject: Updating package sizes.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2929 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 entities/autoconf.ent    |  2 +-
 entities/automake.ent    |  4 ++--
 entities/bash.ent        |  5 +++--
 entities/binutils.ent    |  5 ++---
 entities/bison.ent       |  3 ++-
 entities/bootscripts.ent |  2 +-
 entities/bzip2.ent       |  2 +-
 entities/coreutils.ent   |  3 ++-
 entities/dejagnu.ent     |  4 ++--
 entities/e2fsprogs.ent   |  2 +-
 entities/ed.ent          |  5 +++--
 entities/expect.ent      |  2 +-
 entities/file.ent        |  2 +-
 entities/findutils.ent   |  2 +-
 entities/flex.ent        |  2 +-
 entities/gawk.ent        |  7 ++++---
 entities/gcc-2953.ent    |  6 +++---
 entities/gcc.ent         |  8 ++++----
 entities/gettext.ent     |  3 +--
 entities/glibc.ent       | 11 +++++------
 entities/grep.ent        |  4 ++--
 entities/groff.ent       |  2 +-
 entities/grub.ent        |  6 +++---
 entities/gzip.ent        |  4 ++--
 entities/inetutils.ent   |  4 ++--
 entities/kbd.ent         |  5 +++--
 entities/kernel.ent      |  4 ++--
 entities/less.ent        |  2 +-
 entities/lfs-utils.ent   |  2 +-
 entities/libtool.ent     |  7 ++++---
 entities/m4.ent          |  2 +-
 entities/make.ent        |  4 ++--
 entities/makedev.ent     |  2 +-
 entities/man.ent         |  6 +++---
 entities/manpages.ent    |  2 +-
 entities/modutils.ent    |  2 +-
 entities/ncurses.ent     |  5 +++--
 entities/nettools.ent    |  3 ++-
 entities/patch.ent       |  4 ++--
 entities/perl.ent        |  7 ++++---
 entities/procinfo.ent    |  2 +-
 entities/procps.ent      |  7 ++++---
 entities/psmisc.ent      |  2 +-
 entities/sed.ent         |  4 ++--
 entities/shadow.ent      |  8 ++++----
 entities/sysklogd.ent    |  2 +-
 entities/sysvinit.ent    |  2 +-
 entities/tar.ent         |  4 ++--
 entities/tcl.ent         |  4 ++--
 entities/texinfo.ent     |  2 +-
 entities/utillinux.ent   |  2 +-
 entities/vim.ent         |  2 +-
 entities/zlib.ent        |  3 ++-
 index.xml                |  4 ++--
 54 files changed, 107 insertions(+), 98 deletions(-)

diff --git a/entities/autoconf.ent b/entities/autoconf.ent
index 9093cc726..6b764ceb1 100644
--- a/entities/autoconf.ent
+++ b/entities/autoconf.ent
@@ -12,9 +12,9 @@
 <!ENTITY autoconf-version "2.57">
 <!ENTITY autoconf-depversion "2.52">
 <!ENTITY autoconf-contversion "2.53">
-<!ENTITY autoconf-size "792 KB">
 <!ENTITY autoconf-dir "autoconf-&autoconf-version;">
 <!ENTITY autoconf-package "autoconf-&autoconf-version;.tar.bz2">
+<!ENTITY autoconf-size "792 KB">
 
 <!ENTITY autoconf-compsize "6 MB">
 <!ENTITY autoconf-time "2.3 SBU">
diff --git a/entities/automake.ent b/entities/automake.ent
index 06ee05e99..59c6be5bf 100644
--- a/entities/automake.ent
+++ b/entities/automake.ent
@@ -12,9 +12,9 @@
 <!ENTITY automake-version "1.7.6">
 <!ENTITY automake-depversion "1.5">
 <!ENTITY automake-contversion "1.6.2">
-<!ENTITY automake-size "518 KB">
-<!ENTITY automake-package "automake-&automake-version;.tar.bz2">
 <!ENTITY automake-dir "automake-&automake-version;">
+<!ENTITY automake-package "automake-&automake-version;.tar.bz2">
+<!ENTITY automake-size "545 KB">
 
 <!ENTITY automake-compsize "6 MB">
 <!ENTITY automake-time "4.1 SBU">
diff --git a/entities/bash.ent b/entities/bash.ent
index df7c5cf39..45fd23288 100644
--- a/entities/bash.ent
+++ b/entities/bash.ent
@@ -16,9 +16,10 @@
 <!ENTITY bash-version "2.05b">
 <!ENTITY bash-depversion "2.05a">
 <!ENTITY bash-contversion "2.05a">
-<!ENTITY bash-package "bash-&bash-version;.tar.bz2">
 <!ENTITY bash-dir "bash-&bash-version;">
-<!ENTITY bash-size "1,766 KB">
+<!ENTITY bash-package "bash-&bash-version;.tar.bz2">
+<!ENTITY bash-size "1,910 KB">
+
 <!ENTITY bash-patch-version "2.05b-2">
 <!ENTITY bash-patch-size "7 KB">
 
diff --git a/entities/binutils.ent b/entities/binutils.ent
index c31a9a758..1eec9f7d3 100644
--- a/entities/binutils.ent
+++ b/entities/binutils.ent
@@ -5,7 +5,6 @@
 <!ENTITY c5-binutils-pass2 SYSTEM "../chapter05/binutils-pass2.xml">
 <!ENTITY c5-binutils-pass2-inst SYSTEM "../chapter05/binutils-pass2-inst.xml">
 
-
 <!ENTITY c6-binutils SYSTEM "../chapter06/binutils.xml">
 <!ENTITY c6-binutils-inst SYSTEM "../chapter06/binutils-inst.xml">
 
@@ -18,9 +17,9 @@
 <!ENTITY binutils-version "2.14">
 <!ENTITY binutils-depversion "2.11.2">
 <!ENTITY binutils-contversion "2.12.1">
-<!ENTITY binutils-size "10,665 KB">
-<!ENTITY binutils-package "binutils-&binutils-version;.tar.bz2">
 <!ENTITY binutils-dir "binutils-&binutils-version;">
+<!ENTITY binutils-package "binutils-&binutils-version;.tar.bz2">
+<!ENTITY binutils-size "10,666 KB">
 
 <!ENTITY binutils-pass1-compsize-stage1 "160 MB">
 <!ENTITY binutils-pass1-time-stage1 "1.0 SBU">
diff --git a/entities/bison.ent b/entities/bison.ent
index e66758cb2..af7e94252 100644
--- a/entities/bison.ent
+++ b/entities/bison.ent
@@ -12,9 +12,10 @@
 <!ENTITY bison-version "1.875">
 <!ENTITY bison-depversion "1.31">
 <!ENTITY bison-contversion "1.35">
-<!ENTITY bison-size "796 KB">
 <!ENTITY bison-dir "bison-&bison-version;">
 <!ENTITY bison-package "bison-&bison-version;.tar.bz2">
+<!ENTITY bison-size "796 KB">
+
 <!ENTITY bison-patch-version "1.875-attribute">
 <!ENTITY bison-patch-size "2 KB">
 
diff --git a/entities/bootscripts.ent b/entities/bootscripts.ent
index 3a291ce7e..416d8498c 100644
--- a/entities/bootscripts.ent
+++ b/entities/bootscripts.ent
@@ -12,9 +12,9 @@
 <!ENTITY bootscripts-version "1.11">
 <!ENTITY bootscripts-depversion "1.11">
 <!ENTITY bootscripts-contversion "1.11">
-<!ENTITY bootscripts-size "25 KB">
 <!ENTITY bootscripts-dir "lfs-bootscritps-&bootscripts-version;">
 <!ENTITY bootscripts-package "lfs-bootscripts-&bootscripts-version;.tar.bz2">
+<!ENTITY bootscripts-size "25 KB">
 
 <!ENTITY bootscripts-compsize "252 KB">
 <!ENTITY bootscripts-time "0.1 SBU">
diff --git a/entities/bzip2.ent b/entities/bzip2.ent
index 81a386754..9ce528088 100644
--- a/entities/bzip2.ent
+++ b/entities/bzip2.ent
@@ -15,8 +15,8 @@
 <!ENTITY bzip2-version "1.0.2">
 <!ENTITY bzip2-depversion "1.0.1">
 <!ENTITY bzip2-contversion "1.0.2">
-<!ENTITY bzip2-package "bzip2-&bzip2-version;.tar.bz2">
 <!ENTITY bzip2-dir "bzip2-&bzip2-version;">
+<!ENTITY bzip2-package "bzip2-&bzip2-version;.tar.bz2">
 <!ENTITY bzip2-size "650 KB">
 
 <!ENTITY bzip2-compsize-static "6 MB">
diff --git a/entities/coreutils.ent b/entities/coreutils.ent
index 1e17a7543..339d1c760 100644
--- a/entities/coreutils.ent
+++ b/entities/coreutils.ent
@@ -16,9 +16,10 @@
 <!ENTITY coreutils-version "5.0">
 <!ENTITY coreutils-depversion "">
 <!ENTITY coreutils-contversion "">
-<!ENTITY coreutils-size "1,831 KB">
 <!ENTITY coreutils-dir "coreutils-&coreutils-version;">
 <!ENTITY coreutils-package "coreutils-&coreutils-version;.tar.bz2">
+<!ENTITY coreutils-size "3,860 KB">
+
 <!ENTITY coreutils-uname-patch-size "1 KB">
 <!ENTITY coreutils-uname-patch-version "5.0-uname">
 <!ENTITY coreutils-hostname-patch-size "1 KB">
diff --git a/entities/dejagnu.ent b/entities/dejagnu.ent
index ec8ea9a45..2ef084073 100644
--- a/entities/dejagnu.ent
+++ b/entities/dejagnu.ent
@@ -12,9 +12,9 @@
 <!ENTITY dejagnu-version "1.4.3">
 <!ENTITY dejagnu-depversion "1.4.3">
 <!ENTITY dejagnu-contversion "1.4.3">
-<!ENTITY dejagnu-package "dejagnu-&dejagnu-version;.tar.bz2">
 <!ENTITY dejagnu-dir "dejagnu-&dejagnu-version;">
-<!ENTITY dejagnu-size "1,774 KB">
+<!ENTITY dejagnu-package "dejagnu-&dejagnu-version;.tar.bz2">
+<!ENTITY dejagnu-size "1,775 KB">
 
 <!ENTITY dejagnu-compsize-static "24 MB">
 <!ENTITY dejagnu-time-static "0.1 SBU">
diff --git a/entities/e2fsprogs.ent b/entities/e2fsprogs.ent
index c8f24490f..33447854d 100644
--- a/entities/e2fsprogs.ent
+++ b/entities/e2fsprogs.ent
@@ -12,9 +12,9 @@
 <!ENTITY e2fsprogs-version "1.34">
 <!ENTITY e2fsprogs-depversion "1.25">
 <!ENTITY e2fsprogs-contversion "1.27">
-<!ENTITY e2fsprogs-size "2,827 KB">
 <!ENTITY e2fsprogs-dir "e2fsprogs-&e2fsprogs-version;">
 <!ENTITY e2fsprogs-package "e2fsprogs-&e2fsprogs-version;.tar.bz2">
+<!ENTITY e2fsprogs-size "3,003 KB">
 
 <!ENTITY e2fsprogs-compsize "13 MB">
 <!ENTITY e2fsprogs-time "0.5 SBU">
diff --git a/entities/ed.ent b/entities/ed.ent
index 13217c55b..6df9a6ec3 100644
--- a/entities/ed.ent
+++ b/entities/ed.ent
@@ -13,11 +13,12 @@
 <!ENTITY ed-version "0.2">
 <!ENTITY ed-depversion "0.2">
 <!ENTITY ed-contversion "0.2">
+<!ENTITY ed-dir "ed-&ed-version;">
+<!ENTITY ed-package "ed-&ed-version;.tar.bz2">
 <!ENTITY ed-size "182 KB">
+
 <!ENTITY ed-patch-size "1 KB">
 <!ENTITY ed-patch-version "0.2">
-<!ENTITY ed-dir "ed-&ed-version;">
-<!ENTITY ed-package "ed-&ed-version;.tar.bz2">
 
 <!ENTITY ed-compsize "3 MB">
 <!ENTITY ed-time "0.1 SBU">
diff --git a/entities/expect.ent b/entities/expect.ent
index adebcb5ba..63abf8b61 100644
--- a/entities/expect.ent
+++ b/entities/expect.ent
@@ -13,8 +13,8 @@
 <!ENTITY expect-version "5.39.0">
 <!ENTITY expect-depversion "5.39.0">
 <!ENTITY expect-contversion "5.39.0">
-<!ENTITY expect-package "expect-&expect-version;.tar.bz2">
 <!ENTITY expect-dir "expect-&expect-version;">
+<!ENTITY expect-package "expect-&expect-version;.tar.bz2">
 <!ENTITY expect-size "508 KB">
 
 <!ENTITY expect-patch-version "5.39.0">
diff --git a/entities/file.ent b/entities/file.ent
index fc65cc867..d77c5ae81 100644
--- a/entities/file.ent
+++ b/entities/file.ent
@@ -13,9 +13,9 @@
 <!ENTITY file-version "4.04">
 <!ENTITY file-depversion "3.37">
 <!ENTITY file-contversion "3.39">
-<!ENTITY file-size "177 KB">
 <!ENTITY file-dir "file-&file-version;">
 <!ENTITY file-package "file-&file-version;.tar.bz2">
+<!ENTITY file-size "338 KB">
 
 <!ENTITY file-compsize "2 MB">
 <!ENTITY file-time "0.1 SBU">
diff --git a/entities/findutils.ent b/entities/findutils.ent
index d642e60c6..5bb8eff03 100644
--- a/entities/findutils.ent
+++ b/entities/findutils.ent
@@ -15,9 +15,9 @@
 <!ENTITY findutils-version "4.1.20">
 <!ENTITY findutils-depversion "4.1">
 <!ENTITY findutils-contversion "4.1">
-<!ENTITY findutils-size "759 KB">
 <!ENTITY findutils-dir "findutils-&findutils-version;">
 <!ENTITY findutils-package "findutils-&findutils-version;.tar.bz2">
+<!ENTITY findutils-size "760 KB">
 
 <!ENTITY findutils-compsize-static "8 MB">
 <!ENTITY findutils-time-static "0.2 SBU">
diff --git a/entities/flex.ent b/entities/flex.ent
index 8b91df762..26c6a2ade 100644
--- a/entities/flex.ent
+++ b/entities/flex.ent
@@ -12,9 +12,9 @@
 <!ENTITY flex-version "2.5.4a">
 <!ENTITY flex-depversion "2.5.4a">
 <!ENTITY flex-contversion "2.5.4a">
-<!ENTITY flex-size "372 KB">
 <!ENTITY flex-dir "flex-&flex-version;">
 <!ENTITY flex-package "flex-&flex-version;.tar.bz2">
+<!ENTITY flex-size "372 KB">
 
 <!ENTITY flex-compsize "3 MB">
 <!ENTITY flex-time "0.1 SBU">
diff --git a/entities/gawk.ent b/entities/gawk.ent
index fdf3a6bb1..6ccadf3be 100644
--- a/entities/gawk.ent
+++ b/entities/gawk.ent
@@ -16,11 +16,12 @@
 <!ENTITY gawk-version "3.1.3">
 <!ENTITY gawk-depversion "3.1.0">
 <!ENTITY gawk-contversion "3.1.1">
-<!ENTITY gawk-size "1,831 KB">
-<!ENTITY gawk-patch-size "1 KB">
-<!ENTITY gawk-patch-version "3.1.3">
 <!ENTITY gawk-dir "gawk-&gawk-version;">
 <!ENTITY gawk-package "gawk-&gawk-version;.tar.bz2">
+<!ENTITY gawk-size "1,596 KB">
+
+<!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 c587226f9..00864368e 100644
--- a/entities/gcc-2953.ent
+++ b/entities/gcc-2953.ent
@@ -13,7 +13,9 @@
 <!ENTITY gcc-2953-version "2.95.3">
 <!ENTITY gcc-2953-depversion "2.95.3">
 <!ENTITY gcc-2953-contversion "2.95.3">
-<!ENTITY gcc-2953-size "12,609 KB">
+<!ENTITY gcc-2953-dir "gcc-&gcc-2953-version;">
+<!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-size "16 KB">
@@ -22,8 +24,6 @@
 <!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">
-<!ENTITY gcc-2953-dir "gcc-&gcc-2953-version;">
 
 <!ENTITY gcc-2953-compsize "221 MB">
 <!ENTITY gcc-2953-time "2.0 SBU">
diff --git a/entities/gcc.ent b/entities/gcc.ent
index eb33aae5f..39a33c664 100644
--- a/entities/gcc.ent
+++ b/entities/gcc.ent
@@ -19,13 +19,13 @@
 <!ENTITY gcc-version "3.3.1">
 <!ENTITY gcc-depversion "2.95.3">
 <!ENTITY gcc-contversion "3.1">
-<!ENTITY gcc-core-size "10,969 KB">
-<!ENTITY gcc-gpp-size "2,016 KB">
-<!ENTITY gcc-testsuite-size "1,033 KB">
+<!ENTITY gcc-dir "gcc-&gcc-version;">
 <!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-core-size "10,969 KB">
+<!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-size "1 KB">
diff --git a/entities/gettext.ent b/entities/gettext.ent
index 6f259cb25..e3b5dd83c 100644
--- a/entities/gettext.ent
+++ b/entities/gettext.ent
@@ -15,10 +15,9 @@
 <!ENTITY gettext-version "0.12.1">
 <!ENTITY gettext-depversion "0.10.40">
 <!ENTITY gettext-contversion "0.11.2">
-<!ENTITY gettext-size "3,637 KB">
-
 <!ENTITY gettext-dir "gettext-&gettext-version;">
 <!ENTITY gettext-package "gettext-&gettext-version;.tar.bz2">
+<!ENTITY gettext-size "5,593 KB">
 
 <!ENTITY gettext-compsize "39 MB">
 <!ENTITY gettext-time "5.4 SBU">
diff --git a/entities/glibc.ent b/entities/glibc.ent
index d29f24c0b..78a6677ef 100644
--- a/entities/glibc.ent
+++ b/entities/glibc.ent
@@ -18,16 +18,15 @@
 <!ENTITY glibc-version "2.3.2">
 <!ENTITY glibc-depversion "2.2.5">
 <!ENTITY glibc-contversion "2.2.5">
-<!ENTITY glibc-size "13,063 KB">
-<!ENTITY glibc-threads-size "211 KB">
-
-<!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">
 <!ENTITY glibc-package "glibc-&glibc-version;.tar.bz2">
 <!ENTITY glibc-threads-package "glibc-linuxthreads-&glibc-version;.tar.bz2">
+<!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-size "2 KB">
 
 <!ENTITY glibc-compsize "369 MB">
 <!ENTITY glibc-pass2-compsize "(to be determined)">
diff --git a/entities/grep.ent b/entities/grep.ent
index 5406b4163..6b392d221 100644
--- a/entities/grep.ent
+++ b/entities/grep.ent
@@ -15,9 +15,9 @@
 <!ENTITY grep-version "2.5.1">
 <!ENTITY grep-depversion "2.4.2">
 <!ENTITY grep-contversion "2.5">
-<!ENTITY grep-size "545 KB">
-<!ENTITY grep-package "grep-&grep-version;.tar.bz2">
 <!ENTITY grep-dir "grep-&grep-version;">
+<!ENTITY grep-package "grep-&grep-version;.tar.bz2">
+<!ENTITY grep-size "545 KB">
 
 <!ENTITY grep-compsize-static "5 MB">
 <!ENTITY grep-time-static "0.1 SBU">
diff --git a/entities/groff.ent b/entities/groff.ent
index a4c5fe6f6..ab3090942 100644
--- a/entities/groff.ent
+++ b/entities/groff.ent
@@ -12,9 +12,9 @@
 <!ENTITY groff-version "1.19">
 <!ENTITY groff-depversion "1.17.2">
 <!ENTITY groff-contversion "1.17.2">
-<!ENTITY groff-size "2,198 KB">
 <!ENTITY groff-dir "groff-&groff-version;">
 <!ENTITY groff-package "groff-&groff-version;.tar.bz2">
+<!ENTITY groff-size "2,360 KB">
 
 <!ENTITY groff-compsize "18 MB">
 <!ENTITY groff-time "0.4 SBU">
diff --git a/entities/grub.ent b/entities/grub.ent
index 8248ee8f4..b1a928801 100644
--- a/entities/grub.ent
+++ b/entities/grub.ent
@@ -14,12 +14,12 @@
 <!ENTITY grub-version "0.93">
 <!ENTITY grub-depversion "0.93">
 <!ENTITY grub-contversion "0.93">
+<!ENTITY grub-dir "grub-&grub-version;">
+<!ENTITY grub-package "grub-&grub-version;.tar.bz2">
 <!ENTITY grub-size "870 KB">
+
 <!ENTITY grub-patch-version "0.93-gcc33-1">
 <!ENTITY grub-patch-size "1 KB">
 
-<!ENTITY grub-dir "grub-&grub-version;">
-<!ENTITY grub-package "grub-&grub-version;.tar.bz2">
-
 <!ENTITY grub-compsize "9 MB">
 <!ENTITY grub-time "? SBU">
diff --git a/entities/gzip.ent b/entities/gzip.ent
index 826abb427..2907d0711 100644
--- a/entities/gzip.ent
+++ b/entities/gzip.ent
@@ -15,9 +15,9 @@
 <!ENTITY gzip-version "1.3.5">
 <!ENTITY gzip-depversion "1.2.4a">
 <!ENTITY gzip-contversion "1.2.4a">
-<!ENTITY gzip-size "323 KB">
-<!ENTITY gzip-package "gzip-&gzip-version;.tar.bz2">
 <!ENTITY gzip-dir "gzip-&gzip-version;">
+<!ENTITY gzip-package "gzip-&gzip-version;.tar.bz2">
+<!ENTITY gzip-size "324 KB">
 
 <!ENTITY gzip-compsize-static "2 MB">
 <!ENTITY gzip-time-static "0.1 SBU">
diff --git a/entities/inetutils.ent b/entities/inetutils.ent
index 9d45c136c..d4d9f98fd 100644
--- a/entities/inetutils.ent
+++ b/entities/inetutils.ent
@@ -12,9 +12,9 @@
 <!ENTITY inetutils-version "1.4.2">
 <!ENTITY inetutils-depversion "">
 <!ENTITY inetutils-contversion "1.4.2">
-<!ENTITY inetutils-size "746 KB">
-<!ENTITY inetutils-package "inetutils-&inetutils-version;.tar.bz2">
 <!ENTITY inetutils-dir "inetutils-&inetutils-version;">
+<!ENTITY inetutils-package "inetutils-&inetutils-version;.tar.bz2">
+<!ENTITY inetutils-size "1,019 KB">
 
 <!ENTITY inetutils-compsize "(to be determined)">
 <!ENTITY inetutils-time "0.3 SBU">
diff --git a/entities/kbd.ent b/entities/kbd.ent
index 45aaec138..d8bebf62c 100644
--- a/entities/kbd.ent
+++ b/entities/kbd.ent
@@ -13,11 +13,12 @@
 <!ENTITY kbd-version "1.08">
 <!ENTITY kbd-depversion "1.06">
 <!ENTITY kbd-contversion "1.06">
+<!ENTITY kbd-dir "kbd-&kbd-version;">
+<!ENTITY kbd-package "kbd-&kbd-version;.tar.bz2">
 <!ENTITY kbd-size "801 KB">
+
 <!ENTITY kbd-patch-version "1.08">
 <!ENTITY kbd-patch-size "1 KB">
-<!ENTITY kbd-dir "kbd-&kbd-version;">
-<!ENTITY kbd-package "kbd-&kbd-version;.tar.bz2">
 
 <!ENTITY kbd-compsize "8 MB">
 <!ENTITY kbd-time "0.1 SBU">
diff --git a/entities/kernel.ent b/entities/kernel.ent
index 0c3a4d376..ccdd4f98a 100644
--- a/entities/kernel.ent
+++ b/entities/kernel.ent
@@ -19,9 +19,9 @@
 <!ENTITY kernel-version "2.4.22">
 <!ENTITY kernel-depversion "2.4.17">
 <!ENTITY kernel-contversion "2.4.18">
-<!ENTITY kernel-size "29,529 KB">
-<!ENTITY kernel-package "linux-&kernel-version;.tar.bz2">
 <!ENTITY kernel-dir "linux">
+<!ENTITY kernel-package "linux-&kernel-version;.tar.bz2">
+<!ENTITY kernel-size "28,837 KB">
 
 <!ENTITY kernel-compsize-headers "142 MB">
 <!ENTITY kernel-time-headers "0.1 SBU">
diff --git a/entities/less.ent b/entities/less.ent
index 8f72e797f..69c372fb7 100644
--- a/entities/less.ent
+++ b/entities/less.ent
@@ -12,9 +12,9 @@
 <!ENTITY less-version "381">
 <!ENTITY less-depversion "358">
 <!ENTITY less-contversion "374">
-<!ENTITY less-size "239 KB">
 <!ENTITY less-dir "less-&less-version;">
 <!ENTITY less-package "less-&less-version;.tar.bz2">
+<!ENTITY less-size "259 KB">
 
 <!ENTITY less-compsize "2 MB">
 <!ENTITY less-time "0.1 SBU">
diff --git a/entities/lfs-utils.ent b/entities/lfs-utils.ent
index 32e362015..ef036f4f3 100644
--- a/entities/lfs-utils.ent
+++ b/entities/lfs-utils.ent
@@ -12,9 +12,9 @@
 <!ENTITY lfs-utils-version "0.3">
 <!ENTITY lfs-utils-depversion "">
 <!ENTITY lfs-utils-contversion "0.2.2">
-<!ENTITY lfs-utils-size "156 KB">
 <!ENTITY lfs-utils-dir "lfs-utils-&lfs-utils-version;">
 <!ENTITY lfs-utils-package "lfs-utils-&lfs-utils-version;.tar.bz2">
+<!ENTITY lfs-utils-size "221 KB">
 
 <!ENTITY lfs-utils-compsize "610 KB">
 <!ENTITY lfs-utils-time "0.1 SBU">
diff --git a/entities/libtool.ent b/entities/libtool.ent
index efae0d650..a13fc63d5 100644
--- a/entities/libtool.ent
+++ b/entities/libtool.ent
@@ -12,11 +12,12 @@
 <!ENTITY libtool-version "1.5">
 <!ENTITY libtool-depversion "1.4.2">
 <!ENTITY libtool-contversion "1.4.2">
-<!ENTITY libtool-size "1137 KB">
-<!ENTITY libtool-patch-size "11 KB">
-<!ENTITY libtool-patch-version "1.4.2">
 <!ENTITY libtool-dir "libtool-&libtool-version;">
 <!ENTITY libtool-package "libtool-&libtool-version;.tar.bz2">
+<!ENTITY libtool-size "2,751 KB">
+
+<!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/m4.ent b/entities/m4.ent
index 3e5f3bfd9..7754090b2 100644
--- a/entities/m4.ent
+++ b/entities/m4.ent
@@ -12,9 +12,9 @@
 <!ENTITY m4-version "1.4">
 <!ENTITY m4-depversion "1.4">
 <!ENTITY m4-contversion "1.4">
-<!ENTITY m4-size "310 KB">
 <!ENTITY m4-dir "m4-&m4-version;">
 <!ENTITY m4-package "m4-&m4-version;.tar.bz2">
+<!ENTITY m4-size "310 KB">
 
 <!ENTITY m4-compsize "3 MB">
 <!ENTITY m4-time "0.1 SBU">
diff --git a/entities/make.ent b/entities/make.ent
index 4df144a04..9cfc90534 100644
--- a/entities/make.ent
+++ b/entities/make.ent
@@ -16,9 +16,9 @@
 <!ENTITY make-version "3.80">
 <!ENTITY make-depversion "3.79.1">
 <!ENTITY make-contversion "3.79.1">
-<!ENTITY make-size "899 KB">
-<!ENTITY make-package "make-&make-version;.tar.bz2">
 <!ENTITY make-dir "make-&make-version;">
+<!ENTITY make-package "make-&make-version;.tar.bz2">
+<!ENTITY make-size "899 KB">
 
 <!ENTITY make-compsize-static "8 MB">
 <!ENTITY make-time-static "0.2 SBU">
diff --git a/entities/makedev.ent b/entities/makedev.ent
index 2712b5dae..76cfbc47f 100644
--- a/entities/makedev.ent
+++ b/entities/makedev.ent
@@ -12,8 +12,8 @@
 <!ENTITY makedev-version "1.7">
 <!ENTITY makedev-depversion "1.5">
 <!ENTITY makedev-contversion "1.5">
-<!ENTITY makedev-size "8 KB">
 <!ENTITY makedev-package "MAKEDEV-&makedev-version;.bz2">
+<!ENTITY makedev-size "8 KB">
 
 <!ENTITY makedev-compsize "50 KB">
 <!ENTITY makedev-time "0.1 SBU">
diff --git a/entities/man.ent b/entities/man.ent
index ba9738e32..6d12ca1f0 100644
--- a/entities/man.ent
+++ b/entities/man.ent
@@ -13,7 +13,9 @@
 <!ENTITY man-version "1.5m2">
 <!ENTITY man-depversion "1.5i">
 <!ENTITY man-contversion "1.5k">
-<!ENTITY man-size "222 KB">
+<!ENTITY man-dir "man-&man-version;">
+<!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-size "1 KB">
@@ -22,8 +24,6 @@
 <!ENTITY man-pager-patch-version "1.5m2-pager">
 <!ENTITY man-pager-patch-size "1 KB">
 
-<!ENTITY man-dir "man-&man-version;">
-<!ENTITY man-package "man-&man-version;.tar.bz2">
 
 <!ENTITY man-compsize "2 MB">
 <!ENTITY man-time "0.1 SBU">
diff --git a/entities/manpages.ent b/entities/manpages.ent
index 3125d732b..e19e69f62 100644
--- a/entities/manpages.ent
+++ b/entities/manpages.ent
@@ -12,9 +12,9 @@
 <!ENTITY man-pages-version "1.60">
 <!ENTITY man-pages-depversion "1.47">
 <!ENTITY man-pages-contversion "1.54">
-<!ENTITY man-pages-size "633 KB">
 <!ENTITY man-pages-dir "man-pages-&man-pages-version;">
 <!ENTITY man-pages-package "man-pages-&man-pages-version;.tar.bz2">
+<!ENTITY man-pages-size "627 KB">
 
 <!ENTITY man-pages-compsize "6 MB">
 <!ENTITY man-pages-time "0.1 SBU">
diff --git a/entities/modutils.ent b/entities/modutils.ent
index 3d52e78f0..9929353b2 100644
--- a/entities/modutils.ent
+++ b/entities/modutils.ent
@@ -12,9 +12,9 @@
 <!ENTITY modutils-version "2.4.25">
 <!ENTITY modutils-depversion "2.4.12">
 <!ENTITY modutils-contversion "2.4.16">
-<!ENTITY modutils-size "214 KB">
 <!ENTITY modutils-dir "modutils-&modutils-version;">
 <!ENTITY modutils-package "modutils-&modutils-version;.tar.bz2">
+<!ENTITY modutils-size "215 KB">
 
 <!ENTITY modutils-compsize "3 MB">
 <!ENTITY modutils-time "0.1 SBU">
diff --git a/entities/ncurses.ent b/entities/ncurses.ent
index 5e0757673..a3b6cc7ed 100644
--- a/entities/ncurses.ent
+++ b/entities/ncurses.ent
@@ -16,13 +16,14 @@
 <!ENTITY ncurses-version "5.3">
 <!ENTITY ncurses-depversion "5.2">
 <!ENTITY ncurses-contversion "5.2">
+<!ENTITY ncurses-dir "ncurses-&ncurses-version;">
+<!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-size "1 KB">
 <!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">
 
 <!ENTITY ncurses-compsize "22 MB">
 <!ENTITY ncurses-time "0.7 SBU">
diff --git a/entities/nettools.ent b/entities/nettools.ent
index 4025d9e5a..593424d5d 100644
--- a/entities/nettools.ent
+++ b/entities/nettools.ent
@@ -12,9 +12,10 @@
 <!ENTITY net-tools-version "1.60">
 <!ENTITY net-tools-depversion "1.60">
 <!ENTITY net-tools-contversion "1.60">
-<!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-size "194 KB">
+
 <!ENTITY net-tools-mii-patch-version "1.60-miitool-gcc33-1">
 <!ENTITY net-tools-mii-patch-size "2 KB">
 
diff --git a/entities/patch.ent b/entities/patch.ent
index 58bef2d1b..371900fbe 100644
--- a/entities/patch.ent
+++ b/entities/patch.ent
@@ -15,9 +15,9 @@
 <!ENTITY patch-version "2.5.4">
 <!ENTITY patch-depversion "2.5.4">
 <!ENTITY patch-contversion "2.5.4">
-<!ENTITY patch-size "183 KB">
-<!ENTITY patch-package "patch-&patch-version;.tar.bz2">
 <!ENTITY patch-dir "patch-&patch-version;">
+<!ENTITY patch-package "patch-&patch-version;.tar.bz2">
+<!ENTITY patch-size "182 KB">
 
 <!ENTITY patch-compsize-static "3 MB">
 <!ENTITY patch-time-static "0.1 SBU">
diff --git a/entities/perl.ent b/entities/perl.ent
index 2f2be1dcc..0a579eea7 100644
--- a/entities/perl.ent
+++ b/entities/perl.ent
@@ -16,11 +16,12 @@
 <!ENTITY perl-version "5.8.0">
 <!ENTITY perl-depversion "5.6.1">
 <!ENTITY perl-contversion "5.6.1">
-<!ENTITY perl-libc-patch-version "5.8.0-libc-3">
-<!ENTITY perl-libc-patch-size "1 KB">
-<!ENTITY perl-size "10,765 KB">
 <!ENTITY perl-dir "perl-&perl-version;">
 <!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-size "1 KB">
 
 <!ENTITY perl-compsize-static "52 MB">
 <!ENTITY perl-time-static "0.8 SBU">
diff --git a/entities/procinfo.ent b/entities/procinfo.ent
index ed4acccac..32da6e54d 100644
--- a/entities/procinfo.ent
+++ b/entities/procinfo.ent
@@ -12,9 +12,9 @@
 <!ENTITY procinfo-version "18">
 <!ENTITY procinfo-depversion "18">
 <!ENTITY procinfo-contversion "18">
-<!ENTITY procinfo-size "24 KB">
 <!ENTITY procinfo-dir "procinfo-&procinfo-version;">
 <!ENTITY procinfo-package "procinfo-&procinfo-version;.tar.bz2">
+<!ENTITY procinfo-size "24 KB">
 
 <!ENTITY procinfo-compsize "168 KB">
 <!ENTITY procinfo-time "0.1 SBU">
diff --git a/entities/procps.ent b/entities/procps.ent
index f72a428e9..cdfda3146 100644
--- a/entities/procps.ent
+++ b/entities/procps.ent
@@ -13,11 +13,12 @@
 <!ENTITY procps-version "3.1.11">
 <!ENTITY procps-depversion "2.0.7">
 <!ENTITY procps-contversion "2.0.7">
-<!ENTITY procps-size "233 KB">
-<!ENTITY procps-patch-version "3.1.11">
-<!ENTITY procps-patch-size "1 KB">
 <!ENTITY procps-dir "procps-&procps-version;">
 <!ENTITY procps-package "procps-&procps-version;.tar.bz2">
+<!ENTITY procps-size "242 KB">
+
+<!ENTITY procps-patch-version "3.1.11">
+<!ENTITY procps-patch-size "1 KB">
 
 <!ENTITY procps-compsize "2 MB">
 <!ENTITY procps-time "0.1 SBU">
diff --git a/entities/psmisc.ent b/entities/psmisc.ent
index 619a6b971..ad4bb835e 100644
--- a/entities/psmisc.ent
+++ b/entities/psmisc.ent
@@ -12,9 +12,9 @@
 <!ENTITY psmisc-version "21.3">
 <!ENTITY psmisc-depversion "20.2">
 <!ENTITY psmisc-contversion "21">
-<!ENTITY psmisc-size "253 KB">
 <!ENTITY psmisc-dir "psmisc-&psmisc-version;">
 <!ENTITY psmisc-package "psmisc-&psmisc-version;.tar.bz2">
+<!ENTITY psmisc-size "259 KB">
 
 <!ENTITY psmisc-compsize "2 MB">
 <!ENTITY psmisc-time "0.1 SBU">
diff --git a/entities/sed.ent b/entities/sed.ent
index d7e321a5a..5eb416a22 100644
--- a/entities/sed.ent
+++ b/entities/sed.ent
@@ -15,9 +15,9 @@
 <!ENTITY sed-version "4.0.7">
 <!ENTITY sed-depversion "3.02">
 <!ENTITY sed-contversion "3.02">
-<!ENTITY sed-size "665 KB">
-<!ENTITY sed-package "sed-&sed-version;.tar.bz2">
 <!ENTITY sed-dir "sed-&sed-version;">
+<!ENTITY sed-package "sed-&sed-version;.tar.bz2">
+<!ENTITY sed-size "678 KB">
 
 <!ENTITY sed-compsize-static "2 MB">
 <!ENTITY sed-time-static "0.2 SBU">
diff --git a/entities/shadow.ent b/entities/shadow.ent
index b9c3ebe0d..82b89f8a8 100644
--- a/entities/shadow.ent
+++ b/entities/shadow.ent
@@ -13,12 +13,12 @@
 <!ENTITY shadow-version "4.0.3">
 <!ENTITY shadow-depversion "20001016">
 <!ENTITY shadow-contversion "4.0.3">
-<!ENTITY shadow-size "1030 KB">
-<!ENTITY shadow-patch-version "4.0.3-newgrp-fix">
-<!ENTITY shadow-patch-size "1 KB">
-
 <!ENTITY shadow-dir "shadow-&shadow-version;">
 <!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-size "1 KB">
 
 <!ENTITY shadow-compsize "7 MB">
 <!ENTITY shadow-time "0.4 SBU">
diff --git a/entities/sysklogd.ent b/entities/sysklogd.ent
index ca1b5932d..ebed1ed4c 100644
--- a/entities/sysklogd.ent
+++ b/entities/sysklogd.ent
@@ -15,9 +15,9 @@
 <!ENTITY sysklogd-version "1.4.1">
 <!ENTITY sysklogd-depversion "1.4.1">
 <!ENTITY sysklogd-contversion "1.4.1">
-<!ENTITY sysklogd-size "80 KB">
 <!ENTITY sysklogd-dir "sysklogd-&sysklogd-version;">
 <!ENTITY sysklogd-package "sysklogd-&sysklogd-version;.tar.bz2">
+<!ENTITY sysklogd-size "80 KB">
 
 <!ENTITY sysklogd-compsize "472 KB">
 <!ENTITY sysklogd-time "0.1 SBU">
diff --git a/entities/sysvinit.ent b/entities/sysvinit.ent
index 2b4c41a23..d0052535a 100644
--- a/entities/sysvinit.ent
+++ b/entities/sysvinit.ent
@@ -13,9 +13,9 @@
 <!ENTITY sysvinit-version "2.85">
 <!ENTITY sysvinit-depversion "2.84">
 <!ENTITY sysvinit-contversion "2.84">
-<!ENTITY sysvinit-size "89 KB">
 <!ENTITY sysvinit-dir "sysvinit-&sysvinit-version;">
 <!ENTITY sysvinit-package "sysvinit-&sysvinit-version;.tar.bz2">
+<!ENTITY sysvinit-size "91 KB">
 
 <!ENTITY sysvinit-compsize "1 MB">
 <!ENTITY sysvinit-time "0.1 SBU">
diff --git a/entities/tar.ent b/entities/tar.ent
index f1cd4ddf7..c539836bd 100644
--- a/entities/tar.ent
+++ b/entities/tar.ent
@@ -14,9 +14,9 @@
 <!ENTITY tar-version "1.13.25">
 <!ENTITY tar-depversion "1.13">
 <!ENTITY tar-contversion "1.13">
-<!ENTITY tar-size "1281 KB">
-<!ENTITY tar-package "tar-&tar-version;.tar.bz2">
 <!ENTITY tar-dir "tar-&tar-version;">
+<!ENTITY tar-package "tar-&tar-version;.tar.bz2">
+<!ENTITY tar-size "1,281 KB">
 
 <!ENTITY tar-compsize-static "10 MB">
 <!ENTITY tar-time-static "0.2 SBU">
diff --git a/entities/tcl.ent b/entities/tcl.ent
index 7bf226685..9751c0745 100644
--- a/entities/tcl.ent
+++ b/entities/tcl.ent
@@ -12,9 +12,9 @@
 <!ENTITY tcl-version "8.4.4">
 <!ENTITY tcl-depversion "8.4.4">
 <!ENTITY tcl-contversion "8.4.4">
-<!ENTITY tcl-package "tcl-&tcl-version;.tar.bz2">
 <!ENTITY tcl-dir "tcl-&tcl-version;">
-<!ENTITY tcl-size "3,291 KB">
+<!ENTITY tcl-package "tcl-&tcl-version;.tar.bz2">
+<!ENTITY tcl-size "3,292 KB">
 
 <!ENTITY tcl-compsize-static "24 MB">
 <!ENTITY tcl-time-static "0.6 SBU">
diff --git a/entities/texinfo.ent b/entities/texinfo.ent
index e02114b36..cffa8772d 100644
--- a/entities/texinfo.ent
+++ b/entities/texinfo.ent
@@ -15,9 +15,9 @@
 <!ENTITY texinfo-version "4.6">
 <!ENTITY texinfo-depversion "4.0">
 <!ENTITY texinfo-contversion "4.2">
-<!ENTITY texinfo-size "1,254 KB">
 <!ENTITY texinfo-dir "texinfo-&texinfo-version;">
 <!ENTITY texinfo-package "texinfo-&texinfo-version;.tar.bz2">
+<!ENTITY texinfo-size "1,317 KB">
 
 <!ENTITY texinfo-compsize-static "19 MB">
 <!ENTITY texinfo-time-static "0.2 SBU">
diff --git a/entities/utillinux.ent b/entities/utillinux.ent
index 44a487238..4341301bb 100644
--- a/entities/utillinux.ent
+++ b/entities/utillinux.ent
@@ -15,9 +15,9 @@
 <!ENTITY util-linux-version "2.12">
 <!ENTITY util-linux-depversion "2.11n">
 <!ENTITY util-linux-contversion "2.11t">
-<!ENTITY util-linux-size "1,777 KB">
 <!ENTITY util-linux-dir "util-linux-&util-linux-version;">
 <!ENTITY util-linux-package "util-linux-&util-linux-version;.tar.bz2">
+<!ENTITY util-linux-size "1,814 KB">
 
 <!ENTITY util-linux-compsize-static "9 MB">
 <!ENTITY util-linux-time-static "0.1 SBU">
diff --git a/entities/vim.ent b/entities/vim.ent
index a10bde0f9..5e35ab137 100644
--- a/entities/vim.ent
+++ b/entities/vim.ent
@@ -14,9 +14,9 @@
 <!ENTITY vim-version "6.2">
 <!ENTITY vim-depversion "6.0">
 <!ENTITY vim-contversion "6.1">
-<!ENTITY vim-size "2,822 KB">
 <!ENTITY vim-dir "vim&vim-version;">
 <!ENTITY vim-package "vim-&vim-version;.tar.bz2">
+<!ENTITY vim-size "3,193 KB">
 
 <!ENTITY vim-compsize "24 MB">
 <!ENTITY vim-time "0.4 SBU">
diff --git a/entities/zlib.ent b/entities/zlib.ent
index a2b29def8..575874d86 100644
--- a/entities/zlib.ent
+++ b/entities/zlib.ent
@@ -13,9 +13,10 @@
 <!ENTITY zlib-version "1.1.4">
 <!ENTITY zlib-depversion "1.1.4">
 <!ENTITY zlib-contversion "1.1.4">
-<!ENTITY zlib-size "144 KB">
 <!ENTITY zlib-dir "zlib-&zlib-version;">
 <!ENTITY zlib-package "zlib-&zlib-version;.tar.bz2">
+<!ENTITY zlib-size "144 KB">
+
 <!ENTITY zlib-patch-version "1.1.4-vsnprintf">
 <!ENTITY zlib-patch-size "10 KB">
 
diff --git a/index.xml b/index.xml
index 97fc7157c..2d6b9366b 100644
--- a/index.xml
+++ b/index.xml
@@ -17,8 +17,8 @@
 <!ENTITY patches-root "http://www.linuxfromscratch.org/patches/lfs/5.0/">
 <!ENTITY tldp-root "http://www.tldp.org/">
 
-<!ENTITY all-version "cvs-20030831-estimate">
-<!ENTITY all-size-mb "105 MB">
+<!ENTITY all-size-version "cvs-2003-10-06">
+<!ENTITY all-size-mb "134 MB">
 
 <!ENTITY book SYSTEM "book.xml">
 <!ENTITY bookinfo SYSTEM "bookinfo.xml">
-- 
cgit v1.2.3-54-g00ecf