Package version in seperate entities

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

chapter04/all.xml

@@ -1,6 +1,6 @@
 All LFS Packages - 61,480 KB:
-<ulink url="&ftp-common;/lfs-packages.tar">
-&ftp-common;/lfs-packages.tar</ulink>
-<ulink url="&http-common;/lfs-packages.tar">
-&http-common;/lfs-packages.tar</ulink>
+<ulink url="&ftp-intel;/lfs-packages.tar">
+&ftp-intel;/lfs-packages.tar</ulink>
+<ulink url="&http-intel;/lfs-packages.tar">
+&http-intel;/lfs-packages.tar</ulink>
 

chapter04/automake.xml

@@ -1,6 +1,6 @@
 Automake (&automake-version;) - 277 KB:
-<ulink url="&ftp-intel;/automake-&automake-version;.tar.bz2">
-&ftp-intel;/automake-&automake-version;.tar.bz2</ulink>
-<ulink url="&http-intel;/automake-&automake-version'.tar.bz2">
-&http-intel;/automake-&automake-version;.tar.bz2</ulink>
+<ulink url="&ftp-common;/automake-&automake-version;.tar.bz2">
+&ftp-common;/automake-&automake-version;.tar.bz2</ulink>
+<ulink url="&http-common;/automake-&automake-version;.tar.bz2">
+&http-common;/automake-&automake-version;.tar.bz2</ulink>
 

chapter04/bin86.xml

@@ -1,5 +1,5 @@
 Bin86 (&bin86-version;) - 111 KB:
-<ulink url="&ftp-common;/bin86-$bin86-version;.tar.bz2">
+<ulink url="&ftp-common;/bin86-&bin86-version;.tar.bz2">
 &ftp-common;/bin86-&bin86-version;.tar.bz2</ulink>
 <ulink url="&http-common;/bin86-&bin86-version;.tar.bz2">
 &http-common;/bin86-&bin86-version;.tar.bz2</ulink>

chapter04/fileutils-patch.xml

@@ -1,6 +1,6 @@
 File Utils Patch (&fileutils-version;) - 0.2 KB:
-<ulink url="&ftp-common;/fileutils-&fileutils-version;.patch.bz2">
-&ftp-common;/fileutils-&fileutils-version;.patch.bz2</ulink>
-<ulink url="&http-common;/fileutils-&fileutils-version;.patch;bz2">
-&http-common;/fileutils-&fileutils-version;.patch.bz2</ulink>
+<ulink url="&ftp-cvs;/fileutils-&fileutils-version;.patch.bz2">
+&ftp-cvs;/fileutils-&fileutils-version;.patch.bz2</ulink>
+<ulink url="&http-cvs;/fileutils-&fileutils-version;.patch.bz2">
+&http-cvs;/fileutils-&fileutils-version;.patch.bz2</ulink>
 

chapter04/fileutils.xml

@@ -1,5 +1,6 @@
-File Utils (4.0) 801 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/fileutils-4.0.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/fileutils-4.0.tar.bz2</ulink>
+File Utils (&fileutils-version;) 801 KB:
+<ulink url="&ftp-common;/fileutils-&fileutils-version;.tar.bz2">
+&ftp-common;/fileutils-&fileutils-version;.tar.bz2</ulink>
+<ulink url="&http-common;/fileutils-&fileutils-version;.tar.bz2">
+&http-common;/fileutils-&fileutils-version;.tar.bz2</ulink>
 

chapter04/findutils-patch.xml

@@ -1,5 +1,6 @@
-Find Utils Patch (4.1) 1 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/findutils-4.1.patch.gz">
-ftp://packages.linuxfromscratch.org/common-packages/findutils-4.1.patch.gz</ulink>
+Find Utils Patch (&findutils-version;) 1 KB:
+<ulink url="&ftp-common;/findutils-&findutils-version;.patch.bz2">
+&ftp-common;/findutils-&findutils-version;.patch.bz2</ulink>
+<ulink url="&http-common;/findutils-&findutils-version;.patch.bz2">
+&http-common;/findutils-&findutils-version;.patch.bz2</ulink>
 

