r1461 - in profiles/BLFS/trunk: chapter09 chapter10

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


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

Modified:
   profiles/BLFS/trunk/chapter09/aalib.xml
   profiles/BLFS/trunk/chapter09/directfb.xml
   profiles/BLFS/trunk/chapter09/fontconfig.xml
   profiles/BLFS/trunk/chapter09/freetype.xml
   profiles/BLFS/trunk/chapter09/imlib.xml
   profiles/BLFS/trunk/chapter09/imlib2.xml
   profiles/BLFS/trunk/chapter09/lcms.xml
   profiles/BLFS/trunk/chapter09/libjpeg.xml
   profiles/BLFS/trunk/chapter09/libmng.xml
   profiles/BLFS/trunk/chapter09/libpng.xml
   profiles/BLFS/trunk/chapter09/libtiff.xml
   profiles/BLFS/trunk/chapter09/libungif.xml
   profiles/BLFS/trunk/chapter09/svgalib.xml
   profiles/BLFS/trunk/chapter10/bc.xml
   profiles/BLFS/trunk/chapter10/compface.xml
   profiles/BLFS/trunk/chapter10/hd2u.xml
   profiles/BLFS/trunk/chapter10/imagemagick.xml
   profiles/BLFS/trunk/chapter10/rep-gtk.xml
Log:
tidied chapters 9 & 10

