From f27835d93f9d4244e585e3aa47bd74bd9b06cbec Mon Sep 17 00:00:00 2001
From: Alex Gronenwoud <alex@linuxfromscratch.org>
Date: Sat, 11 Oct 2003 12:02:47 +0000
Subject: [PATCH] Adapting the required disk space sizes.

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

diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 2c102e39b..8ea856ad1 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -2,8 +2,8 @@
 <title>Installing Bash-&bash-version;</title>
 <?dbhtml filename="bash.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &bash-time-static; 
-Estimated required disk space:  &bash-compsize-static;</screen>
+<screen>Estimated build time:           &bash-time-tools; 
+Estimated required disk space:  &bash-compsize-tools;</screen>
 
 &aa-bash-shortdesc;
 &aa-bash-dep;
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index ace0b932d..5f533f1dd 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -2,8 +2,8 @@
 <title>Installing Binutils-&binutils-version; - Pass 1</title>
 <?dbhtml filename="binutils-pass1.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &binutils-pass1-time-stage1;
-Estimated required disk space:  &binutils-pass1-compsize-stage1;</screen>
+<screen>Estimated build time:           &binutils-time-tools-pass1;
+Estimated required disk space:  &binutils-compsize-tools-pass1;</screen>
 
 &aa-binutils-shortdesc;
 &aa-binutils-dep;
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 0792ba9f2..3e9827b5f 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -2,8 +2,8 @@
 <title>Installing Binutils-&binutils-version; - Pass 2</title>
 <?dbhtml filename="binutils-pass2.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &binutils-pass2-time-stage1;
-Estimated required disk space:  &binutils-pass2-compsize-stage1;</screen>
+<screen>Estimated build time:           &binutils-time-tools-pass2;
+Estimated required disk space:  &binutils-compsize-tools-pass2;</screen>
 
 &c5-binutils-pass2-inst;
 
diff --git a/chapter05/bzip2.xml b/chapter05/bzip2.xml
index 296bfec6b..9207f646d 100644
--- a/chapter05/bzip2.xml
+++ b/chapter05/bzip2.xml
@@ -2,8 +2,8 @@
 <title>Installing Bzip2-&bzip2-version;</title>
 <?dbhtml filename="bzip2.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &bzip2-time-static;
-Estimated required disk space:  &bzip2-compsize-static;</screen>
+<screen>Estimated build time:           &bzip2-time-tools;
+Estimated required disk space:  &bzip2-compsize-tools;</screen>
 
 &aa-bzip2-shortdesc;
 &aa-bzip2-dep;
diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml
index 6cd9f28f6..17b3d3432 100644
--- a/chapter05/coreutils.xml
+++ b/chapter05/coreutils.xml
@@ -2,8 +2,8 @@
 <title>Installing Coreutils-&coreutils-version;</title>
 <?dbhtml filename="coreutils.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &coreutils-time-static;
-Estimated required disk space:  &coreutils-compsize-static;</screen>
+<screen>Estimated build time:           &coreutils-time-tools;
+Estimated required disk space:  &coreutils-compsize-tools;</screen>
 
 &aa-coreutils-shortdesc;
 &aa-coreutils-dep;
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index 832ef1f92..318eb1506 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -2,8 +2,8 @@
 <title>Installing DejaGnu-&dejagnu-version;</title>
 <?dbhtml filename="dejagnu.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &dejagnu-time-static; 
-Estimated required disk space:  &dejagnu-compsize-static;</screen>
+<screen>Estimated build time:           &dejagnu-time-tools; 
+Estimated required disk space:  &dejagnu-compsize-tools;</screen>
 
 &aa-dejagnu-shortdesc;
 &aa-dejagnu-dep;
diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml
index 3156c340c..75ef875e3 100644
--- a/chapter05/diffutils.xml
+++ b/chapter05/diffutils.xml
@@ -2,8 +2,8 @@
 <title>Installing Diffutils-&diffutils-version;</title>
 <?dbhtml filename="diffutils.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &diffutils-time-static;
-Estimated required disk space:  &diffutils-compsize-static;</screen>
+<screen>Estimated build time:           &diffutils-time-tools;
+Estimated required disk space:  &diffutils-compsize-tools;</screen>
 
 &aa-diffutils-shortdesc;
 &aa-diffutils-dep;
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 747b924cd..338d35537 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -2,8 +2,8 @@
 <title>Installing Expect-&expect-version;</title>
 <?dbhtml filename="expect.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &expect-time-static; 
-Estimated required disk space:  &expect-compsize-static;</screen>
+<screen>Estimated build time:           &expect-time-tools; 
+Estimated required disk space:  &expect-compsize-tools;</screen>
 
 &aa-expect-shortdesc;
 &aa-expect-dep;
diff --git a/chapter05/findutils.xml b/chapter05/findutils.xml
index 0ecaae958..04560c80d 100644
--- a/chapter05/findutils.xml
+++ b/chapter05/findutils.xml
@@ -2,8 +2,8 @@
 <title>Installing Findutils-&findutils-version;</title>
 <?dbhtml filename="findutils.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &findutils-time-static;
-Estimated required disk space:  &findutils-compsize-static;</screen>
+<screen>Estimated build time:           &findutils-time-tools;
+Estimated required disk space:  &findutils-compsize-tools;</screen>
 
 &aa-findutils-shortdesc;
 &aa-findutils-dep;
diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml
index 76a1cba0e..37b042779 100644
--- a/chapter05/gawk.xml
+++ b/chapter05/gawk.xml
@@ -2,8 +2,8 @@
 <title>Installing Gawk-&gawk-version;</title>
 <?dbhtml filename="gawk.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gawk-time-static;
-Estimated required disk space:  &gawk-compsize-static;</screen>
+<screen>Estimated build time:           &gawk-time-tools;
+Estimated required disk space:  &gawk-compsize-tools;</screen>
 
 &aa-gawk-shortdesc;
 &aa-gawk-dep;
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 1fb44650f..42325708f 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -2,8 +2,8 @@
 <title>Installing GCC-&gcc-version; - Pass 1</title>
 <?dbhtml filename="gcc-pass1.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gcc-time-pass1-stage1;
-Estimated required disk space:  &gcc-compsize-pass1-stage1;</screen>
+<screen>Estimated build time:           &gcc-time-tools-pass1;
+Estimated required disk space:  &gcc-compsize-tools-pass1;</screen>
 
 &aa-gcc-shortdesc;
 &aa-gcc-dep;
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 6826f64a5..ad9b1892d 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -2,8 +2,8 @@
 <title>Installing GCC-&gcc-version; - Pass 2</title>
 <?dbhtml filename="gcc-pass2.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gcc-time-pass2-stage1;