chapter04/findutils.xml

@@ -1,5 +1,6 @@
-Find Utils (4.1) 226 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/findutils-4.1.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/findutils-4.1.tar.bz2</ulink>
+Find Utils (&findutils-version;) 226 KB:
+<ulink url="&ftp-common;/findutils-&findutils-version;.tar.bz2">
+&ftp-common;/findutils-&findutils-version;.tar.bz2</ulink>
+<ulink url="&http-common;/findutils-&findutils-version;.tar.bz2">
+&http-common;/findutils-&findutils-version;.tar.bz2</ulink>
 

chapter04/flex.xml

@@ -1,5 +1,6 @@
-Flex (2.5.4a) 278 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/flex-2.5.4a.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/flex-2.5.4a.tar.bz2</ulink>
+Flex (&flex-version;) 278 KB:
+<ulink url="&ftp-common;/flex-&flex-version;.tar.bz2">
+&ftp-common;/flex-&flex-version;.tar.bz2</ulink>
+<ulink url="&http-common;/flex-&flex-version;.tar.bz2">
+&http-common;/flex-&flex-version;.tar.bz2</ulink>
 

chapter04/gcc.xml

@@ -1,5 +1,6 @@
-GCC (2.95.2.1) 9,551 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/new-in-cvs/gcc-2.95.2.1.tar.bz2">
-ftp://packages.linuxfromscratch.org/new-in-cvs/gcc-2.95.2.1.tar.bz2</ulink>
+GCC (&gcc-version;) 9,551 KB:
+<ulink url="&ftp-cvs;/gcc-&gcc-version;.tar.bz2">
+&ftp-cvs;/gcc-&gcc-version;.tar.bz2</ulink>
+<ulink url="&http-cvs;/gcc-&gcc-version;.tar.bz2">
+&http-cvs;/gcc-&gcc-version;.tar.bz2</ulink>
 

chapter04/gettext.xml

@@ -1,5 +1,6 @@
-Gettext (0.10.35) 525 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/gettext-0.10.35.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/gettext-0.10.35.tar.bz2</ulink>
+Gettext (&gettext-version;) 525 KB:
+<ulink url="&ftp-common;/gettext-&gettext-version;.tar.bz2">
+&ftp-common;/gettext-&gettext-version;.tar.bz2</ulink>
+<ulink url="&http-common;/gettext-&gettext-version;.tar.bz2">
+&http-common;/gettext-&gettext-version;.tar.bz2</ulink>
 

chapter04/glibc-threads.xml

@@ -1,5 +1,6 @@
-Glibc-linuxthreads (2.2.1) 149 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/new-in-cvs/glibc-linuxthreads-2.2.1.tar.bz2">
-ftp://packages.linuxfromscratch.org/new-in-cvs/glibc-linuxthreads-2.2.1.tar.bz2</ulink>
+Glibc-linuxthreads (&glibc-version;) 149 KB:
+<ulink url="&ftp-cvs;/glibc-linuxthreads-&glibc-version;.tar.bz2">
+&ftp-cvs;/glibc-linuxthreads-&glibc-version;.tar.bz2</ulink>
+<ulink url="&http-cvs;/glibc-linuxthreads-&glibc-version;.tar.bz2">
+&http-cvs;/glibc-linuxthreads-&glibc-version;.tar.bz2</ulink>
 

chapter04/glibc.xml

@@ -1,5 +1,6 @@
-Glibc (2.2.1) 10,137 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/new-in-cvs/glibc-2.2.1.tar.bz2">
-ftp://packages.linuxfromscratch.org/new-in-cvs/glibc-2.2.1.tar.bz2</ulink>
+Glibc (&glibc-version;) 10,137 KB:
+<ulink url="&ftp-cvs;/glibc-&glibc-version;.tar.bz2">
+&ftp-cvs;/glibc-&glibc-version;.tar.bz2</ulink>
+<ulink url="&http-cvs;/glibc-&glibc-version;.tar.bz2">
+&http-cvs;/glibc-&glibc-version;.tar.bz2</ulink>
 

