merged all chapter 4 xml files into one, separated packages and patches

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

78 files changed, 276 insertions, 296 deletions

diff --git a/chapter04/all.xml b/chapter04/all.xml
deleted file mode 100644
index fd3609f0a..000000000
--- a/chapter04/all.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<para>Download the following packages:</para>
-
diff --git a/chapter04/autoconf.xml b/chapter04/autoconf.xml
deleted file mode 100644
index 56bb9fa2a..000000000
--- a/chapter04/autoconf.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Autoconf (&autoconf-version;) - &autoconf-size;:
-<ulink url="http://freshmeat.net/projects/autoconf/"/>
diff --git a/chapter04/automake.xml b/chapter04/automake.xml
deleted file mode 100644
index 056bec01f..000000000
--- a/chapter04/automake.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Automake (&automake-version;) - &automake-size;:
-<ulink url="http://freshmeat.net/projects/automake/"/>
diff --git a/chapter04/bash-patch.xml b/chapter04/bash-patch.xml
deleted file mode 100644
index 685a10133..000000000
--- a/chapter04/bash-patch.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Bash Patch (&bash-patch-version;) - &bash-patch-size;:
-<ulink url="&http;/bash-&bash-patch-version;.patch"/>
diff --git a/chapter04/bash.xml b/chapter04/bash.xml
deleted file mode 100644
index ec0cacea4..000000000
--- a/chapter04/bash.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Bash (&bash-version;) - &bash-size;:
-<ulink url="http://freshmeat.net/projects/gnubash/"/>
diff --git a/chapter04/bin86.xml b/chapter04/bin86.xml
deleted file mode 100644
index 6e51f2330..000000000
--- a/chapter04/bin86.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Bin86 (&bin86-version;) - &bin86-size;:
-<ulink url="http://freshmeat.net/projects/bin86/"/>
diff --git a/chapter04/binutils.xml b/chapter04/binutils.xml
deleted file mode 100644
index 00454c451..000000000
--- a/chapter04/binutils.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Binutils (&binutils-version;) - &binutils-size;:
-<ulink url="http://freshmeat.net/projects/binutils/"/>
diff --git a/chapter04/bison.xml b/chapter04/bison.xml
deleted file mode 100644
index 039aa6cd7..000000000
--- a/chapter04/bison.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Bison (&bison-version;) - &bison-size;:
-<ulink url="http://freshmeat.net/projects/bison/"/>
diff --git a/chapter04/bootscripts.xml b/chapter04/bootscripts.xml
deleted file mode 100644
index 839f2f3ca..000000000
--- a/chapter04/bootscripts.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-LFS-Bootscripts (&bootscripts-version;) - &bootscripts-size;:
-<ulink url="&http;/lfs-bootscripts-&bootscripts-version;.tar.bz2"/>
diff --git a/chapter04/bzip2.xml b/chapter04/bzip2.xml
deleted file mode 100644
index 2952fe419..000000000
--- a/chapter04/bzip2.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Bzip2 (&bzip2-version;) - &bzip2-size;:
-<ulink url="http://freshmeat.net/projects/bzip2/"/>
diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml
index 687ba5264..943a5385b 100644
--- a/chapter04/chapter04.xml
+++ b/chapter04/chapter04.xml
@@ -1,9 +1,282 @@
 <chapter id="chapter04">
-<title>Packages that need to be downloaded</title>
+<title>The materials: packages and patches</title>
 <?dbhtml filename="chapter04.html" dir="chapter04"?>
 