-Estimated required disk space:  &gcc-compsize-pass2-stage1;</screen>
+<screen>Estimated build time:           &gcc-time-tools-pass2;
+Estimated required disk space:  &gcc-compsize-tools-pass2;</screen>
 
 &c5-gcc-pass2-inst;
 
diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index 9195a3c1d..744a33213 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -2,8 +2,8 @@
 <title>Installing Gettext-&gettext-version;</title>
 <?dbhtml filename="gettext.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gettext-time;
-Estimated required disk space:  &gettext-compsize;</screen>
+<screen>Estimated build time:           &gettext-time-tools;
+Estimated required disk space:  &gettext-compsize-tools;</screen>
 
 &aa-gettext-shortdesc;
 &aa-gettext-dep;
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index f6ab886bd..1a2fa38aa 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -2,8 +2,8 @@
 <title>Installing Glibc-&glibc-version;</title>
 <?dbhtml filename="glibc.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &glibc-time;
-Estimated required disk space:  &glibc-compsize;</screen>
+<screen>Estimated build time:           &glibc-time-tools;
+Estimated required disk space:  &glibc-compsize-tools;</screen>
 
 &aa-glibc-shortdesc;
 &aa-glibc-dep;
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index dbb0e80cf..2003512b2 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -2,8 +2,8 @@
 <title>Installing Grep-&grep-version;</title>
 <?dbhtml filename="grep.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &grep-time-static;
-Estimated required disk space:  &grep-compsize-static;</screen>
+<screen>Estimated build time:           &grep-time-tools;
+Estimated required disk space:  &grep-compsize-tools;</screen>
 
 &aa-grep-shortdesc;
 &aa-grep-dep;
diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml
index 6d608ceb1..5211e69a6 100644
--- a/chapter05/gzip.xml
+++ b/chapter05/gzip.xml
@@ -2,8 +2,8 @@
 <title>Installing Gzip-&gzip-version;</title>
 <?dbhtml filename="gzip.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gzip-time-static;
-Estimated required disk space:  &gzip-compsize-static;</screen>
+<screen>Estimated build time:           &gzip-time-tools;
+Estimated required disk space:  &gzip-compsize-tools;</screen>
 
 &aa-gzip-shortdesc;
 &aa-gzip-dep;
diff --git a/chapter05/make.xml b/chapter05/make.xml
index ebb9331bb..1a51acc3b 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -2,8 +2,8 @@
 <title>Installing Make-&make-version;</title>
 <?dbhtml filename="make.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &make-time-static;
-Estimated required disk space:  &make-compsize-static;</screen>
+<screen>Estimated build time:           &make-time-tools;
+Estimated required disk space:  &make-compsize-tools;</screen>
 
 &aa-make-shortdesc;
 &aa-make-dep;
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index b36aafecb..b8c8a4465 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -2,8 +2,8 @@
 <title>Installing Ncurses-&ncurses-version;</title>
 <?dbhtml filename="ncurses.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &ncurses-time;
-Estimated required disk space:  &ncurses-compsize;</screen>
+<screen>Estimated build time:           &ncurses-time-tools;
+Estimated required disk space:  &ncurses-compsize-tools;</screen>
 
 &aa-ncurses-shortdesc;
 &aa-ncurses-dep;
diff --git a/chapter05/patch.xml b/chapter05/patch.xml
index c8d6b8d65..f2471acad 100644
--- a/chapter05/patch.xml
+++ b/chapter05/patch.xml
@@ -2,8 +2,8 @@
 <title>Installing Patch-&patch-version;</title>
 <?dbhtml filename="patch.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &patch-time-static;
-Estimated required disk space:  &patch-compsize-static;</screen>
+<screen>Estimated build time:           &patch-time-tools;
+Estimated required disk space:  &patch-compsize-tools;</screen>
 
 &aa-patch-shortdesc;
 &aa-patch-dep;
diff --git a/chapter05/sed.xml b/chapter05/sed.xml
index 2f0ceaee5..fe3c627d6 100644
--- a/chapter05/sed.xml
+++ b/chapter05/sed.xml
@@ -2,8 +2,8 @@
 <title>Installing Sed-&sed-version;</title>
 <?dbhtml filename="sed.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &sed-time-static;
-Estimated required disk space:  &sed-compsize-static;</screen>
+<screen>Estimated build time:           &sed-time-tools;
+Estimated required disk space:  &sed-compsize-tools;</screen>
 
 &aa-sed-shortdesc;
 &aa-sed-dep;
diff --git a/chapter05/tar.xml b/chapter05/tar.xml
index 55c993836..1011e943a 100644
--- a/chapter05/tar.xml
+++ b/chapter05/tar.xml
@@ -2,8 +2,8 @@
 <title>Installing Tar-&tar-version;</title>
 <?dbhtml filename="tar.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &tar-time-static;
-Estimated required disk space:  &tar-compsize-static;</screen>
+<screen>Estimated build time:           &tar-time-tools;
+Estimated required disk space:  &tar-compsize-tools;</screen>
 
 &aa-tar-shortdesc;
 &aa-tar-dep;
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index 8ababe922..1813c50b2 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -2,8 +2,8 @@
 <title>Installing Tcl-&tcl-version;</title>
 <?dbhtml filename="tcl.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &tcl-time-static; 
-Estimated required disk space:  &tcl-compsize-static;</screen>
+<screen>Estimated build time:           &tcl-time-tools; 
+Estimated required disk space:  &tcl-compsize-tools;</screen>
 
 &aa-tcl-shortdesc;
 &aa-tcl-dep;
diff --git a/chapter05/texinfo.xml b/chapter05/texinfo.xml
index fdbf5f83c..53a4beaff 100644
--- a/chapter05/texinfo.xml
+++ b/chapter05/texinfo.xml
@@ -2,8 +2,8 @@
 <title>Installing Texinfo-&texinfo-version;</title>
 <?dbhtml filename="texinfo.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &texinfo-time-static;
-Estimated required disk space:  &texinfo-compsize-static;</screen>
+<screen>Estimated build time:           &texinfo-time-tools;
+Estimated required disk space:  &texinfo-compsize-tools;</screen>
 
 &aa-texinfo-shortdesc;
 &aa-texinfo-dep;
diff --git a/chapter05/utillinux.xml b/chapter05/utillinux.xml
index 059dca15b..0e0d7ff05 100644
--- a/chapter05/utillinux.xml
+++ b/chapter05/utillinux.xml
@@ -2,8 +2,8 @@
 <title>Installing Util-linux-&util-linux-version;</title>
 <?dbhtml filename="util-linux.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &util-linux-time-static;
-Estimated required disk space:  &util-linux-compsize-static;</screen>
+<screen>Estimated build time:           &util-linux-time-tools;
+Estimated required disk space:  &util-linux-compsize-tools;</screen>
 
 &aa-utillinux-shortdesc;
 &aa-utillinux-dep;