chapter04/grep.xml

@@ -1,5 +1,6 @@
-Grep (2.4.2) 382 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/grep-2.4.2.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/grep-2.4.2.tar.bz2</ulink>
+Grep (&grep-version;) 382 KB:
+<ulink url="&ftp-common;/grep-&grep-version;.tar.bz2">
+&ftp-common;/grep-&grep-version;.tar.bz2</ulink>
+<ulink url="&http-common;/grep-&grep-version;.tar.bz2">
+&http-common;/grep-&grep-version;.tar.bz2</ulink>
 

chapter04/groff.xml

@@ -1,5 +1,6 @@
-Groff (1.16.1) 1,173 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/groff-1.16.1.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/groff-1.16.1.tar.bz2</ulink>
+Groff (&groff-version;) 1,173 KB:
+<ulink url="&ftp-common;/groff-&groff-version;.tar.bz2">
+&ftp-common;/groff-&groff-version;.tar.bz2</ulink>
+<ulink url="&http-common;/groff-&groff-version;.tar.bz2">
+&http-common;/groff-&groff-version;.tar.bz2</ulink>
 

chapter04/gzip-patch.xml

@@ -1,5 +1,6 @@
-Gzip Patch (1.2.4a) 1 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/gzip-1.2.4a.patch.gz">
-ftp://packages.linuxfromscratch.org/common-packages/gzip-1.2.4a.patch.gz</ulink>
+Gzip Patch (&gzip-version;) 1 KB:
+<ulink url="&ftp-common;/gzip-&gzip-version;.patch.bz2">
+&ftp-common;/gzip-&gzip-version;.patch.bz2</ulink>
+<ulink url="&http-common;/gzip-&gzip-version;.patch.bz2">
+&http-common;/gzip-&gzip-version;.patch.bz2</ulink>
 

chapter04/gzip.xml

@@ -1,5 +1,6 @@
-Gzip (1.2.4a) 178 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/gzip-1.2.4a.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/gzip-1.2.4a.tar.bz2</ulink>
+Gzip (&gzip-version;) 178 KB:
+<ulink url="&ftp-common;/gzip-&gzip-version;.tar.bz2">
+&ftp-common;/gzip-&gzip-version;.tar.bz2</ulink>
+<ulink url="&http-common;/gzip-&gzip-version;.tar.bz2">
+&http-common;/gzip-&gzip-version;.tar.bz2</ulink>
 

chapter04/kernel.xml

@@ -1,5 +1,6 @@
-Linux Kernel (2.4.1) 19,505 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/new-in-cvs/linux-2.4.1.tar.bz2">
-ftp://packages.linuxfromscratch.org/new-in-cvs/linux-2.4.1.tar.bz2</ulink>
+Linux Kernel (&kernel-version;) 19,505 KB:
+<ulink url="&ftp-cvs;/linux-&kernel-version;.tar.bz2">
+&ftp-cvs;/linux-&kernel-version;.tar.bz2</ulink>
+<ulink url="&http-cvs;/linux-&kernel-version;.tar.bz2">
+&http-cvs;/linux-&kernel-version;.tar.bz2</ulink>
 

chapter04/ldso.xml

@@ -1,5 +1,6 @@
-Ld.so (1.9.9) 280 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/ld.so-1.9.9.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/ld.so-1.9.9.tar.bz2</ulink>
+Ld.so (&ld.so-version;) 280 KB:
+<ulink url="&ftp-common;/ld.so-&ld.so-version;.tar.bz2">
+&ftp-common;/ld.so-&ld.so-version;.tar.bz2</ulink>
+<ulink url="&http-common;/ld.so-&ld.so-version;.tar.bz2">
+&http-common;/ld.so-&ld.so-version;.tar.bz2</ulink>
 

chapter04/less.xml

