r1462 - in profiles/BLFS/trunk: chapter11 chapter12

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Sun Jul 18 16:21:31 PDT 2004


Author: thomasp
Date: 2004-07-18 17:21:29 -0600 (Sun, 18 Jul 2004)
New Revision: 1462

Modified:
   profiles/BLFS/trunk/chapter11/cpio.xml
   profiles/BLFS/trunk/chapter11/fcron.xml
   profiles/BLFS/trunk/chapter11/gpm.xml
   profiles/BLFS/trunk/chapter11/hdparm.xml
   profiles/BLFS/trunk/chapter11/mc.xml
   profiles/BLFS/trunk/chapter11/pciutils.xml
   profiles/BLFS/trunk/chapter11/pkgconfig.xml
   profiles/BLFS/trunk/chapter11/unzip.xml
   profiles/BLFS/trunk/chapter11/which.xml
   profiles/BLFS/trunk/chapter11/zip.xml
   profiles/BLFS/trunk/chapter12/gcc-full.xml
   profiles/BLFS/trunk/chapter12/gcc295.xml
   profiles/BLFS/trunk/chapter12/gnat.xml
   profiles/BLFS/trunk/chapter12/j2sdk.xml
   profiles/BLFS/trunk/chapter12/librep.xml
   profiles/BLFS/trunk/chapter12/nasm.xml
   profiles/BLFS/trunk/chapter12/perlmodules.xml
   profiles/BLFS/trunk/chapter12/python.xml
   profiles/BLFS/trunk/chapter12/ruby.xml
   profiles/BLFS/trunk/chapter12/tcl.xml
   profiles/BLFS/trunk/chapter12/tk.xml
Log:
tidied chapters 11 & 12