diff --git a/entities/autoconf.ent b/entities/autoconf.ent
index b4ee9b8e6..2590eb806 100644
--- a/entities/autoconf.ent
+++ b/entities/autoconf.ent
@@ -14,5 +14,5 @@
 <!ENTITY autoconf-package "autoconf-&autoconf-version;.tar.bz2">
 <!ENTITY autoconf-size "792 KB">
 
-<!ENTITY autoconf-compsize "6 MB">
-<!ENTITY autoconf-time "2.3 SBU">
+<!ENTITY autoconf-compsize "7.7 MB">
+<!ENTITY autoconf-time "2.9 SBU">
diff --git a/entities/automake.ent b/entities/automake.ent
index d3f060609..f8ffc7936 100644
--- a/entities/automake.ent
+++ b/entities/automake.ent
@@ -14,5 +14,5 @@
 <!ENTITY automake-package "automake-&automake-version;.tar.bz2">
 <!ENTITY automake-size "545 KB">
 
-<!ENTITY automake-compsize "6 MB">
-<!ENTITY automake-time "4.1 SBU">
+<!ENTITY automake-compsize "6.8 MB">
+<!ENTITY automake-time "5.3 SBU">
diff --git a/entities/bash.ent b/entities/bash.ent
index 5fee9969e..467e959bb 100644
--- a/entities/bash.ent
+++ b/entities/bash.ent
@@ -14,14 +14,14 @@
 <!ENTITY bash-depversion "2.05a">
 <!ENTITY bash-contversion "2.05a">
 <!ENTITY bash-dir "bash-&bash-version;">
-<!ENTITY bash-package "bash-&bash-version;.tar.bz2">
+<!ENTITY bash-package "bash-&bash-version;.tar.gz">
 <!ENTITY bash-size "1,910 KB">
 
 <!ENTITY bash-patch "bash-&bash-version;-2.patch">
 <!ENTITY bash-patch-size "7 KB">
 
-<!ENTITY bash-compsize-static "24 MB">
-<!ENTITY bash-time-static "0.8 SBU">
+<!ENTITY bash-compsize-tools "27 MB">
+<!ENTITY bash-time-tools "1.2 SBU">
 
-<!ENTITY bash-compsize "14 MB">
-<!ENTITY bash-time "0.8 SBU">
+<!ENTITY bash-compsize "27 MB">
+<!ENTITY bash-time "1.2 SBU">
diff --git a/entities/binutils.ent b/entities/binutils.ent
index d0e1b1f1b..736cdf7f6 100644
--- a/entities/binutils.ent
+++ b/entities/binutils.ent
@@ -19,11 +19,11 @@
 <!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">
+<!ENTITY binutils-compsize-tools-pass1 "194 MB">
+<!ENTITY binutils-time-tools-pass1 "1.0 SBU">
 
-<!ENTITY binutils-pass2-compsize-stage1 "160 MB">
-<!ENTITY binutils-pass2-time-stage1 "1.4 SBU">
+<!ENTITY binutils-compsize-tools-pass2 "108 MB">
+<!ENTITY binutils-time-tools-pass2 "1.5 SBU">
 
-<!ENTITY binutils-compsize "94 MB">
+<!ENTITY binutils-compsize "167 MB">
 <!ENTITY binutils-time "1.4 SBU">
diff --git a/entities/bison.ent b/entities/bison.ent
index f001b7bab..756774577 100644
--- a/entities/bison.ent
+++ b/entities/bison.ent
@@ -17,5 +17,5 @@
 <!ENTITY bison-patch "bison-&bison-version;-attribute.patch">
 <!ENTITY bison-patch-size "2 KB">
 
-<!ENTITY bison-compsize "6 MB">
+<!ENTITY bison-compsize "10.6 MB">
 <!ENTITY bison-time "0.6 SBU">
diff --git a/entities/bootscripts.ent b/entities/bootscripts.ent
index 0ee44b7fb..01a6d3987 100644
--- a/entities/bootscripts.ent
+++ b/entities/bootscripts.ent
@@ -14,5 +14,5 @@
 <!ENTITY bootscripts-package "lfs-bootscripts-&bootscripts-version;.tar.bz2">
 <!ENTITY bootscripts-size "25 KB">
 
-<!ENTITY bootscripts-compsize "252 KB">
+<!ENTITY bootscripts-compsize "0.3 MB">
 <!ENTITY bootscripts-time "0.1 SBU">
diff --git a/entities/bzip2.ent b/entities/bzip2.ent
index 59d05cb0e..da9ef7858 100644
--- a/entities/bzip2.ent
+++ b/entities/bzip2.ent
@@ -14,11 +14,11 @@
 <!ENTITY bzip2-depversion "1.0.1">
 <!ENTITY bzip2-contversion "1.0.2">
 <!ENTITY bzip2-dir "bzip2-&bzip2-version;">
-<!ENTITY bzip2-package "bzip2-&bzip2-version;.tar.bz2">
+<!ENTITY bzip2-package "bzip2-&bzip2-version;.tar.gz">
 <!ENTITY bzip2-size "650 KB">
 
-<!ENTITY bzip2-compsize-static "6 MB">
-<!ENTITY bzip2-time-static "0.1 SBU">
+<!ENTITY bzip2-compsize-tools "2.5 MB">
+<!ENTITY bzip2-time-tools "0.1 SBU">
 
-<!ENTITY bzip2-compsize "3 MB">
+<!ENTITY bzip2-compsize "3.0 MB">
 <!ENTITY bzip2-time "0.1 SBU">
diff --git a/entities/coreutils.ent b/entities/coreutils.ent
index d3229d346..880161ed0 100644
--- a/entities/coreutils.ent
+++ b/entities/coreutils.ent
@@ -22,8 +22,8 @@
 <!ENTITY coreutils-hostname-patch "coreutils-&coreutils-version;-hostname-2.patch">
 <!ENTITY coreutils-hostname-patch-size "1 KB">
 
-<!ENTITY coreutils-compsize-static "17 MB">
-<!ENTITY coreutils-time-static "0.8 SBU">
+<!ENTITY coreutils-compsize-tools "69 MB">
+<!ENTITY coreutils-time-tools "0.9 SBU">
 
-<!ENTITY coreutils-compsize "15 MB">
-<!ENTITY coreutils-time "0.5 SBU">
+<!ENTITY coreutils-compsize "69 MB">
+<!ENTITY coreutils-time "0.9 SBU">
diff --git a/entities/dejagnu.ent b/entities/dejagnu.ent
index 7d2cdaa14..8af0906f0 100644
--- a/entities/dejagnu.ent
+++ b/entities/dejagnu.ent
@@ -11,8 +11,8 @@
 <!ENTITY dejagnu-depversion "1.4.3">
 <!ENTITY dejagnu-contversion "1.4.3">
 <!ENTITY dejagnu-dir "dejagnu-&dejagnu-version;">
