r1714 - profiles/LFS/trunk/chapter06

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Sun Feb 6 11:42:18 PST 2005


Author: kpfleming
Date: 2005-02-06 12:42:16 -0700 (Sun, 06 Feb 2005)
New Revision: 1714

Modified:
   profiles/LFS/trunk/chapter06/autoconf.xml
   profiles/LFS/trunk/chapter06/automake.xml
   profiles/LFS/trunk/chapter06/bash.xml
   profiles/LFS/trunk/chapter06/basic-dev.xml
   profiles/LFS/trunk/chapter06/binutils.xml
   profiles/LFS/trunk/chapter06/bison.xml
   profiles/LFS/trunk/chapter06/bzip2.xml
   profiles/LFS/trunk/chapter06/changingowner.xml
   profiles/LFS/trunk/chapter06/coreutils.xml
   profiles/LFS/trunk/chapter06/createfiles.xml
   profiles/LFS/trunk/chapter06/creatingdirs.xml
   profiles/LFS/trunk/chapter06/diffutils.xml
   profiles/LFS/trunk/chapter06/e2fsprogs.xml
   profiles/LFS/trunk/chapter06/file.xml
   profiles/LFS/trunk/chapter06/findutils.xml
   profiles/LFS/trunk/chapter06/flex.xml
   profiles/LFS/trunk/chapter06/gawk.xml
   profiles/LFS/trunk/chapter06/gcc.xml
   profiles/LFS/trunk/chapter06/gettext.xml
   profiles/LFS/trunk/chapter06/glibc.xml
   profiles/LFS/trunk/chapter06/grep.xml
   profiles/LFS/trunk/chapter06/groff.xml
   profiles/LFS/trunk/chapter06/grub.xml
   profiles/LFS/trunk/chapter06/gzip.xml
   profiles/LFS/trunk/chapter06/hotplug.xml
   profiles/LFS/trunk/chapter06/iana-etc.xml
   profiles/LFS/trunk/chapter06/inetutils.xml
   profiles/LFS/trunk/chapter06/iproute2.xml
   profiles/LFS/trunk/chapter06/kbd.xml
   profiles/LFS/trunk/chapter06/kernfs.xml
   profiles/LFS/trunk/chapter06/less.xml
   profiles/LFS/trunk/chapter06/libc-headers.xml
   profiles/LFS/trunk/chapter06/libol.xml
   profiles/LFS/trunk/chapter06/libtool.xml
   profiles/LFS/trunk/chapter06/m4.xml
   profiles/LFS/trunk/chapter06/make.xml
   profiles/LFS/trunk/chapter06/man-pages.xml
   profiles/LFS/trunk/chapter06/man.xml
   profiles/LFS/trunk/chapter06/mktemp.xml
   profiles/LFS/trunk/chapter06/module-init-tools.xml
   profiles/LFS/trunk/chapter06/ncurses.xml
   profiles/LFS/trunk/chapter06/patch.xml
   profiles/LFS/trunk/chapter06/perl.xml
   profiles/LFS/trunk/chapter06/procps.xml
   profiles/LFS/trunk/chapter06/psmisc.xml
   profiles/LFS/trunk/chapter06/pwdgroup.xml
   profiles/LFS/trunk/chapter06/readjustingtoolchain.xml
   profiles/LFS/trunk/chapter06/readline.xml
   profiles/LFS/trunk/chapter06/sed.xml
   profiles/LFS/trunk/chapter06/shadow.xml
   profiles/LFS/trunk/chapter06/strip.xml
   profiles/LFS/trunk/chapter06/syslog-ng.xml
   profiles/LFS/trunk/chapter06/sysvinit.xml
   profiles/LFS/trunk/chapter06/tar.xml
   profiles/LFS/trunk/chapter06/texinfo.xml
   profiles/LFS/trunk/chapter06/udev.xml
   profiles/LFS/trunk/chapter06/util-linux.xml
   profiles/LFS/trunk/chapter06/vim.xml
   profiles/LFS/trunk/chapter06/zlib.xml
Log:
tidy



Modified: profiles/LFS/trunk/chapter06/autoconf.xml
===================================================================
--- profiles/LFS/trunk/chapter06/autoconf.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/autoconf.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,50 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="autoconf" version="&autoconf-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&autoconf-md5;</digest>
-			<archive>&packages_dir;/&autoconf-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&autoconf-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&autoconf-directory;</remove>
-	</stage>
-</package>
-
+  <package name="autoconf" version="&autoconf-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&autoconf-md5;</digest>
+        <archive>&packages_dir;/&autoconf-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&autoconf-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&autoconf-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/automake.xml
===================================================================
--- profiles/LFS/trunk/chapter06/automake.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/automake.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,51 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="automake" version="&automake-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&automake-md5;</digest>
-			<archive>&packages_dir;/&automake-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&automake-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&automake-directory;</remove>
-	</stage>
-</package>
-
+  <package name="automake" version="&automake-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&automake-md5;</digest>
+        <archive>&packages_dir;/&automake-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&automake-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&automake-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/bash.xml
===================================================================
--- profiles/LFS/trunk/chapter06/bash.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/bash.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,65 +1,55 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="bash" version="&bash-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&bash-md5;</digest>
-			<archive>&packages_dir;/&bash-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&bash-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&bash-fixes-patch;</param>
-		</patch>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&bash-wcontinued-patch;</param>
-		</patch>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--bindir=/bin</param>
-			<param>--without-bash-malloc</param>
-			<param>--with-installed-readline</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>tests</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&bash-directory;</remove>
-	</stage>
-</package>
-
+  <package name="bash" version="&bash-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&bash-md5;</digest>
+        <archive>&packages_dir;/&bash-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&bash-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&bash-fixes-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&bash-wcontinued-patch;</param>
+      </patch>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--bindir=/bin</param>
+        <param>--without-bash-malloc</param>
+        <param>--with-installed-readline</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>tests</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&bash-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/basic-dev.xml
===================================================================
--- profiles/LFS/trunk/chapter06/basic-dev.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/basic-dev.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,122 +1,102 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" []>
-
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[]>
 <alfs>
-
-<stage name="Populating /dev">
-  <stage name="Creating Initial Device Nodes">
-    <execute command="mknod">
-	<param>-m 600</param>
-	<param>/dev/console</param>
-	<param>c 5 1</param>
-    </execute>
-
-    <execute command="mknod">
-  	<param>-m 666</param>
-	<param>/dev/null</param>
-	<param>c 1 3</param>
-    </execute>
+  <stage name="Populating /dev">
+    <stage name="Creating Initial Device Nodes">
+      <execute command="mknod">
+        <param>-m 600</param>
+        <param>/dev/console</param>
+        <param>c 5 1</param>
+      </execute>
+      <execute command="mknod">
+        <param>-m 666</param>
+        <param>/dev/null</param>
+        <param>c 1 3</param>
+      </execute>
+    </stage>
+    <stage name="Mounting ramfs and Populating /dev">
+      <execute command="mount">
+        <param>-n</param>
+        <param>-t ramfs</param>
+        <param>none</param>
+        <param>/dev</param>
+      </execute>
+      <execute command="mknod">
+        <param>-m 622</param>
+        <param>/dev/console</param>
+        <param>c 5 1</param>
+      </execute>
+      <execute command="mknod">
+        <param>-m 666</param>
+        <param>/dev/null</param>
+        <param>c 1 3</param>
+      </execute>
+      <execute command="mknod">
+        <param>-m 666</param>
+        <param>/dev/zero</param>
+        <param>c 1 5</param>
+      </execute>
+      <execute command="mknod">
+        <param>-m 666</param>
+        <param>/dev/ptmx</param>
+        <param>c 5 2</param>
+      </execute>
+      <execute command="mknod">
+        <param>-m 666</param>
+        <param>/dev/tty</param>
+        <param>c 5 0</param>
+      </execute>
+      <execute command="mknod">
+        <param>-m 444</param>
+        <param>/dev/random</param>
+        <param>c 1 8</param>
+      </execute>
+      <execute command="mknod">
+        <param>-m 444</param>
+        <param>/dev/urandom</param>
+        <param>c 1 9</param>
+      </execute>
+      <ownership base="/dev" user="root" group="tty">
+        <name>console</name>
+        <name>ptmx</name>
+        <name>tty</name>
+      </ownership>
+      <link>
+        <target>/proc/self/fd</target>
+        <name>/dev/fd</name>
+      </link>
+      <link>
+        <target>/proc/self/fd/0</target>
+        <name>/dev/stdin</name>
+      </link>
+      <link>
+        <target>/proc/self/fd/1</target>
+        <name>/dev/stdout</name>
+      </link>
+      <link>
+        <target>/proc/self/fd/2</target>
+        <name>/dev/stderr</name>
+      </link>
+      <link>
+        <target>/proc/kcore</target>
+        <name>/dev/core</name>
+      </link>
+      <mkdir>
+        <name>/dev/shm</name>
+        <name>/dev/pts</name>
+      </mkdir>
+      <execute command="mount">
+        <param>-t devpts</param>
+        <param>-o gid=4,mode=620</param>
+        <param>none</param>
+        <param>/dev/pts</param>
+      </execute>
+      <execute command="mount">
+        <param>-t tmpfs</param>
+        <param>none</param>
+        <param>/dev/shm</param>
+      </execute>
+    </stage>
   </stage>
-
-  <stage name="Mounting ramfs and Populating /dev">
-    <execute command="mount">
-      <param>-n</param>
-      <param>-t ramfs</param>
-      <param>none</param>
-      <param>/dev</param>
-    </execute>
-
-    <execute command="mknod">
-	<param>-m 622</param>
-	<param>/dev/console</param>
-	<param>c 5 1</param>
-    </execute>
-
-    <execute command="mknod">
-  	<param>-m 666</param>
-	<param>/dev/null</param>
-	<param>c 1 3</param>
-    </execute>
-
-    <execute command="mknod">
-  	<param>-m 666</param>
-	<param>/dev/zero</param>
-	<param>c 1 5</param>
-    </execute>
-
-    <execute command="mknod">
-  	<param>-m 666</param>
-	<param>/dev/ptmx</param>
-	<param>c 5 2</param>
-    </execute>
-
-    <execute command="mknod">
-  	<param>-m 666</param>
-	<param>/dev/tty</param>
-	<param>c 5 0</param>
-    </execute>
-
-    <execute command="mknod">
-  	<param>-m 444</param>
-	<param>/dev/random</param>
-	<param>c 1 8</param>
-    </execute>
-
-    <execute command="mknod">
-  	<param>-m 444</param>
-	<param>/dev/urandom</param>
-	<param>c 1 9</param>
-    </execute>
-
-    <ownership base="/dev" user="root" group="tty">
-	<name>console</name>
-	<name>ptmx</name>
-	<name>tty</name>
-    </ownership>
-
-    <link>
-      <target>/proc/self/fd</target>
-      <name>/dev/fd</name>
-    </link>
-
-    <link>
-      <target>/proc/self/fd/0</target>
-      <name>/dev/stdin</name>
-    </link>
-
-    <link>
-      <target>/proc/self/fd/1</target>
-      <name>/dev/stdout</name>
-    </link>
-
-    <link>
-      <target>/proc/self/fd/2</target>
-      <name>/dev/stderr</name>
-    </link>
-
-    <link>
-      <target>/proc/kcore</target>
-      <name>/dev/core</name>
-    </link>
-
-    <mkdir>
-      <name>/dev/shm</name>
-      <name>/dev/pts</name>
-    </mkdir>
-
-    <execute command="mount">
-      <param>-t devpts</param>
-      <param>-o gid=4,mode=620</param>
-      <param>none</param>
-      <param>/dev/pts</param>
-    </execute>
-
-    <execute command="mount">
-      <param>-t tmpfs</param>
-      <param>none</param>
-      <param>/dev/shm</param>
-    </execute>
-  </stage>
-</stage>
-
 </alfs>

Modified: profiles/LFS/trunk/chapter06/binutils.xml
===================================================================
--- profiles/LFS/trunk/chapter06/binutils.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/binutils.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,74 +1,63 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="binutils" version="&binutils-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&binutils-md5;</digest>
-			<archive>&packages_dir;/&binutils-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<mkdir base="&build_dir;">
-			<option>parents</option>
-			<name>binutils-build</name>
-		</mkdir>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-				<variable name="CFLAGS" />
-				<variable name="CXXFLAGS" />
-			</environment>
-			<base>&build_dir;/binutils-build</base>
-		</stageinfo>
-
-<!-- Run the following command:  expect -c "spawn ls"
+  <package name="binutils" version="&binutils-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&binutils-md5;</digest>
+        <archive>&packages_dir;/&binutils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <mkdir base="&build_dir;">
+        <option>parents</option>
+        <name>binutils-build</name>
+      </mkdir>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="CFLAGS" />
+          <variable name="CXXFLAGS" />
+        </environment>
+        <base>&build_dir;/binutils-build</base>
+      </stageinfo>
+      <!-- Run the following command:  expect -c "spawn ls"
 If you receive the message:
     The system has no more ptys.  Ask your system administrator to create more.
 Your chroot environment is not set up for proper PTY operation. In this case there is no point in running the test
 suites for Binutils and GCC until you are able to resolve the issue.