Modified: profiles/BLFS/trunk/chapter11/cpio.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/cpio.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter11/cpio.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch11.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,40 +10,31 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="cpio" version="&cpio-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&cpio-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&cpio-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--libexec=/tmp/cpio</param>
-			<param>--bindir=/bin</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-		<remove>/tmp/cpio</remove>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&cpio-directory;</remove>
-	</stage>
-
-</package>
+  <package name="cpio" version="&cpio-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&cpio-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&cpio-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libexec=/tmp/cpio</param>
+        <param>--bindir=/bin</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <remove>/tmp/cpio</remove>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&cpio-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter11/fcron.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/fcron.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter11/fcron.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch11.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,91 +10,90 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="fcron" version="&fcron-version;">
-
-        <packageinfo>
-                <utilizes><name>sendmail</name></utilizes>
-                <utilizes><name>postfix</name></utilizes>
-                <utilizes><name>qmail</name></utilizes>
-                <utilizes><name>exim</name></utilizes>
-                <utilizes><name>courier</name></utilizes>
-                <utilizes><name>linuxpam</name></utilizes>
-                <utilizes><name>openjade</name></utilizes>
-                <utilizes><name>docbook-dsssl</name></utilizes>
-        </packageinfo>
-
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&fcron-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Creating user and group">
-		<execute command="groupadd">
-			<param>-f</param>
-			<param>fcron</param>
-		</execute>
-
-		<execute command="grep -q ^fcron /etc/passwd || useradd">
-		        <param>-c fcron</param>
-			<param>-d /dev/null</param>
-			<param>-g fcron</param>
-			<param>-s /bin/false</param>
-			<param>fcron</param>
-		</execute>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&fcron-directory;</base>
-		</stageinfo>
-
-		<textdump>
-		    <file>/etc/syslog.conf</file>
-		    <content>
-		    =# Begin fcron addition to /etc/syslog.conf
-		    =
-		    =cron.* -/var/log/cron.log
-		    =
-		    =# End fcron addition
-		    </content>
-		</textdump>
-
-		<execute command="/etc/rc.d/init.d/sysklogd">
-			<param>reload</param>
-		</execute>
-
-		<configure>
-			<param>--without-sendmail</param>
-			<param>--with-answer-all=no</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-fcron</param>
-		</make>
-	</stage>
-
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&fcron-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-
-</package>
+  <package name="fcron" version="&fcron-version;">
+    <packageinfo>
+      <utilizes>
+        <name>sendmail</name>
+      </utilizes>
+      <utilizes>
+        <name>postfix</name>
+      </utilizes>
+      <utilizes>
+        <name>qmail</name>
+      </utilizes>
+      <utilizes>
+        <name>exim</name>
+      </utilizes>
+      <utilizes>
+        <name>courier</name>
+      </utilizes>
+      <utilizes>
+        <name>linuxpam</name>
+      </utilizes>
+      <utilizes>
+        <name>openjade</name>
+      </utilizes>
+      <utilizes>
+        <name>docbook-dsssl</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&fcron-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Creating user and group">
+      <execute command="groupadd">
+        <param>-f</param>
+        <param>fcron</param>
+      </execute>
+      <execute command="grep -q ^fcron /etc/passwd || useradd">
+        <param>-c fcron</param>
+        <param>-d /dev/null</param>
+        <param>-g fcron</param>
+        <param>-s /bin/false</param>
+        <param>fcron</param>
+      </execute>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&fcron-directory;</base>
+      </stageinfo>
+      <textdump>
+        <file>/etc/syslog.conf</file>
+        <content>
+	  =# Begin fcron addition to /etc/syslog.conf
+	  =
+	  =cron.* -/var/log/cron.log
+	  =
+	  =# End fcron addition
+	</content>
+      </textdump>
+      <execute command="/etc/rc.d/init.d/sysklogd">
+        <param>reload</param>
+      </execute>
+      <configure>
+        <param>--without-sendmail</param>
+        <param>--with-answer-all=no</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-fcron</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&fcron-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter11/gpm.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/gpm.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter11/gpm.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch11.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,84 +10,66 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gpm" version="&gpm-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gpm-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gpm-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&gpm-patch1;</param>
-		</patch>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&gpm-patch2;</param>
-		</patch>
-
-		<configure>
-			<prefix>LDFLAGS='-lm'</prefix>
-			<param>--prefix=/usr</param>
-			<param>--sysconfdir=/etc</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<copy base="./conf">
-			<option>force</option>
-			<source>gpm-root.conf</source>
-			<destination>/etc</destination>
-		</copy>
-
-		&ldconfig;
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-gpm</param>
-		</make>
-
-		<textdump base="/etc/sysconfig">
-			<file>mouse</file>
-			<content>
-				=# Begin /etc/sysconfig/mouse
-				=MDEVICE=&mouse_device;
-				=PROTOCOL=&mouse_protocol;
-				=# End /etc/sysconfig/mouse
-			</content>
-		</textdump>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gpm-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-
-</package>
+  <package name="gpm" version="&gpm-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gpm-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+    <stageinfo>
+      <base>&build_dir;/&gpm-directory;</base>
+    </stageinfo>
+    <patch>
+      <param>-N</param>
+      <param>-p1</param>
+      <param>-i &packages_dir;/&gpm-patch1;</param>
+    </patch>
+    <patch>
+      <param>-N</param>
+      <param>-p1</param>
+      <param>-i &packages_dir;/&gpm-patch2;</param>
+    </patch>
+    <configure>
+      <prefix>LDFLAGS='-lm'</prefix>
+      <param>--prefix=/usr</param>
+      <param>--sysconfdir=/etc</param>
+    </configure>
+    <make />
+    <make>
+      <param>install</param>
+    </make>
+    <copy base="./conf">
+      <option>force</option>
+      <source>gpm-root.conf</source>
+      <destination>/etc</destination>
+    </copy>&ldconfig;</stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-gpm</param>
+      </make>
+      <textdump base="/etc/sysconfig">
+        <file>mouse</file>
+        <content>
+	  =# Begin /etc/sysconfig/mouse
+	  =MDEVICE=&mouse_device;
+	  =PROTOCOL=&mouse_protocol;
+	  =# End /etc/sysconfig/mouse
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gpm-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter11/hdparm.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/hdparm.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter11/hdparm.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch11.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,40 +10,31 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="hdparm" version="&hdparm-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&hdparm-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&hdparm-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&hdparm-patch1;</param>
-		</patch>
-
-		<make/>
-
-		<make>
-			<param>binprefix=/usr</param>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&hdparm-directory;</remove>
-	</stage>
-
-</package>
+  <package name="hdparm" version="&hdparm-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&hdparm-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&hdparm-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&hdparm-patch1;</param>
+      </patch>
+      <make />
+      <make>
+        <param>binprefix=/usr</param>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&hdparm-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter11/mc.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/mc.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter11/mc.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch11.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,46 +10,48 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="mc" version="&mc-version;">
-
-        <packageinfo>
-                <requires><name>glib2</name></requires>
-                <utilizes><name>xfree86</name></utilizes>
-                <utilizes><name>samba</name></utilizes>
-                <utilizes><name>slang</name></utilizes>
-                <utilizes><name>zip</name></utilizes>
-                <utilizes><name>unzip</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&mc-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&mc-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&mc-directory;</remove>
-	</stage>
-
-</package>
+  <package name="mc" version="&mc-version;">
+    <packageinfo>
+      <requires>
+        <name>glib2</name>
+      </requires>
+      <utilizes>
+        <name>xfree86</name>
+      </utilizes>
+      <utilizes>
+        <name>samba</name>
+      </utilizes>
+      <utilizes>
+        <name>slang</name>
+      </utilizes>
+      <utilizes>
+        <name>zip</name>
+      </utilizes>
+      <utilizes>
+        <name>unzip</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&mc-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&mc-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&mc-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter11/pciutils.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/pciutils.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter11/pciutils.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch11.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,40 +10,33 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="pciutils" version="&pciutils-version;">
-
-        <packageinfo>
-                <requires><name>which</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&pciutils-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&pciutils-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>PREFIX=/usr</param>
-		</make>
-
-		<make>
-			<param>PREFIX=/usr</param>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&pciutils-directory;</remove>
-	</stage>
-
-</package>
+  <package name="pciutils" version="&pciutils-version;">
+    <packageinfo>
+      <requires>
+        <name>which</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&pciutils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&pciutils-directory;</base>
+      </stageinfo>
+      <make>
+        <param>PREFIX=/usr</param>
+      </make>
+      <make>
+        <param>PREFIX=/usr</param>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&pciutils-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter11/pkgconfig.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/pkgconfig.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter11/pkgconfig.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch11.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,37 +10,28 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="pkgconfig" version="&pkgconfig-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&pkgconfig-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&pkgconfig-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&pkgconfig-directory;</remove>
-	</stage>
-
-</package>
+  <package name="pkgconfig" version="&pkgconfig-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&pkgconfig-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&pkgconfig-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&pkgconfig-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter11/unzip.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/unzip.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter11/unzip.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch11.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,70 +10,57 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="unzip" version="&unzip-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&unzip-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&unzip-directory;</base>
-		</stageinfo>
-
-		<patch>
-		        <param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&unzip-patch1;</param>
-		</patch>
-
-		<patch>
-		        <param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&unzip-patch2;</param>
-		</patch>
-
-		<patch>
-		        <param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&unzip-patch3;</param>
-		</patch>
-
-		<copy>
-			<source>unix/Makefile</source>
-			<destination>.</destination>
-		</copy>
-
-		<make>
-		        <param>prefix=/usr</param>
-		        <param>linux</param>
-		</make>
-
-		<make>
-		        <param>prefix=/usr</param>
-		        <param>linux_shlibz</param>
-		</make>
-
-		<make>
-		        <param>prefix=/usr</param>
-			<param>install</param>
-		</make>
-
-		<copy>
-		        <option>archive</option>
-			<source>libunzip.so*</source>
-			<destination>/usr/lib</destination>
-		</copy>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&unzip-directory;</remove>
-	</stage>
-
-</package>
+  <package name="unzip" version="&unzip-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&unzip-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&unzip-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&unzip-patch1;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&unzip-patch2;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&unzip-patch3;</param>
+      </patch>
+      <copy>
+        <source>unix/Makefile</source>
+        <destination>.</destination>
+      </copy>
+      <make>
+        <param>prefix=/usr</param>
+        <param>linux</param>
+      </make>
+      <make>
+        <param>prefix=/usr</param>
+        <param>linux_shlibz</param>
+      </make>
+      <make>
+        <param>prefix=/usr</param>
+        <param>install</param>
+      </make>
+      <copy>
+        <option>archive</option>
+        <source>libunzip.so*</source>
+        <destination>/usr/lib</destination>
+      </copy>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&unzip-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter11/which.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/which.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter11/which.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch11.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,37 +10,28 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="which" version="&which-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&which-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&which-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&which-directory;</remove>
-	</stage>
-
-</package>
+  <package name="which" version="&which-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&which-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&which-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&which-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter11/zip.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/zip.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter11/zip.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch11.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,42 +10,33 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="zip" version="&zip-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&zip-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&zip-directory;</base>
-		</stageinfo>
-
-		<copy>
-			<source>unix/Makefile</source>
-			<destination>.</destination>
-		</copy>
-
-		<make>
-		        <param>prefix=/usr</param>
-		        <param>generic_gcc</param>
-		</make>
-
-		<make>
-		        <param>prefix=/usr</param>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&zip-directory;</remove>
-	</stage>
-
-</package>
+  <package name="zip" version="&zip-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&zip-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&zip-directory;</base>
+      </stageinfo>
+      <copy>
+        <source>unix/Makefile</source>
+        <destination>.</destination>
+      </copy>
+      <make>
+        <param>prefix=/usr</param>
+        <param>generic_gcc</param>
+      </make>
+      <make>
+        <param>prefix=/usr</param>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&zip-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter12/gcc-full.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/gcc-full.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter12/gcc-full.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch12.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,92 +10,79 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gcc-full" version="&gcc-full-version;">
-
-        <packageinfo>
-                <requires><name>tcsh</name></requires>
-                <requires><name>gnat</name></requires>
-        </packageinfo>
-
-	
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gcc-full-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<mkdir>
-		        <name>&build_dir;/gcc-build</name>
-		</mkdir>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-			        <variable name="CC">/usr/bin/gcc</variable>
-			        <variable name="CFLAGS" />
-			        <variable name="CXXFLAGS" />
-			        <variable name="PATH">/opt/gnat/bin:/bin:/usr/bin:/usr/local/bin</variable>
-			</environment>
-			<base>&build_dir;/gcc-build</base>
-		</stageinfo>
-
-		<patch base="&build_dir;/&gcc-full-directory;">
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&gcc-full-patch1;</param>
-		</patch>
-
-		<search_replace base="&build_dir;/&gcc-full-directory;">
-			<file>libiberty/Makefile.in</file>
-			<find>install_to_$(INSTALL_DEST) </find>
-			<replace> </replace>
-		</search_replace>
-
-		<execute base="&build_dir;/&gcc-full-directory;/gcc/ada"
-		        command="touch">
-			<param>treeprs.ads</param>
-			<param>[es]info.h</param>
-			<param>nmake.ad[bs]</param>
-		</execute>
-
-		<configure command="../&gcc-full-directory;/configure">
-			<prefix>CC=/usr/bin/gcc</prefix>
-		        <param>--prefix=/usr</param>
-			<param>--enable-shared</param>
-			<param>--enable-languages=c,c++,objc,f77,ada,java</param>
-			<param>--enable-threads=posix</param>
-			<param>--enable-__cxa_atexit</param>
-			<param>--enable-clocale=gnu</param>
-		</configure>
-
-		<make>
-		        <param>bootstrap</param>
-		</make>
-
-		<make>
-		        <param>-C gcc</param>
-		        <param>gnatlib_and_tools</param>
-		</make>
-
-		<make>
-		        <param>install</param>
-		</make>
-
-		<link>
-		        <option>force</option>
-		        <target>g77</target>
-			<name>/usr/bin/f77</name>
-		</link>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gcc-full-directory;</remove>
-		<remove>&build_dir;/gcc-build</remove>
-		<remove>/opt/gnat</remove>
-	</stage>
-
-</package>
+  <package name="gcc-full" version="&gcc-full-version;">
+    <packageinfo>
+      <requires>
+        <name>tcsh</name>
+      </requires>
+      <requires>
+        <name>gnat</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gcc-full-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <mkdir>
+        <name>&build_dir;/gcc-build</name>
+      </mkdir>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="CC">/usr/bin/gcc</variable>
+          <variable name="CFLAGS" />
+          <variable name="CXXFLAGS" />
+          <variable name="PATH">/opt/gnat/bin:/bin:/usr/bin:/usr/local/bin</variable>
+        </environment>
+        <base>&build_dir;/gcc-build</base>
+      </stageinfo>
+      <patch base="&build_dir;/&gcc-full-directory;">
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&gcc-full-patch1;</param>
+      </patch>
+      <search_replace base="&build_dir;/&gcc-full-directory;">
+        <file>libiberty/Makefile.in</file>
+        <find>install_to_$(INSTALL_DEST)</find>
+        <replace></replace>
+      </search_replace>
+      <execute base="&build_dir;/&gcc-full-directory;/gcc/ada" command="touch">
+        <param>treeprs.ads</param>
+        <param>[es]info.h</param>
+        <param>nmake.ad[bs]</param>
+      </execute>
+      <configure command="../&gcc-full-directory;/configure">
+        <prefix>CC=/usr/bin/gcc</prefix>
+        <param>--prefix=/usr</param>
+        <param>--enable-shared</param>
+        <param>--enable-languages=c,c++,objc,f77,ada,java</param>
+        <param>--enable-threads=posix</param>
+        <param>--enable-__cxa_atexit</param>
+        <param>--enable-clocale=gnu</param>
+      </configure>
+      <make>
+        <param>bootstrap</param>
+      </make>
+      <make>
+        <param>-C gcc</param>
+        <param>gnatlib_and_tools</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+      <link>
+        <option>force</option>
+        <target>g77</target>
+        <name>/usr/bin/f77</name>
+      </link>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gcc-full-directory;</remove>
+      <remove>&build_dir;/gcc-build</remove>
+      <remove>/opt/gnat</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter12/gcc295.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/gcc295.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter12/gcc295.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch12.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,73 +10,60 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gcc295" version="&gcc295-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gcc295-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-		<mkdir>
-		        <name>&build_dir;/gcc-build</name>
-		</mkdir>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/gcc-build</base>
-		</stageinfo>
-
-		<patch base="&build_dir;/&gcc295-directory;">
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&gcc295-patch1;</param>
-		</patch>
-
-		<patch base="&build_dir;/&gcc295-directory;">
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&gcc295-patch2;</param>
-		</patch>
-
-		<patch base="&build_dir;/&gcc295-directory;">
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&gcc295-patch3;</param>
-		</patch>
-
-		<configure command="../&gcc295-directory;/configure">
-		        <param>--prefix=/opt/gcc-&gcc295-version;</param>
-			<param>--enable-shared</param>
-			<param>--enable-languages=c,c++</param>
-			<param>--enable-threads=posix</param>
-		</configure>
-
-		<make>
-		        <param>bootstrap</param>
-		</make>
-
-		<make>
-		        <param>install</param>
-		</make>
-
-		<execute command="L=`find /opt/gcc-&gcc295-version;/lib -name '*libstdc++*.so' -type f` &real-amp;&real-amp;">
-			<param>IL=`basename $L` &real-amp;&real-amp;</param>
-			<param>for i in /opt/gcc-&gcc295-version;/lib/*.so*;</param>
-			<param>do mv -f $i /usr/lib;ln -sf /usr/lib/`basename $i` /opt/gcc-&gcc295-version;/lib; done &real-amp;&real-amp;</param>
-			<param>ln -sf $IL /usr/lib/libstdc++-libc6.1-1.so.2 &real-amp;&real-amp;</param>
-			<param>ln -sf $IL /usr/lib/libstdc++-libc6.2-2.so.3 &real-amp;&real-amp;</param>
-			<param>ln -sf $IL /usr/lib/libstdc++-libc6.3-2.so.3</param>
-		</execute>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gcc295-directory;</remove>
-		<remove>&build_dir;/gcc-build</remove>
-	</stage>
-
-</package>
+  <package name="gcc295" version="&gcc295-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gcc295-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <mkdir>
+        <name>&build_dir;/gcc-build</name>
+      </mkdir>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/gcc-build</base>
+      </stageinfo>
+      <patch base="&build_dir;/&gcc295-directory;">
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&gcc295-patch1;</param>
+      </patch>
+      <patch base="&build_dir;/&gcc295-directory;">
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&gcc295-patch2;</param>
+      </patch>
+      <patch base="&build_dir;/&gcc295-directory;">
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&gcc295-patch3;</param>
+      </patch>
+      <configure command="../&gcc295-directory;/configure">
+        <param>--prefix=/opt/gcc-&gcc295-version;</param>
+        <param>--enable-shared</param>
+        <param>--enable-languages=c,c++</param>
+        <param>--enable-threads=posix</param>
+      </configure>
+      <make>
+        <param>bootstrap</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+      <execute command="L=`find /opt/gcc-&gcc295-version;/lib -name '*libstdc++*.so' -type f` &real-amp;&real-amp;">
+        <param>IL=`basename $L` &real-amp;&real-amp;</param>
+        <param>for i in /opt/gcc-&gcc295-version;/lib/*.so*;</param>
+        <param>do mv -f $i /usr/lib;ln -sf /usr/lib/`basename $i` /opt/gcc-&gcc295-version;/lib; done &real-amp;&real-amp;</param>
+        <param>ln -sf $IL /usr/lib/libstdc++-libc6.1-1.so.2 &real-amp;&real-amp;</param>
+        <param>ln -sf $IL /usr/lib/libstdc++-libc6.2-2.so.3 &real-amp;&real-amp;</param>
+        <param>ln -sf $IL /usr/lib/libstdc++-libc6.3-2.so.3</param>
+      </execute>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gcc295-directory;</remove>
+      <remove>&build_dir;/gcc-build</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter12/gnat.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/gnat.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter12/gnat.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch12.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,41 +10,33 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gnat" version="&gnat-version;">
-	
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gnat-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gnat-directory;</base>
-		</stageinfo>
-
-		<textdump base="/tmp">
-		        <file>gnat_reply</file>
-
-			<content>
-			        =
-			        =3
-				=/opt/gnat
-				=
-			</content>
-		</textdump>
-
-		<execute command="./doconfig < /tmp/gnat_reply" />
-
-		<execute command="./doinstall" />
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gnat-directory;</remove>
-		<remove>/tmp/gnat_reply</remove>
-	</stage>
-</package>
+  <package name="gnat" version="&gnat-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gnat-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gnat-directory;</base>
+      </stageinfo>
+      <textdump base="/tmp">
+        <file>gnat_reply</file>
+        <content>
+	  =
+	  =3
+	  =/opt/gnat
+	  =
+	</content>
+      </textdump>
+      <execute command="./doconfig < /tmp/gnat_reply" />
+      <execute command="./doinstall" />
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gnat-directory;</remove>
+      <remove>/tmp/gnat_reply</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter12/j2sdk.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/j2sdk.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter12/j2sdk.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch12.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,157 +10,128 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="j2sdk-binary" version="&j2sdk-binary-version;">
-
-	<stage name="Unpacking">
-		<stageinfo>
-			<base>&build_dir;</base>
-		</stageinfo>
-
-		<mkdir>
-			<name>java-build</name>
-		</mkdir>
-
-		<copy>
-			<source>&packages_dir;/&j2sdk-binary-package;</source>
-			<destination>&build_dir;/java-build</destination>
-		</copy>
-
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/java-build</base>
-		</stageinfo>
-
-		<execute command="sed">
-			<param>-i</param>
-			<param>"s:^PATH=.*::"</param>
-			<param>&j2sdk-binary-package;</param>
-		</execute>
-
-		<permissions mode="711">
-		        <name>&j2sdk-binary-package;</name>
-		</permissions>
-
-		<mkdir>
-			<option>parents</option>
-			<name>bin</name>
-		</mkdir>
-
-		<link>
-			<option>force</option>
-			<target>/bin/true</target>
-			<name>bin/more</name>
-		</link>
-
-		<execute command="yes | PATH=$PWD/bin:$PATH ./&j2sdk-binary-package;" />
-
-		<mkdir>
-			<option>parents</option>
-			<name>/opt/j2sdk/j2sdk-precompiled-&j2sdk-binary-norev-version;</name>
-		</mkdir>
-
-		<move base="&build_dir;/java-build/&j2sdk-binary-directory;">
-		        <option>force</option>
-		        <source>*</source>
-			<destination>/opt/j2sdk/j2sdk-precompiled-&j2sdk-binary-norev-version;</destination>
-		</move>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/java-build/&j2sdk-binary-package;</remove>
-		<remove>&build_dir;/java-build/&j2sdk-binary-directory;</remove>
-	</stage>
-
-</package>
-
-<package name="j2sdk-src" version="&j2sdk-src-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&j2sdk-src-package;</archive>
-			<destination>&build_dir;/java-build</destination>
-		</unpack>
-		<unpack>
-			<archive>&packages_dir;/&j2sdk-src-bin-package;</archive>
-			<destination>&build_dir;/java-build</destination>
-		</unpack>
-		<unpack>
-			<archive>&packages_dir;/&j2sdk-src-mozilla-headers-package;</archive>
-			<destination>&build_dir;/java-build</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-				<variable name="PATH" mode="append">:/opt/j2sdk/j2sdk-precompiled-&j2sdk-binary-norev-version;/bin</variable>
-				<variable name="ALT_BOOTDIR">/opt/j2sdk/j2sdk-precompiled-&j2sdk-binary-norev-version;</variable>
-				<variable name="CLASSPATH" />
-				<variable name="CFLAGS" />
-				<variable name="CXXFLAGS" />
-				<variable name="LDFLAGS" />
-				<variable name="ALT_DEVTOOLS_PATH">"/usr/bin"</variable>
-				<variable name="BUILD_NUMBER">blfs-5.1-nALFS</variable>
-				<variable name="DEV_ONLY">true</variable>
-				<variable name="ALT_MOZILLA_PATH">&build_dir;/java-build</variable>
-				<variable name="INSANE">true</variable>
-				<variable name="MAKE_VERBOSE">true</variable>
-				<variable name="ALT_CACERTS_FILE">/opt/j2sdk/j2sdk-precompiled-&j2sdk-binary-norev-version;/jre/lib/security/cacerts</variable>
-			</environment>
-			<base>&build_dir;/java-build</base>
-		</stageinfo>
-
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&j2sdk-asm-patch;</param>
-		</patch>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&j2sdk-gcc33-patch;</param>
-		</patch>
-		
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&j2sdk-motif-patch;</param>
-		</patch>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&j2sdk-remove-debug-patch;</param>
-		</patch>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&j2sdk-fixed-paths-patch;</param>
-		</patch>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&j2sdk-static-cxx-patch;</param>
-		</patch>
-
-		<make base="&build_dir;/java-build/motif/lib/Xm" />
-
-		<make base="&build_dir;/java-build/control/make" />
-
-		<copy base="&build_dir;/java-build/control/build/linux-i586">
-			<option>archive</option>
-			<source>j2sdk-image</source>
-			<destination>/opt/j2sdk/j2sdk-&j2sdk-src-version;</destination>
-		</copy>
-	</stage>
-</package>
+  <package name="j2sdk-binary" version="&j2sdk-binary-version;">
+    <stage name="Unpacking">
+      <stageinfo>
+        <base>&build_dir;</base>
+      </stageinfo>
+      <mkdir>
+        <name>java-build</name>
+      </mkdir>
+      <copy>
+        <source>&packages_dir;/&j2sdk-binary-package;</source>
+        <destination>&build_dir;/java-build</destination>
+      </copy>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/java-build</base>
+      </stageinfo>
+      <execute command="sed">
+        <param>-i</param>
+        <param>"s:^PATH=.*::"</param>
+        <param>&j2sdk-binary-package;</param>
+      </execute>
+      <permissions mode="711">
+        <name>&j2sdk-binary-package;</name>
+      </permissions>
+      <mkdir>
+        <option>parents</option>
+        <name>bin</name>
+      </mkdir>
+      <link>
+        <option>force</option>
+        <target>/bin/true</target>
+        <name>bin/more</name>
+      </link>
+      <execute command="yes | PATH=$PWD/bin:$PATH ./&j2sdk-binary-package;" />
+      <mkdir>
+        <option>parents</option>
+        <name>/opt/j2sdk/j2sdk-precompiled-&j2sdk-binary-norev-version;</name>
+      </mkdir>
+      <move base="&build_dir;/java-build/&j2sdk-binary-directory;">
+        <option>force</option>
+        <source>*</source>
+        <destination>/opt/j2sdk/j2sdk-precompiled-&j2sdk-binary-norev-version;</destination>
+      </move>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/java-build/&j2sdk-binary-package;</remove>
+      <remove>&build_dir;/java-build/&j2sdk-binary-directory;</remove>
+    </stage>
+  </package>
+  <package name="j2sdk-src" version="&j2sdk-src-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&j2sdk-src-package;</archive>
+        <destination>&build_dir;/java-build</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&j2sdk-src-bin-package;</archive>
+        <destination>&build_dir;/java-build</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&j2sdk-src-mozilla-headers-package;</archive>
+        <destination>&build_dir;/java-build</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="PATH" mode="append">:/opt/j2sdk/j2sdk-precompiled-&j2sdk-binary-norev-version;/bin</variable>
+          <variable name="ALT_BOOTDIR">/opt/j2sdk/j2sdk-precompiled-&j2sdk-binary-norev-version;</variable>
+          <variable name="CLASSPATH" />
+          <variable name="CFLAGS" />
+          <variable name="CXXFLAGS" />
+          <variable name="LDFLAGS" />
+          <variable name="ALT_DEVTOOLS_PATH">"/usr/bin"</variable>
+          <variable name="BUILD_NUMBER">blfs-5.1-nALFS</variable>
+          <variable name="DEV_ONLY">true</variable>
+          <variable name="ALT_MOZILLA_PATH">&build_dir;/java-build</variable>
+          <variable name="INSANE">true</variable>
+          <variable name="MAKE_VERBOSE">true</variable>
+          <variable name="ALT_CACERTS_FILE">/opt/j2sdk/j2sdk-precompiled-&j2sdk-binary-norev-version;/jre/lib/security/cacerts</variable>
+        </environment>
+        <base>&build_dir;/java-build</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&j2sdk-asm-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&j2sdk-gcc33-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&j2sdk-motif-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&j2sdk-remove-debug-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&j2sdk-fixed-paths-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&j2sdk-static-cxx-patch;</param>
+      </patch>
+      <make base="&build_dir;/java-build/motif/lib/Xm" />
+      <make base="&build_dir;/java-build/control/make" />
+      <copy base="&build_dir;/java-build/control/build/linux-i586">
+        <option>archive</option>
+        <source>j2sdk-image</source>
+        <destination>/opt/j2sdk/j2sdk-&j2sdk-src-version;</destination>
+      </copy>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter12/librep.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/librep.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter12/librep.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch12.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,44 +10,40 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="librep" version="&librep-version;">
-
-    	<packageinfo>
-        	<requires><name>gdbm</name></requires>
-		<utilizes><name>gmp</name></utilizes>
-        	<utilizes><name>readline</name></utilizes>
-    	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&librep-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&librep-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--libexecdir=/usr/lib</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&librep-directory;</remove>
-	</stage>
-
-</package>
+  <package name="librep" version="&librep-version;">
+    <packageinfo>
+      <requires>
+        <name>gdbm</name>
+      </requires>
+      <utilizes>
+        <name>gmp</name>
+      </utilizes>
+      <utilizes>
+        <name>readline</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&librep-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&librep-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libexecdir=/usr/lib</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&librep-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter12/nasm.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/nasm.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter12/nasm.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch12.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,36 +10,28 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="nasm" version="&nasm-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&nasm-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&nasm-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&nasm-directory;</remove>
-	</stage>
-
-</package>
+  <package name="nasm" version="&nasm-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&nasm-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&nasm-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&nasm-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter12/perlmodules.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/perlmodules.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter12/perlmodules.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch12.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,186 +10,146 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<stage name="Perl modules">
-
-<package name="Astro-FITS-Header" version="&Astro-FITS-Header-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&Astro-FITS-Header-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&Astro-FITS-Header-directory;</base>
-		</stageinfo>
-
-		<execute command="perl Makefile.PL" />
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&Astro-FITS-Header-directory;</remove>
-	</stage>
-</package>
-
-<package name="PDL" version="&PDL-version;">
-
-	<packageinfo>
-		<requires><name>Astro-FITS-Header</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&PDL-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&PDL-directory;</base>
-		</stageinfo>
-
-		<execute command="perl Makefile.PL" />
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&PDL-directory;</remove>
-	</stage>
-</package>
-
-<package name="XML-Writer" version="&XML-Writer-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&XML-Writer-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&XML-Writer-directory;</base>
-		</stageinfo>
-
-		<execute command="perl Makefile.PL" />
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&XML-Writer-directory;</remove>
-	</stage>
-</package>
-
-<package name="XML-Parser" version="&XML-Parser-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&XML-Parser-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&XML-Parser-directory;</base>
-		</stageinfo>
-
-		<execute command="perl Makefile.PL" />
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&XML-Parser-directory;</remove>
-	</stage>
-</package>
-
-<package name="Gtk-Perl" version="&Gtk-Perl-version;">
-
-	<packageinfo>
-		<requires><name>XML-Writer</name></requires>
-		<requires><name>XML-Parser</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&Gtk-Perl-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&Gtk-Perl-directory;</base>
-		</stageinfo>
-
-		<execute command="perl Makefile.PL --without-guessing" />
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&Gtk-Perl-directory;</remove>
-	</stage>
-</package>
-
-<package name="Parse-RecDescent" version="&Parse-RecDescent-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&Parse-RecDescent-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&Parse-RecDescent-directory;</base>
-		</stageinfo>
-
-		<execute command="perl Makefile.PL" />
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&Parse-RecDescent-directory;</remove>
-	</stage>
-</package>
-
-</stage>
+  <stage name="Perl modules">
+    <package name="Astro-FITS-Header" version="&Astro-FITS-Header-version;">
+      <stage name="Unpacking">
+        <unpack>
+          <archive>&packages_dir;/&Astro-FITS-Header-package;</archive>
+          <destination>&build_dir;</destination>
+        </unpack>
+      </stage>
+      <stage name="Installing">
+        <stageinfo>
+          <base>&build_dir;/&Astro-FITS-Header-directory;</base>
+        </stageinfo>
+        <execute command="perl Makefile.PL" />
+        <make />
+        <make>
+          <param>install</param>
+        </make>
+      </stage>
+      <stage name="Cleanup">
+        <remove>&build_dir;/&Astro-FITS-Header-directory;</remove>
+      </stage>
+    </package>
+    <package name="PDL" version="&PDL-version;">
+      <packageinfo>
+        <requires>
+          <name>Astro-FITS-Header</name>
+        </requires>
+      </packageinfo>
+      <stage name="Unpacking">
+        <unpack>
+          <archive>&packages_dir;/&PDL-package;</archive>
+          <destination>&build_dir;</destination>
+        </unpack>
+      </stage>
+      <stage name="Installing">
+        <stageinfo>
+          <base>&build_dir;/&PDL-directory;</base>
+        </stageinfo>
+        <execute command="perl Makefile.PL" />
+        <make />
+        <make>
+          <param>install</param>
+        </make>
+      </stage>
+      <stage name="Cleanup">
+        <remove>&build_dir;/&PDL-directory;</remove>
+      </stage>
+    </package>
+    <package name="XML-Writer" version="&XML-Writer-version;">
+      <stage name="Unpacking">
+        <unpack>
+          <archive>&packages_dir;/&XML-Writer-package;</archive>
+          <destination>&build_dir;</destination>
+        </unpack>
+      </stage>
+      <stage name="Installing">
+        <stageinfo>
+          <base>&build_dir;/&XML-Writer-directory;</base>
+        </stageinfo>
+        <execute command="perl Makefile.PL" />
+        <make />
+        <make>
+          <param>install</param>
+        </make>
+      </stage>
+      <stage name="Cleanup">
+        <remove>&build_dir;/&XML-Writer-directory;</remove>
+      </stage>
+    </package>
+    <package name="XML-Parser" version="&XML-Parser-version;">
+      <stage name="Unpacking">
+        <unpack>
+          <archive>&packages_dir;/&XML-Parser-package;</archive>
+          <destination>&build_dir;</destination>
+        </unpack>
+      </stage>
+      <stage name="Installing">
+        <stageinfo>
+          <base>&build_dir;/&XML-Parser-directory;</base>
+        </stageinfo>
+        <execute command="perl Makefile.PL" />
+        <make />
+        <make>
+          <param>install</param>
+        </make>
+      </stage>
+      <stage name="Cleanup">
+        <remove>&build_dir;/&XML-Parser-directory;</remove>
+      </stage>
+    </package>
+    <package name="Gtk-Perl" version="&Gtk-Perl-version;">
+      <packageinfo>
+        <requires>
+          <name>XML-Writer</name>
+        </requires>
+        <requires>
+          <name>XML-Parser</name>
+        </requires>
+      </packageinfo>
+      <stage name="Unpacking">
+        <unpack>
+          <archive>&packages_dir;/&Gtk-Perl-package;</archive>
+          <destination>&build_dir;</destination>
+        </unpack>
+      </stage>
+      <stage name="Installing">
+        <stageinfo>
+          <base>&build_dir;/&Gtk-Perl-directory;</base>
+        </stageinfo>
+        <execute command="perl Makefile.PL --without-guessing" />
+        <make />
+        <make>
+          <param>install</param>
+        </make>
+      </stage>
+      <stage name="Cleanup">
+        <remove>&build_dir;/&Gtk-Perl-directory;</remove>
+      </stage>
+    </package>
+    <package name="Parse-RecDescent" version="&Parse-RecDescent-version;">
+      <stage name="Unpacking">
+        <unpack>
+          <archive>&packages_dir;/&Parse-RecDescent-package;</archive>
+          <destination>&build_dir;</destination>
+        </unpack>
+      </stage>
+      <stage name="Installing">
+        <stageinfo>
+          <base>&build_dir;/&Parse-RecDescent-directory;</base>
+        </stageinfo>
+        <execute command="perl Makefile.PL" />
+        <make />
+        <make>
+          <param>install</param>
+        </make>
+      </stage>
+      <stage name="Cleanup">
+        <remove>&build_dir;/&Parse-RecDescent-directory;</remove>
+      </stage>
+    </package>
+  </stage>
 </alfs>

Modified: profiles/BLFS/trunk/chapter12/python.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/python.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter12/python.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch12.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,55 +10,54 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="python" version="&python-version;">
-
-        <packageinfo>
-                <utilizes><name>expat</name></utilizes>
-                <utilizes><name>tk</name></utilizes>
-                <utilizes><name>gdbm</name></utilizes>
-		<utilizes><name>db</name></utilizes>
-                <utilizes><name>gmp</name></utilizes>
-                <utilizes><name>readline</name></utilizes>
-        </packageinfo>
-
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&python-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&python-directory;</base>
-		</stageinfo>
-
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&python-patch;</param>
-		</patch>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--enable-shared</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&python-directory;</remove>
-	</stage>
-
-</package>
+  <package name="python" version="&python-version;">
+    <packageinfo>
+      <utilizes>
+        <name>expat</name>
+      </utilizes>
+      <utilizes>
+        <name>tk</name>
+      </utilizes>
+      <utilizes>
+        <name>gdbm</name>
+      </utilizes>
+      <utilizes>
+        <name>db</name>
+      </utilizes>
+      <utilizes>
+        <name>gmp</name>
+      </utilizes>
+      <utilizes>
+        <name>readline</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&python-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&python-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&python-patch;</param>
+      </patch>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--enable-shared</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&python-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter12/ruby.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/ruby.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter12/ruby.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch12.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,37 +10,28 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="ruby" version="&ruby-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&ruby-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&ruby-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&ruby-directory;</remove>
-	</stage>
-
-</package>
+  <package name="ruby" version="&ruby-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&ruby-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&ruby-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&ruby-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter12/tcl.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/tcl.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter12/tcl.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch12.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,116 +10,94 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="tcl" version="&tcl-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&tcl-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-			    <variable name="VERSION">&tcl-version;</variable>
-			</environment>
-			<base>&build_dir;/&tcl-directory;/unix</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<search_replace>
-		       <file>tclConfig.sh</file>
-		       <find>&build_dir;/&tcl-directory;/unix</find>
-		       <replace>/usr/lib</replace>
-		</search_replace>
-
-		<search_replace>
-		       <file>tclConfig.sh</file>
-		       <find>&build_dir;/&tcl-directory;</find>
-		       <replace>/usr/include/tcl&tcl-major-minor;</replace>
-		</search_replace>
-
-		<search_replace>
-		       <file>tclConfig.sh</file>
-		       <find>TCL_LIB_FILE='libtcl&tcl-major-minor;${TCL_DBGX}.so'</find>
-		       <replace>TCL_LIB_FILE="libtcl&tcl-major-minor;${TCL_DBGX}.so"</replace>
-		</search_replace>
-
-		<move base="&build_dir;/&tcl-directory;/doc">
-			<source>Thread.3</source>
-			<destination>Tcl_Thread.3</destination>
-		</move>
-
-		<search_replace base="&build_dir;/&tcl-directory;/doc">
-			<file>mkLinks</file>
-			<find> Thread.3</find>
-			<replace> Tcl_Thread.3</replace>
-		</search_replace>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<mkdir>
-			<option>parents</option>
-			<name>/usr/include/tcl&tcl-major-minor;/unix</name>
-		</mkdir>
-
-		<copy>
-			<source>*.h</source>
-			<destination>/usr/include/tcl&tcl-major-minor;/unix</destination>
-		</copy>
-
-		<mkdir>
-			<option>parents</option>
-			<name>/usr/include/tcl&tcl-major-minor;/generic</name>
-		</mkdir>
-
-		<copy>
-			<source>../generic/*.h</source>
-			<destination>/usr/include/tcl&tcl-major-minor;/generic</destination>
-		</copy>
-
-		<permissions mode="0644">
-			<name>/usr/include/tcl&tcl-major-minor;/unix/*.h</name>
-			<name>/usr/include/tcl&tcl-major-minor;/generic/*.h</name>
-		</permissions>
-
-		<remove>/usr/include/tcl&tcl-major-minor;/generic/tcl.h</remove>
-		<remove>/usr/include/tcl&tcl-major-minor;/generic/tclDecls.h</remove>
-		<remove>/usr/include/tcl&tcl-major-minor;/generic/tclPlatDecls.h</remove>
-		
-		<link>
-		        <option>force</option>
-			<option>no-dereference</option>
-			<target>/usr/include/tcl&tcl-major-minor;</target>
-			<name>/usr/lib/tcl&tcl-major-minor;/include</name>
-		</link>
-
-		<link>
-		        <option>force</option>
-			<target>libtcl&tcl-major-minor;.so</target>
-			<name>/usr/lib/libtcl.so</name>
-		</link>
-
-		<link>
-		        <option>force</option>
-			<target>tclsh&tcl-major-minor;</target>
-			<name>/usr/bin/tclsh</name>
-		</link>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&tcl-directory;</remove>
-	</stage>
-
-</package>
+  <package name="tcl" version="&tcl-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&tcl-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="VERSION">&tcl-version;</variable>
+        </environment>
+        <base>&build_dir;/&tcl-directory;/unix</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <search_replace>
+        <file>tclConfig.sh</file>
+        <find>&build_dir;/&tcl-directory;/unix</find>
+        <replace>/usr/lib</replace>
+      </search_replace>
+      <search_replace>
+        <file>tclConfig.sh</file>
+        <find>&build_dir;/&tcl-directory;</find>
+        <replace>/usr/include/tcl&tcl-major-minor;</replace>
+      </search_replace>
+      <search_replace>
+        <file>tclConfig.sh</file>
+        <find>TCL_LIB_FILE='libtcl&tcl-major-minor;${TCL_DBGX}.so'</find>
+        <replace>TCL_LIB_FILE="libtcl&tcl-major-minor;${TCL_DBGX}.so"</replace>
+      </search_replace>
+      <move base="&build_dir;/&tcl-directory;/doc">
+        <source>Thread.3</source>
+        <destination>Tcl_Thread.3</destination>
+      </move>
+      <search_replace base="&build_dir;/&tcl-directory;/doc">
+        <file>mkLinks</file>
+        <find>Thread.3</find>
+        <replace>Tcl_Thread.3</replace>
+      </search_replace>
+      <make>
+        <param>install</param>
+      </make>
+      <mkdir>
+        <option>parents</option>
+        <name>/usr/include/tcl&tcl-major-minor;/unix</name>
+      </mkdir>
+      <copy>
+        <source>*.h</source>
+        <destination>/usr/include/tcl&tcl-major-minor;/unix</destination>
+      </copy>
+      <mkdir>
+        <option>parents</option>
+        <name>/usr/include/tcl&tcl-major-minor;/generic</name>
+      </mkdir>
+      <copy>
+        <source>../generic/*.h</source>
+        <destination>/usr/include/tcl&tcl-major-minor;/generic</destination>
+      </copy>
+      <permissions mode="0644">
+        <name>/usr/include/tcl&tcl-major-minor;/unix/*.h</name>
+        <name>/usr/include/tcl&tcl-major-minor;/generic/*.h</name>
+      </permissions>
+      <remove>/usr/include/tcl&tcl-major-minor;/generic/tcl.h</remove>
+      <remove>/usr/include/tcl&tcl-major-minor;/generic/tclDecls.h</remove>
+      <remove>/usr/include/tcl&tcl-major-minor;/generic/tclPlatDecls.h</remove>
+      <link>
+        <option>force</option>
+        <option>no-dereference</option>
+        <target>/usr/include/tcl&tcl-major-minor;</target>
+        <name>/usr/lib/tcl&tcl-major-minor;/include</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>libtcl&tcl-major-minor;.so</target>
+        <name>/usr/lib/libtcl.so</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>tclsh&tcl-major-minor;</target>
+        <name>/usr/bin/tclsh</name>
+      </link>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&tcl-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter12/tk.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/tk.xml	2004-07-18 23:16:21 UTC (rev 1461)
+++ profiles/BLFS/trunk/chapter12/tk.xml	2004-07-18 23:21:29 UTC (rev 1462)
@@ -1,5 +1,6 @@
 <?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/packages/ch12.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,104 +10,88 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="tk" version="&tk-version;">
-
-    	<packageinfo>
-        	<requires><name>xfree</name></requires>
-        	<requires><name>tcl</name></requires>
-    	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&tk-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-			    <variable name="VERSION">&tk-version;</variable>
-			</environment>
-			<base>&build_dir;/&tk-directory;/unix</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<search_replace>
-		       <file>tkConfig.sh</file>
-		       <find>&build_dir;/&tk-directory;/unix</find>
-		       <replace>/usr/lib</replace>
-		</search_replace>
-
-		<search_replace>
-		       <file>tkConfig.sh</file>
-		       <find>&build_dir;/&tk-directory;</find>
-		       <replace>/usr/include/&tk-major-minor;</replace>
-		</search_replace>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<mkdir>
-			<option>parents</option>
-			<name>/usr/include/tk&tk-major-minor;/unix</name>
-		</mkdir>
-
-		<copy>
-			<source>*.h</source>
-			<destination>/usr/include/tk&tk-major-minor;/unix</destination>
-		</copy>
-
-		<mkdir>
-			<option>parents</option>
-			<name>/usr/include/tk&tk-major-minor;/generic</name>
-		</mkdir>
-
-		<copy>
-			<source>../generic/*.h</source>
-			<destination>/usr/include/tk&tk-major-minor;/generic</destination>
-		</copy>
-
-		<permissions mode="0644">
-			<name>/usr/include/tk&tk-major-minor;/unix/*.h</name>
-			<name>/usr/include/tk&tk-major-minor;/generic/*.h</name>
-		</permissions>
-
-		<remove>/usr/include/tk&tk-major-minor;/generic/tk.h</remove>
-		<remove>/usr/include/tk&tk-major-minor;/generic/tkDecls.h</remove>
-		<remove>/usr/include/tk&tk-major-minor;/generic/tkPlatDecls.h</remove>
-		
-		<link>
-		        <option>force</option>
-			<option>no-dereference</option>
-			<target>/usr/include/tk&tk-major-minor;</target>
-			<name>/usr/lib/tk&tk-major-minor;/include</name>
-		</link>
-
-		<link>
-		        <option>force</option>
-			<target>libtk&tk-major-minor;.so</target>
-			<name>/usr/lib/libtk.so</name>
-		</link>
-
-		<link>
-		        <option>force</option>
-			<target>wish&tk-major-minor;</target>
-			<name>/usr/bin/wish</name>
-		</link>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&tk-directory;</remove>
-	</stage>
-
-</package>
+  <package name="tk" version="&tk-version;">
+    <packageinfo>
+      <requires>
+        <name>xfree</name>
+      </requires>
+      <requires>
+        <name>tcl</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&tk-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="VERSION">&tk-version;</variable>
+        </environment>
+        <base>&build_dir;/&tk-directory;/unix</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <search_replace>
+        <file>tkConfig.sh</file>
+        <find>&build_dir;/&tk-directory;/unix</find>
+        <replace>/usr/lib</replace>
+      </search_replace>
+      <search_replace>
+        <file>tkConfig.sh</file>
+        <find>&build_dir;/&tk-directory;</find>
+        <replace>/usr/include/&tk-major-minor;</replace>
+      </search_replace>
+      <make>
+        <param>install</param>
+      </make>
+      <mkdir>
+        <option>parents</option>
+        <name>/usr/include/tk&tk-major-minor;/unix</name>
+      </mkdir>
+      <copy>
+        <source>*.h</source>
+        <destination>/usr/include/tk&tk-major-minor;/unix</destination>
+      </copy>
+      <mkdir>
+        <option>parents</option>
+        <name>/usr/include/tk&tk-major-minor;/generic</name>
+      </mkdir>
+      <copy>
+        <source>../generic/*.h</source>
+        <destination>/usr/include/tk&tk-major-minor;/generic</destination>
+      </copy>
+      <permissions mode="0644">
+        <name>/usr/include/tk&tk-major-minor;/unix/*.h</name>
+        <name>/usr/include/tk&tk-major-minor;/generic/*.h</name>
+      </permissions>
+      <remove>/usr/include/tk&tk-major-minor;/generic/tk.h</remove>
+      <remove>/usr/include/tk&tk-major-minor;/generic/tkDecls.h</remove>
+      <remove>/usr/include/tk&tk-major-minor;/generic/tkPlatDecls.h</remove>
+      <link>
+        <option>force</option>
+        <option>no-dereference</option>
+        <target>/usr/include/tk&tk-major-minor;</target>
+        <name>/usr/lib/tk&tk-major-minor;/include</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>libtk&tk-major-minor;.so</target>
+        <name>/usr/lib/libtk.so</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>wish&tk-major-minor;</target>
+        <name>/usr/bin/wish</name>
+      </link>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&tk-directory;</remove>
+    </stage>
+  </package>
 </alfs>




More information about the alfs-log mailing list