-<!ENTITY dejagnu-package "dejagnu-&dejagnu-version;.tar.bz2">
+<!ENTITY dejagnu-package "dejagnu-&dejagnu-version;.tar.gz">
 <!ENTITY dejagnu-size "1,775 KB">
 
-<!ENTITY dejagnu-compsize-static "24 MB">
-<!ENTITY dejagnu-time-static "0.1 SBU">
+<!ENTITY dejagnu-compsize-tools "8.6 MB">
+<!ENTITY dejagnu-time-tools "0.1 SBU">
diff --git a/entities/diffutils.ent b/entities/diffutils.ent
index af9a876c4..277dfe429 100644
--- a/entities/diffutils.ent
+++ b/entities/diffutils.ent
@@ -14,11 +14,11 @@
 <!ENTITY diffutils-depversion "2.7">
 <!ENTITY diffutils-contversion "2.8.1">
 <!ENTITY diffutils-dir "diffutils-&diffutils-version;">
-<!ENTITY diffutils-package "diffutils-&diffutils-version;.tar.bz2">
+<!ENTITY diffutils-package "diffutils-&diffutils-version;.tar.gz">
 <!ENTITY diffutils-size "762 KB">
 
-<!ENTITY diffutils-compsize-static "10 MB">
-<!ENTITY diffutils-time-static "0.1 SBU">
+<!ENTITY diffutils-compsize-tools "7.5 MB">
+<!ENTITY diffutils-time-tools "0.1 SBU">
 
-<!ENTITY diffutils-compsize "6 MB">
+<!ENTITY diffutils-compsize "7.5 MB">
 <!ENTITY diffutils-time "0.1 SBU">
diff --git a/entities/e2fsprogs.ent b/entities/e2fsprogs.ent
index 3a54e9e8f..df4ec5ef0 100644
--- a/entities/e2fsprogs.ent
+++ b/entities/e2fsprogs.ent
@@ -11,8 +11,8 @@
 <!ENTITY e2fsprogs-depversion "1.25">
 <!ENTITY e2fsprogs-contversion "1.27">
 <!ENTITY e2fsprogs-dir "e2fsprogs-&e2fsprogs-version;">
-<!ENTITY e2fsprogs-package "e2fsprogs-&e2fsprogs-version;.tar.bz2">
+<!ENTITY e2fsprogs-package "e2fsprogs-&e2fsprogs-version;.tar.gz">
 <!ENTITY e2fsprogs-size "3,003 KB">
 
-<!ENTITY e2fsprogs-compsize "13 MB">
-<!ENTITY e2fsprogs-time "0.5 SBU">
+<!ENTITY e2fsprogs-compsize "48.4 MB">
+<!ENTITY e2fsprogs-time "0.6 SBU">
diff --git a/entities/ed.ent b/entities/ed.ent
index c7191d1d0..3c98409da 100644
--- a/entities/ed.ent
+++ b/entities/ed.ent
@@ -11,11 +11,11 @@
 <!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-package "ed-&ed-version;.tar.gz">
 <!ENTITY ed-size "182 KB">
 
 <!ENTITY ed-patch "ed-&ed-version;-mkstemp.patch">
 <!ENTITY ed-patch-size "1 KB">
 
-<!ENTITY ed-compsize "3 MB">
+<!ENTITY ed-compsize "3.1 MB">
 <!ENTITY ed-time "0.1 SBU">
diff --git a/entities/expect.ent b/entities/expect.ent
index 2a35ff85f..90f0a2e01 100644
--- a/entities/expect.ent
+++ b/entities/expect.ent
@@ -11,11 +11,11 @@
 <!ENTITY expect-depversion "5.39.0">
 <!ENTITY expect-contversion "5.39.0">
 <!ENTITY expect-dir "expect-&expect-version;">
-<!ENTITY expect-package "expect-&expect-version;.tar.bz2">
+<!ENTITY expect-package "expect-&expect-version;.tar.gz">
 <!ENTITY expect-size "508 KB">
 
 <!ENTITY expect-patch "expect-&expect-version;-spawn.patch">
 <!ENTITY expect-patch-size "6 KB">
 
-<!ENTITY expect-compsize-static "24 MB">
-<!ENTITY expect-time-static "0.1 SBU">
+<!ENTITY expect-compsize-tools "3.9 MB">
+<!ENTITY expect-time-tools "0.1 SBU">
diff --git a/entities/file.ent b/entities/file.ent
index 218a702e1..d217aa467 100644
--- a/entities/file.ent
+++ b/entities/file.ent
@@ -11,8 +11,8 @@
 <!ENTITY file-depversion "3.37">
 <!ENTITY file-contversion "3.39">
 <!ENTITY file-dir "file-&file-version;">
-<!ENTITY file-package "file-&file-version;.tar.bz2">
+<!ENTITY file-package "file-&file-version;.tar.gz">
 <!ENTITY file-size "338 KB">
 
-<!ENTITY file-compsize "2 MB">
+<!ENTITY file-compsize "6.3 MB">
 <!ENTITY file-time "0.1 SBU">
diff --git a/entities/findutils.ent b/entities/findutils.ent
index 8e67838ca..7c4790641 100644
--- a/entities/findutils.ent
+++ b/entities/findutils.ent
@@ -14,11 +14,11 @@
 <!ENTITY findutils-depversion "4.1">
 <!ENTITY findutils-contversion "4.1">
 <!ENTITY findutils-dir "findutils-&findutils-version;">
-<!ENTITY findutils-package "findutils-&findutils-version;.tar.bz2">
+<!ENTITY findutils-package "findutils-&findutils-version;.tar.gz">
 <!ENTITY findutils-size "760 KB">
 
-<!ENTITY findutils-compsize-static "8 MB">
-<!ENTITY findutils-time-static "0.2 SBU">
+<!ENTITY findutils-compsize-tools "7.6 MB">
+<!ENTITY findutils-time-tools "0.2 SBU">
 
-<!ENTITY findutils-compsize "3 MB">
+<!ENTITY findutils-compsize "7.5 MB">
 <!ENTITY findutils-time "0.2 SBU">
diff --git a/entities/flex.ent b/entities/flex.ent
index 549225190..42eac46ca 100644
--- a/entities/flex.ent
+++ b/entities/flex.ent
@@ -11,8 +11,8 @@
 <!ENTITY flex-depversion "2.5.4a">
 <!ENTITY flex-contversion "2.5.4a">
 <!ENTITY flex-dir "flex-&flex-version;">
-<!ENTITY flex-package "flex-&flex-version;.tar.bz2">
+<!ENTITY flex-package "flex-&flex-version;.tar.gz">
 <!ENTITY flex-size "372 KB">
 