--->
-
-		<configure command="../&binutils-directory;/configure">
-			<param>--prefix=/usr</param>
-			<param>--enable-shared</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-			<param>tooldir=/usr</param>
-		</make>
-
-		<make>
-			<param>-k check</param>
-			<param>|| true</param>
-		</make>
-
-		<make>
-			<param>tooldir=/usr</param>
-			<param>install</param>
-		</make>
-
-		<copy>
-			<source>../&binutils-directory;/include/libiberty.h</source>
-			<destination>/usr/include</destination>
-		</copy>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&binutils-directory;</remove>
-		<remove>&build_dir;/binutils-build</remove>
-	</stage>
-</package>
-
+      -->
+      <configure command="../&binutils-directory;/configure">
+        <param>--prefix=/usr</param>
+        <param>--enable-shared</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+        <param>tooldir=/usr</param>
+      </make>
+      <make>
+        <param>-k check</param>
+        <param>|| true</param>
+      </make>
+      <make>
+        <param>tooldir=/usr</param>
+        <param>install</param>
+      </make>
+      <copy>
+        <source>../&binutils-directory;/include/libiberty.h</source>
+        <destination>/usr/include</destination>
+      </copy>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&binutils-directory;</remove>
+      <remove>&build_dir;/binutils-build</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/bison.xml
===================================================================
--- profiles/LFS/trunk/chapter06/bison.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/bison.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,50 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="bison" version="&bison-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&bison-md5;</digest>
-			<archive>&packages_dir;/&bison-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&bison-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&bison-directory;</remove>
-	</stage>
-</package>
-
+  <package name="bison" version="&bison-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&bison-md5;</digest>
+        <archive>&packages_dir;/&bison-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&bison-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&bison-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/bzip2.xml
===================================================================
--- profiles/LFS/trunk/chapter06/bzip2.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/bzip2.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,86 +1,71 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="bzip2" version="&bzip2-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&bzip2-md5;</digest>
-			<archive>&packages_dir;/&bzip2-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&bzip2-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>-f Makefile-libbz2_so</param>
-		</make>
-
-		<make>
-			<param>clean</param>
-		</make>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<copy>
-			<source>bzip2-shared</source>
-			<destination>/bin/bzip2</destination>
-		</copy>
-
-		<copy>
-			<option>archive</option>
-			<source>libbz2.so*</source>
-			<destination>/lib</destination>
-		</copy>
-
-		<link>
-			<option>force</option>
-			<target>../../lib/libbz2.so.1.0</target>
-			<name>/usr/lib/libbz2.so</name>
-		</link>
-
-		<remove>/usr/bin/bunzip2</remove>
-		<remove>/usr/bin/bzcat</remove>
-		<remove>/usr/bin/bzip2</remove>
-
-		<move base="/usr/bin">
-			<source>bzip2recover</source>
-			<source>bzless</source>
-			<source>bzmore</source>
-			<destination>/bin</destination>
-		</move>
-
-		<link>
-			<option>force</option>
- 			<target>bzip2</target>
-			<name>/bin/bunzip2</name>
-		</link>
-
-		<link>
-			<option>force</option>
-			<target>bzip2</target>
-			<name>/bin/bzcat</name>
-		</link>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&bzip2-directory;</remove>
-	</stage>
-</package>
-
+  <package name="bzip2" version="&bzip2-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&bzip2-md5;</digest>
+        <archive>&packages_dir;/&bzip2-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&bzip2-directory;</base>
+      </stageinfo>
+      <make>
+        <param>-f Makefile-libbz2_so</param>
+      </make>
+      <make>
+        <param>clean</param>
+      </make>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <copy>
+        <source>bzip2-shared</source>
+        <destination>/bin/bzip2</destination>
+      </copy>
+      <copy>
+        <option>archive</option>
+        <source>libbz2.so*</source>
+        <destination>/lib</destination>
+      </copy>
+      <link>
+        <option>force</option>
+        <target>../../lib/libbz2.so.1.0</target>
+        <name>/usr/lib/libbz2.so</name>
+      </link>
+      <remove>/usr/bin/bunzip2</remove>
+      <remove>/usr/bin/bzcat</remove>
+      <remove>/usr/bin/bzip2</remove>
+      <move base="/usr/bin">
+        <source>bzip2recover</source>
+        <source>bzless</source>
+        <source>bzmore</source>
+        <destination>/bin</destination>
+      </move>
+      <link>
+        <option>force</option>
+        <target>bzip2</target>
+        <name>/bin/bunzip2</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>bzip2</target>
+        <name>/bin/bzcat</name>
+      </link>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&bzip2-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/changingowner.xml
===================================================================
--- profiles/LFS/trunk/chapter06/changingowner.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/changingowner.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" []>
-
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[]>
 <alfs>