@@ -1,5 +1,6 @@
-Less (358) 178 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/less-358.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/less-358.tar.bz2</ulink>
+Less (&less-version;) 178 KB:
+<ulink url="&ftp-common;/less-&less-version;.tar.bz2">
+&ftp-common;/less-&less-version;.tar.bz2</ulink>
+<ulink url="&http-common;/less-&less-version;.tar.bz2">
+&http-common;/less-&less-version;.tar.bz2</ulink>
 

chapter04/libtool.xml

@@ -1,5 +1,6 @@
-Libtool (1.3.5) 361 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/libtool-1.3.5.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/libtool-1.3.5.tar.bz2</ulink>
+Libtool (&libtool-version;) 361 KB:
+<ulink url="&ftp-common;/libtool-&libtool-version;.tar.bz2">
+&ftp-common;/libtool-&libtool-version;.tar.bz2</ulink>
+<ulink url="&http-common;/libtool-&libtool-version;.tar.bz2">
+&http-common;/libtool-&libtool-version;.tar.bz2</ulink>
 

chapter04/lilo.xml

@@ -1,5 +1,6 @@
-Lilo (21.6) 172 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/intel-packages/lilo-21.6.tar.bz2">
-ftp://packages.linuxfromscratch.org/intel-packages/lilo-21.6.tar.bz2</ulink>
+Lilo (&lilo-version;) 172 KB:
+<ulink url="&ftp-intel;/lilo-&lilo-version;.tar.bz2">
+&ftp-intel;/lilo-&lilo-version;.tar.bz2</ulink>
+<ulink url="&http-intel;/lilo-&lilo-version;.tar.bz2">
+&http-intel;/lilo-&lilo-version;.tar.bz2</ulink>
 

chapter04/m4.xml

@@ -1,5 +1,6 @@
-M4 (1.4) 249 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/m4-1.4.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/m4-1.4.tar.bz2</ulink>
+M4 (&m4-version;) 249 KB:
+<ulink url="&ftp-common;/m4-&m4-version;.tar.bz2">
+&ftp-common;/m4-&m4-version;.tar.bz2</ulink>
+<ulink url="&http-common;/m4-&m4-version;.tar.bz2">
+&http-common;/m4-&m4-version;.tar.bz2</ulink>
 

chapter04/make.xml

@@ -1,5 +1,6 @@
-Make (3.79.1) 749 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/make-3.79.1.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/make-3.79.1.tar.bz2</ulink>
+Make (&make-version;) 749 KB:
+<ulink url="&ftp-common;/make-&make-version;.tar.bz2">
+&ftp-common;/make-&make-version;.tar.bz2</ulink>
+<ulink url="&http-common;/make-&make-version;.tar.bz2">
+&http-common;/make-&make-version;.tar.bz2</ulink>
 

chapter04/makedev-patch.xml

@@ -1,5 +1,6 @@
-MAKEDEV Patch (2.5) - 0.5 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/new-in-cvs/MAKEDEV-2.5.patch.bz2">
-ftp://packages.linuxfromscratch.org/new-in-cvs/MAKEDEV-2.5.patch.bz2</ulink>
+MAKEDEV Patch (&makedev-version;) - 0.5 KB:
+<ulink url="&ftp-cvs;/MAKEDEV-&makedev-version;.patch.bz2">
+&ftp-cvs;/MAKEDEV-&makedev-version;.patch.bz2</ulink>
+<ulink url="&http-cvs;/MAKEDEV-&makedev-version;.patch.bz2">
+&http-cvs;/MAKEDEV-&makedev-version;.patch.bz2</ulink>
 

chapter04/makedev.xml

@@ -1,5 +1,6 @@
-MAKEDEV (2.5) - 11 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/MAKEDEV-2.5.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/MAKEDEV-2.5.tar.bz2</ulink>
+MAKEDEV (&makedev-version;) - 11 KB:
+<ulink url="&ftp-common;/MAKEDEV-&makedev-version;.tar.bz2">
+&ftp-common;/MAKEDEV-&makedev-version;.tar.bz2</ulink>
+<ulink url="&http-common;/MAKEDEV-&makedev-version;.tar.bz2">
+&http-common;/MAKEDEV-&makedev-version;.tar.bz2</ulink>
 