-<!ENTITY flex-compsize "3 MB">
+<!ENTITY flex-compsize "3.4 MB">
 <!ENTITY flex-time "0.1 SBU">
diff --git a/entities/gawk.ent b/entities/gawk.ent
index 092ca1517..8863a6b46 100644
--- a/entities/gawk.ent
+++ b/entities/gawk.ent
@@ -20,8 +20,8 @@
 <!ENTITY gawk-patch "gawk-&gawk-version;-libexecdir.patch">
 <!ENTITY gawk-patch-size "1 KB">
 
-<!ENTITY gawk-compsize-static "17 MB">
-<!ENTITY gawk-time-static "0.2 SBU">
+<!ENTITY gawk-compsize-tools "17 MB">
+<!ENTITY gawk-time-tools "0.2 SBU">
 
-<!ENTITY gawk-compsize "15 MB">
+<!ENTITY gawk-compsize "17 MB">
 <!ENTITY gawk-time "0.2 SBU">
diff --git a/entities/gcc-2953.ent b/entities/gcc-2953.ent
index 768119431..bb2bb11a8 100644
--- a/entities/gcc-2953.ent
+++ b/entities/gcc-2953.ent
@@ -21,5 +21,5 @@
 <!ENTITY gcc-2953-returntype-fix-patch "gcc-&gcc-2953-version;-returntype-fix.patch">
 <!ENTITY gcc-2953-returntype-fix-patch-size "1 KB">
 
-<!ENTITY gcc-2953-compsize "221 MB">
-<!ENTITY gcc-2953-time "2.0 SBU">
+<!ENTITY gcc-2953-compsize "130 MB">
+<!ENTITY gcc-2953-time "1.5 SBU">
diff --git a/entities/gcc.ent b/entities/gcc.ent
index bd81a80ff..71778f103 100644
--- a/entities/gcc.ent
+++ b/entities/gcc.ent
@@ -30,11 +30,11 @@
 <!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">
-<!ENTITY gcc-time-pass1-stage1 "3.9 SBU">
+<!ENTITY gcc-compsize-tools-pass1 "300 MB">
+<!ENTITY gcc-time-tools-pass1 "4.4 SBU">
 
-<!ENTITY gcc-compsize-pass2-stage1 "326 MB">
-<!ENTITY gcc-time-pass2-stage1 "11.0 SBU">
+<!ENTITY gcc-compsize-tools-pass2 "274 MB">
+<!ENTITY gcc-time-tools-pass2 "11.0 SBU">
 
-<!ENTITY gcc-compsize "221 MB">
+<!ENTITY gcc-compsize "294 MB">
 <!ENTITY gcc-time "11.7 SBU">
diff --git a/entities/gettext.ent b/entities/gettext.ent
index 21fcfda8e..fd0ad6b9a 100644
--- a/entities/gettext.ent
+++ b/entities/gettext.ent
@@ -14,8 +14,11 @@
 <!ENTITY gettext-depversion "0.10.40">
 <!ENTITY gettext-contversion "0.11.2">
 <!ENTITY gettext-dir "gettext-&gettext-version;">
-<!ENTITY gettext-package "gettext-&gettext-version;.tar.bz2">
+<!ENTITY gettext-package "gettext-&gettext-version;.tar.gz">
 <!ENTITY gettext-size "5,593 KB">
 
-<!ENTITY gettext-compsize "39 MB">
-<!ENTITY gettext-time "5.4 SBU">
+<!ENTITY gettext-compsize-tools "55 MB">
+<!ENTITY gettext-time-tools "7.2 SBU">
+
+<!ENTITY gettext-compsize "55 MB">
+<!ENTITY gettext-time "6.9 SBU">
diff --git a/entities/glibc.ent b/entities/glibc.ent
index eb8107af0..5efa98e4f 100644
--- a/entities/glibc.ent
+++ b/entities/glibc.ent
@@ -24,7 +24,8 @@
 <!ENTITY glibc-sscanf-patch "glibc-&glibc-version;-sscanf-1.patch">
 <!ENTITY glibc-sscanf-patch-size "2 KB">
 
-<!ENTITY glibc-compsize "369 MB">
-<!ENTITY glibc-pass2-compsize "(to be determined)">
-<!ENTITY glibc-time "14.0 SBU">
-<!ENTITY glibc-pass2-time "15.4 SBU">
+<!ENTITY glibc-compsize-tools "800">
+<!ENTITY glibc-time-tools "11.8 SBU">
+
+<!ENTITY glibc-compsize "784 MB">
+<!ENTITY glibc-time "12.3 SBU">
diff --git a/entities/grep.ent b/entities/grep.ent
index 69f4edb21..2d40c3beb 100644
--- a/entities/grep.ent
+++ b/entities/grep.ent
@@ -17,8 +17,8 @@
 <!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">
+<!ENTITY grep-compsize-tools "5.8 MB">
+<!ENTITY grep-time-tools "0.1 SBU">
 
-<!ENTITY grep-compsize "5 MB">
+<!ENTITY grep-compsize "5.8 MB">
 <!ENTITY grep-time "0.1 SBU">
diff --git a/entities/groff.ent b/entities/groff.ent
index d957f7cf0..e2b5727f9 100644
--- a/entities/groff.ent
+++ b/entities/groff.ent
@@ -14,5 +14,5 @@
 <!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">
+<!ENTITY groff-compsize "43 MB">
+<!ENTITY groff-time "0.5 SBU">
diff --git a/entities/grub.ent b/entities/grub.ent
index d48730d69..6253159da 100644
--- a/entities/grub.ent
+++ b/entities/grub.ent
@@ -11,11 +11,11 @@
 <!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-package "grub-&grub-version;.tar.gz">
 <!ENTITY grub-size "870 KB">
 
 <!ENTITY grub-patch "grub-&grub-version;-gcc33-1.patch">
 <!ENTITY grub-patch-size "1 KB">
 
-<!ENTITY grub-compsize "9 MB">
-<!ENTITY grub-time "? SBU">
+<!ENTITY grub-compsize "10 MB">
+<!ENTITY grub-time "0.2 SBU">
diff --git a/entities/gzip.ent b/entities/gzip.ent
index 26c8f6230..574292197 100644
--- a/entities/gzip.ent
+++ b/entities/gzip.ent
@@ -14,11 +14,11 @@
 <!ENTITY gzip-depversion "1.2.4a">
 <!ENTITY gzip-contversion "1.2.4a">
 <!ENTITY gzip-dir "gzip-&gzip-version;">
-<!ENTITY gzip-package "gzip-&gzip-version;.tar.bz2">
+<!ENTITY gzip-package "gzip-&gzip-version;.tar.gz">
 <!ENTITY gzip-size "324 KB">
 
-<!ENTITY gzip-compsize-static "2 MB">
-<!ENTITY gzip-time-static "0.1 SBU">
+<!ENTITY gzip-compsize-tools "2.6 MB">
+<!ENTITY gzip-time-tools "0.1 SBU">
 