-
-<stage name="Changing Ownership">
-	<ownership user="0" group="0">
-		<option>recursive</option>
-		<name>/tools</name>
-	</ownership>
-</stage>
-
+  <stage name="Changing Ownership">
+    <ownership user="0" group="0">
+      <option>recursive</option>
+      <name>/tools</name>
+    </ownership>
+  </stage>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/coreutils.xml
===================================================================
--- profiles/LFS/trunk/chapter06/coreutils.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/coreutils.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,133 +1,119 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="coreutils" version="&coreutils-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&coreutils-md5;</digest>
-			<archive>&packages_dir;/&coreutils-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&coreutils-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&coreutils-uname-patch;</param>
-		</patch>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&coreutils-dupes-patch;</param>
-		</patch>
-
-		<configure>
-			<prefix>DEFAULT_POSIX2_VERSION=199209</prefix>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-<!--
-		<textdump mode="append">
-			<file>/etc/group</file>
-			<content>
-				=dummy1:x:1000
-				=dummy2:x:1001:dummy
-			</content>
-		</textdump>
-
-		<textdump mode="append">
-			<file>/etc/passwd</file>
-			<content>=dummy:x:1000:1000:::/bin/bash</content>
-		</textdump>
-
-		<make>
-			<param>NON_ROOT_USERNAME=dummy</param>
-			<param>check-root</param>
-		</make>
-
-		<execute command="src/su">
-			<param>dummy</param>
-			<param>-c "make RUN_EXPENSIVE_TESTS=yes check"</param>
-		</execute>
-
-		<execute command="sed">
-			<param>-i.bak</param>
-			<param>'/dummy/d'</param>
-			<param>/etc/passwd</param>
-			<param>/etc/group</param>
-		</execute>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<move base="/usr/bin">
-			<source>[</source>
-			<source>basename</source>
-			<source>cat</source>
-			<source>chgrp</source>
-			<source>chmod</source>
-			<source>chown</source>
-			<source>cp</source>
-			<source>dd</source>
-			<source>df</source>
-			<source>date</source>
-			<source>echo</source>
-			<source>false</source>
-			<source>head</source>
-			<source>hostname</source>
-			<source>install</source>
-			<source>ln</source>
-			<source>ls</source>
-			<source>mkdir</source>
-			<source>mknod</source>
-			<source>mv</source>
-			<source>pwd</source>
-			<source>rm</source>
-			<source>rmdir</source>
-			<source>sync</source>
-			<source>sleep</source>
-			<source>stty</source>
-			<source>test</source>
-			<source>touch</source>
-			<source>true</source>
-			<source>uname</source>
-			<destination>/bin</destination>
-		</move>
-
-		<move>
-			<source>/usr/bin/chroot</source>
-			<destination>/usr/sbin</destination>
-		</move>
-
-		<link>
-			<option>force</option>
-			<target>../../bin/install</target>
-			<name>/usr/bin</name>
-		</link>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&coreutils-directory;</remove>
-	</stage>
-</package>
-
+  <package name="coreutils" version="&coreutils-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&coreutils-md5;</digest>
+        <archive>&packages_dir;/&coreutils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&coreutils-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&coreutils-uname-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&coreutils-dupes-patch;</param>
+      </patch>
+      <configure>
+        <prefix>DEFAULT_POSIX2_VERSION=199209</prefix>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <textdump mode="append">
+        <file>/etc/group</file>
+	<content>
+	=dummy1:x:1000
+	=dummy2:x:1001:dummy
+	</content>
+      </textdump>
+      <textdump mode="append">
+        <file>/etc/passwd</file>
+	<content>
+	=dummy:x:1000:1000:::/bin/bash
+	</content>
+      </textdump>
+      <make>
+        <param>NON_ROOT_USERNAME=dummy</param>
+	<param>check-root</param>
+      </make>
+      <execute command="src/su">
+	<param>dummy</param>
+	<param>-c "make RUN_EXPENSIVE_TESTS=yes check"</param>
+      </execute>
+      <execute command="sed">
+        <param>-i.bak</param>
+	<param>'/dummy/d'</param>
+	<param>/etc/passwd</param>
+	<param>/etc/group</param>
+      </execute>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+      <move base="/usr/bin">
+        <source>[</source>
+        <source>basename</source>
+        <source>cat</source>
+        <source>chgrp</source>
+        <source>chmod</source>
+        <source>chown</source>
+        <source>cp</source>
+        <source>dd</source>
+        <source>df</source>
+        <source>date</source>
+        <source>echo</source>
+        <source>false</source>
+        <source>head</source>
+        <source>hostname</source>
+        <source>install</source>
+        <source>ln</source>
+        <source>ls</source>
+        <source>mkdir</source>
+        <source>mknod</source>
+        <source>mv</source>
+        <source>pwd</source>
+        <source>rm</source>
+        <source>rmdir</source>
+        <source>sync</source>
+        <source>sleep</source>
+        <source>stty</source>
+        <source>test</source>
+        <source>touch</source>
+        <source>true</source>
+        <source>uname</source>
+        <destination>/bin</destination>
+      </move>
+      <move>
+        <source>/usr/bin/chroot</source>
+        <destination>/usr/sbin</destination>
+      </move>
+      <link>
+        <option>force</option>
+        <target>../../bin/install</target>
+        <name>/usr/bin</name>
+      </link>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&coreutils-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/createfiles.xml
===================================================================
--- profiles/LFS/trunk/chapter06/createfiles.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/createfiles.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,36 +1,31 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" []>
-
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[]>
 <alfs>
-
-<stage name="Creating Essential Symlinks">
-	<link>
-		<option>force</option>
-		<target>/tools/bin/bash</target>
-		<target>/tools/bin/cat</target>
-		<target>/tools/bin/pwd</target>
-		<target>/tools/bin/stty</target>
-		<name>/bin</name>
-	</link>
-
-	<link>
-		<option>force</option>
-		<target>/tools/bin/perl</target>
-		<name>/usr/bin</name>
-	</link>
-
-	<link>
-		<option>force</option>
-		<target>/tools/lib/libgcc_s.so</target>
-		<target>/tools/lib/libgcc_s.so.1</target>
-		<name>/usr/lib</name>
-	</link>
-
-	<link>
-		<option>force</option>
-		<target>bash</target>
-		<name>/bin/sh</name>
-	</link>
-</stage>
-
+  <stage name="Creating Essential Symlinks">
+    <link>
+      <option>force</option>
+      <target>/tools/bin/bash</target>
+      <target>/tools/bin/cat</target>
+      <target>/tools/bin/pwd</target>
+      <target>/tools/bin/stty</target>
+      <name>/bin</name>
+    </link>
+    <link>
+      <option>force</option>
+      <target>/tools/bin/perl</target>
+      <name>/usr/bin</name>
+    </link>
+    <link>
+      <option>force</option>
+      <target>/tools/lib/libgcc_s.so</target>
+      <target>/tools/lib/libgcc_s.so.1</target>
+      <name>/usr/lib</name>
+    </link>
+    <link>
+      <option>force</option>
+      <target>bash</target>
+      <name>/bin/sh</name>
+    </link>
+  </stage>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/creatingdirs.xml
===================================================================
--- profiles/LFS/trunk/chapter06/creatingdirs.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/creatingdirs.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,163 +1,141 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" []>
-
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[]>
 <alfs>
-
-<stage name="Creating Directories">
-	<mkdir base="/">
-		<option>parents</option>
-	
-		<name>bin</name>
-		<name>boot</name>
-		<name>dev</name>
-		<name>etc/opt</name>
-		<name>home</name>
-		<name>lib</name>
-		<name>media/cdrom</name>
-		<name>media/floppy</name>
-		<name>mnt</name>
-		<name>proc</name>
-		<name>root</name>
-		<name>sbin</name>
-		<name>srv</name>
-		<name>sys</name>
-		<name>tmp</name>
-		<name>usr/local</name>
-		<name>var</name>
-		<name>opt</name>
-	</mkdir>
-
-	<mkdir base="/usr">
-		<option>parents</option>
-
-		<name>bin</name>
-		<name>include</name>
-		<name>lib</name>
-		<name>sbin</name>
-		<name>share</name>
-		<name>src</name>
-	</mkdir>
-
-	<link>
-		<option>force</option>
-		<target>share/man</target>
-		<target>share/doc</target>
-		<target>share/info</target>
-		<name>/usr</name>
-	</link>
-
-	<mkdir base="/usr/share">
-		<option>parents</option>
-
-		<name>doc</name>
-		<name>info</name>
-		<name>locale</name>
-		<name>man</name>
-		<name>misc</name>
-		<name>terminfo</name>
-		<name>zoneinfo</name>
-	</mkdir>
-
-	<mkdir base="/usr/share/man">
-		<option>parents</option>
-
-		<name>man1</name>
-		<name>man2</name>
-		<name>man3</name>
-		<name>man4</name>
-		<name>man5</name>
-		<name>man6</name>
-		<name>man7</name>
-		<name>man8</name>
-	</mkdir>
-
-	<mkdir base="/usr/local">
-		<option>parents</option>
-		<name>bin</name>
-		<name>etc</name>
-		<name>include</name>
-		<name>lib</name>
-		<name>sbin</name>
-		<name>share</name>
-		<name>src</name>
-	</mkdir>
-
-	<link>
-		<option>force</option>
-		<target>share/man</target>
-		<target>share/doc</target>
-		<target>share/info</target>
-		<name>/usr/local</name>
-	</link>
-
-	<mkdir base="/usr/local/share">
-		<option>parents</option>
-
-		<name>dict</name>
-		<name>doc</name>
-		<name>info</name>
-		<name>locale</name>
-		<name>man</name>
-		<name>nls</name>
-		<name>misc</name>
-		<name>terminfo</name>
-		<name>zoneinfo</name>
-	</mkdir>
-
-	<mkdir base="/usr/local/share/man">
-		<option>parents</option>
-
-		<name>man1</name>
-		<name>man2</name>
-		<name>man3</name>
-		<name>man4</name>
-		<name>man5</name>
-		<name>man6</name>
-		<name>man7</name>
-		<name>man8</name>
-	</mkdir>
-	
-	<mkdir base="/var">
-		<option>parents</option>
-
-		<name>lock</name>
-		<name>log</name>
-		<name>mail</name>
-		<name>run</name>
-		<name>spool</name>
-		<name>tmp</name>
-		<name>opt</name>
-		<name>cache</name>
-		<name>lib/misc</name>
-		<name>local</name>
-	</mkdir>
-
-	<mkdir base="/opt">
-		<option>parents</option>
-
-		<name>bin</name>
-		<name>doc</name>
-		<name>include</name>
-		<name>info</name>
-		<name>lib</name>
-		<name>man/man1</name>
-		<name>man/man2</name>
-		<name>man/man3</name>
-		<name>man/man4</name>
-		<name>man/man5</name>
-		<name>man/man6</name>
-		<name>man/man7</name>
-		<name>man/man8</name>
-	</mkdir>
-	
-	<permissions mode="0750">
-		<name>/root</name>
-	</permissions>
-
-	<permissions mode="1777">
-		<name>/tmp</name>
-		<name>/var/tmp</name>
-	</permissions>
-</stage>
-
+  <stage name="Creating Directories">
+    <mkdir base="/">
+      <option>parents</option>
+      <name>bin</name>
+      <name>boot</name>
+      <name>dev</name>
+      <name>etc/opt</name>
+      <name>home</name>
+      <name>lib</name>
+      <name>media/cdrom</name>
+      <name>media/floppy</name>
+      <name>mnt</name>
+      <name>proc</name>
+      <name>root</name>
+      <name>sbin</name>
+      <name>srv</name>
+      <name>sys</name>
+      <name>tmp</name>
+      <name>usr/local</name>
+      <name>var</name>
+      <name>opt</name>
+    </mkdir>
+    <mkdir base="/usr">
+      <option>parents</option>
+      <name>bin</name>
+      <name>include</name>
+      <name>lib</name>
+      <name>sbin</name>
+      <name>share</name>
+      <name>src</name>
+    </mkdir>
+    <link>
+      <option>force</option>
+      <target>share/man</target>
+      <target>share/doc</target>
+      <target>share/info</target>
+      <name>/usr</name>
+    </link>
+    <mkdir base="/usr/share">
+      <option>parents</option>
+      <name>doc</name>
+      <name>info</name>
+      <name>locale</name>
+      <name>man</name>
+      <name>misc</name>
+      <name>terminfo</name>
+      <name>zoneinfo</name>
+    </mkdir>
+    <mkdir base="/usr/share/man">
+      <option>parents</option>
+      <name>man1</name>
+      <name>man2</name>
+      <name>man3</name>
+      <name>man4</name>
+      <name>man5</name>
+      <name>man6</name>
+      <name>man7</name>
+      <name>man8</name>
+    </mkdir>
+    <mkdir base="/usr/local">
+      <option>parents</option>
+      <name>bin</name>
+      <name>etc</name>
+      <name>include</name>
+      <name>lib</name>
+      <name>sbin</name>
+      <name>share</name>
+      <name>src</name>
+    </mkdir>
+    <link>
+      <option>force</option>
+      <target>share/man</target>
+      <target>share/doc</target>
+      <target>share/info</target>
+      <name>/usr/local</name>
+    </link>
+    <mkdir base="/usr/local/share">
+      <option>parents</option>
+      <name>dict</name>
+      <name>doc</name>
+      <name>info</name>
+      <name>locale</name>
+      <name>man</name>
+      <name>nls</name>
+      <name>misc</name>
+      <name>terminfo</name>
+      <name>zoneinfo</name>
+    </mkdir>
+    <mkdir base="/usr/local/share/man">
+      <option>parents</option>
+      <name>man1</name>
+      <name>man2</name>
+      <name>man3</name>
+      <name>man4</name>
+      <name>man5</name>
+      <name>man6</name>
+      <name>man7</name>
+      <name>man8</name>
+    </mkdir>
+    <mkdir base="/var">
+      <option>parents</option>
+      <name>lock</name>
+      <name>log</name>
+      <name>mail</name>
+      <name>run</name>
+      <name>spool</name>
+      <name>tmp</name>
+      <name>opt</name>
+      <name>cache</name>
+      <name>lib/misc</name>
+      <name>local</name>
+    </mkdir>
+    <mkdir base="/opt">
+      <option>parents</option>
+      <name>bin</name>
+      <name>doc</name>
+      <name>include</name>
+      <name>info</name>
+      <name>lib</name>
+      <name>man/man1</name>
+      <name>man/man2</name>
+      <name>man/man3</name>
+      <name>man/man4</name>
+      <name>man/man5</name>
+      <name>man/man6</name>
+      <name>man/man7</name>
+      <name>man/man8</name>
+    </mkdir>
+    <permissions mode="0750">
+      <name>/root</name>
+    </permissions>
+    <permissions mode="1777">
+      <name>/tmp</name>
+      <name>/var/tmp</name>
+    </permissions>
+  </stage>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/diffutils.xml
===================================================================
--- profiles/LFS/trunk/chapter06/diffutils.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/diffutils.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,44 +1,37 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="diffutils" version="&diffutils-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&diffutils-md5;</digest>
-			<archive>&packages_dir;/&diffutils-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&diffutils-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&diffutils-directory;</remove>
-	</stage>
-</package>
-
+  <package name="diffutils" version="&diffutils-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&diffutils-md5;</digest>
+        <archive>&packages_dir;/&diffutils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&diffutils-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&diffutils-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/e2fsprogs.xml
===================================================================
--- profiles/LFS/trunk/chapter06/e2fsprogs.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/e2fsprogs.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,62 +1,52 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="e2fsprogs" version="&e2fsprogs-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&e2fsprogs-md5;</digest>
-			<archive>&packages_dir;/&e2fsprogs-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<mkdir base="&build_dir;">
-			<name>e2fsprogs-build</name>
-		</mkdir>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/e2fsprogs-build</base>
-		</stageinfo>
-
-		<configure command="../&e2fsprogs-directory;/configure">
-			<param>--prefix=/usr</param>
-			<param>--with-root-prefix=""</param>
-			<param>--enable-elf-shlibs</param>
-			<param>--disable-evms</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>			
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<make>
-			<param>install-libs</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&e2fsprogs-directory;</remove>
-		<remove>&build_dir;/e2fsprogs-build</remove>
-	</stage>
-</package>
-
+  <package name="e2fsprogs" version="&e2fsprogs-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&e2fsprogs-md5;</digest>
+        <archive>&packages_dir;/&e2fsprogs-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <mkdir base="&build_dir;">
+        <name>e2fsprogs-build</name>
+      </mkdir>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/e2fsprogs-build</base>
+      </stageinfo>
+      <configure command="../&e2fsprogs-directory;/configure">
+        <param>--prefix=/usr</param>
+        <param>--with-root-prefix=""</param>
+        <param>--enable-elf-shlibs</param>
+        <param>--disable-evms</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+      <make>
+        <param>install-libs</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&e2fsprogs-directory;</remove>
+      <remove>&build_dir;/e2fsprogs-build</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/file.xml
===================================================================
--- profiles/LFS/trunk/chapter06/file.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/file.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,44 +1,37 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="file" version="&file-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&file-md5;</digest>
-			<archive>&packages_dir;/&file-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&file-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&file-directory;</remove>
-	</stage>
-</package>
-
+  <package name="file" version="&file-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&file-md5;</digest>
+        <archive>&packages_dir;/&file-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&file-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&file-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/findutils.xml
===================================================================
--- profiles/LFS/trunk/chapter06/findutils.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/findutils.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,52 +1,44 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="findutils" version="&findutils-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&findutils-md5;</digest>
-			<archive>&packages_dir;/&findutils-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&findutils-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--libexecdir=/usr/lib/locate</param>
-			<param>--localstatedir=/var/lib/locate</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&findutils-directory;</remove>
-	</stage>
-</package>
-
+  <package name="findutils" version="&findutils-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&findutils-md5;</digest>
+        <archive>&packages_dir;/&findutils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&findutils-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libexecdir=/usr/lib/locate</param>
+        <param>--localstatedir=/var/lib/locate</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&findutils-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/flex.xml
===================================================================
--- profiles/LFS/trunk/chapter06/flex.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/flex.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,82 +1,69 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="flex" version="&flex-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&flex-md5;</digest>
-			<archive>&packages_dir;/&flex-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&flex-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&flex-debian-fixes-patch;</param>
-		</patch>
-
-		<execute command="touch">
-			<param>doc/*.1</param>
-		</execute>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<link>
-			<option>force</option>
-			<target>libfl.a</target>
-			<name>/usr/lib/libl.a</name>
-		</link>
-
-		<textdump>
-			<file>/usr/bin/lex</file>
-			<content>
-				=#!/bin/sh
-				=# Begin /usr/bin/lex
-				=
-				=exec /usr/bin/flex -l "$@"
-				=
-				=# End /usr/bin/lex
-			</content>
-		</textdump>
-
-		<permissions mode="755">
-			<name>/usr/bin/lex</name>
-		</permissions>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&flex-directory;</remove>
-	</stage>
-</package>
-
+  <package name="flex" version="&flex-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&flex-md5;</digest>
+        <archive>&packages_dir;/&flex-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&flex-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&flex-debian-fixes-patch;</param>
+      </patch>
+      <execute command="touch">
+        <param>doc/*.1</param>
+      </execute>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+      <link>
+        <option>force</option>
+        <target>libfl.a</target>
+        <name>/usr/lib/libl.a</name>
+      </link>
+      <textdump>
+        <file>/usr/bin/lex</file>
+        <content>
+	=#!/bin/sh
+	=# Begin /usr/bin/lex
+	=
+	=exec /usr/bin/flex -l "$@"
+	=
+	=# End /usr/bin/lex
+	</content>
+      </textdump>
+      <permissions mode="755">
+        <name>/usr/bin/lex</name>
+      </permissions>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&flex-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/gawk.xml
===================================================================
--- profiles/LFS/trunk/chapter06/gawk.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/gawk.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,51 +1,43 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="gawk" version="&gawk-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&gawk-md5;</digest>
-			<archive>&packages_dir;/&gawk-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gawk-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--libexecdir=/usr/lib</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gawk-directory;</remove>
-	</stage>
-</package>
-
+  <package name="gawk" version="&gawk-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&gawk-md5;</digest>
+        <archive>&packages_dir;/&gawk-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gawk-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libexecdir=/usr/lib</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gawk-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/gcc.xml
===================================================================
--- profiles/LFS/trunk/chapter06/gcc.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/gcc.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,98 +1,83 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="gcc" version="&gcc-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&gcc-md5;</digest>
-			<archive>&packages_dir;/&gcc-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<mkdir base="&build_dir;">
-			<option>parents</option>
-			<name>gcc-build</name>
-		</mkdir>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-				<variable name="CFLAGS" />
-				<variable name="CXXFLAGS" />
-			</environment>
-			<base>&build_dir;/gcc-build</base>
-		</stageinfo>
-
-		<patch base="&build_dir;/&gcc-directory;">
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&gcc-no-fixincludes-patch;</param>
-		</patch>
-
-		<patch base="&build_dir;/&gcc-directory;">
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&gcc-linkonce-patch;</param>
-		</patch>
-
-		<search_replace base="&build_dir;/&gcc-directory;">
-			<file>libiberty/Makefile.in</file>
-			<find>install_to_$(INSTALL_DEST) </find>
-			<replace> </replace>
-		</search_replace>
-
-		<configure command="../&gcc-directory;/configure">
-			<param>--prefix=/usr</param>
-			<param>--libexecdir=/usr/lib</param>
-			<param>--enable-shared</param>
-			<param>--enable-threads=posix</param>
-			<param>--enable-__cxa_atexit</param>
-			<param>--enable-clocale=gnu</param>
-			<param>--enable-languages=c,c++</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-		<make>
-			<param>-k check</param>
-			<param>|| true</param>
-		</make>
-
-<!-- Shows a summary of the tests ran in the above `make -k check` -->
-		<execute command="../&gcc-directory;/contrib/test_summary" />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<link>
-			<option>force</option>
-			<target>../usr/bin/cpp</target>
-			<name>/lib</name>
-		</link>
-
-		<link>
-			<option>force</option>
-			<target>gcc</target>
-			<name>/usr/bin/cc</name>
-		</link>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gcc-directory;</remove>
-		<remove>&build_dir;/gcc-build</remove>
-	</stage>
-</package>
-
+  <package name="gcc" version="&gcc-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&gcc-md5;</digest>
+        <archive>&packages_dir;/&gcc-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <mkdir base="&build_dir;">
+        <option>parents</option>
+        <name>gcc-build</name>
+      </mkdir>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="CFLAGS" />
+          <variable name="CXXFLAGS" />
+        </environment>
+        <base>&build_dir;/gcc-build</base>
+      </stageinfo>
+      <patch base="&build_dir;/&gcc-directory;">
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&gcc-no-fixincludes-patch;</param>
+      </patch>
+      <patch base="&build_dir;/&gcc-directory;">
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&gcc-linkonce-patch;</param>
+      </patch>
+      <search_replace base="&build_dir;/&gcc-directory;">
+        <file>libiberty/Makefile.in</file>
+        <find>install_to_$(INSTALL_DEST)</find>
+        <replace></replace>
+      </search_replace>
+      <configure command="../&gcc-directory;/configure">
+        <param>--prefix=/usr</param>
+        <param>--libexecdir=/usr/lib</param>
+        <param>--enable-shared</param>
+        <param>--enable-threads=posix</param>
+        <param>--enable-__cxa_atexit</param>
+        <param>--enable-clocale=gnu</param>
+        <param>--enable-languages=c,c++</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>-k check</param>
+        <param>|| true</param>
+      </make>
+      <!-- Shows a summary of the tests ran in the above `make -k check` -->
+      <execute command="../&gcc-directory;/contrib/test_summary" />
+      <make>
+        <param>install</param>
+      </make>
+      <link>
+        <option>force</option>
+        <target>../usr/bin/cpp</target>
+        <name>/lib</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>gcc</target>
+        <name>/usr/bin/cc</name>
+      </link>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gcc-directory;</remove>
+      <remove>&build_dir;/gcc-build</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/gettext.xml
===================================================================
--- profiles/LFS/trunk/chapter06/gettext.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/gettext.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,50 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="gettext" version="&gettext-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&gettext-md5;</digest>
-			<archive>&packages_dir;/&gettext-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gettext-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gettext-directory;</remove>
-	</stage>
-</package>
-
+  <package name="gettext" version="&gettext-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&gettext-md5;</digest>
+        <archive>&packages_dir;/&gettext-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gettext-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gettext-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/glibc.xml
===================================================================
--- profiles/LFS/trunk/chapter06/glibc.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/glibc.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,135 +1,118 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="glibc" version="&glibc-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&glibc-md5;</digest>
-			<archive>&packages_dir;/&glibc-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<mkdir base="&build_dir;">
-			<option>parents</option>
-			<name>glibc-build</name>
-		</mkdir>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-				<variable name="CFLAGS" />
-				<variable name="CXXFLAGS" />
-			</environment>
-			<base>&build_dir;/glibc-build</base>
-		</stageinfo>
-
-		<configure command="../&glibc-directory;/configure">
-			<param>--prefix=/usr</param>
-			<param>--disable-profile</param>
-			<param>--enable-add-ons</param>
-			<param>--enable-kernel=2.6.0</param>
-			<param>--without-cvs</param>
-			<param>--libexecdir=/usr/lib/glibc</param>
-		</configure>
-
-		<make>
-			<prefix>PARALLELMFLAGS=&jlevel;</prefix>
-		</make>
-
-		<make>
-			<param>check</param>
-		</make>
-
-		<execute command="touch">
-			<param>/etc/ld.so.conf</param>
-		</execute>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<mkdir>
-			<option>parents</option>
-			<name>/usr/lib/locale</name>
-		</mkdir>
-
-		<execute command="localedef -i de_DE -f ISO-8859-1 de_DE" />
-		<execute command="localedef -i de_DE at euro -f ISO-8859-15 de_DE at euro" />
-		<execute command="localedef -i en_HK -f ISO-8859-1 en_HK" />
-		<execute command="localedef -i en_PH -f ISO-8859-1 en_PH" />
-		<execute command="localedef -i en_US -f ISO-8859-1 en_US" />
-		<execute command="localedef -i es_MX -f ISO-8859-1 es_MX" />
-		<execute command="localedef -i fa_IR -f UTF-8 fa_IR" />
-		<execute command="localedef -i fr_FR -f ISO-8859-1 fr_FR" />
-		<execute command="localedef -i fr_FR at euro -f ISO-8859-15 fr_FR at euro" />
-		<execute command="localedef -i it_IT -f ISO-8859-1 it_IT" />
-		<execute command="localedef -i ja_JP -f EUC-JP ja_JP" />
-
-		<make>
-			<param>-C ../&glibc-directory;/linuxthreads/man</param>
-		</make>
-
-		<make>
-			<param>-C ../&glibc-directory;/linuxthreads/man</param>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Configuring">
-		<textdump>
-			<file>/etc/nsswitch.conf</file>
-			<content>
-				=# Begin /etc/nsswitch.conf
-				=
-				=passwd: files
-				=group: files
-				=shadow: files
-				=
-				=hosts: files dns
-				=networks: files
-				=
-				=protocols: files
-				=services: files
-				=ethers: files
-				=rpc: files
-				=
-				=# End /etc/nsswitch.conf
-			</content>
-		</textdump>
-
-		<remove>/etc/localtime</remove>
-		<copy>
-			<option>force</option>
-			<source>&localtime;</source>
-			<destination>/etc/localtime</destination>
-		</copy>
-
-		<textdump>
-			<file>/etc/ld.so.conf</file>
-			<content>
-				=# Begin /etc/ld.so.conf
-				=
-				=/usr/local/lib
-				=/opt/lib
-				=
-				=# End /etc/ld.so.conf
-			</content>
-		</textdump>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&glibc-directory;</remove>
-		<remove>&build_dir;/glibc-build</remove>
-	</stage>
-</package>
-
+  <package name="glibc" version="&glibc-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&glibc-md5;</digest>
+        <archive>&packages_dir;/&glibc-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <mkdir base="&build_dir;">
+        <option>parents</option>
+        <name>glibc-build</name>
+      </mkdir>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="CFLAGS" />
+          <variable name="CXXFLAGS" />
+        </environment>
+        <base>&build_dir;/glibc-build</base>
+      </stageinfo>
+      <configure command="../&glibc-directory;/configure">
+        <param>--prefix=/usr</param>
+        <param>--disable-profile</param>
+        <param>--enable-add-ons</param>
+        <param>--enable-kernel=2.6.0</param>
+        <param>--without-cvs</param>
+        <param>--libexecdir=/usr/lib/glibc</param>
+      </configure>
+      <make>
+        <prefix>PARALLELMFLAGS=&jlevel;</prefix>
+      </make>
+      <make>
+        <param>check</param>
+      </make>
+      <execute command="touch">
+        <param>/etc/ld.so.conf</param>
+      </execute>
+      <make>
+        <param>install</param>
+      </make>
+      <mkdir>
+        <option>parents</option>
+        <name>/usr/lib/locale</name>
+      </mkdir>
+      <execute command="localedef -i de_DE -f ISO-8859-1 de_DE" />
+      <execute command="localedef -i de_DE at euro -f ISO-8859-15 de_DE at euro" />
+      <execute command="localedef -i en_HK -f ISO-8859-1 en_HK" />
+      <execute command="localedef -i en_PH -f ISO-8859-1 en_PH" />
+      <execute command="localedef -i en_US -f ISO-8859-1 en_US" />
+      <execute command="localedef -i es_MX -f ISO-8859-1 es_MX" />
+      <execute command="localedef -i fa_IR -f UTF-8 fa_IR" />
+      <execute command="localedef -i fr_FR -f ISO-8859-1 fr_FR" />
+      <execute command="localedef -i fr_FR at euro -f ISO-8859-15 fr_FR at euro" />
+      <execute command="localedef -i it_IT -f ISO-8859-1 it_IT" />
+      <execute command="localedef -i ja_JP -f EUC-JP ja_JP" />
+      <make>
+        <param>-C ../&glibc-directory;/linuxthreads/man</param>
+      </make>
+      <make>
+        <param>-C ../&glibc-directory;/linuxthreads/man</param>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Configuring">
+      <textdump>
+        <file>/etc/nsswitch.conf</file>
+        <content>
+	=# Begin /etc/nsswitch.conf
+	=
+	=passwd: files
+	=group: files
+	=shadow: files
+	=
+	=hosts: files dns
+	=networks: files
+	=
+	=protocols: files
+	=services: files
+	=ethers: files
+	=rpc: files
+	=
+	=# End /etc/nsswitch.conf
+	</content>
+      </textdump>
+      <remove>/etc/localtime</remove>
+      <copy>
+        <option>force</option>
+        <source>&localtime;</source>
+        <destination>/etc/localtime</destination>
+      </copy>
+      <textdump>
+        <file>/etc/ld.so.conf</file>
+        <content>
+	=# Begin /etc/ld.so.conf 
+	=
+	=/usr/local/lib
+	=/opt/lib
+	=
+	=# End /etc/ld.so.conf
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&glibc-directory;</remove>
+      <remove>&build_dir;/glibc-build</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/grep.xml
===================================================================
--- profiles/LFS/trunk/chapter06/grep.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/grep.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,52 +1,44 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="grep" version="&grep-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&grep-md5;</digest>
-			<archive>&packages_dir;/&grep-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&grep-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--bindir=/bin</param>
-			<param>--with-included-regex</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&grep-directory;</remove>
-	</stage>
-</package>
-
+  <package name="grep" version="&grep-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&grep-md5;</digest>
+        <archive>&packages_dir;/&grep-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&grep-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--bindir=/bin</param>
+        <param>--with-included-regex</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&grep-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/groff.xml
===================================================================
--- profiles/LFS/trunk/chapter06/groff.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/groff.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,61 +1,51 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="groff" version="&groff-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&groff-md5;</digest>
-			<archive>&packages_dir;/&groff-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&groff-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<prefix>PAGE=&paper_size;</prefix>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<link>
-			<option>force</option>
-			<target>soelim</target>
-			<name>/usr/bin/zsoelim</name>
-		</link>
-
-		<link>
-			<option>force</option>
-			<target>eqn</target>
-			<name>/usr/bin/geqn</name>
-		</link>
-
-		<link>
-			<option>force</option>
-			<target>tbl</target>
-			<name>/usr/bin/gtbl</name>
-		</link>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&groff-directory;</remove>
-	</stage>
-</package>
-
+  <package name="groff" version="&groff-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&groff-md5;</digest>
+        <archive>&packages_dir;/&groff-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&groff-directory;</base>
+      </stageinfo>
+      <configure>
+        <prefix>PAGE=&paper_size;</prefix>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <link>
+        <option>force</option>
+        <target>soelim</target>
+        <name>/usr/bin/zsoelim</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>eqn</target>
+        <name>/usr/bin/geqn</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>tbl</target>
+        <name>/usr/bin/gtbl</name>
+      </link>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&groff-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/grub.xml
===================================================================
--- profiles/LFS/trunk/chapter06/grub.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/grub.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,59 +1,50 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="grub" version="&grub-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&grub-md5;</digest>
-			<archive>&packages_dir;/&grub-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-				<variable name="CFLAGS" />
-				<variable name="CXXFLAGS" />
-			</environment>
-			<base>&build_dir;/&grub-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<mkdir>
-			<name>/boot/grub</name>
-		</mkdir>
-
-		<copy base="/usr/share/grub/i386-pc">
-			<source>stage1</source>
-			<source>stage2</source>
-			<source>e2fs_stage1_5</source>
-			<destination>/boot/grub</destination>
-		</copy>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&grub-directory;</remove>
-	</stage>
-</package>
-
+  <package name="grub" version="&grub-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&grub-md5;</digest>
+        <archive>&packages_dir;/&grub-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="CFLAGS" />
+          <variable name="CXXFLAGS" />
+        </environment>
+        <base>&build_dir;/&grub-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+      <mkdir>
+        <name>/boot/grub</name>
+      </mkdir>
+      <copy base="/usr/share/grub/i386-pc">
+        <source>stage1</source>
+        <source>stage2</source>
+        <source>e2fs_stage1_5</source>
+        <destination>/boot/grub</destination>
+      </copy>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&grub-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/gzip.xml
===================================================================
--- profiles/LFS/trunk/chapter06/gzip.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/gzip.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,76 +1,63 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="gzip" version="&gzip-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&gzip-md5;</digest>
-			<archive>&packages_dir;/&gzip-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gzip-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<search_replace>
-			<file>gzexe.in</file>
-			<find>"BINDIR"</find>
-			<replace>/bin</replace>
-		</search_replace>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<move>
-			<source>/usr/bin/gzip</source>
-			<destination>/bin</destination>
-		</move>
-
-		<remove>/usr/bin/gunzip</remove>
-		<remove>/usr/bin/zcat</remove>
-
-		<link>
-			<option>force</option>
-			<target>gzip</target>
-			<name>/bin/gunzip</name>
-		</link>
-
-		<link>
-			<option>force</option>
-			<target>gzip</target>
-			<name>/bin/zcat</name>
-		</link>
-
-		<link>
-			<option>force</option>
-			<target>gunzip</target>
-			<name>/bin/uncompress</name>
-		</link>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gzip-directory;</remove>
-	</stage>
-</package>
-
+  <package name="gzip" version="&gzip-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&gzip-md5;</digest>
+        <archive>&packages_dir;/&gzip-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gzip-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <search_replace>
+        <file>gzexe.in</file>
+        <find>"BINDIR"</find>
+        <replace>/bin</replace>
+      </search_replace>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+      <move>
+        <source>/usr/bin/gzip</source>
+        <destination>/bin</destination>
+      </move>
+      <remove>/usr/bin/gunzip</remove>
+      <remove>/usr/bin/zcat</remove>
+      <link>
+        <option>force</option>
+        <target>gzip</target>
+        <name>/bin/gunzip</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>gzip</target>
+        <name>/bin/zcat</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>gunzip</target>
+        <name>/bin/uncompress</name>
+      </link>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gzip-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/hotplug.xml
===================================================================
--- profiles/LFS/trunk/chapter06/hotplug.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/hotplug.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,45 +1,37 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="hotplug" version="&hotplug-version;">
-	<stage name="Unpacking.">
-		<unpack>
-			<digest>&hotplug-md5;</digest>
-			<archive>&packages_dir;/&hotplug-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing.">
-		<stageinfo>
-			<base>&build_dir;/&hotplug-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<copy>
-			<source>etc/hotplug/pnp.distmap</source>
-			<destination>/etc/hotplug</destination>
-		</copy>
-
-		<remove>/etc/init.d</remove>
-		<remove>/etc/hotplug/net.agent</remove>
-
-	</stage>
-
-	<stage name="Cleaning up.">
-		<remove>&build_dir;/&hotplug-directory;</remove>
-	</stage>
-</package>
-
+  <package name="hotplug" version="&hotplug-version;">
+    <stage name="Unpacking.">
+      <unpack>
+        <digest>&hotplug-md5;</digest>
+        <archive>&packages_dir;/&hotplug-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing.">
+      <stageinfo>
+        <base>&build_dir;/&hotplug-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install</param>
+      </make>
+      <copy>
+        <source>etc/hotplug/pnp.distmap</source>
+        <destination>/etc/hotplug</destination>
+      </copy>
+      <remove>/etc/init.d</remove>
+      <remove>/etc/hotplug/net.agent</remove>
+    </stage>
+    <stage name="Cleaning up.">
+      <remove>&build_dir;/&hotplug-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/iana-etc.xml
===================================================================
--- profiles/LFS/trunk/chapter06/iana-etc.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/iana-etc.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,38 +1,32 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="iana-etc" version="&iana-etc-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&iana-etc-md5;</digest>
-			<archive>&packages_dir;/&iana-etc-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&iana-etc-directory;</base>
-		</stageinfo>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&iana-etc-directory;</remove>
-	</stage>
-</package>
-
+  <package name="iana-etc" version="&iana-etc-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&iana-etc-md5;</digest>
+        <archive>&packages_dir;/&iana-etc-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&iana-etc-directory;</base>
+      </stageinfo>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&iana-etc-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/inetutils.xml
===================================================================
--- profiles/LFS/trunk/chapter06/inetutils.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/inetutils.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,68 +1,58 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="inetutils" version="&inetutils-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&inetutils-md5;</digest>
-			<archive>&packages_dir;/&inetutils-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&inetutils-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&inetutils-no-man-pages-patch;</param>
-		</patch>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&inetutils-kernel-headers-patch;</param>
-		</patch>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--libexecdir=/usr/sbin</param>	
-			<param>--sysconfdir=/etc</param>
-			<param>--localstatedir=/var</param>
-			<param>--disable-logger</param>
-			<param>--disable-syslogd</param>
-			<param>--disable-whois</param>
-			<param>--disable-servers</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<move>
-			<source>/usr/bin/ping</source>
-			<destination>/bin</destination>
-		</move>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&inetutils-directory;</remove>
-	</stage>
-</package>
-
+  <package name="inetutils" version="&inetutils-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&inetutils-md5;</digest>
+        <archive>&packages_dir;/&inetutils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&inetutils-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&inetutils-no-man-pages-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&inetutils-kernel-headers-patch;</param>
+      </patch>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libexecdir=/usr/sbin</param>
+        <param>--sysconfdir=/etc</param>
+        <param>--localstatedir=/var</param>
+        <param>--disable-logger</param>
+        <param>--disable-syslogd</param>
+        <param>--disable-whois</param>
+        <param>--disable-servers</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+      <move>
+        <source>/usr/bin/ping</source>
+        <destination>/bin</destination>
+      </move>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&inetutils-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/iproute2.xml
===================================================================
--- profiles/LFS/trunk/chapter06/iproute2.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/iproute2.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,56 +1,47 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="iproute2" version="&iproute2-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&iproute2-md5;</digest>
-			<archive>&packages_dir;/&iproute2-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&iproute2-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&iproute2-remove-db-patch;</param>
-		</patch>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&iproute2-find-update-patch;</param>
-		</patch>
-
-		<configure />
-
-		<make>
-			<param>&jlevel;</param>	
-			<param>SBINDIR=/sbin</param>
-		</make>
-
-		<make>
-			<param>install</param>
-			<param>SBINDIR=/sbin</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&iproute2-directory;</remove>
-	</stage>
-</package>
-
+  <package name="iproute2" version="&iproute2-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&iproute2-md5;</digest>
+        <archive>&packages_dir;/&iproute2-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&iproute2-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&iproute2-remove-db-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&iproute2-find-update-patch;</param>
+      </patch>
+      <configure />
+      <make>
+        <param>&jlevel;</param>
+        <param>SBINDIR=/sbin</param>
+      </make>
+      <make>
+        <param>install</param>
+        <param>SBINDIR=/sbin</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&iproute2-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/kbd.xml
===================================================================
--- profiles/LFS/trunk/chapter06/kbd.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/kbd.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,45 +1,36 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="kbd" version="&kbd-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&kbd-md5;</digest>
-			<archive>&packages_dir;/&kbd-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&kbd-directory;</base>
-		</stageinfo>
-
-		<configure />
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../config/keymap-ch6.xml" />
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&kbd-directory;</remove>
-	</stage>
-</package>
-
+  <package name="kbd" version="&kbd-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&kbd-md5;</digest>
+        <archive>&packages_dir;/&kbd-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&kbd-directory;</base>
+      </stageinfo>
+      <configure />
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../config/keymap-ch6.xml" />
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&kbd-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/kernfs.xml
===================================================================
--- profiles/LFS/trunk/chapter06/kernfs.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/kernfs.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,53 +1,45 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 
 %general_entities;
 ]>
-
 <alfs>
-
-<stage name="Mounting Virtual Kernel File Systems">
-
-	<mkdir base="&LFS;">
-		<option>parents</option>
-		<name>proc</name>
-		<name>sys</name>
-	</mkdir>
-
-	<execute command="mount">
-		<param>-t proc</param>
-		<param>proc</param>
-		<param>&LFS;/proc</param>
-	</execute>
-
-	<execute command="mount">
-		<param>-t sysfs</param>
-		<param>sysfs</param>
-		<param>&LFS;/sys</param>
-	</execute>
-
-	<execute command="mount">
-		<param>-f</param>
-		<param>-t ramfs</param>
-		<param>ramfs</param>
-		<param>&LFS;/dev</param>
-	</execute>
-
-	<execute command="mount">
-		<param>-f</param>
-		<param>-t tmpfs</param>
-		<param>tmpfs</param>
-		<param>&LFS;/dev/shm</param>
-	</execute>
-
-	<execute command="mount">
-		<param>-f</param>
-		<param>-t devpts</param>
-		<param>-o gid=4,mode=620</param>
-		<param>devpts</param>
-		<param>&LFS;/dev/pts</param>
-	</execute>
-</stage>
-
+  <stage name="Mounting Virtual Kernel File Systems">
+    <mkdir base="&LFS;">
+      <option>parents</option>
+      <name>proc</name>
+      <name>sys</name>
+    </mkdir>
+    <execute command="mount">
+      <param>-t proc</param>
+      <param>proc</param>
+      <param>&LFS;/proc</param>
+    </execute>
+    <execute command="mount">
+      <param>-t sysfs</param>
+      <param>sysfs</param>
+      <param>&LFS;/sys</param>
+    </execute>
+    <execute command="mount">
+      <param>-f</param>
+      <param>-t ramfs</param>
+      <param>ramfs</param>
+      <param>&LFS;/dev</param>
+    </execute>
+    <execute command="mount">
+      <param>-f</param>
+      <param>-t tmpfs</param>
+      <param>tmpfs</param>
+      <param>&LFS;/dev/shm</param>
+    </execute>
+    <execute command="mount">
+      <param>-f</param>
+      <param>-t devpts</param>
+      <param>-o gid=4,mode=620</param>
+      <param>devpts</param>
+      <param>&LFS;/dev/pts</param>
+    </execute>
+  </stage>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/less.xml
===================================================================
--- profiles/LFS/trunk/chapter06/less.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/less.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,46 +1,39 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="less" version="&less-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&less-md5;</digest>
-			<archive>&packages_dir;/&less-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&less-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--bindir=/bin</param>
-			<param>--sysconfdir=/etc</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&less-directory;</remove>
-	</stage>
-</package>
-
+  <package name="less" version="&less-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&less-md5;</digest>
+        <archive>&packages_dir;/&less-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&less-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--bindir=/bin</param>
+        <param>--sysconfdir=/etc</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&less-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/libc-headers.xml
===================================================================
--- profiles/LFS/trunk/chapter06/libc-headers.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/libc-headers.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,62 +1,53 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="libc-headers" version="&linux-libc-headers-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&linux-libc-headers-md5;</digest>
-			<archive>&packages_dir;/&linux-libc-headers-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&linux-libc-headers-directory;</base>
-		</stageinfo>
-
-		<copy>
-		  	<option>recursive</option>
-			<source>include/asm-i386</source>
-			<destination>/usr/include/asm</destination>
-		</copy>
-
-		<copy>
-		  	<option>recursive</option>
-			<source>include/linux</source>
-			<destination>/usr/include</destination>
-		</copy>
-
-		<ownership user="root" group="root">
-		  	<option>recursive</option>
-			<name>/usr/include/asm</name>
-			<name>/usr/include/linux</name>
-		</ownership>
-
-		<permissions mode="u=rw,o=r,g=r">
-		  	<option>recursive</option>
-			<name>/usr/include/asm</name>
-			<name>/usr/include/linux</name>
-		</permissions>
-
-		<permissions mode="a+X">
-		  	<option>recursive</option>
-			<name>/usr/include/asm</name>
-			<name>/usr/include/linux</name>
-		</permissions>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&linux-libc-headers-directory;</remove>
-	</stage>
-</package>
-
+  <package name="libc-headers" version="&linux-libc-headers-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&linux-libc-headers-md5;</digest>
+        <archive>&packages_dir;/&linux-libc-headers-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&linux-libc-headers-directory;</base>
+      </stageinfo>
+      <copy>
+        <option>recursive</option>
+        <source>include/asm-i386</source>
+        <destination>/usr/include/asm</destination>
+      </copy>
+      <copy>
+        <option>recursive</option>
+        <source>include/linux</source>
+        <destination>/usr/include</destination>
+      </copy>
+      <ownership user="root" group="root">
+        <option>recursive</option>
+        <name>/usr/include/asm</name>
+        <name>/usr/include/linux</name>
+      </ownership>
+      <permissions mode="u=rw,o=r,g=r">
+        <option>recursive</option>
+        <name>/usr/include/asm</name>
+        <name>/usr/include/linux</name>
+      </permissions>
+      <permissions mode="a+X">
+        <option>recursive</option>
+        <name>/usr/include/asm</name>
+        <name>/usr/include/linux</name>
+      </permissions>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&linux-libc-headers-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/libol.xml
===================================================================
--- profiles/LFS/trunk/chapter06/libol.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/libol.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,44 +1,37 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="libol" version="&libol-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&libol-md5;</digest>
-			<archive>&packages_dir;/&libol-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libol-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libol-directory;</remove>
-	</stage>
-</package>
-
+  <package name="libol" version="&libol-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&libol-md5;</digest>
+        <archive>&packages_dir;/&libol-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libol-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libol-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/libtool.xml
===================================================================
--- profiles/LFS/trunk/chapter06/libtool.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/libtool.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,50 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="libtool" version="&libtool-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&libtool-md5;</digest>
-			<archive>&packages_dir;/&libtool-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libtool-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libtool-directory;</remove>
-	</stage>
-</package>
-
+  <package name="libtool" version="&libtool-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&libtool-md5;</digest>
+        <archive>&packages_dir;/&libtool-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libtool-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libtool-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/m4.xml
===================================================================
--- profiles/LFS/trunk/chapter06/m4.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/m4.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,50 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="m4" version="&m4-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&m4-md5;</digest>
-			<archive>&packages_dir;/&m4-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&m4-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&m4-directory;</remove>
-	</stage>
-</package>
-
+  <package name="m4" version="&m4-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&m4-md5;</digest>
+        <archive>&packages_dir;/&m4-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&m4-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&m4-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/make.xml
===================================================================
--- profiles/LFS/trunk/chapter06/make.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/make.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,50 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="make" version="&make-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&make-md5;</digest>
-			<archive>&packages_dir;/&make-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&make-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&make-directory;</remove>
-	</stage>
-</package>
-
+  <package name="make" version="&make-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&make-md5;</digest>
+        <archive>&packages_dir;/&make-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&make-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&make-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/man-pages.xml
===================================================================
--- profiles/LFS/trunk/chapter06/man-pages.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/man-pages.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,36 +1,31 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="man-pages" version="&man-pages-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&man-pages-md5;</digest>
-			<archive>&packages_dir;/&man-pages-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&man-pages-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&man-pages-directory;</remove>
-	</stage>
-</package>
-
+  <package name="man-pages" version="&man-pages-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&man-pages-md5;</digest>
+        <archive>&packages_dir;/&man-pages-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&man-pages-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&man-pages-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/man.xml
===================================================================
--- profiles/LFS/trunk/chapter06/man.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/man.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,56 +1,47 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="man" version="&man-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&man-md5;</digest>
-			<archive>&packages_dir;/&man-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&man-directory;</base>
-		</stageinfo>
-
-		<search_replace base="&build_dir;/&man-directory;">
-			<file>configure</file>
-			<find>-is</find>
-			<replace>-isR</replace>
-		</search_replace>
-
-		<search_replace base="&build_dir;/&man-directory;">
-			<file>src/man.conf.in</file>
-   			<find>MANPATH&#x09;/usr/man</find>
-			<replace>#MANPATH /usr/man</replace>
-		</search_replace>
-
-		<configure>
-			<param>-confdir=/etc</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&man-directory;</remove>
-	</stage>
-</package>
-
+  <package name="man" version="&man-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&man-md5;</digest>
+        <archive>&packages_dir;/&man-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&man-directory;</base>
+      </stageinfo>
+      <search_replace base="&build_dir;/&man-directory;">
+        <file>configure</file>
+        <find>-is</find>
+        <replace>-isR</replace>
+      </search_replace>
+      <search_replace base="&build_dir;/&man-directory;">
+        <file>src/man.conf.in</file>
+        <find>MANPATH	/usr/man</find>
+        <replace>#MANPATH /usr/man</replace>
+      </search_replace>
+      <configure>
+        <param>-confdir=/etc</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&man-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/mktemp.xml
===================================================================
--- profiles/LFS/trunk/chapter06/mktemp.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/mktemp.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,53 +1,44 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="mktemp" version="&mktemp-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&mktemp-md5;</digest>
-			<archive>&packages_dir;/&mktemp-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&mktemp-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&mktemp-tempfile-patch;</param>
-		</patch>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--with-libc</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<make>
-			<param>install-tempfile</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&mktemp-directory;</remove>
-	</stage>
-</package>
-
+  <package name="mktemp" version="&mktemp-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&mktemp-md5;</digest>
+        <archive>&packages_dir;/&mktemp-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&mktemp-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&mktemp-tempfile-patch;</param>
+      </patch>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--with-libc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <make>
+        <param>install-tempfile</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&mktemp-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/module-init-tools.xml
===================================================================
--- profiles/LFS/trunk/chapter06/module-init-tools.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/module-init-tools.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,50 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="module-init-tools" version="&module-init-tools-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&module-init-tools-md5;</digest>
-			<archive>&packages_dir;/&module-init-tools-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&module-init-tools-directory;</base>
-		</stageinfo>
-
-		<configure>
-		  	<param>--prefix=""</param>
-			<param>--enable-zlib</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-			<param>DOCBOOKTOMAN=""</param>
-		</make>
-
-		<make>
-  			<param>check</param>
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&module-init-tools-directory;</remove>
-	</stage>
-</package>
-
+  <package name="module-init-tools" version="&module-init-tools-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&module-init-tools-md5;</digest>
+        <archive>&packages_dir;/&module-init-tools-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&module-init-tools-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=""</param>
+        <param>--enable-zlib</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+        <param>DOCBOOKTOMAN=""</param>
+      </make>
+      <make>
+        <param>check</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&module-init-tools-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/ncurses.xml
===================================================================
--- profiles/LFS/trunk/chapter06/ncurses.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/ncurses.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,72 +1,59 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="ncurses" version="&ncurses-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&ncurses-md5;</digest>
-			<archive>&packages_dir;/&ncurses-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&ncurses-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--with-shared</param>
-			<param>--without-debug</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<permissions mode="755">
-			<name>/usr/lib/*.&ncurses-version;</name>
-		</permissions>
-
-		<permissions mode="644">
-			<name>/usr/lib/libncurses++.a</name>
-		</permissions>
-
-		<move>
-			<source>/usr/lib/libncurses.so.5*</source>
-			<destination>/lib</destination>
-		</move>
-
-		<link>
-			<option>force</option>
-			<target>../../lib/libncurses.so.5</target>
-			<name>/usr/lib/libncurses.so</name>
-		</link>
-
-		<link>
-			<option>force</option>
-			<target>libncurses.so</target>
-			<name>/usr/lib/libcurses.so</name>
-		</link>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&ncurses-directory;</remove>
-	</stage>
-</package>
-
+  <package name="ncurses" version="&ncurses-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&ncurses-md5;</digest>
+        <archive>&packages_dir;/&ncurses-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&ncurses-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--with-shared</param>
+        <param>--without-debug</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+      <permissions mode="755">
+        <name>/usr/lib/*.&ncurses-version;</name>
+      </permissions>
+      <permissions mode="644">
+        <name>/usr/lib/libncurses++.a</name>
+      </permissions>
+      <move>
+        <source>/usr/lib/libncurses.so.5*</source>
+        <destination>/lib</destination>
+      </move>
+      <link>
+        <option>force</option>
+        <target>../../lib/libncurses.so.5</target>
+        <name>/usr/lib/libncurses.so</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>libncurses.so</target>
+        <name>/usr/lib/libcurses.so</name>
+      </link>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&ncurses-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/patch.xml
===================================================================
--- profiles/LFS/trunk/chapter06/patch.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/patch.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,45 +1,38 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="patch" version="&patch-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&patch-md5;</digest>
-			<archive>&packages_dir;/&patch-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&patch-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<prefix>CPPFLAGS=-D_GNU_SOURCE</prefix>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&patch-directory;</remove>
-	</stage>
-</package>
-
+  <package name="patch" version="&patch-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&patch-md5;</digest>
+        <archive>&packages_dir;/&patch-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&patch-directory;</base>
+      </stageinfo>
+      <configure>
+        <prefix>CPPFLAGS=-D_GNU_SOURCE</prefix>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&patch-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/perl.xml
===================================================================
--- profiles/LFS/trunk/chapter06/perl.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/perl.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,56 +1,49 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="perl" version="&perl-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&perl-md5;</digest>
-			<archive>&packages_dir;/&perl-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&perl-directory;</base>
-		</stageinfo>
-
-		<configure command="./configure.gnu">
-			<param>--prefix=/usr</param>
-			<param>-Dpager="/bin/less -isR"</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-<!--
-		<textdump>
-			<file>/etc/hosts</file>
-			<content>=127.0.0.1 &hostname; localhost</content>
-		</textdump>
-
-		<make>
-			<param>test</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&perl-directory;</remove>
-	</stage>
-</package>
-
+  <package name="perl" version="&perl-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&perl-md5;</digest>
+        <archive>&packages_dir;/&perl-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&perl-directory;</base>
+      </stageinfo>
+      <configure command="./configure.gnu">
+        <param>--prefix=/usr</param>
+        <param>-Dpager="/bin/less -isR"</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <textdump>
+        <file>/etc/hosts</file>
+	<content>
+	=127.0.0.1 &hostname; localhost
+	</content>
+      </textdump>
+      <make>
+        <param>test</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&perl-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/procps.xml
===================================================================
--- profiles/LFS/trunk/chapter06/procps.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/procps.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,41 +1,34 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="procps" version="&procps-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&procps-md5;</digest>
-			<archive>&packages_dir;/&procps-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&procps-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&procps-directory;</remove>
-	</stage>
-</package>
-
+  <package name="procps" version="&procps-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&procps-md5;</digest>
+        <archive>&packages_dir;/&procps-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&procps-directory;</base>
+      </stageinfo>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&procps-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/psmisc.xml
===================================================================
--- profiles/LFS/trunk/chapter06/psmisc.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/psmisc.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,62 +1,52 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="psmisc" version="&psmisc-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&psmisc-md5;</digest>
-			<archive>&packages_dir;/&psmisc-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&psmisc-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--exec-prefix=""</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<move>
-			<source>/bin/pstree*</source>
-			<destination>/usr/bin</destination>
-		</move>
-
-		<link>
-			<option>force</option>
-			<target>pstree</target>
-			<name>/usr/bin/pstree.x11</name>
-		</link>
-
-		<link>
-			<option>force</option>
-			<target>killall</target>
-			<name>/bin/pidof</name>
-		</link>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&psmisc-directory;</remove>
-	</stage>
-</package>
-
+  <package name="psmisc" version="&psmisc-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&psmisc-md5;</digest>
+        <archive>&packages_dir;/&psmisc-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&psmisc-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--exec-prefix=""</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+      <move>
+        <source>/bin/pstree*</source>
+        <destination>/usr/bin</destination>
+      </move>
+      <link>
+        <option>force</option>
+        <target>pstree</target>
+        <name>/usr/bin/pstree.x11</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>killall</target>
+        <name>/bin/pidof</name>
+      </link>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&psmisc-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/pwdgroup.xml
===================================================================
--- profiles/LFS/trunk/chapter06/pwdgroup.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/pwdgroup.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,49 +1,45 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" []>
-
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[]>
 <alfs>
-
-<stage name="Creating the passwd, group, and log Files">
-	<textdump base="/etc">
-		<file>passwd</file>
-		<content>=root:x:0:0:root:/root:/bin/bash</content>
-	</textdump>
-
-	<textdump base="/etc">
-		<file>group</file>
-		<content>
-			=root:x:0:
-			=bin:x:1:
-			=sys:x:2:
-			=kmem:x:3:
-			=tty:x:4:
-			=tape:x:5:
-			=daemon:x:6:
-			=floppy:x:7:
-			=disk:x:8:
-			=lp:x:9:
-			=dialout:x:10:
-			=audio:x:11:
-			=video:x:12:
-			=utmp:x:13:
-			=usb:x:14:
-		</content>
-	</textdump>
-
-	<execute command="touch">
-		<param>/var/run/utmp</param>
-		<param>/var/log/{btmp,lastlog,wtmp}</param>
-	</execute>
-
-	<ownership base="/var" group="utmp">
-		<name>run/utmp</name>
-		<name>log/lastlog</name>
-	</ownership>
-		
-	<permissions base="/var" mode="664">
-		<name>run/utmp</name>
-		<name>log/lastlog</name>
-	</permissions>
-</stage>
-
+  <stage name="Creating the passwd, group, and log Files">
+    <textdump base="/etc">
+      <file>passwd</file>
+      <content>
+      =root:x:0:0:root:/root:/bin/bash
+      </content>
+    </textdump>
+    <textdump base="/etc">
+      <file>group</file>
+      <content>
+      =root:x:0:
+      =bin:x:1:
+      =sys:x:2:
+      =kmem:x:3:
+      =tty:x:4:
+      =tape:x:5:
+      =daemon:x:6:
+      =floppy:x:7:
+      =disk:x:8:
+      =lp:x:9:
+      =dialout:x:10:
+      =audio:x:11:
+      =video:x:12:
+      =utmp:x:13:
+      =usb:x:14:
+      </content>
+    </textdump>
+    <execute command="touch">
+      <param>/var/run/utmp</param>
+      <param>/var/log/{btmp,lastlog,wtmp}</param>
+    </execute>
+    <ownership base="/var" group="utmp">
+      <name>run/utmp</name>
+      <name>log/lastlog</name>
+    </ownership>
+    <permissions base="/var" mode="664">
+      <name>run/utmp</name>
+      <name>log/lastlog</name>
+    </permissions>
+  </stage>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/readjustingtoolchain.xml
===================================================================
--- profiles/LFS/trunk/chapter06/readjustingtoolchain.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/readjustingtoolchain.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,50 +1,43 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<stage name="Re-adjusting the Toolchain">
-  <stage name="Adjusting the Linker">
-    <stageinfo>
-      <base>&build_dir;/binutils-build</base>
-    </stageinfo>
-
-    <make>
-      <param>-C ld</param>
-      <param>INSTALL=/tools/bin/install</param>
-      <param>install</param>
-    </make>
-  </stage>
-
-  <remove>&build_dir;/&binutils-directory;</remove>
-  <remove>&build_dir;/binutils-build</remove>
-
-  <stage name="Amending the GCC specs File">
-    <search_replace>
-      <file>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</file>
-      <find> /tools/lib/&glibc-loader;</find>
-      <replace> /lib/&glibc-loader;</replace>
-    </search_replace>
-
-    <execute command="perl">
-      <param>-pi -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;'</param>
-      <param>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</param>
-    </execute>
-  </stage>
-
-<!-- Test basic functions of toolchain with:
+  <stage name="Re-adjusting the Toolchain">
+    <stage name="Adjusting the Linker">
+      <stageinfo>
+        <base>&build_dir;/binutils-build</base>
+      </stageinfo>
+      <make>
+        <param>-C ld</param>
+        <param>INSTALL=/tools/bin/install</param>
+        <param>install</param>
+      </make>
+    </stage>
+    <remove>&build_dir;/&binutils-directory;</remove>
+    <remove>&build_dir;/binutils-build</remove>
+    <stage name="Amending the GCC specs File">
+      <search_replace>
+        <file>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</file>
+        <find>/tools/lib/&glibc-loader;</find>
+        <replace>/lib/&glibc-loader;</replace>
+      </search_replace>
+      <execute command="perl">
+        <param>-pi -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;'</param>
+        <param>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</param>
+      </execute>
+    </stage>
+    <!-- Test basic functions of toolchain with:
 echo 'main(){}' > dummy.c; gcc dummy.c; readelf -l a.out | grep ': /lib';
 Output of last line s/b: [Requesting program interpreter: /lib/ld-linux.so.2]
 If so:
-	rm dummy.c a.out
+        rm dummy.c a.out
 Otherwise, STOP HERE & find & fix the problem
--->
-</stage>
-
+    -->
+  </stage>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/readline.xml
===================================================================
--- profiles/LFS/trunk/chapter06/readline.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/readline.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,78 +1,65 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="readline" version="&readline-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&readline-md5;</digest>
-			<archive>&packages_dir;/&readline-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&readline-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&readline-fixes-patch;</param>
-		</patch>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--libdir=/lib</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-			<param>SHLIB_XLDFLAGS=-lncurses</param>
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<permissions mode="755">
-			<name>/lib/libreadline.so*</name>
-			<name>/lib/libhistory.so*</name>
-		</permissions>
-
-		<move>
-			<source>/lib/libreadline.a</source>
-			<source>/lib/libhistory.a</source>
-			<destination>/usr/lib</destination>
-		</move>
-
-		<remove>/lib/libreadline.so</remove>
-		<remove>/lib/libhistory.so</remove>
-
-		<link>
-			<option>force</option>
-			<target>../../lib/libreadline.so.5</target>
-			<name>/usr/lib/libreadline.so</name>
-		</link>
-
-		<link>
-			<option>force</option>
-			<target>../../lib/libhistory.so.5</target>
-			<name>/usr/lib/libhistory.so</name>
-		</link>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&readline-directory;</remove>
-	</stage>
-</package>
-
+  <package name="readline" version="&readline-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&readline-md5;</digest>
+        <archive>&packages_dir;/&readline-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&readline-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&readline-fixes-patch;</param>
+      </patch>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libdir=/lib</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+        <param>SHLIB_XLDFLAGS=-lncurses</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+      <permissions mode="755">
+        <name>/lib/libreadline.so*</name>
+        <name>/lib/libhistory.so*</name>
+      </permissions>
+      <move>
+        <source>/lib/libreadline.a</source>
+        <source>/lib/libhistory.a</source>
+        <destination>/usr/lib</destination>
+      </move>
+      <remove>/lib/libreadline.so</remove>
+      <remove>/lib/libhistory.so</remove>
+      <link>
+        <option>force</option>
+        <target>../../lib/libreadline.so.5</target>
+        <name>/usr/lib/libreadline.so</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>../../lib/libhistory.so.5</target>
+        <name>/usr/lib/libhistory.so</name>
+      </link>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&readline-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/sed.xml
===================================================================
--- profiles/LFS/trunk/chapter06/sed.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/sed.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,51 +1,43 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="sed" version="&sed-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&sed-md5;</digest>
-			<archive>&packages_dir;/&sed-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&sed-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--bindir=/bin</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&sed-directory;</remove>
-	</stage>
-</package>
-
+  <package name="sed" version="&sed-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&sed-md5;</digest>
+        <archive>&packages_dir;/&sed-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&sed-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--bindir=/bin</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&sed-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/shadow.xml
===================================================================
--- profiles/LFS/trunk/chapter06/shadow.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/shadow.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,118 +1,96 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="shadow" version="&shadow-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&shadow-md5;</digest>
-			<archive>&packages_dir;/&shadow-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&shadow-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--libdir=/lib</param>
-			<param>--enable-shared</param>
-		</configure>
-
-		<search_replace>
-			<file>src/Makefile</file>
-			<find>groups$(EXEEXT) </find>
-			<replace></replace>
-		</search_replace>
-
-		<!--
-		  Note: the next step uses sed, because the matching
-		  lines need to be removed from the file.
-		-->
-		<execute command="sed">
-			<param>-i</param>
-			<param>-e '/groups/d'</param>
-			<param>man/Makefile</param>
-		</execute>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<copy>
-			<source>etc/limits</source>
-			<source>etc/login.access</source>
-			<destination>/etc</destination>
-		</copy>
-
-		<copy>
-			<source>etc/login.defs.linux</source>
-			<destination>/etc/login.defs</destination>
-		</copy>
-
-		<search_replace>
-			<file>/etc/login.defs</file>
-			<find>/var/spool/mail</find>
-			<replace>/var/mail</replace>
-		</search_replace>
-
-		<search_replace>
-			<file>/etc/login.defs</file>
-			<find>#MD5_CRYPT_ENAB	no</find>
-			<replace>MD5_CRYPT_ENAB	yes</replace>
-		</search_replace>
-
-		<move>
-			<source>/usr/bin/passwd</source>
-			<destination>/bin</destination>
-		</move>
-
-		<move>
-			<source>/lib/libshadow.*a</source>
-			<destination>/usr/lib</destination>
-		</move>
-
-		<remove>/lib/libshadow.so</remove>
-
-		<link>
-			<option>force</option>
-			<target>../../lib/libshadow.so.0</target>
-			<name>/usr/lib/libshadow.so</name>
-		</link>
-
-		<mkdir>
-			<name>/etc/default</name>
-		</mkdir>
-
-	</stage>
-
-	<stage name="Configuring">
-		<execute command="pwconv" />
-		<execute command="grpconv" />
-
-		<execute command="echo">
-			<param>root:&password;</param>
-			<param>| chpasswd</param>
-		</execute>
-	</stage>
-
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&shadow-directory;</remove>
-	</stage>
-</package>
-
+  <package name="shadow" version="&shadow-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&shadow-md5;</digest>
+        <archive>&packages_dir;/&shadow-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&shadow-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--libdir=/lib</param>
+        <param>--enable-shared</param>
+      </configure>
+      <search_replace>
+        <file>src/Makefile</file>
+        <find>groups$(EXEEXT)</find>
+        <replace></replace>
+      </search_replace>
+      <!--
+      Note: the next step uses sed, because the matching
+      lines need to be removed from the file.
+      -->
+      <execute command="sed">
+        <param>-i</param>
+        <param>-e '/groups/d'</param>
+        <param>man/Makefile</param>
+      </execute>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+      <copy>
+        <source>etc/limits</source>
+        <source>etc/login.access</source>
+        <destination>/etc</destination>
+      </copy>
+      <copy>
+        <source>etc/login.defs.linux</source>
+        <destination>/etc/login.defs</destination>
+      </copy>
+      <search_replace>
+        <file>/etc/login.defs</file>
+        <find>/var/spool/mail</find>
+        <replace>/var/mail</replace>
+      </search_replace>
+      <search_replace>
+        <file>/etc/login.defs</file>
+        <find>#MD5_CRYPT_ENAB no</find>
+        <replace>MD5_CRYPT_ENAB yes</replace>
+      </search_replace>
+      <move>
+        <source>/usr/bin/passwd</source>
+        <destination>/bin</destination>
+      </move>
+      <move>
+        <source>/lib/libshadow.*a</source>
+        <destination>/usr/lib</destination>
+      </move>
+      <remove>/lib/libshadow.so</remove>
+      <link>
+        <option>force</option>
+        <target>../../lib/libshadow.so.0</target>
+        <name>/usr/lib/libshadow.so</name>
+      </link>
+      <mkdir>
+        <name>/etc/default</name>
+      </mkdir>
+    </stage>
+    <stage name="Configuring">
+      <execute command="pwconv" />
+      <execute command="grpconv" />
+      <execute command="echo">
+        <param>root:&password;</param>
+        <param>| chpasswd</param>
+      </execute>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&shadow-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/strip.xml
===================================================================
--- profiles/LFS/trunk/chapter06/strip.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/strip.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" []>
-
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[]>
 <alfs>
-
-<!-- 
-	
+  <!-- 
  ************************ 
- * OPTIONAL BUT USEFULL *
+ * OPTIONAL BUT USEFUL  *
  ************************
 
  * remove the space in between the - -strip command to make the strip work
 
-<stage name="Stripping debug symbols">
-	<execute command="/tools/bin/find">
-		<param>/{,usr/,usr/local/}{bin,lib,sbin}</param>
-		<param>-type f</param>
-		<param>-exec /tools/bin/strip - -strip-debug '{}' ';'</param>	
-	</execute>
-</stage> -->
-
+  <stage name="Stripping debug symbols">
+    <execute command="/tools/bin/find">
+      <param>/{,usr/,usr/local/}{bin,lib,sbin}</param>
+      <param>-type f</param>
+      <param>-exec /tools/bin/strip - -strip-debug '{}' ';'</param>   
+    </execute>
+  </stage>
+  -->
 </alfs>

Modified: profiles/LFS/trunk/chapter06/syslog-ng.xml
===================================================================
--- profiles/LFS/trunk/chapter06/syslog-ng.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/syslog-ng.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,126 +1,117 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="syslog-ng" version="&syslog-ng-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&syslog-ng-md5;</digest>
-			<archive>&packages_dir;/&syslog-ng-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&syslog-ng-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--sysconfdir=/etc</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<mkdir>
-			<name>/etc/syslog-ng</name>
-		</mkdir>
-
-		<textdump>
-			<file>/etc/syslog-ng/syslog-ng.conf</file>
-			<content>
-				=# Begin /etc/syslog-ng/syslog-ng.conf
-				=
-				=options { 	sync (0);
-				=		time_reopen (10);
-				=		log_fifo_size (1000);
-				=		long_hostnames(off); 
-				=		use_dns (no);
-				=		use_fqdn (no);
-				=		create_dirs (no);
-				=		keep_hostname (yes);
-				=	};
-				=
-				=source src {	unix-stream("/dev/log");
-				=		internal();
-				=		pipe("/proc/kmsg");
-				=	    };
-				=
-				=destination authlog { file("/var/log/authorize.log"); };
-				=destination syslog { file("/var/log/syslog.log"); };
-				=destination cron { file("/var/log/cron.log"); };
-				=destination daemon { file("/var/log/daemon.log"); };
-				=destination kernel { file("/var/log/kernel.log"); };
-				=destination lpr { file("/var/log/lpr.log"); };
-				=destination user { file("/var/log/user.log"); };
-				=destination uucp { file("/var/log/uucp.log"); };
-				=destination mail { file("/var/log/mail.log"); };
-				=destination news { file("/var/log/news.log"); };
-				=destination debug { file("/var/log/debug.log"); };
-				=destination messages { file("/var/log/messages.log"); };
-				=destination everything { file("/var/log/everything.log"); };
-				=destination console { usertty("root"); };
-				=destination console_all { file("/dev/tty12"); };
-				=
-				=filter f_auth { facility(auth); };
-				=filter f_authpriv { facility(auth, authpriv); };
-				=filter f_syslog { not facility(authpriv, mail); };
-				=filter f_cron { facility(cron); };
-				=filter f_daemon { facility(daemon); };
-				=filter f_kernel { facility(kern); };
-				=filter f_lpr { facility(lpr); };
-				=filter f_mail { facility(mail); };
-				=filter f_news { facility(news); };
-				=filter f_user { facility(user); };
-				=filter f_uucp { facility(cron); };
-				=filter f_news { facility(news); };
-				=filter f_debug { not facility(auth, authpriv, news, mail); };
-				=filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news); };
-				=filter f_everything { level(debug..emerg) and not facility(auth, authpriv); };
-				=
-				=filter f_emergency { level(emerg); };
-				=filter f_info { level(info); };
-				=filter f_notice { level(notice); };
-				=filter f_warn { level(warn); };
-				=filter f_crit { level(crit); };
-				=filter f_err { level(err); };
-				=
-				=log { source(src); filter(f_authpriv); destination(authlog); };
-				=log { source(src); filter(f_syslog); destination(syslog); };
-				=log { source(src); filter(f_cron); destination(cron); };
-				=log { source(src); filter(f_daemon); destination(daemon); };
-				=log { source(src); filter(f_kernel); destination(kernel); };
-				=log { source(src); filter(f_lpr); destination(lpr); };
-				=log { source(src); filter(f_mail); destination(mail); };
-				=log { source(src); filter(f_news); destination(news); };
-				=log { source(src); filter(f_user); destination(user); };
-				=log { source(src); filter(f_uucp); destination(uucp); };
-				=log { source(src); filter(f_debug); destination(debug); };
-				=log { source(src); filter(f_messages); destination(messages); };
-				=log { source(src); filter(f_emergency); destination(console); };
-				=log { source(src); filter(f_everything); destination(everything); };
-				=log { source(src); destination(console_all); };
-				=
-				=# END /etc/syslog-ng/syslog-ng.conf
-			</content>
-		</textdump>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&syslog-ng-directory;</remove>
-	</stage>
-</package>
-
+  <package name="syslog-ng" version="&syslog-ng-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&syslog-ng-md5;</digest>
+        <archive>&packages_dir;/&syslog-ng-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&syslog-ng-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <mkdir>
+        <name>/etc/syslog-ng</name>
+      </mkdir>
+      <textdump>
+        <file>/etc/syslog-ng/syslog-ng.conf</file>
+        <content>
+	=# Begin /etc/syslog-ng/syslog-ng.conf 
+	= 
+	=options { sync (0); 
+	= time_reopen (10); 
+	= log_fifo_size (1000); 
+	= long_hostnames(off); 
+	= use_dns (no); 
+	= use_fqdn (no); 
+	= create_dirs (no); 
+	= keep_hostname (yes); 
+	= }; 
+	= 
+	=source src { unix-stream("/dev/log"); 
+	= internal(); 
+	= pipe("/proc/kmsg"); 
+	= }; 
+	= 
+	=destination authlog { file("/var/log/authorize.log"); }; 
+	=destination syslog { file("/var/log/syslog.log"); }; 
+	=destination cron { file("/var/log/cron.log"); }; 
+	=destination daemon { file("/var/log/daemon.log"); }; 
+	=destination kernel { file("/var/log/kernel.log"); }; 
+	=destination lpr { file("/var/log/lpr.log"); }; 
+	=destination user { file("/var/log/user.log"); }; 
+	=destination uucp { file("/var/log/uucp.log"); }; 
+	=destination mail { file("/var/log/mail.log"); }; 
+	=destination news { file("/var/log/news.log"); }; 
+	=destination debug { file("/var/log/debug.log"); }; 
+	=destination messages { file("/var/log/messages.log"); }; 
+	=destination everything { file("/var/log/everything.log"); }; 
+	=destination console { usertty("root"); }; 
+	=destination console_all { file("/dev/tty12"); }; 
+	= 
+	=filter f_auth { facility(auth); }; 
+	=filter f_authpriv { facility(auth, authpriv); }; 
+	=filter f_syslog { not facility(authpriv, mail); }; 
+	=filter f_cron { facility(cron); }; 
+	=filter f_daemon { facility(daemon); }; 
+	=filter f_kernel { facility(kern); }; 
+	=filter f_lpr { facility(lpr); }; 
+	=filter f_mail { facility(mail); }; 
+	=filter f_news { facility(news); }; 
+	=filter f_user { facility(user); }; 
+	=filter f_uucp { facility(cron); }; 
+	=filter f_news { facility(news); }; 
+	=filter f_debug { not facility(auth, authpriv, news, mail); }; 
+	=filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news); }; 
+	=filter f_everything { level(debug..emerg) and not facility(auth, authpriv); }; 
+	= 
+	=filter f_emergency { level(emerg); }; 
+	=filter f_info { level(info); }; 
+	=filter f_notice { level(notice); }; 
+	=filter f_warn { level(warn); }; 
+	=filter f_crit { level(crit); }; 
+	=filter f_err { level(err); }; 
+	= 
+	=log { source(src); filter(f_authpriv); destination(authlog); }; 
+	=log { source(src); filter(f_syslog); destination(syslog); }; 
+	=log { source(src); filter(f_cron); destination(cron); }; 
+	=log { source(src); filter(f_daemon); destination(daemon); }; 
+	=log { source(src); filter(f_kernel); destination(kernel); }; 
+	=log { source(src); filter(f_lpr); destination(lpr); }; 
+	=log { source(src); filter(f_mail); destination(mail); }; 
+	=log { source(src); filter(f_news); destination(news); }; 
+	=log { source(src); filter(f_user); destination(user); }; 
+	=log { source(src); filter(f_uucp); destination(uucp); }; 
+	=log { source(src); filter(f_debug); destination(debug); }; 
+	=log { source(src); filter(f_messages); destination(messages); }; 
+	=log { source(src); filter(f_emergency); destination(console); }; 
+	=log { source(src); filter(f_everything); destination(everything); }; 
+	=log { source(src); destination(console_all); }; 
+	= 
+	=# END /etc/syslog-ng/syslog-ng.conf
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&syslog-ng-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/sysvinit.xml
===================================================================
--- profiles/LFS/trunk/chapter06/sysvinit.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/sysvinit.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,81 +1,72 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="sysvinit" version="&sysvinit-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&sysvinit-md5;</digest>
-			<archive>&packages_dir;/&sysvinit-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&sysvinit-directory;</base>
-		</stageinfo>
-
-		<search_replace>
-			<file>src/init.c</file>
-			<find>Sending processes</find>
-			<replace>Sending processes started by init</replace>
-		</search_replace>
-
-		<make>
-			<param>&jlevel;</param>	
-			<param>-C src</param>
-		</make>
-
-		<make>
-			<param>-C src</param>
-			<param>install</param>
-		</make>
-
-		<textdump>
-			<file>/etc/inittab</file>
-			<content>
-				=# Begin /etc/inittab
-				=
-				=id:3:initdefault:
-				=
-				=si::sysinit:/etc/rc.d/init.d/rc sysinit
-				=
-				=l0:0:wait:/etc/rc.d/init.d/rc 0
-				=l1:S1:wait:/etc/rc.d/init.d/rc 1
-				=l2:2:wait:/etc/rc.d/init.d/rc 2
-				=l3:3:wait:/etc/rc.d/init.d/rc 3
-				=l4:4:wait:/etc/rc.d/init.d/rc 4
-				=l5:5:wait:/etc/rc.d/init.d/rc 5
-				=l6:6:wait:/etc/rc.d/init.d/rc 6
-				=
-				=ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
-				=
-				=su:S016:once:/sbin/sulogin
-				=
-				=1:2345:respawn:/sbin/agetty -I '\033(K' tty1 9600
-				=2:2345:respawn:/sbin/agetty -I '\033(K' tty2 9600
-				=3:2345:respawn:/sbin/agetty -I '\033(K' tty3 9600
-				=4:2345:respawn:/sbin/agetty -I '\033(K' tty4 9600
-				=5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600
-				=6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600
-				=
-				=# End /etc/inittab
-			</content>
-		</textdump>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&sysvinit-directory;</remove>
-	</stage>
-</package>
-
+  <package name="sysvinit" version="&sysvinit-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&sysvinit-md5;</digest>
+        <archive>&packages_dir;/&sysvinit-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&sysvinit-directory;</base>
+      </stageinfo>
+      <search_replace>
+        <file>src/init.c</file>
+        <find>Sending processes</find>
+        <replace>Sending processes started by init</replace>
+      </search_replace>
+      <make>
+        <param>&jlevel;</param>
+        <param>-C src</param>
+      </make>
+      <make>
+        <param>-C src</param>
+        <param>install</param>
+      </make>
+      <textdump>
+        <file>/etc/inittab</file>
+        <content>
+	=# Begin /etc/inittab 
+	= 
+	=id:3:initdefault: 
+	= 
+	=si::sysinit:/etc/rc.d/init.d/rc sysinit 
+	= 
+	=l0:0:wait:/etc/rc.d/init.d/rc 0 
+	=l1:S1:wait:/etc/rc.d/init.d/rc 1 
+	=l2:2:wait:/etc/rc.d/init.d/rc 2 
+	=l3:3:wait:/etc/rc.d/init.d/rc 3 
+	=l4:4:wait:/etc/rc.d/init.d/rc 4 
+	=l5:5:wait:/etc/rc.d/init.d/rc 5 
+	=l6:6:wait:/etc/rc.d/init.d/rc 6 
+	= 
+	=ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now 
+	= 
+	=su:S016:once:/sbin/sulogin 
+	= 
+	=1:2345:respawn:/sbin/agetty -I '\033(K' tty1 9600 
+	=2:2345:respawn:/sbin/agetty -I '\033(K' tty2 9600 
+	=3:2345:respawn:/sbin/agetty -I '\033(K' tty3 9600 
+	=4:2345:respawn:/sbin/agetty -I '\033(K' tty4 9600 
+	=5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600 
+	=6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600 
+	= 
+	=# End /etc/inittab
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&sysvinit-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/tar.xml
===================================================================
--- profiles/LFS/trunk/chapter06/tar.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/tar.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,52 +1,44 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="tar" version="&tar-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&tar-md5;</digest>
-			<archive>&packages_dir;/&tar-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&tar-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--bindir=/bin</param>
-			<param>--libexecdir=/usr/sbin</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&tar-directory;</remove>
-	</stage>
-</package>
-
+  <package name="tar" version="&tar-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&tar-md5;</digest>
+        <archive>&packages_dir;/&tar-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&tar-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--bindir=/bin</param>
+        <param>--libexecdir=/usr/sbin</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&tar-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/texinfo.xml
===================================================================
--- profiles/LFS/trunk/chapter06/texinfo.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/texinfo.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,55 +1,46 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="texinfo" version="&texinfo-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&texinfo-md5;</digest>
-			<archive>&packages_dir;/&texinfo-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&texinfo-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>	
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<make>
-			<param>TEXMF=/usr/share/texmf</param>
-			<param>install-tex</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&texinfo-directory;</remove>
-	</stage>
-</package>
-
+  <package name="texinfo" version="&texinfo-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&texinfo-md5;</digest>
+        <archive>&packages_dir;/&texinfo-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&texinfo-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+      <make>
+        <param>TEXMF=/usr/share/texmf</param>
+        <param>install-tex</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&texinfo-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/udev.xml
===================================================================
--- profiles/LFS/trunk/chapter06/udev.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/udev.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,56 +1,47 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="udev" version="&udev-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&udev-md5;</digest>
-			<archive>&packages_dir;/&udev-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&udev-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>&jlevel;</param>	
-		  	<param>udevdir=/dev</param>
-		</make>
-
-		<make>
-			<param>udevdir=/dev</param>
-			<param>install</param>
-		</make>
-
-		<copy base="&packages_dir;">
-        		<option>force</option>
-        		<source>&udev-permissions-file;</source>
-        		<destination>/etc/udev/permissions.d/25-lfs.permissions</destination>
-		</copy>
-
-		<copy base="&packages_dir;">
-        		<option>force</option>
-        		<source>&udev-rules-file;</source>
-        		<destination>/etc/udev/rules.d/25-lfs.rules</destination>
-		</copy>
-
-		<execute command="/sbin/udevstart" />	
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&udev-directory;</remove>
-	</stage>
-</package>
-
+  <package name="udev" version="&udev-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&udev-md5;</digest>
+        <archive>&packages_dir;/&udev-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&udev-directory;</base>
+      </stageinfo>
+      <make>
+        <param>&jlevel;</param>
+        <param>udevdir=/dev</param>
+      </make>
+      <make>
+        <param>udevdir=/dev</param>
+        <param>install</param>
+      </make>
+      <copy base="&packages_dir;">
+        <option>force</option>
+        <source>&udev-permissions-file;</source>
+        <destination>/etc/udev/permissions.d/25-lfs.permissions</destination>
+      </copy>
+      <copy base="&packages_dir;">
+        <option>force</option>
+        <source>&udev-rules-file;</source>
+        <destination>/etc/udev/rules.d/25-lfs.rules</destination>
+      </copy>
+      <execute command="/sbin/udevstart" />
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&udev-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/util-linux.xml
===================================================================
--- profiles/LFS/trunk/chapter06/util-linux.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/util-linux.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,63 +1,53 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="util-linux" version="&util-linux-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&util-linux-md5;</digest>
-			<archive>&packages_dir;/&util-linux-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&util-linux-directory;</base>
-		</stageinfo>
-
-		<search_replace>
-			<file>hwclock/hwclock.c</file>
-			<find>etc/adjtime</find>
-			<replace>var/lib/hwclock/adjtime</replace>
-		</search_replace>
-
-		<mkdir>
-			<option>parents</option>
-			<name>/var/lib/hwclock</name>
-		</mkdir>
- 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&util-linux-cramfs-patch;</param>
-		</patch>
-
-		<configure />
-
-		<make>
-			<param>&jlevel;</param>
-			<param>HAVE_KILL=yes</param>
-			<param>HAVE_SLN=yes</param>
-		</make>
-
-		<make>
-			<param>HAVE_KILL=yes</param>
-			<param>HAVE_SLN=yes</param>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&util-linux-directory;</remove>
-	</stage>
-</package>
-
+  <package name="util-linux" version="&util-linux-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&util-linux-md5;</digest>
+        <archive>&packages_dir;/&util-linux-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&util-linux-directory;</base>
+      </stageinfo>
+      <search_replace>
+        <file>hwclock/hwclock.c</file>
+        <find>etc/adjtime</find>
+        <replace>var/lib/hwclock/adjtime</replace>
+      </search_replace>
+      <mkdir>
+        <option>parents</option>
+        <name>/var/lib/hwclock</name>
+      </mkdir>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&util-linux-cramfs-patch;</param>
+      </patch>
+      <configure />
+      <make>
+        <param>&jlevel;</param>
+        <param>HAVE_KILL=yes</param>
+        <param>HAVE_SLN=yes</param>
+      </make>
+      <make>
+        <param>HAVE_KILL=yes</param>
+        <param>HAVE_SLN=yes</param>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&util-linux-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/vim.xml
===================================================================
--- profiles/LFS/trunk/chapter06/vim.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/vim.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,94 +1,81 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="vim" version="&vim-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&vim-md5;</digest>
-			<archive>&packages_dir;/&vim-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-		<unpack>
-			<digest>&vim-lang-md5;</digest>
-			<archive>&packages_dir;/&vim-lang-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&vim-directory;</base>
-		</stageinfo>
-
-		<textdump mode="append">
-			<file>src/feature.h</file>
-			<content>
-				=#define SYS_VIMRC_FILE "/etc/vimrc"
-				=#define SYS_GVIMRC_FILE "/etc/gvimrc"
-			</content>
-		</textdump>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&vim-security-patch;</param>
-		</patch>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--enable-multibyte</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>test</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<link>
-			<option>force</option>
-			<target>vim</target>
-			<name>/usr/bin/vi</name>
-		</link>
-
-		<textdump>
-			<file>/etc/vimrc</file>
-			<content>
-				=" Begin /etc/vimrc
-				=
-				=set nocompatible
-				=set backspace=2
-				=syntax on
-				=
-				=if (&real-amp;term == "iterm") || (&real-amp;term == "putty")
-				=  set background=dark
-				=endif
-				=
-				=" End /etc/vimrc
-			</content>
-		</textdump>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&vim-directory;</remove>
-	</stage>
-</package>
-
+  <package name="vim" version="&vim-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&vim-md5;</digest>
+        <archive>&packages_dir;/&vim-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <digest>&vim-lang-md5;</digest>
+        <archive>&packages_dir;/&vim-lang-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&vim-directory;</base>
+      </stageinfo>
+      <textdump mode="append">
+        <file>src/feature.h</file>
+        <content>
+	=#define SYS_VIMRC_FILE "/etc/vimrc"
+	=#define SYS_GVIMRC_FILE "/etc/gvimrc"
+	</content>
+      </textdump>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&vim-security-patch;</param>
+      </patch>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--enable-multibyte</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>test</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+      <link>
+        <option>force</option>
+        <target>vim</target>
+        <name>/usr/bin/vi</name>
+      </link>
+      <textdump>
+        <file>/etc/vimrc</file>
+        <content>
+	=" Begin /etc/vimrc
+	=
+	=set nocompatible
+	=set backspace=2
+	=syntax on
+	=
+	=if (&real-amp;term == "iterm") || (&real-amp;term == "putty")
+	= set background=dark
+	=endif
+	=
+	=" End /etc/vimrc
+        </content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&vim-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter06/zlib.xml
===================================================================
--- profiles/LFS/trunk/chapter06/zlib.xml	2005-02-06 19:25:33 UTC (rev 1713)
+++ profiles/LFS/trunk/chapter06/zlib.xml	2005-02-06 19:42:16 UTC (rev 1714)
@@ -1,82 +1,66 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="zlib" version="&zlib-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&zlib-md5;</digest>
-			<archive>&packages_dir;/&zlib-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&zlib-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--shared</param>
-			<param>--libdir=/lib</param>
-		</configure>
-
-		<make />
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<remove>/lib/libz.so</remove>
-
-		<link>
-			<option>force</option>
-			<target>../../lib/libz.so.&zlib-version;</target>
-			<name>/usr/lib/libz.so</name>
-		</link>
-
-		<make>
-			<param>clean</param>
-		</make>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<permissions mode="644">
-			<name>/usr/lib/libz.a</name>
-		</permissions>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&zlib-directory;</remove>
-	</stage>
-</package>
-
+  <package name="zlib" version="&zlib-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&zlib-md5;</digest>
+        <archive>&packages_dir;/&zlib-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&zlib-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--shared</param>
+        <param>--libdir=/lib</param>
+      </configure>
+      <make />
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+      <remove>/lib/libz.so</remove>
+      <link>
+        <option>force</option>
+        <target>../../lib/libz.so.&zlib-version;</target>
+        <name>/usr/lib/libz.so</name>
+      </link>
+      <make>
+        <param>clean</param>
+      </make>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+      <permissions mode="644">
+        <name>/usr/lib/libz.a</name>
+      </permissions>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&zlib-directory;</remove>
+    </stage>
+  </package>
 </alfs>




More information about the alfs-log mailing list