chapter04/man.xml

@@ -1,5 +1,6 @@
-Man (1.5h1) 156 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/man-1.5h1.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/man-1.5h1.tar.bz2</ulink>
+Man (&man-version;) 156 KB:
+<ulink url="&ftp-common;/man-&man-version;.tar.bz2">
+&ftp-common;/man-&man-version;.tar.bz2</ulink>
+<ulink url="&http-common;/man-&man-version;.tar.bz2">
+&http-common;/man-&man-version;.tar.bz2</ulink>
 

chapter04/manpages.xml

@@ -1,5 +1,6 @@
-Man-pages (1.33) 475 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/man-pages-1.33.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/man-pages-1.33.tar.bz2</ulink>
+Man-pages (&man-pages-version;) 475 KB:
+<ulink url="&ftp-common;/man-pages-&man-pages-version;.tar.bz2">
+&ftp-common;/man-pages-&man-pages-version;.tar.bz2</ulink>
+<ulink url="&http-common;/man-pages-&man-pages-version;.tar.bz2">
+&http-common;/man-pages-&man-pages-version;.tar.bz2</ulink>
 

chapter04/mawk.xml

@@ -1,5 +1,6 @@
-Mawk (1.3.3) 168 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/mawk1.3.3.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/mawk1.3.3.tar.bz2</ulink>
+Mawk (&mawk-version;) 168 KB:
+<ulink url="&ftp-common;/mawk&mawk-version;.tar.bz2">
+&ftp-common;/mawk&mawk-version;.tar.bz2</ulink>
+<ulink url="&http-common;/mawk&mawk-version;.tar.bz2">
+&http-common;/mawk&mawk-version;.tar.bz2</ulink>
 

chapter04/modutils.xml

@@ -1,5 +1,6 @@
-Modutils (2.4.0) 195 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/modutils-2.4.0.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/modutils-2.4.0.tar.bz2</ulink>
+Modutils (&modutils-version;) 195 KB:
+<ulink url="&ftp-common;/modutils-&modutils-version;.tar.bz2">
+&ftp-common;/modutils-&modutils-version;.tar.bz2</ulink>
+<ulink url="&http-common;/modutils-&modutils-version;.tar.bz2">
+&http-common;/modutils-&modutils-version;.tar.bz2</ulink>
 

chapter04/ncurses.xml

@@ -1,5 +1,6 @@
-Ncurses (5.2) 1,307 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/intel-packages/ncurses-5.2.tar.bz2">
-ftp://packages.linuxfromscratch.org/intel-packages/ncurses-5.2.tar.bz2</ulink>
+Ncurses (&ncurses-version;) 1,307 KB:
+<ulink url="&ftp-intel;/ncurses-&ncurses-version;.tar.bz2">
+&ftp-intel;/ncurses-&ncurses-version;.tar.bz2</ulink>
+<ulink url="&http-intel;/ncurses-&ncurses-version;.tar.bz2">
+&http-intel;/ncurses-&ncurses-version;.tar.bz2</ulink>
 

chapter04/netkitbase.xml

@@ -1,5 +1,6 @@
-Netkit-base (0.17) 49 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/netkit-base-0.17.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/netkit-base-0.17.tar.bz2</ulink>
+Netkit-base (&netkit-base-version;) 49 KB:
+<ulink url="&ftp-common;/netkit-base-&netkit-base-version;.tar.bz2">
+&ftp-common;/netkit-base-&netkit-base-version;.tar.bz2</ulink>
+<ulink url="&http-common;/netkit-base-&netkit-base-version;.tar.bz2">
+&http-common;/netkit-base-&netkit-base-version;.tar.bz2</ulink>
 

chapter04/nettools.xml

@@ -1,5 +1,6 @@
-Net-tools (1.57) 187 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/net-tools-1.57.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/net-tools-1.57.tar.bz2</ulink>
+Net-tools (&net-tools-version;) 187 KB:
+<ulink url="&ftp-common;/net-tools-&net-tools-version;.tar.bz2">
+&ftp-common;/net-tools-&net-tools-version;.tar.bz2</ulink>
+<ulink url="&http-common;/net-tools-&net-tools-version;.tar.bz2">
+&http-common;/net-tools-&net-tools-version;.tar.bz2</ulink>
 