-<!ENTITY gzip-compsize "2 MB">
+<!ENTITY gzip-compsize "2.6 MB">
 <!ENTITY gzip-time "0.1 SBU">
diff --git a/entities/inetutils.ent b/entities/inetutils.ent
index 4a3e03b29..5ec1ddfcd 100644
--- a/entities/inetutils.ent
+++ b/entities/inetutils.ent
@@ -11,8 +11,8 @@
 <!ENTITY inetutils-depversion "">
 <!ENTITY inetutils-contversion "1.4.2">
 <!ENTITY inetutils-dir "inetutils-&inetutils-version;">
-<!ENTITY inetutils-package "inetutils-&inetutils-version;.tar.bz2">
+<!ENTITY inetutils-package "inetutils-&inetutils-version;.tar.gz">
 <!ENTITY inetutils-size "1,019 KB">
 
-<!ENTITY inetutils-compsize "(to be determined)">
-<!ENTITY inetutils-time "0.3 SBU">
+<!ENTITY inetutils-compsize "11 MB">
+<!ENTITY inetutils-time "0.2 SBU">
diff --git a/entities/kbd.ent b/entities/kbd.ent
index d1175d069..2549c1e0e 100644
--- a/entities/kbd.ent
+++ b/entities/kbd.ent
@@ -11,11 +11,11 @@
 <!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-package "kbd-&kbd-version;.tar.gz">
 <!ENTITY kbd-size "801 KB">
 
 <!ENTITY kbd-patch "kbd-&kbd-version;-more-programs.patch">
 <!ENTITY kbd-patch-size "1 KB">
 
-<!ENTITY kbd-compsize "8 MB">
+<!ENTITY kbd-compsize "12 MB">
 <!ENTITY kbd-time "0.1 SBU">
diff --git a/entities/kernel.ent b/entities/kernel.ent
index 2f530258c..58c3e1ea1 100644
--- a/entities/kernel.ent
+++ b/entities/kernel.ent
@@ -21,7 +21,7 @@
 <!ENTITY kernel-package "linux-&kernel-version;.tar.bz2">
 <!ENTITY kernel-size "28,837 KB">
 
-<!ENTITY kernel-compsize-headers "142 MB">
+<!ENTITY kernel-compsize-headers "186 MB">
 <!ENTITY kernel-time-headers "0.1 SBU">
 
 <!ENTITY kernel-compsize "All default options: 181 MB">
diff --git a/entities/less.ent b/entities/less.ent
index 2e1456a81..f1ae88f94 100644
--- a/entities/less.ent
+++ b/entities/less.ent
@@ -11,8 +11,8 @@
 <!ENTITY less-depversion "358">
 <!ENTITY less-contversion "374">
 <!ENTITY less-dir "less-&less-version;">
-<!ENTITY less-package "less-&less-version;.tar.bz2">
+<!ENTITY less-package "less-&less-version;.tar.gz">
 <!ENTITY less-size "259 KB">
 
-<!ENTITY less-compsize "2 MB">
+<!ENTITY less-compsize "3.4 MB">
 <!ENTITY less-time "0.1 SBU">
diff --git a/entities/lfs-utils.ent b/entities/lfs-utils.ent
index e3bc48680..ff84464fe 100644
--- a/entities/lfs-utils.ent
+++ b/entities/lfs-utils.ent
@@ -14,5 +14,5 @@
 <!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-compsize "1.1 MB">
 <!ENTITY lfs-utils-time "0.1 SBU">
diff --git a/entities/libtool.ent b/entities/libtool.ent
index 2769aa02a..e6d08e253 100644
--- a/entities/libtool.ent
+++ b/entities/libtool.ent
@@ -17,5 +17,5 @@
 <!ENTITY libtool-patch "libtool-&libtool-version;.patch">
 <!ENTITY libtool-patch-size "11 KB">
 
-<!ENTITY libtool-compsize "7 MB">
-<!ENTITY libtool-time "1.1 SBU">
+<!ENTITY libtool-compsize "20 MB">
+<!ENTITY libtool-time "1.5 SBU">
diff --git a/entities/m4.ent b/entities/m4.ent
index c347969b4..ed72c6427 100644
--- a/entities/m4.ent
+++ b/entities/m4.ent
@@ -11,8 +11,8 @@
 <!ENTITY m4-depversion "1.4">
 <!ENTITY m4-contversion "1.4">
 <!ENTITY m4-dir "m4-&m4-version;">
-<!ENTITY m4-package "m4-&m4-version;.tar.bz2">
+<!ENTITY m4-package "m4-&m4-version;.tar.gz">
 <!ENTITY m4-size "310 KB">
 
-<!ENTITY m4-compsize "3 MB">
+<!ENTITY m4-compsize "3.0 MB">
 <!ENTITY m4-time "0.1 SBU">
diff --git a/entities/make.ent b/entities/make.ent
index 66f208df2..64ea689fd 100644
--- a/entities/make.ent
+++ b/entities/make.ent
@@ -17,8 +17,8 @@
 <!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">
+<!ENTITY make-compsize-tools "8.8 MB">
+<!ENTITY make-time-tools "0.2 SBU">
 
-<!ENTITY make-compsize "6 MB">
+<!ENTITY make-compsize "8.8 MB">
 <!ENTITY make-time "0.2 SBU">
diff --git a/entities/man.ent b/entities/man.ent
index fb01ce23a..ebc6612dd 100644
--- a/entities/man.ent
+++ b/entities/man.ent
@@ -22,5 +22,5 @@
 <!ENTITY man-pager-patch-size "1 KB">
 
 
-<!ENTITY man-compsize "2 MB">
+<!ENTITY man-compsize "1.9MB">
 <!ENTITY man-time "0.1 SBU">
diff --git a/entities/manpages.ent b/entities/manpages.ent
index 51db5466f..85c41ead5 100644
--- a/entities/manpages.ent
+++ b/entities/manpages.ent
@@ -14,5 +14,5 @@
 <!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-compsize "15 MB">
 <!ENTITY man-pages-time "0.1 SBU">
diff --git a/entities/modutils.ent b/entities/modutils.ent
index 5af602f13..e0157a5c4 100644
--- a/entities/modutils.ent
+++ b/entities/modutils.ent
@@ -14,5 +14,5 @@
 <!ENTITY modutils-package "modutils-&modutils-version;.tar.bz2">
 <!ENTITY modutils-size "215 KB">
 
-<!ENTITY modutils-compsize "3 MB">
+<!ENTITY modutils-compsize "2.9 MB">
 <!ENTITY modutils-time "0.1 SBU">