Modified: profiles/BLFS/trunk/chapter09/aalib.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/aalib.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter09/aalib.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch09.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,41 +10,36 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="aalib" version="&aalib-version;">
-
-        <packageinfo>
-                <utilizes><name>xfree86</name></utilizes>
-                <utilizes><name>slang</name></utilizes>
-        </packageinfo>
-
-        <stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&aalib-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&aalib-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&aalib-directory;</remove>
-	</stage>
-
-</package>
+  <package name="aalib" version="&aalib-version;">
+    <packageinfo>
+      <utilizes>
+        <name>xfree86</name>
+      </utilizes>
+      <utilizes>
+        <name>slang</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&aalib-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&aalib-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&aalib-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter09/directfb.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/directfb.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter09/directfb.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch09.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,73 +10,74 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="directfb" version="&directfb-version;">
-
-        <packageinfo>
-                <requires><name>freetype</name></requires>
-                <requires><name>libjpeg</name></requires>
-                <requires><name>libpng</name></requires>
-
-		<utilizes><name>sdl</name></utilizes>
-		<utilizes><name>libmpeg</name></utilizes>
-		<utilizes><name>pkgconfig</name></utilizes>
-		<utilizes><name>imlib2</name></utilizes>
-		<utilizes><name>openquicktime</name></utilizes>
-		<utilizes><name>avifile</name></utilizes>
-        </packageinfo>
-
-
-
-        <stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&directfb-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&directfb-extra-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&directfb-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make >
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&directfb-extra-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&directfb-directory;</remove>
-		<remove>&build_dir;/&directfb-extra-directory;</remove>
-	</stage>
-
-</package>
+  <package name="directfb" version="&directfb-version;">
+    <packageinfo>
+      <requires>
+        <name>freetype</name>
+      </requires>
+      <requires>
+        <name>libjpeg</name>
+      </requires>
+      <requires>
+        <name>libpng</name>
+      </requires>
+      <utilizes>
+        <name>sdl</name>
+      </utilizes>
+      <utilizes>
+        <name>libmpeg</name>
+      </utilizes>
+      <utilizes>
+        <name>pkgconfig</name>
+      </utilizes>
+      <utilizes>
+        <name>imlib2</name>
+      </utilizes>
+      <utilizes>
+        <name>openquicktime</name>
+      </utilizes>
+      <utilizes>
+        <name>avifile</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&directfb-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&directfb-extra-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&directfb-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&directfb-extra-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&directfb-directory;</remove>
+      <remove>&build_dir;/&directfb-extra-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter09/fontconfig.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/fontconfig.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter09/fontconfig.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch09.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,49 +10,44 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="fontconfig" version="&fontconfig-version;">
-
-        <packageinfo>
-	        <requires><name>freetype</name></requires>
-	        <requires><name>expat</name></requires>
-
-		<utilizes><name>docbook-utils</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&fontconfig-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&fontconfig-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--sysconfdir=/etc</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<execute command="sed -i -e '/^<\/fontconfig>/i\
-			<dir>/usr/X11R6/lib/X11/fonts/TTF</dir>\
-			<dir>usr/X11R6/lib/X11/fonts/Type1</dir>\
-			<dir>/usr/X11R6/lib/X11/fonts/truetype</dir>' /etc/fonts/local.conf" />
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&fontconfig-directory;</remove>
-	</stage>
-
-</package>
+  <package name="fontconfig" version="&fontconfig-version;">
+    <packageinfo>
+      <requires>
+        <name>freetype</name>
+      </requires>
+      <requires>
+        <name>expat</name>
+      </requires>
+      <utilizes>
+        <name>docbook-utils</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&fontconfig-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&fontconfig-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <execute command="sed -i -e '/^<\/fontconfig>/i
+                        <dir>/usr/X11R6/lib/X11/fonts/TTF</dir>
+                        <dir>usr/X11R6/lib/X11/fonts/Type1</dir>
+                              <dir>/usr/X11R6/lib/X11/fonts/truetype</dir>' /etc/fonts/local.conf" />
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&fontconfig-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter09/freetype.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/freetype.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter09/freetype.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch09.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,45 +10,32 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="freetype" version="&freetype-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&freetype-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&freetype-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&freetype-bytecode-interpreter-patch;</param>
-		</patch>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		&ldconfig;
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&freetype-directory;</remove>
-	</stage>
-
-</package>
+  <package name="freetype" version="&freetype-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&freetype-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+    <stageinfo>
+      <base>&build_dir;/&freetype-directory;</base>
+    </stageinfo>
+    <patch>
+      <param>-N</param>
+      <param>-p1</param>
+      <param>-i &packages_dir;/&freetype-bytecode-interpreter-patch;</param>
+    </patch>
+    <configure>
+      <param>--prefix=/usr</param>
+    </configure>
+    <make />
+    <make>
+      <param>install</param>
+    </make>&ldconfig;</stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&freetype-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter09/imlib.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/imlib.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter09/imlib.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch09.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,42 +10,37 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="imlib" version="&imlib-version;">
-
-        <packageinfo>
-                <requires><name>libungif</name></requires>
-                <requires><name>gtk+</name></requires>
-        </packageinfo>
-
-        <stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&imlib-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&imlib-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		        <param>--sysconfdir=/etc/imlib</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&imlib-directory;</remove>
-	</stage>
-
-</package>
+  <package name="imlib" version="&imlib-version;">
+    <packageinfo>
+      <requires>
+        <name>libungif</name>
+      </requires>
+      <requires>
+        <name>gtk+</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&imlib-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&imlib-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc/imlib</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&imlib-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter09/imlib2.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/imlib2.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter09/imlib2.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch09.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,45 +10,42 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="imlib2" version="&imlib2-version;">
-
-        <packageinfo>
-		<requires><name>xfree86</name></requires>
-                <requires><name>libjpeg</name></requires>
-
-		<utilizes><name>libtiff</name></utilizes>
-		<utilizes><name>libungif</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&imlib2-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&imlib2-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&imlib2-directory;</remove>
-	</stage>
-
-</package>
+  <package name="imlib2" version="&imlib2-version;">
+    <packageinfo>
+      <requires>
+        <name>xfree86</name>
+      </requires>
+      <requires>
+        <name>libjpeg</name>
+      </requires>
+      <utilizes>
+        <name>libtiff</name>
+      </utilizes>
+      <utilizes>
+        <name>libungif</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&imlib2-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&imlib2-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&imlib2-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter09/lcms.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/lcms.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter09/lcms.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch09.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,43 +10,42 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="lcms" version="&lcms-version;">
-
-        <packageinfo>
-                <utilizes><name>libtiff</name></utilizes>
-                <utilizes><name>libjpeg</name></utilizes>
-                <utilizes><name>python</name></utilizes>
-                <utilizes><name>swig</name></utilizes>
-        </packageinfo>
-
-        <stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&lcms-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&lcms-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&lcms-directory;</remove>
-	</stage>
-
-</package>
+  <package name="lcms" version="&lcms-version;">
+    <packageinfo>
+      <utilizes>
+        <name>libtiff</name>
+      </utilizes>
+      <utilizes>
+        <name>libjpeg</name>
+      </utilizes>
+      <utilizes>
+        <name>python</name>
+      </utilizes>
+      <utilizes>
+        <name>swig</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&lcms-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&lcms-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&lcms-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter09/libjpeg.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/libjpeg.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter09/libjpeg.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch09.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,39 +10,30 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libjpeg" version="&libjpeg-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libjpeg-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libjpeg-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--enable-static</param>
-			<param>--enable-shared</param>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libjpeg-directory;</remove>
-	</stage>
-
-</package>
+  <package name="libjpeg" version="&libjpeg-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libjpeg-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libjpeg-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--enable-static</param>
+        <param>--enable-shared</param>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libjpeg-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter09/libmng.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/libmng.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter09/libmng.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch09.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,55 +10,45 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libmng" version="&libmng-version;">
-
-        <packageinfo>
-                <requires><name>libjpeg</name></requires>
-                <requires><name>lcms</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libmng-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libmng-directory;</base>
-		</stageinfo>
-
-		<execute command="./autogen.sh" />
-
-		<configure>
-		    <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<copy>
-		        <source>doc/man/*.3</source>
-			<destination>/usr/share/man/man3</destination>
-		</copy>
-
-		<copy>
-		        <source>doc/man/*.5</source>
-			<destination>/usr/share/man/man5</destination>
-		</copy>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libmng-directory;</remove>
-	</stage>
-
-
-</package>
+  <package name="libmng" version="&libmng-version;">
+    <packageinfo>
+      <requires>
+        <name>libjpeg</name>
+      </requires>
+      <requires>
+        <name>lcms</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libmng-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libmng-directory;</base>
+      </stageinfo>
+      <execute command="./autogen.sh" />
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <copy>
+        <source>doc/man/*.3</source>
+        <destination>/usr/share/man/man3</destination>
+      </copy>
+      <copy>
+        <source>doc/man/*.5</source>
+        <destination>/usr/share/man/man5</destination>
+      </copy>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libmng-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter09/libpng.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/libpng.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter09/libpng.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch09.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,49 +10,36 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libpng" version="&libpng-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libpng-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libpng-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&libpng-link-to-proper-libs-patch;</param>
-		</patch>
-
-
-		<make>
-		        <param>prefix=/usr</param>
-		        <param>ZLIBINC=/usr/include</param>
-		        <param>ZLIBLIB=/usr/lib</param>
-		        <param>-f scripts/makefile.linux</param>
-		</make>
-
-		<make>
-			<param>prefix=/usr</param>
-			<param>install</param>
-			<param>-f scripts/makefile.linux</param>
-		</make>
-
-		&ldconfig;
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libpng-directory;</remove>
-	</stage>
-
-
-</package>
+  <package name="libpng" version="&libpng-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libpng-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+    <stageinfo>
+      <base>&build_dir;/&libpng-directory;</base>
+    </stageinfo>
+    <patch>
+      <param>-N</param>
+      <param>-p1</param>
+      <param>-i &packages_dir;/&libpng-link-to-proper-libs-patch;</param>
+    </patch>
+    <make>
+      <param>prefix=/usr</param>
+      <param>ZLIBINC=/usr/include</param>
+      <param>ZLIBLIB=/usr/lib</param>
+      <param>-f scripts/makefile.linux</param>
+    </make>
+    <make>
+      <param>prefix=/usr</param>
+      <param>install</param>
+      <param>-f scripts/makefile.linux</param>
+    </make>&ldconfig;</stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libpng-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter09/libtiff.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/libtiff.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter09/libtiff.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch09.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,48 +10,36 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libtiff" version="&libtiff-version;">
-
-        <packageinfo>
-                <utilizes><name>libjpeg</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libtiff-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libtiff-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--noninteractive</param>
-			<param>--with-DIR_MAN=/usr/share/man</param>
-			<param>--with-ZIP=yes</param>
-			<param>--with-DIR_GZLIB=/usr/lib</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		&ldconfig;
-	</stage>
-
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libtiff-directory;</remove>
-	</stage>
-
-</package>
+  <package name="libtiff" version="&libtiff-version;">
+    <packageinfo>
+      <utilizes>
+        <name>libjpeg</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libtiff-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+    <stageinfo>
+      <base>&build_dir;/&libtiff-directory;</base>
+    </stageinfo>
+    <configure>
+      <param>--prefix=/usr</param>
+      <param>--noninteractive</param>
+      <param>--with-DIR_MAN=/usr/share/man</param>
+      <param>--with-ZIP=yes</param>
+      <param>--with-DIR_GZLIB=/usr/lib</param>
+    </configure>
+    <make />
+    <make>
+      <param>install</param>
+    </make>&ldconfig;</stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libtiff-directory;</remove>
+    </stage>
+  </package>
 </alfs>
-

Modified: profiles/BLFS/trunk/chapter09/libungif.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/libungif.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter09/libungif.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch09.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,44 +10,33 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libungif" version="&libungif-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libungif-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libungif-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&libungif-patch;</param>
-		</patch>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-
-	        <make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libungif-directory;</remove>
-	</stage>
-
-</package>
+  <package name="libungif" version="&libungif-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libungif-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libungif-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&libungif-patch;</param>
+      </patch>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libungif-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter09/svgalib.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/svgalib.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter09/svgalib.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch09.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,42 +10,30 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="svgalib" version="&svgalib-version;">
-
-        <stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&svgalib-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&svgalib-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&svgalib-gcc3-1-patch;</param>
-		</patch>
-
-		<make>
-			<param>prefix=/usr</param>
-			<param>install</param>
-		</make>
-
-		<execute base="doc" command="for dir in man?; do for file in $dir/*; do gunzip /usr/share/man/$file; done; done" />
-
-		&ldconfig;
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&svgalib-directory;</remove>
-	</stage>
-
-</package>
+  <package name="svgalib" version="&svgalib-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&svgalib-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+    <stageinfo>
+      <base>&build_dir;/&svgalib-directory;</base>
+    </stageinfo>
+    <patch>
+      <param>-N</param>
+      <param>-p1</param>
+      <param>-i &packages_dir;/&svgalib-gcc3-1-patch;</param>
+    </patch>
+    <make>
+      <param>prefix=/usr</param>
+      <param>install</param>
+    </make>
+    <execute base="doc" command="for dir in man?; do for file in $dir/*; do gunzip /usr/share/man/$file; done; done" />&ldconfig;</stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&svgalib-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter10/bc.xml
===================================================================
--- profiles/BLFS/trunk/chapter10/bc.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter10/bc.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch10.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,53 +10,44 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="bc" version="&bc-version;">
-
-        <packageinfo>
-                <requires><name>readline</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&bc-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&bc-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&bc-flex-invocation-patch;</param>
-		</patch>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&bc-readline-patch;</param>
-		</patch>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--with-readline</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&bc-directory;</remove>
-	</stage>
-
-</package>
+  <package name="bc" version="&bc-version;">
+    <packageinfo>
+      <requires>
+        <name>readline</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&bc-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&bc-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&bc-flex-invocation-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&bc-readline-patch;</param>
+      </patch>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--with-readline</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&bc-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter10/compface.xml
===================================================================
--- profiles/BLFS/trunk/chapter10/compface.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter10/compface.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch10.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,42 +10,33 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="compface" version="&compface-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&compface-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&compface-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&compface-errno-2-patch;</param>
-		</patch>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&compface-directory;</remove>
-	</stage>
-
-</package>
+  <package name="compface" version="&compface-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&compface-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&compface-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&compface-errno-2-patch;</param>
+      </patch>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&compface-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter10/hd2u.xml
===================================================================
--- profiles/BLFS/trunk/chapter10/hd2u.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter10/hd2u.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch10.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,40 +10,33 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="hd2u" version="&hd2u-version;">
-
-        <packageinfo>
-                <requires><name>popt</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&hd2u-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&hd2u-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&hd2u-directory;</remove>
-	</stage>
-
-</package>
+  <package name="hd2u" version="&hd2u-version;">
+    <packageinfo>
+      <requires>
+        <name>popt</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&hd2u-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&hd2u-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&hd2u-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter10/imagemagick.xml
===================================================================
--- profiles/BLFS/trunk/chapter10/imagemagick.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter10/imagemagick.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch10.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,56 +10,71 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="imagemagick" version="&imagemagick-version;">
-
-        <packageinfo>
-                <requires><name>xfree86</name></requires>
-                <requires><name>ghostscript</name></requires>
-
-		<utilizes><name>lcms</name></utilizes>
-		<utilizes><name>libjpeg</name></utilizes>
-		<utilizes><name>libpng</name></utilizes>
-		<utilizes><name>libtiff</name></utilizes>
-		<utilizes><name>libxml2</name></utilizes>
-		<utilizes><name>libwmf</name></utilizes>
-		<utilizes><name>libexif</name></utilizes>
-		<utilizes><name>flashpix</name></utilizes>
-		<utilizes><name>jbig</name></utilizes>
-		<utilizes><name>jasper</name></utilizes>
-		<utilizes><name>corefonts</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&imagemagick-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&imagemagick-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--enable-shared</param>
-			<param>--with-modules</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&imagemagick-directory;</remove>
-	</stage>
-
-</package>
+  <package name="imagemagick" version="&imagemagick-version;">
+    <packageinfo>
+      <requires>
+        <name>xfree86</name>
+      </requires>
+      <requires>
+        <name>ghostscript</name>
+      </requires>
+      <utilizes>
+        <name>lcms</name>
+      </utilizes>
+      <utilizes>
+        <name>libjpeg</name>
+      </utilizes>
+      <utilizes>
+        <name>libpng</name>
+      </utilizes>
+      <utilizes>
+        <name>libtiff</name>
+      </utilizes>
+      <utilizes>
+        <name>libxml2</name>
+      </utilizes>
+      <utilizes>
+        <name>libwmf</name>
+      </utilizes>
+      <utilizes>
+        <name>libexif</name>
+      </utilizes>
+      <utilizes>
+        <name>flashpix</name>
+      </utilizes>
+      <utilizes>
+        <name>jbig</name>
+      </utilizes>
+      <utilizes>
+        <name>jasper</name>
+      </utilizes>
+      <utilizes>
+        <name>corefonts</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&imagemagick-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&imagemagick-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--enable-shared</param>
+        <param>--with-modules</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&imagemagick-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter10/rep-gtk.xml
===================================================================
--- profiles/BLFS/trunk/chapter10/rep-gtk.xml	2004-07-18 22:58:18 UTC (rev 1460)
+++ profiles/BLFS/trunk/chapter10/rep-gtk.xml	2004-07-18 23:16:21 UTC (rev 1461)
@@ -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/ch10.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,48 +10,44 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="rep-gtk" version="&rep-gtk-version;">
-
-        <packageinfo>
-                <requires><name>gtk+2</name></requires>
-                <requires><name>librep</name></requires>
-                <requires><name>libglade</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&rep-gtk-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&rep-gtk-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&rep-gtk-gtk2.4-patch;</param>
-		</patch>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&rep-gtk-directory;</remove>
-	</stage>
-
-</package>
+  <package name="rep-gtk" version="&rep-gtk-version;">
+    <packageinfo>
+      <requires>
+        <name>gtk+2</name>
+      </requires>
+      <requires>
+        <name>librep</name>
+      </requires>
+      <requires>
+        <name>libglade</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&rep-gtk-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&rep-gtk-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&rep-gtk-gtk2.4-patch;</param>
+      </patch>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&rep-gtk-directory;</remove>
+    </stage>
+  </package>
 </alfs>




More information about the alfs-log mailing list