chapter04/patch.xml

@@ -1,5 +1,6 @@
-Patch (2.5.4) 149 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/patch-2.5.4.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/patch-2.5.4.tar.bz2</ulink>
+Patch (&patch-version;) 149 KB:
+<ulink url="&ftp-common;/patch-&patch-version;.tar.bz2">
+&ftp-common;/patch-&patch-version;.tar.bz2</ulink>
+<ulink url="&http-common;/patch-&patch-version;.tar.bz2">
+&http-common;/patch-&patch-version;.tar.bz2</ulink>
 

chapter04/perl.xml

@@ -1,5 +1,6 @@
-Perl (5.6.0) 4,327 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/perl-5.6.0.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/perl-5.6.0.tar.bz2</ulink>
+Perl (&perl-version;) 4,327 KB:
+<ulink url="&ftp-common;/perl-&perl-version;.tar.bz2">
+&ftp-common;/perl-&perl-version;.tar.bz2</ulink>
+<ulink url="&http-common;/perl-&perl-version;.tar.bz2">
+&http-common;/perl-&perl-version;.tar.bz2</ulink>
 

chapter04/procinfo.xml

@@ -1,5 +1,6 @@
-Procinfo (17) 21 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/procinfo-17.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/procinfo-17.tar.bz2</ulink>
+Procinfo (&procinfo-version;) 21 KB:
+<ulink url="&ftp-common;/procinfo-&procinfo-version;.tar.bz2">
+&ftp-common;/procinfo-&procinfo-version;.tar.bz2</ulink>
+<ulink url="&http-common;/procinfo-&procinfo-version;.tar.bz2">
+&http-common;/procinfo-&procinfo-version;.tar.bz2</ulink>
 

chapter04/procps.xml

@@ -1,5 +1,6 @@
-Procps (2.0.7) 153 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/procps-2.0.7.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/procps-2.0.7.tar.bz2</ulink>
+Procps (&procps-version;) 153 KB:
+<ulink url="&ftp-common;/procps-&procps-version;.tar.bz2">
+&ftp-common;/procps-&procps-version;.tar.bz2</ulink>
+<ulink url="&http-common;/procps-&procps-version;.tar.bz2">
+&http-common;/procps-&procps-version;.tar.bz2</ulink>
 

chapter04/psmisc.xml

@@ -1,5 +1,6 @@
-Psmisc (19) 20 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/psmisc-19.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/psmisc-19.tar.bz2</ulink>
+Psmisc (&psmisc-version;) 20 KB:
+<ulink url="&ftp-common;/psmisc-&psmisc-version;.tar.bz2">
+&ftp-common;/psmisc-&psmisc-version;.tar.bz2</ulink>
+<ulink url="&http-common;/psmisc-&psmisc-version;.tar.bz2">
+&http-common;/psmisc-&psmisc-version;.tar.bz2</ulink>
 

chapter04/sed.xml

@@ -1,5 +1,6 @@
-Sed (3.02) 221 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/sed-3.02.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/sed-3.02.tar.bz2</ulink>
+Sed (&sed-version;) 221 KB:
+<ulink url="&ftp-common;/sed-&sed-version;.tar.bz2">
+&ftp-common;/sed-&sed-version;.tar.bz2</ulink>
+<ulink url="&http-common;/sed-&sed-version;.tar.bz2">
+&http-common;/sed-&sed-version;.tar.bz2</ulink>
 

chapter04/shadowpwd.xml

@@ -1,5 +1,6 @@
-Shadow Password Suite (20000902) 557 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/shadow-20000902.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/shadow-20000902.tar.bz2</ulink>
+Shadow Password Suite (&shadow-version;) 557 KB:
+<ulink url="&ftp-common;/shadow-&shadow-version;.tar.bz2">
+&ftp-common;/shadow-&shadow-version;.tar.bz2</ulink>
+<ulink url="&http-common;/shadow-&shadow-version;.tar.bz2">
+&http-common;/shadow-&shadow-version;.tar.bz2</ulink>
 