-&c4-introduction;
-&c4-packages;
+
+<sect1 id="ch04-introduction">
+<title>Introduction</title>
+<?dbhtml filename="introduction.html" dir="chapter04"?>
+
+<para>Below is a list of packages you need to download for building a
+basic Linux system. The listed version numbers correspond to versions
+of the software that are known to work, and this book is based upon
+them. Feel free to try out newer versions, but if you experience problems
+with those versions, please try the recommended version first before
+sending bug reports.</para>
+
+<para>All the URLs, when possible, refer to the project's page at
+<ulink url="http://www.freshmeat.net">Freshmeat.net</ulink>. The Freshmeat
+pages will give you easy access to the official download sites as well as
+project websites, mailinglists, FAQs, Changelogs and more.</para>
+
+<!--
+<para>For your convenience the top of the list contains a link to a file
+you can use with the <ulink url="http://wget.sunsite.dk">wget</ulink>
+program. Using this file and the <userinput>wget</userinput> program will
+make it easy to download all the files at once, rather than downloading each
+and every individual file manually.</para>
+-->
+
+</sect1>
+
+
+<sect1 id="ch04-packages">
+<title>All the packages</title>
+<?dbhtml filename="packages.html" dir="chapter04"?>
+
+<para>Download or otherwise obtain the following packages:</para>
+
+<literallayout>
+Autoconf (&autoconf-version;) - &autoconf-size;:
+<ulink url="http://freshmeat.net/projects/autoconf/"/>
+
+Automake (&automake-version;) - &automake-size;:
+<ulink url="http://freshmeat.net/projects/automake/"/>
+
+Bash (&bash-version;) - &bash-size;:
+<ulink url="http://freshmeat.net/projects/gnubash/"/>
+
+Bin86 (&bin86-version;) - &bin86-size;:
+<ulink url="http://freshmeat.net/projects/bin86/"/>
+
+Binutils (&binutils-version;) - &binutils-size;:
+<ulink url="http://freshmeat.net/projects/binutils/"/>
+
+Bison (&bison-version;) - &bison-size;:
+<ulink url="http://freshmeat.net/projects/bison/"/>
+
+Bzip2 (&bzip2-version;) - &bzip2-size;:
+<ulink url="http://freshmeat.net/projects/bzip2/"/>
+
+Coreutils (&coreutils-version;) - &coreutils-size;:
+<ulink url="http://freshmeat.net/projects/coreutils/"/>
+
+DejaGNU (&dejagnu-version;) - &dejagnu-size;:
+<ulink url="http://freshmeat.net/projects/dejagnu/"/>
+
+Diffutils (&diffutils-version;) - &diffutils-size;:
+<ulink url="http://freshmeat.net/projects/diffutils/"/>
+
+E2fsprogs (&e2fsprogs-version;) - &e2fsprogs-size;:
+<ulink url="http://freshmeat.net/projects/e2fsprogs/"/>
+
+Ed (&ed-version;) - &ed-size;:
+<ulink url="http://freshmeat.net/projects/ed/"/>
+
+Expect (&expect-version;) - &expect-size;:
+<ulink url="http://freshmeat.net/projects/expect/"/>
+
+File (&file-version;) - &file-size;:
+<ulink url="http://freshmeat.net/projects/file/"/>
+
+Findutils (&findutils-version;) - &findutils-size;:
+<ulink url="http://netsw.org/system/tools/fileutils/find/"/>
+
+Flex (&flex-version;) - &flex-size;:
+<ulink url="ftp://ftp.gnu.org/pub/non-gnu/flex/"/>
+
+Gawk (&gawk-version;) - &gawk-size;:
+<ulink url="http://freshmeat.net/projects/gnuawk/"/>
+
+GCC (&gcc-2953-version;) - &gcc-2953-size;:
+<ulink url="http://freshmeat.net/projects/gcc/"/>
+
+GCC-core (&gcc-version;) - &gcc-core-size;:
+<ulink url="http://freshmeat.net/projects/gcc/"/>
+GCC-g++ (&gcc-version;) - &gcc-gpp-size;:
+<ulink url="http://freshmeat.net/projects/gcc/"/>
+GCC-testsuite (&gcc-version;) - &gcc-testsuite-size;:
+<ulink url="http://freshmeat.net/projects/gcc/"/>
+
+Gettext (&gettext-version;) - &gettext-size;:
+<ulink url="http://freshmeat.net/projects/gettext/"/>
+
+Glibc (&glibc-version;) - &glibc-size;:
+<ulink url="http://freshmeat.net/projects/glibc/"/>
+Glibc-linuxthreads (&glibc-version;) - &glibc-threads-size;:
+<ulink url="http://freshmeat.net/projects/glibc/"/>
+
+Grep (&grep-version;) - &grep-size;:
+<ulink url="http://freshmeat.net/projects/grep/"/>
+
+Groff (&groff-version;) - &groff-size;:
+<ulink url="http://freshmeat.net/projects/groff/"/>
+
+Gzip (&gzip-version;) - &gzip-size;:
+<ulink url="ftp://alpha.gnu.org/gnu/gzip/"/>
+
+Inetutils (&inetutils-version;) - &inetutils-size;:
+<ulink url="http://freshmeat.net/projects/inetutils/"/>
+
+Kbd (&kbd-version;) - &kbd-size;:
+<ulink url="http://freshmeat.net/projects/kbd/"/>
+
+Linux (&kernel-version;) - &kernel-size;:
+<ulink url="http://freshmeat.net/projects/linux/"/>
+
+Less (&less-version;) - &less-size;:
+<ulink url="http://freshmeat.net/projects/less/"/>
+
+LFS-Bootscripts (&bootscripts-version;) - &bootscripts-size;:
+<ulink url="&http;/lfs-bootscripts-&bootscripts-version;.tar.bz2"/>
+
+Lfs-Utils (&lfs-utils-version;) - &lfs-utils-size;:
+<ulink url="http://www.linuxfromscratch.org/~winkie/downloads/lfs-utils/"/>
+
+Libtool (&libtool-version;) - &libtool-size;:
+<ulink url="http://freshmeat.net/projects/libtool/"/>
+
+Lilo (&lilo-version;) - &lilo-size;:
+<ulink url="http://freshmeat.net/projects/lilo/"/>
+
+M4 (&m4-version;) - &m4-size;:
+<ulink url="http://freshmeat.net/projects/gnum4/"/>
+
+Make (&make-version;) - &make-size;:
+<ulink url="http://freshmeat.net/projects/gnumake"/>
+
+MAKEDEV (&makedev-version;) - &makedev-size;:
+<ulink url="&http;/MAKEDEV-&makedev-version;.bz2"/>
+
+Man (&man-version;) - &man-size;:
+<ulink url="http://freshmeat.net/projects/man/"/>
+
+Man-pages (&man-pages-version;) - &man-pages-size;:
+<ulink url="http://freshmeat.net/projects/man-pages/"/>
+
+Modutils (&modutils-version;) - &modutils-size;:
+<ulink url="http://freshmeat.net/projects/modutils/"/>
+
+Ncurses (&ncurses-version;) - &ncurses-size;:
+<ulink url="http://freshmeat.net/projects/ncurses/"/>
+
+Net-tools (&net-tools-version;) - &net-tools-size;:
+<ulink url="http://freshmeat.net/projects/net-tools/"/>
+
+Patch (&patch-version;) - &patch-size;:
+<ulink url="http://freshmeat.net/projects/patch/"/>
+
+Perl (&perl-version;) - &perl-size;:
+<ulink url="http://freshmeat.net/projects/perl/"/>
+
+Procinfo (&procinfo-version;) - &procinfo-size;:
+<ulink url="http://freshmeat.net/projects/procinfo/"/>
+
+Procps (&procps-version;) - &procps-size;:
+<ulink url="http://freshmeat.net/projects/procps/"/>
+
+Psmisc (&psmisc-version;) - &psmisc-size;:
+<ulink url="http://freshmeat.net/projects/psmisc/"/>
+
+Sed (&sed-version;) - &sed-size;:
+<ulink url="http://freshmeat.net/projects/sed/"/>
+
+Shadow (&shadow-version;) - &shadow-size;:
+<ulink url="http://freshmeat.net/projects/shadow/"/>
+
+Sysklogd (&sysklogd-version;) - &sysklogd-size;:
+<ulink url="http://freshmeat.net/projects/sysklogd/"/>
+
+Sysvinit (&sysvinit-version;) - &sysvinit-size;:
+<ulink url="http://freshmeat.net/projects/sysvinit/"/>
+
+Tar (&tar-version;) - &tar-size;:
+<ulink url="ftp://alpha.gnu.org/gnu/tar/"/>
+
+TCL (&tcl-version;) - &tcl-size;:
+<ulink url="http://freshmeat.net/projects/tcltk/"/>
+
+Texinfo (&texinfo-version;) - &texinfo-size;:
+<ulink url="http://freshmeat.net/projects/texinfo/"/>
+
+Util-linux (&util-linux-version;) - &util-linux-size;:
+<ulink url="http://freshmeat.net/projects/util-linux/"/>
+
+Vim (&vim-version;) - &vim-size;:
+<ulink url="http://freshmeat.net/projects/vim/"/>
+
+Zlib (&zlib-version;) - &zlib-size;:
+<ulink url="http://freshmeat.net/projects/zlib/"/>
+
+Total size of these packages: &all-size-mb;
+</literallayout>
+
+</sect1>
+
+
+<sect1 id="ch04-patches">
+<title>Needed patches</title>
+<?dbhtml filename="patches.html" dir="chapter04"?>
+
+<para>Besides all those packages, you'll also need several patches. These
+correct tiny mistakes in the packages that should be fixed by the maintainer,
+or just make some small modifications to bend things our way. You'll need the
+following:</para>
+
+<literallayout>
+Bash Patch (&bash-patch-version;) - &bash-patch-size;:
+<ulink url="&http;/bash-&bash-patch-version;.patch"/>
+
+Coreutils Hostname Patch (&coreutils-hostname-patch-version;) - &coreutils-hostname-patch-size;:
+<ulink url="&http;/coreutils-&coreutils-hostname-patch-version;.patch"/>
+Coreutils Uname Patch (&coreutils-uname-patch-version;) - &coreutils-uname-patch-size;:
+<ulink url="&http;/coreutils-&coreutils-uname-patch-version;.patch"/>
+
+Ed Patch (&ed-patch-version;) - &ed-patch-size;:
+<ulink url="&http;/ed-&ed-patch-version;.patch"/>
+
+Expect Patch (&expect-patch-version;) - &expect-patch-size;:
+<ulink url="&http;/expect-&expect-patch-version;.patch"/>
+
+Gawk Patch (&gawk-patch-version;) - &gawk-patch-size;:
+<ulink url="&http;/gawk-&gawk-patch-version;.patch"/>
+
+GCC Patch (&gcc-2953-patch-version;) - &gcc-2953-patch-size;:
+<ulink url="&http;/gcc-&gcc-2953-patch-version;.patch"/>
+
+GCC Specs Patch:
+<ulink url="&http;/gcc-3.2.3-specs-4.patch"/>
+GCC MMap Test Patch:
+<ulink url="&http;/gcc-3.2.3-mmap_test.patch"/>
+GCC No Fixincludes Patch:
+<ulink url="&http;/gcc-3.2.3-no_fixincludes.patch"/>
+
+Kbd Patch (&kbd-patch-version;) - &kbd-patch-size;:
+<ulink url="&http;/kbd-&kbd-patch-version;.patch"/>
+
+Man 80Cols Patch (&man-80cols-patch-version;) - &man-80cols-patch-size;:
+<ulink url="&http;/man-&man-80cols-patch-version;-80cols.patch"/>
+Man Manpath Patch (&man-manpath-patch-version;) - &man-manpath-patch-size;:
+<ulink url="&http;/man-&man-manpath-patch-version;-manpath.patch"/>
+Man Pager Patch (&man-pager-patch-version;) - &man-pager-patch-size;:
+<ulink url="&http;/man-&man-pager-patch-version;-pager.patch"/>
+
+Ncurses Etip Patch (&ncurses-etip-patch-version;) - &ncurses-etip-patch-size;:
+<ulink url="&http;/ncurses-5.3-etip-2.patch"/>
+Ncurses Vsscanf Patch (&ncurses-vsscanf-patch-version;) - &ncurses-vsscanf-patch-size;:
+<ulink url="&http;/ncurses-5.3-vsscanf.patch"/>
+
+Perl Libc Patch (&perl-libc-patch-version;) - &perl-libc-patch-size;:
+<ulink url="&http;/perl-&perl-libc-patch-version;-libc.patch"/>
+
+Procps Patch (&procps-patch-version;) - &procps-patch-size;:
+<ulink url="&http;/procps-&procps-patch-version;.patch"/>
+
+Zlib Patch (&zlib-patch-version;) - &zlib-patch-size;:
+<ulink url="&http;/zlib-&zlib-patch-version;.patch"/>
+</literallayout>
+
+</sect1>
 
 </chapter>
 