diff --git a/entities/ncurses.ent b/entities/ncurses.ent
index 3cb6784c8..715cf7495 100644
--- a/entities/ncurses.ent
+++ b/entities/ncurses.ent
@@ -14,7 +14,7 @@
 <!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-package "ncurses-&ncurses-version;.tar.gz">
 <!ENTITY ncurses-size "2,019 KB">
 
 <!ENTITY ncurses-etip-patch "ncurses-&ncurses-version;-etip-2.patch">
@@ -22,5 +22,8 @@
 <!ENTITY ncurses-vsscanf-patch "ncurses-&ncurses-version;-vsscanf.patch">
 <!ENTITY ncurses-vsscanf-patch-size "1 KB">
 
-<!ENTITY ncurses-compsize "22 MB">
-<!ENTITY ncurses-time "0.7 SBU">
+<!ENTITY ncurses-compsize-tools "26 MB">
+<!ENTITY ncurses-time-tools "0.7 SBU">
+
+<!ENTITY ncurses-compsize "27 MB">
+<!ENTITY ncurses-time "0.6 SBU">
diff --git a/entities/nettools.ent b/entities/nettools.ent
index c462fe5c5..664ba2b36 100644
--- a/entities/nettools.ent
+++ b/entities/nettools.ent
@@ -17,5 +17,5 @@
 <!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">
+<!ENTITY net-tools-compsize "9.4 MB">
 <!ENTITY net-tools-time "0.1 SBU">
diff --git a/entities/patch.ent b/entities/patch.ent
index 84e681412..ea5855e06 100644
--- a/entities/patch.ent
+++ b/entities/patch.ent
@@ -14,11 +14,11 @@
 <!ENTITY patch-depversion "2.5.4">
 <!ENTITY patch-contversion "2.5.4">
 <!ENTITY patch-dir "patch-&patch-version;">
-<!ENTITY patch-package "patch-&patch-version;.tar.bz2">
+<!ENTITY patch-package "patch-&patch-version;.tar.gz">
 <!ENTITY patch-size "182 KB">
 
-<!ENTITY patch-compsize-static "3 MB">
-<!ENTITY patch-time-static "0.1 SBU">
+<!ENTITY patch-compsize-tools "1.9 MB">
+<!ENTITY patch-time-tools "0.1 SBU">
 
-<!ENTITY patch-compsize "2 MB">
+<!ENTITY patch-compsize "1.9 MB">
 <!ENTITY patch-time "0.1 SBU">
diff --git a/entities/perl.ent b/entities/perl.ent
index f4370ff75..f45eeca9e 100644
--- a/entities/perl.ent
+++ b/entities/perl.ent
@@ -14,14 +14,14 @@
 <!ENTITY perl-depversion "5.6.1">
 <!ENTITY perl-contversion "5.6.1">
 <!ENTITY perl-dir "perl-&perl-version;">
-<!ENTITY perl-package "perl-&perl-version;.tar.bz2">
+<!ENTITY perl-package "perl-&perl-version;.tar.gz">
 <!ENTITY perl-size "10,765 KB">
 
 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-3.patch">
 <!ENTITY perl-libc-patch-size "1 KB">
 
-<!ENTITY perl-compsize-static "52 MB">
-<!ENTITY perl-time-static "0.8 SBU">
+<!ENTITY perl-compsize-tools "74 MB">
+<!ENTITY perl-time-tools "0.8 SBU">
 
-<!ENTITY perl-compsize "52 MB">
-<!ENTITY perl-time "2.7 SBU">
+<!ENTITY perl-compsize "143 MB">
+<!ENTITY perl-time "2.9 SBU">
diff --git a/entities/procinfo.ent b/entities/procinfo.ent
index 8b61dbc83..a6b11252f 100644
--- a/entities/procinfo.ent
+++ b/entities/procinfo.ent
@@ -11,8 +11,8 @@
 <!ENTITY procinfo-depversion "18">
 <!ENTITY procinfo-contversion "18">
 <!ENTITY procinfo-dir "procinfo-&procinfo-version;">
-<!ENTITY procinfo-package "procinfo-&procinfo-version;.tar.bz2">
+<!ENTITY procinfo-package "procinfo-&procinfo-version;.tar.gz">
 <!ENTITY procinfo-size "24 KB">
 
-<!ENTITY procinfo-compsize "168 KB">
+<!ENTITY procinfo-compsize "0.2 MB">
 <!ENTITY procinfo-time "0.1 SBU">
diff --git a/entities/procps.ent b/entities/procps.ent
index e05eb1878..681b1dbd3 100644
--- a/entities/procps.ent
+++ b/entities/procps.ent
@@ -17,5 +17,5 @@
 <!ENTITY procps-patch "procps-&procps-version;-locale-fix.patch">
 <!ENTITY procps-patch-size "1 KB">
 
-<!ENTITY procps-compsize "2 MB">
+<!ENTITY procps-compsize "6.2 MB">
 <!ENTITY procps-time "0.1 SBU">
diff --git a/entities/psmisc.ent b/entities/psmisc.ent
index 11122fa3f..0f2eb2a4f 100644
--- a/entities/psmisc.ent
+++ b/entities/psmisc.ent
@@ -11,8 +11,8 @@
 <!ENTITY psmisc-depversion "20.2">
 <!ENTITY psmisc-contversion "21">
 <!ENTITY psmisc-dir "psmisc-&psmisc-version;">
-<!ENTITY psmisc-package "psmisc-&psmisc-version;.tar.bz2">
+<!ENTITY psmisc-package "psmisc-&psmisc-version;.tar.gz">
 <!ENTITY psmisc-size "259 KB">
 
-<!ENTITY psmisc-compsize "2 MB">
+<!ENTITY psmisc-compsize "2.2 MB">
 <!ENTITY psmisc-time "0.1 SBU">
diff --git a/entities/sed.ent b/entities/sed.ent
index e0643ccb4..0e91d4a07 100644
--- a/entities/sed.ent
+++ b/entities/sed.ent
@@ -14,11 +14,11 @@
 <!ENTITY sed-depversion "3.02">
 <!ENTITY sed-contversion "3.02">
 <!ENTITY sed-dir "sed-&sed-version;">
-<!ENTITY sed-package "sed-&sed-version;.tar.bz2">
+<!ENTITY sed-package "sed-&sed-version;.tar.gz">
 <!ENTITY sed-size "678 KB">
 
-<!ENTITY sed-compsize-static "2 MB">
-<!ENTITY sed-time-static "0.2 SBU">
+<!ENTITY sed-compsize-tools "5.2 MB">
+<!ENTITY sed-time-tools "0.2 SBU">
 
-<!ENTITY sed-compsize "2 MB">
+<!ENTITY sed-compsize "5.2 MB">
 <!ENTITY sed-time "0.2 SBU">