chapter04/shellutils.xml

@@ -1,5 +1,6 @@
-Sh-utils (2.0) 824 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/sh-utils-2.0.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/sh-utils-2.0.tar.bz2</ulink>
+Sh-utils (&sh-utils-version;) 824 KB:
+<ulink url="&ftp-common;/sh-utils-&sh-utils-version;.tar.bz2">
+&ftp-common;/sh-utils-&sh-utils-version;.tar.bz2</ulink>
+<ulink url="&http-common;/sh-utils-&sh-utils-version;.tar.bz2">
+&http-common;/sh-utils-&sh-utils-version;.tar.bz2</ulink>
 

chapter04/sysklogd-patch.xml

@@ -1,5 +1,6 @@
-Sysklogd Patch (1.4) 0.5 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/sysklogd-1.4.patch.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/sysklogd-1.4.patch.bz2</ulink>
+Sysklogd Patch (&sysklogd-version;) 0.5 KB:
+<ulink url="&ftp-common;/sysklogd-&sysklogd-version;.patch.bz2">
+&ftp-common;/sysklogd-&sysklogd-version;.patch.bz2</ulink>
+<ulink url="&http-common;/sysklogd-&sysklogd-version;.patch.bz2">
+&http-common;/sysklogd-&sysklogd-version;.patch.bz2</ulink>
 

chapter04/sysklogd.xml

@@ -1,5 +1,6 @@
-Sysklogd (1.4) 67 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/sysklogd-1.4.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/sysklogd-1.4.tar.bz2</ulink>
+Sysklogd (&sysklogd-version;) 67 KB:
+<ulink url="&ftp-common;/sysklogd-&sysklogd-version;.tar.bz2">
+&ftp-common;/sysklogd-&sysklogd-version;.tar.bz2</ulink>
+<ulink url="&http-common;/sysklogd-&sysklogd-version;.tar.bz2">
+&http-common;/sysklogd-&sysklogd-version;.tar.bz2</ulink>
 

chapter04/sysvinit-patch.xml

@@ -1,5 +1,6 @@
-Sysvinit Patch (2.78) 1 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/sysvinit-2.78.patch">
-ftp://packages.linuxfromscratch.org/common-packages/sysvinit-2.78.patch</ulink>
+Sysvinit Patch (&sysvinit-version;) 1 KB:
+<ulink url="&ftp-common;/sysvinit-&sysvinit-version;.patch.bz2">
+&ftp-common;/sysvinit-&sysvinit-version;.patch.bz2</ulink>
+<ulink url="&http-common;/sysvinit-&sysvinit-version;.patch.bz2">
+&http-common;/sysvinit-&sysvinit-version;.patch.bz2</ulink>
 

chapter04/sysvinit.xml

@@ -1,5 +1,6 @@
-Sysvinit (2.78) 90 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/sysvinit-2.78.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/sysvinit-2.78.tar.bz2</ulink>
+Sysvinit (&sysvinit-version;) 90 KB:
+<ulink url="&ftp-common;/sysvinit-&sysvinit-version;.tar.bz2">
+&ftp-common;/sysvinit-&sysvinit-version;.tar.bz2</ulink>
+<ulink url="&http-common;/sysvinit-&sysvinit-version;.tar.bz2">
+&http-common;/sysvinit-&sysvinit-version;.tar.bz2</ulink>
 

chapter04/tar-patch.xml

@@ -1,5 +1,6 @@
-Tar Patch (1.13) 2 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/gnutarpatch.txt">
-ftp://packages.linuxfromscratch.org/common-packages/gnutarpatch.txt</ulink>
+Tar Patch (&tar-version;) 2 KB:
+<ulink url="&ftp-common;/gnutarpatch.txt.bz2">
+&ftp-common;/gnutarpatch.txt.bz2</ulink>
+<ulink url="&http-common;/gnutarpatch.txt.bz2">
+&http-common;/gnutarpatch.txt.bz2</ulink>
 