diff --git a/chapter04/coreutils-patch.xml b/chapter04/coreutils-patch.xml
deleted file mode 100644
index e4cefb5fc..000000000
--- a/chapter04/coreutils-patch.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-Coreutils Uname Patch (&coreutils-uname-patch-version;) - &coreutils-uname-patch-size;:
-<ulink url="&http;/coreutils-&coreutils-uname-patch-version;.patch"/>
-
-Coreutils Hostname Patch (&coreutils-hostname-patch-version;) - &coreutils-hostname-patch-size;:
-<ulink url="&http;/coreutils-&coreutils-hostname-patch-version;.patch"/>
diff --git a/chapter04/coreutils.xml b/chapter04/coreutils.xml
deleted file mode 100644
index c34b708c3..000000000
--- a/chapter04/coreutils.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Coreutils (&coreutils-version;) - &coreutils-size;:
-<ulink url="http://freshmeat.net/projects/coreutils/"/>
diff --git a/chapter04/dejagnu.xml b/chapter04/dejagnu.xml
deleted file mode 100644
index ac7b12ab8..000000000
--- a/chapter04/dejagnu.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-DejaGNU (&dejagnu-version;) - &dejagnu-size;:
-<ulink url="http://freshmeat.net/projects/dejagnu/"/>
diff --git a/chapter04/diffutils.xml b/chapter04/diffutils.xml
deleted file mode 100644
index 643529c02..000000000
--- a/chapter04/diffutils.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Diffutils (&diffutils-version;) - &diffutils-size;:
-<ulink url="http://freshmeat.net/projects/diffutils/"/>
diff --git a/chapter04/e2fsprogs.xml b/chapter04/e2fsprogs.xml
deleted file mode 100644
index dafb0fa1c..000000000
--- a/chapter04/e2fsprogs.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-E2fsprogs (&e2fsprogs-version;) - &e2fsprogs-size;:
-<ulink url="http://freshmeat.net/projects/e2fsprogs/"/>
diff --git a/chapter04/ed-patch.xml b/chapter04/ed-patch.xml
deleted file mode 100644
index d4a28caa6..000000000
--- a/chapter04/ed-patch.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Ed Patch (&ed-patch-version;) - &ed-patch-size;:
-<ulink url="&http;/ed-&ed-patch-version;.patch"/>
diff --git a/chapter04/ed.xml b/chapter04/ed.xml
deleted file mode 100644
index 797070e4b..000000000
--- a/chapter04/ed.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Ed (&ed-version;) - &ed-size;:
-<ulink url="http://freshmeat.net/projects/ed/"/>
diff --git a/chapter04/expect-patch.xml b/chapter04/expect-patch.xml
deleted file mode 100644
index 700d8dd52..000000000
--- a/chapter04/expect-patch.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Expect Patch (&expect-patch-version;) - &expect-patch-size;:
-<ulink url="&http;/expect-&expect-patch-version;.patch"/>
diff --git a/chapter04/expect.xml b/chapter04/expect.xml
deleted file mode 100644
index 7e88ad903..000000000
--- a/chapter04/expect.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Expect (&expect-version;) - &expect-size;:
-<ulink url="http://freshmeat.net/projects/expect/"/>
diff --git a/chapter04/file.xml b/chapter04/file.xml
deleted file mode 100644
index e63095477..000000000
--- a/chapter04/file.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-File (&file-version;) - &file-size;:
-<ulink url="http://freshmeat.net/projects/file/"/>
diff --git a/chapter04/findutils-patch.xml b/chapter04/findutils-patch.xml
deleted file mode 100644
index 88a3df69e..000000000
--- a/chapter04/findutils-patch.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-Findutils Patch (&findutils-patch-version;) - &findutils-patch-size;:
-<ulink url="&http;/findutils-&findutils-patch-version;.patch"/>
-
-Findutils Segfault Patch (&findutils-segfault-patch-version;) - &findutils-segfault-patch-size;:
-<ulink url="&http;/findutils-&findutils-segfault-patch-version;-segfault.patch"/>
diff --git a/chapter04/findutils.xml b/chapter04/findutils.xml
deleted file mode 100644
index 38a3db2f9..000000000
--- a/chapter04/findutils.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Findutils (&findutils-version;) - &findutils-size;:
-<ulink url="http://netsw.org/system/tools/fileutils/find/"/>
diff --git a/chapter04/flex.xml b/chapter04/flex.xml
deleted file mode 100644
index e8e4c14fd..000000000
--- a/chapter04/flex.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Flex (&flex-version;) - &flex-size;:
-<ulink url="ftp://ftp.gnu.org/pub/non-gnu/flex/"/>
diff --git a/chapter04/gawk-patch.xml b/chapter04/gawk-patch.xml
deleted file mode 100644
index c1a910521..000000000
--- a/chapter04/gawk-patch.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Gawk Patch (&gawk-patch-version;) - &gawk-patch-size;:
-<ulink url="&http;/gawk-&gawk-patch-version;.patch"/>
diff --git a/chapter04/gawk.xml b/chapter04/gawk.xml
deleted file mode 100644
index 651cbe130..000000000
--- a/chapter04/gawk.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Gawk (&gawk-version;) - &gawk-size;:
-<ulink url="http://freshmeat.net/projects/gnuawk/"/>
diff --git a/chapter04/gcc-2953.xml b/chapter04/gcc-2953.xml
deleted file mode 100644
index c595f65f4..000000000
--- a/chapter04/gcc-2953.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-GCC (&gcc-2953-version;) - &gcc-2953-size;:
-<ulink url="http://freshmeat.net/projects/gcc/"/>
-
-GCC Patch (&gcc-2953-patch-version;) - &gcc-2953-patch-size;:
-<ulink url="&http;/gcc-&gcc-2953-patch-version;.patch"/>
diff --git a/chapter04/gcc-patch.xml b/chapter04/gcc-patch.xml
deleted file mode 100644
index 2d16648a8..000000000
--- a/chapter04/gcc-patch.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-GCC Specs Patch:
-<ulink url="&http;/gcc-3.2.3-specs-4.patch"/>
-
-GCC MMap Test Patch:
-<ulink url="&http;/gcc-3.2.3-mmap_test.patch"/>
-
-GCC No Fixincludes Patch:
-<ulink url="&http;/gcc-3.2.3-no_fixincludes.patch"/>
diff --git a/chapter04/gcc.xml b/chapter04/gcc.xml
deleted file mode 100644
index 694d26a6c..000000000
--- a/chapter04/gcc.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-GCC-core (&gcc-version;) - &gcc-core-size;:
-<ulink url="http://freshmeat.net/projects/gcc/"/>
-
-GCC-g++ (&gcc-version;) - &gcc-gpp-size;:
-<ulink url="http://freshmeat.net/projects/gcc/"/>
-
-GCC-testsuite (&gcc-version;) - &gcc-testsuite-size;:
-<ulink url="http://freshmeat.net/projects/gcc/"/>
diff --git a/chapter04/gettext.xml b/chapter04/gettext.xml
deleted file mode 100644
index a6cc3a8af..000000000
--- a/chapter04/gettext.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Gettext (&gettext-version;) - &gettext-size;:
-<ulink url="http://freshmeat.net/projects/gettext/"/>
diff --git a/chapter04/glibc-patch.xml b/chapter04/glibc-patch.xml
deleted file mode 100644
index b83dd7e22..000000000
--- a/chapter04/glibc-patch.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-Glibc Root/Perl Patch: (&glibc-rootperl-patch-version;) - &glibc-rootperl-patch-size;:
-<ulink url="&http;/glibc-&glibc-rootperl-patch-version;-root-perl.patch"/>
-
-Glibc Libnss  Patch: (&glibc-libnss-patch-version;) - &glibc-libnss-patch-size;:
-<ulink url="&http;/glibc-&glibc-libnss-patch-version;-libnss.patch"/>
diff --git a/chapter04/glibc-threads.xml b/chapter04/glibc-threads.xml
deleted file mode 100644
index f2714caf8..000000000
--- a/chapter04/glibc-threads.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Glibc-linuxthreads (&glibc-version;) - &glibc-threads-size;:
-<ulink url="http://freshmeat.net/projects/glibc/"/>
diff --git a/chapter04/glibc.xml b/chapter04/glibc.xml
deleted file mode 100644
index 827bb6995..000000000
--- a/chapter04/glibc.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Glibc (&glibc-version;) - &glibc-size;:
-<ulink url="http://freshmeat.net/projects/glibc/"/>
diff --git a/chapter04/grep.xml b/chapter04/grep.xml
deleted file mode 100644
index 179466b0a..000000000
--- a/chapter04/grep.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Grep (&grep-version;) - &grep-size;:
-<ulink url="http://freshmeat.net/projects/grep/"/>
diff --git a/chapter04/groff.xml b/chapter04/groff.xml
deleted file mode 100644
index 8d3c95e73..000000000
--- a/chapter04/groff.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Groff (&groff-version;) - &groff-size;:
-<ulink url="http://freshmeat.net/projects/groff/"/>
diff --git a/chapter04/gzip-patch.xml b/chapter04/gzip-patch.xml
deleted file mode 100644
index a698434b3..000000000
--- a/chapter04/gzip-patch.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Gzip Patch (&gzip-patch-version;) - &gzip-patch-size;:
-<ulink url="&http;/gzip-&gzip-patch-version;.patch"/>
diff --git a/chapter04/gzip.xml b/chapter04/gzip.xml
deleted file mode 100644
index 240ce0bc8..000000000
--- a/chapter04/gzip.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Gzip (&gzip-version;) - &gzip-size;:
-<ulink url="ftp://alpha.gnu.org/gnu/gzip/"/>
diff --git a/chapter04/inetutils.xml b/chapter04/inetutils.xml
deleted file mode 100644
index 5fa067fb5..000000000
--- a/chapter04/inetutils.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Inetutils (&inetutils-version;) - &inetutils-size;:
-<ulink url="http://freshmeat.net/projects/inetutils/"/>
diff --git a/chapter04/introduction.xml b/chapter04/introduction.xml
deleted file mode 100644
index a1b384abb..000000000
--- a/chapter04/introduction.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<sect1 id="ch04-introduction">
-<title>Introduction</title>
-<?dbhtml filename="introduction.html" dir="chapter04"?>
-
-<para>Below is a list of packages you need to download for building a
-basic Linux system. The listed version numbers correspond to versions
-of the software that are known to work, and this book is based upon
-them. Feel free to try out newer versions, but if you experience problems
-with those versions, please try the recommended version first before
-sending bug reports.</para>
-
-<para>All the URLs, when possible, refer to the project's page at
-<ulink url="http://www.freshmeat.net">Freshmeat.net</ulink>. The Freshmeat
-pages will give you easy access to the official download sites as well as
-project websites, mailinglists, FAQs, Changelogs and more.</para>
-
-<!--
-<para>For your convenience the top of the list contains a link to a file
-you can use with the <ulink url="http://wget.sunsite.dk">wget</ulink>
-program. Using this file and the <userinput>wget</userinput> program will
-make it easy to download all the files at once, rather than downloading each
-and every individual file manually.</para>
--->
-</sect1>
-
diff --git a/chapter04/kbd-patch.xml b/chapter04/kbd-patch.xml
deleted file mode 100644
index 2edd2dff7..000000000
--- a/chapter04/kbd-patch.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Kbd Patch (&kbd-patch-version;) - &kbd-patch-size;:
-<ulink url="&http;/kbd-&kbd-patch-version;.patch"/>
diff --git a/chapter04/kbd.xml b/chapter04/kbd.xml
deleted file mode 100644
index 3253bf115..000000000
--- a/chapter04/kbd.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Kbd (&kbd-version;) - &kbd-size;:
-<ulink url="http://freshmeat.net/projects/kbd/"/>
diff --git a/chapter04/kernel.xml b/chapter04/kernel.xml
deleted file mode 100644
index f9f1ea28a..000000000
--- a/chapter04/kernel.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Linux (&kernel-version;) - &kernel-size;:
-<ulink url="http://freshmeat.net/projects/linux/"/>
diff --git a/chapter04/less.xml b/chapter04/less.xml
deleted file mode 100644
index aa404331a..000000000
--- a/chapter04/less.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Less (&less-version;) - &less-size;:
-<ulink url="http://freshmeat.net/projects/less/"/>
diff --git a/chapter04/lfs-utils.xml b/chapter04/lfs-utils.xml
deleted file mode 100644
index b1ab7e72c..000000000
--- a/chapter04/lfs-utils.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Lfs-Utils (&lfs-utils-version;) - &lfs-utils-size;:
-<ulink url="http://www.linuxfromscratch.org/~winkie/downloads/lfs-utils/"/>
diff --git a/chapter04/libtool-patch.xml b/chapter04/libtool-patch.xml
deleted file mode 100644
index aab8f43fa..000000000
--- a/chapter04/libtool-patch.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-Libtool Patch (&libtool-patch-version;) - &libtool-patch-size;:
-<ulink url="&ftp;/libtool-&libtool-patch-version;.patch"/>
-<ulink url="&http;/libtool-&libtool-patch-version;.patch"/>
diff --git a/chapter04/libtool.xml b/chapter04/libtool.xml
deleted file mode 100644
index 37a9e4de7..000000000
--- a/chapter04/libtool.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Libtool (&libtool-version;) - &libtool-size;:
-<ulink url="http://freshmeat.net/projects/libtool/"/>
diff --git a/chapter04/lilo.xml b/chapter04/lilo.xml
deleted file mode 100644
index 19aa568ea..000000000
--- a/chapter04/lilo.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Lilo (&lilo-version;) - &lilo-size;:
-<ulink url="http://freshmeat.net/projects/lilo/"/>
diff --git a/chapter04/m4.xml b/chapter04/m4.xml
deleted file mode 100644
index efe30852d..000000000
--- a/chapter04/m4.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-M4 (&m4-version;) - &m4-size;:
-<ulink url="http://freshmeat.net/projects/gnum4/"/>
diff --git a/chapter04/make.xml b/chapter04/make.xml
deleted file mode 100644
index 9c85bab12..000000000
--- a/chapter04/make.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Make (&make-version;) - &make-size;:
-<ulink url="http://freshmeat.net/projects/gnumake"/>
diff --git a/chapter04/makedev.xml b/chapter04/makedev.xml
deleted file mode 100644
index 0fe7e6dc6..000000000
--- a/chapter04/makedev.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-MAKEDEV (&makedev-version;) - &makedev-size;:
-<ulink url="&http;/MAKEDEV-&makedev-version;.bz2"/>
diff --git a/chapter04/man-patch.xml b/chapter04/man-patch.xml
deleted file mode 100644
index c4d5dbf01..000000000
--- a/chapter04/man-patch.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-Man 80Cols Patch (&man-80cols-patch-version;) - &man-80cols-patch-size;:
-<ulink url="&http;/man-&man-80cols-patch-version;-80cols.patch"/>
-
-Man Manpath Patch (&man-manpath-patch-version;) - &man-manpath-patch-size;:
-<ulink url="&http;/man-&man-manpath-patch-version;-manpath.patch"/>
-
-Man Pager Patch (&man-pager-patch-version;) - &man-pager-patch-size;:
-<ulink url="&http;/man-&man-pager-patch-version;-pager.patch"/>
diff --git a/chapter04/man.xml b/chapter04/man.xml
deleted file mode 100644
index 715dd044f..000000000
--- a/chapter04/man.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Man (&man-version;) - &man-size;:
-<ulink url="http://freshmeat.net/projects/man/"/>
diff --git a/chapter04/manpages.xml b/chapter04/manpages.xml
deleted file mode 100644
index 159a9d8b3..000000000
--- a/chapter04/manpages.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Man-pages (&man-pages-version;) - &man-pages-size;:
-<ulink url="http://freshmeat.net/projects/man-pages/"/>
diff --git a/chapter04/modutils.xml b/chapter04/modutils.xml
deleted file mode 100644
index 49e7cbfe4..000000000
--- a/chapter04/modutils.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Modutils (&modutils-version;) - &modutils-size;:
-<ulink url="http://freshmeat.net/projects/modutils/"/>
diff --git a/chapter04/ncurses-patch.xml b/chapter04/ncurses-patch.xml
deleted file mode 100644
index 5287670db..000000000
--- a/chapter04/ncurses-patch.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-Ncurses Patch (&ncurses-etip-patch-version;) - &ncurses-etip-patch-size;:
-<ulink url="&http;/ncurses-5.3-etip-2.patch"/>
-
-Ncurses Patch (&ncurses-etip-patch-version;) - &ncurses-etip-patch-size;:
-<ulink url="&http;/ncurses-5.3-vsscanf.patch"/>
diff --git a/chapter04/ncurses.xml b/chapter04/ncurses.xml
deleted file mode 100644
index ceec6f1ca..000000000
--- a/chapter04/ncurses.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Ncurses (&ncurses-version;) - &ncurses-size;:
-<ulink url="http://freshmeat.net/projects/ncurses/"/>
diff --git a/chapter04/netkitbase.xml b/chapter04/netkitbase.xml
deleted file mode 100644
index 2767fa298..000000000
--- a/chapter04/netkitbase.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Netkit-base (&netkit-base-version;) - &netkit-base-size;:
-<ulink url="http://freshmeat.net/projects/netkit/"/>
diff --git a/chapter04/nettools.xml b/chapter04/nettools.xml
deleted file mode 100644
index 08dab07f1..000000000
--- a/chapter04/nettools.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Net-tools (&net-tools-version;) - &net-tools-size;:
-<ulink url="http://freshmeat.net/projects/net-tools/"/>
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
deleted file mode 100644
index f04f3be72..000000000
--- a/chapter04/packages.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<sect1 id="ch04-packages">
-<title>Packages that need to be downloaded</title>
-<?dbhtml filename="packages.html" dir="chapter04"?>
-
-&c4-all;
-
-<literallayout>
-&c4-autoconf;
-&c4-automake;
-&c4-bash;
-&c4-bash-patch;
-&c4-bin86;
-&c4-binutils;
-&c4-bison;
-&c4-bzip2;
-&c4-coreutils;
-&c4-coreutils-patch;
-&c4-dejagnu;
-&c4-diffutils;
-&c4-e2fsprogs;
-&c4-ed;
-&c4-ed-patch;
-&c4-expect;
-&c4-expect-patch;
-&c4-file;
-&c4-findutils;
-&c4-flex;
-&c4-gawk;
-&c4-gawk-patch;
-&c4-gcc;
-&c4-gcc-patch;
-&c4-gcc-2953;
-&c4-gettext;
-&c4-glibc;
-&c4-glibc-threads;
-&c4-grep;
-&c4-groff;
-&c4-gzip;
-&c4-inetutils;
-&c4-kbd;
-&c4-kbd-patch;
-&c4-less;
-&c4-bootscripts;
-&c4-lfs-utils;
-&c4-libtool;
-&c4-lilo;
-&c4-kernel;
-&c4-m4;
-&c4-make;
-&c4-makedev;
-&c4-man;
-&c4-man-patch;
-&c4-manpages;
-&c4-modutils;
-&c4-ncurses;
-&c4-ncurses-patch;
-&c4-nettools;
-&c4-patch;
-&c4-perl;
-&c4-procinfo;
-&c4-procps;
-&c4-procps-patch;
-&c4-psmisc;
-&c4-sed;
-&c4-shadowpwd;
-&c4-sysklogd;
-&c4-sysvinit;
-&c4-tar;
-&c4-tcl;
-&c4-texinfo;
-&c4-utillinux;
-&c4-vim;
-&c4-zlib;
-&c4-zlib-patch;
-
-Total size of all packages: &all-size-kb; (&all-size-mb;)
-</literallayout>
-
-</sect1>
-
diff --git a/chapter04/patch.xml b/chapter04/patch.xml
deleted file mode 100644
index f59ab0d21..000000000
--- a/chapter04/patch.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Patch (&patch-version;) - &patch-size;:
-<ulink url="http://freshmeat.net/projects/patch/"/>
diff --git a/chapter04/perl.xml b/chapter04/perl.xml
deleted file mode 100644
index cbaffe07a..000000000
--- a/chapter04/perl.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-Perl (&perl-version;) - &perl-size;:
-<ulink url="http://freshmeat.net/projects/perl/"/>
-
-Perl Libc Patch:
-<ulink url="&http;/perl-&perl-version;-libc.patch"/>
diff --git a/chapter04/procinfo.xml b/chapter04/procinfo.xml
deleted file mode 100644
index 226afa2a0..000000000
--- a/chapter04/procinfo.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Procinfo (&procinfo-version;) - &procinfo-size;:
-<ulink url="http://freshmeat.net/projects/procinfo/"/>
diff --git a/chapter04/procps-patch.xml b/chapter04/procps-patch.xml
deleted file mode 100644
index f4340fbb1..000000000
--- a/chapter04/procps-patch.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Procps Patch (&procps-patch-version;) - &procps-patch-size;:
-<ulink url="&http;/procps-&procps-patch-version;.patch"/>
diff --git a/chapter04/procps.xml b/chapter04/procps.xml
deleted file mode 100644
index 5cf30a2a5..000000000
--- a/chapter04/procps.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Procps (&procps-version;) - &procps-size;:
-<ulink url="http://freshmeat.net/projects/procps/"/>
diff --git a/chapter04/psmisc.xml b/chapter04/psmisc.xml
deleted file mode 100644
index bb2ca91d5..000000000
--- a/chapter04/psmisc.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Psmisc (&psmisc-version;) - &psmisc-size;:
-<ulink url="http://freshmeat.net/projects/psmisc/"/>
diff --git a/chapter04/sed.xml b/chapter04/sed.xml
deleted file mode 100644
index 39537c2b2..000000000
--- a/chapter04/sed.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Sed (&sed-version;) - &sed-size;:
-<ulink url="http://freshmeat.net/projects/sed/"/>
diff --git a/chapter04/shadowpwd.xml b/chapter04/shadowpwd.xml
deleted file mode 100644
index a144be283..000000000
--- a/chapter04/shadowpwd.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Shadow (&shadow-version;) - &shadow-size;:
-<ulink url="http://freshmeat.net/projects/shadow/"/>
diff --git a/chapter04/sysklogd.xml b/chapter04/sysklogd.xml
deleted file mode 100644
index 890ffef0e..000000000
--- a/chapter04/sysklogd.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Sysklogd (&sysklogd-version;) - &sysklogd-size;:
-<ulink url="http://freshmeat.net/projects/sysklogd/"/>
diff --git a/chapter04/sysvinit.xml b/chapter04/sysvinit.xml
deleted file mode 100644
index b18b96460..000000000
--- a/chapter04/sysvinit.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Sysvinit (&sysvinit-version;) - &sysvinit-size;:
-<ulink url="http://freshmeat.net/projects/sysvinit/"/>
diff --git a/chapter04/tar-patch.xml b/chapter04/tar-patch.xml
deleted file mode 100644
index 07a4b839c..000000000
--- a/chapter04/tar-patch.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Tar Patch (&tar-patch-version;) - &tar-patch-size;:
-<ulink url="&http;/tar-&tar-patch-version;.patch"/>
diff --git a/chapter04/tar.xml b/chapter04/tar.xml
deleted file mode 100644
index 84c253b54..000000000
--- a/chapter04/tar.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Tar (&tar-version;) - &tar-size;:
-<ulink url="ftp://alpha.gnu.org/gnu/tar/"/>
diff --git a/chapter04/tcl.xml b/chapter04/tcl.xml
deleted file mode 100644
index 6f352d8dd..000000000
--- a/chapter04/tcl.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-TCL (&tcl-version;) - &tcl-size;:
-<ulink url="http://freshmeat.net/projects/tcltk/"/>
diff --git a/chapter04/texinfo.xml b/chapter04/texinfo.xml
deleted file mode 100644
index f85439536..000000000
--- a/chapter04/texinfo.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Texinfo (&texinfo-version;) - &texinfo-size;:
-<ulink url="http://freshmeat.net/projects/texinfo/"/>
diff --git a/chapter04/utillinux.xml b/chapter04/utillinux.xml
deleted file mode 100644
index 83e403af6..000000000
--- a/chapter04/utillinux.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Util-linux (&util-linux-version;) - &util-linux-size;:
-<ulink url="http://freshmeat.net/projects/util-linux/"/>
diff --git a/chapter04/vim-patch.xml b/chapter04/vim-patch.xml
deleted file mode 100644
index 1ea4097d6..000000000
--- a/chapter04/vim-patch.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-Vim Patch (&vim-patch-version;) - &vim-patch-size;:
-<ulink url="&ftp;/vim-&vim-patch-version;.patch"/>
-<ulink url="&http;/vim-&vim-patch-version;.patch"/>
diff --git a/chapter04/vim.xml b/chapter04/vim.xml
deleted file mode 100644
index a296ba963..000000000
--- a/chapter04/vim.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Vim (&vim-version;) - &vim-size;:
-<ulink url="http://freshmeat.net/projects/vim/"/>
diff --git a/chapter04/zlib-patch.xml b/chapter04/zlib-patch.xml
deleted file mode 100644
index 2939adb48..000000000
--- a/chapter04/zlib-patch.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Zlib Patch (&zlib-patch-version;) - &zlib-patch-size;:
-<ulink url="&http;/zlib-&zlib-patch-version;.patch"/>
diff --git a/chapter04/zlib.xml b/chapter04/zlib.xml
deleted file mode 100644
index bb4e8246a..000000000
--- a/chapter04/zlib.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-Zlib (&zlib-version;) - &zlib-size;:
-<ulink url="http://freshmeat.net/projects/zlib/"/>