diff --git a/entities/shadow.ent b/entities/shadow.ent
index 15c7d97f3..7185c942b 100644
--- a/entities/shadow.ent
+++ b/entities/shadow.ent
@@ -18,5 +18,5 @@
 <!ENTITY shadow-patch "shadow-&shadow-version;-newgrp-fix.patch">
 <!ENTITY shadow-patch-size "1 KB">
 
-<!ENTITY shadow-compsize "7 MB">
+<!ENTITY shadow-compsize "11 MB">
 <!ENTITY shadow-time "0.4 SBU">
diff --git a/entities/sysklogd.ent b/entities/sysklogd.ent
index 73b04c8be..8aaef1b25 100644
--- a/entities/sysklogd.ent
+++ b/entities/sysklogd.ent
@@ -14,8 +14,8 @@
 <!ENTITY sysklogd-depversion "1.4.1">
 <!ENTITY sysklogd-contversion "1.4.1">
 <!ENTITY sysklogd-dir "sysklogd-&sysklogd-version;">
-<!ENTITY sysklogd-package "sysklogd-&sysklogd-version;.tar.bz2">
+<!ENTITY sysklogd-package "sysklogd-&sysklogd-version;.tar.gz">
 <!ENTITY sysklogd-size "80 KB">
 
-<!ENTITY sysklogd-compsize "472 KB">
+<!ENTITY sysklogd-compsize "0.5 MB">
 <!ENTITY sysklogd-time "0.1 SBU">
diff --git a/entities/sysvinit.ent b/entities/sysvinit.ent
index 6adffffb2..2cc5a5e6c 100644
--- a/entities/sysvinit.ent
+++ b/entities/sysvinit.ent
@@ -12,8 +12,8 @@
 <!ENTITY sysvinit-depversion "2.84">
 <!ENTITY sysvinit-contversion "2.84">
 <!ENTITY sysvinit-dir "sysvinit-&sysvinit-version;">
-<!ENTITY sysvinit-package "sysvinit-&sysvinit-version;.tar.bz2">
+<!ENTITY sysvinit-package "sysvinit-&sysvinit-version;.tar.gz">
 <!ENTITY sysvinit-size "91 KB">
 
-<!ENTITY sysvinit-compsize "1 MB">
+<!ENTITY sysvinit-compsize "0.9 MB">
 <!ENTITY sysvinit-time "0.1 SBU">
diff --git a/entities/tar.ent b/entities/tar.ent
index 423c6c284..ba7285513 100644
--- a/entities/tar.ent
+++ b/entities/tar.ent
@@ -14,11 +14,11 @@
 <!ENTITY tar-depversion "1.13">
 <!ENTITY tar-contversion "1.13">
 <!ENTITY tar-dir "tar-&tar-version;">
-<!ENTITY tar-package "tar-&tar-version;.tar.bz2">
+<!ENTITY tar-package "tar-&tar-version;.tar.gz">
 <!ENTITY tar-size "1,281 KB">
 
-<!ENTITY tar-compsize-static "10 MB">
-<!ENTITY tar-time-static "0.2 SBU">
+<!ENTITY tar-compsize-tools "10 MB">
+<!ENTITY tar-time-tools "0.2 SBU">
 
-<!ENTITY tar-compsize "6 MB">
+<!ENTITY tar-compsize "10 MB">
 <!ENTITY tar-time "0.2 SBU">
diff --git a/entities/tcl.ent b/entities/tcl.ent
index b9199111a..d52eac882 100644
--- a/entities/tcl.ent
+++ b/entities/tcl.ent
@@ -11,8 +11,8 @@
 <!ENTITY tcl-depversion "8.4.4">
 <!ENTITY tcl-contversion "8.4.4">
 <!ENTITY tcl-dir "tcl-&tcl-version;">
-<!ENTITY tcl-package "tcl-&tcl-version;.tar.bz2">
+<!ENTITY tcl-package "tcl-&tcl-version;.tar.gz">
 <!ENTITY tcl-size "3,292 KB">
 
-<!ENTITY tcl-compsize-static "24 MB">
-<!ENTITY tcl-time-static "0.6 SBU">
+<!ENTITY tcl-compsize-tools "23 MB">
+<!ENTITY tcl-time-tools "0.9 SBU">
diff --git a/entities/texinfo.ent b/entities/texinfo.ent
index 5af83e2e5..237242884 100644
--- a/entities/texinfo.ent
+++ b/entities/texinfo.ent
@@ -17,8 +17,8 @@
 <!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">
+<!ENTITY texinfo-compsize-tools "16 MB">
+<!ENTITY texinfo-time-tools "0.2 SBU">
 
-<!ENTITY texinfo-compsize "12 MB">
+<!ENTITY texinfo-compsize "17 MB">
 <!ENTITY texinfo-time "0.2 SBU">
diff --git a/entities/utillinux.ent b/entities/utillinux.ent
index 45a39e9e3..399e82574 100644
--- a/entities/utillinux.ent
+++ b/entities/utillinux.ent
@@ -14,11 +14,11 @@
 <!ENTITY util-linux-depversion "2.11n">
 <!ENTITY util-linux-contversion "2.11t">
 <!ENTITY util-linux-dir "util-linux-&util-linux-version;">
-<!ENTITY util-linux-package "util-linux-&util-linux-version;.tar.bz2">
+<!ENTITY util-linux-package "util-linux-&util-linux-version;.tar.gz">
 <!ENTITY util-linux-size "1,814 KB">
 
-<!ENTITY util-linux-compsize-static "9 MB">
-<!ENTITY util-linux-time-static "0.1 SBU">
+<!ENTITY util-linux-compsize-tools "8 MB">
+<!ENTITY util-linux-time-tools "0.1 SBU">
 
-<!ENTITY util-linux-compsize "10 MB">
+<!ENTITY util-linux-compsize "16 MB">
 <!ENTITY util-linux-time "0.2 SBU">
diff --git a/entities/vim.ent b/entities/vim.ent
index 619fda5b4..72656b89d 100644
--- a/entities/vim.ent
+++ b/entities/vim.ent
@@ -15,5 +15,5 @@
 <!ENTITY vim-package "vim-&vim-version;.tar.bz2">
 <!ENTITY vim-size "3,193 KB">
 
-<!ENTITY vim-compsize "24 MB">
+<!ENTITY vim-compsize "34 MB">
 <!ENTITY vim-time "0.4 SBU">
diff --git a/entities/zlib.ent b/entities/zlib.ent
index 409325168..7363c7b3c 100644
--- a/entities/zlib.ent
+++ b/entities/zlib.ent
@@ -17,5 +17,5 @@
 <!ENTITY zlib-patch "zlib-&zlib-version;-vsnprintf.patch">
 <!ENTITY zlib-patch-size "10 KB">
 
-<!ENTITY zlib-compsize "1 MB">
+<!ENTITY zlib-compsize "1.5 MB">
 <!ENTITY zlib-time "0.1 SBU">