chapter04/tar.xml

@@ -1,5 +1,6 @@
-Tar (1.13) 730 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/tar-1.13.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/tar-1.13.tar.bz2</ulink>
+Tar (&tar-version;) 730 KB:
+<ulink url="&ftp-common;/tar-&tar-version;.tar.bz2">
+&ftp-common;/tar-&tar-version;.tar.bz2</ulink>
+<ulink url="&http-common;/tar-&tar-version;.tar.bz2">
+&http-common;/tar-&tar-version;.tar.bz2</ulink>
 

chapter04/texinfo.xml

@@ -1,5 +1,6 @@
-Texinfo (4.0) 812 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/texinfo-4.0.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/texinfo-4.0.tar.bz2</ulink>
+Texinfo (&texinfo-version;) 812 KB:
+<ulink url="&ftp-common;/texinfo-&texinfo-version;.tar.bz2">
+&ftp-common;/texinfo-&texinfo-version;.tar.bz2</ulink>
+<ulink url="&http-common;/texinfo-&texinfo-version;.tar.bz2">
+&http-common;/texinfo-&texinfo-version;.tar.bz2</ulink>
 

chapter04/textutils.xml

@@ -1,5 +1,6 @@
-Text Utils (2.0) 1,040 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/textutils-2.0.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/textutils-2.0.tar.bz2</ulink>
+Text Utils (&textutils-version;) 1,040 KB:
+<ulink url="&ftp-common;/textutils-&textutils-version;.tar.bz2">
+&ftp-common;/textutils-&textutils-version;.tar.bz2</ulink>
+<ulink url="&http-common;/textutils-&textutils-version;.tar.bz2">
+&http-common;/textutils-&textutils-version;.tar.bz2</ulink>
 

chapter04/toplevel.xml

@@ -1,10 +1,8 @@
 Browse FTP: 
-	<ulink
-url="ftp://packages.linuxfromscratch.org/">
-ftp://packages.linuxfromscratch.org</ulink>
+<ulink url="&ftp-root;">
+&ftp-root;</ulink>
 
 Browse HTTP:
-	<ulink
-url="http://packages.linuxfromscrach.org/">
-http://packages.linuxfromscratch.org</ulink>
+<ulink url="&http-root;">
+&http-root;</ulink>
 

chapter04/utillinux.xml

@@ -1,5 +1,6 @@
-Util Linux (2.10r) 883 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/util-linux-2.10r.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/util-linux-2.10r.tar.bz2</ulink>
+Util Linux (&util-linux-version;) 883 KB:
+<ulink url="&ftp-common;/util-linux-&util-linux-version;.tar.bz2">
+&ftp-common;/util-linux-&util-linux-version;.tar.bz2</ulink>
+<ulink url="&http-common;/util-linux-&util-linux-version;.tar.bz2">
+&http-common;/util-linux-&util-linux-version;.tar.bz2</ulink>
 

chapter04/vim.xml

@@ -1,10 +1,10 @@
-Vim-rt (5.7) 905 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/vim-5.7-rt.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/vim-5.7-rt.tar.bz2</ulink>
-
-Vim-src (5.7) 963 KB:
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/vim-5.7-src.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/vim-5.7-src.tar.bz2</ulink>
+Vim-rt (&vim-version;) 905 KB:
+<ulink url="&ftp-common;/vim-&vim-version;-rt.tar.bz2">
+&ftp-common;/vim-&vim-version;-rt.tar.bz2</ulink>
+<ulink url="&ftp-common;/vim-&vim-version;-src.tar.bz2">
+&ftp-common;/vim-&vim-version;-src.tar.bz2</ulink>
 
+<ulink url="&http-common;/vim-&vim-version;-rt.tar.bz2">
+&http-common;/vim-&vim-version;-rt.tar.bz2</ulink>
+<ulink url="&http-common;/vim-&vim-version;-src.tar.bz2">
+&http-common;/vim-&vim-version;-src.tar.bz2</ulink>