r1470 - in profiles/BLFS/trunk: chapter32 chapter33

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Jul 19 12:10:03 PDT 2004


Author: thomasp
Date: 2004-07-19 13:10:00 -0600 (Mon, 19 Jul 2004)
New Revision: 1470

Modified:
   profiles/BLFS/trunk/chapter32/bonobo.xml
   profiles/BLFS/trunk/chapter32/gal.xml
   profiles/BLFS/trunk/chapter32/gconf.xml
   profiles/BLFS/trunk/chapter32/gdk-pixbuf.xml
   profiles/BLFS/trunk/chapter32/gnome-libs.xml
   profiles/BLFS/trunk/chapter32/gnome-print.xml
   profiles/BLFS/trunk/chapter32/gnome-vfs.xml
   profiles/BLFS/trunk/chapter32/gnome1-pre-installation.xml
   profiles/BLFS/trunk/chapter32/gtkhtml.xml
   profiles/BLFS/trunk/chapter32/guppi.xml
   profiles/BLFS/trunk/chapter32/libcapplet.xml
   profiles/BLFS/trunk/chapter32/libghttp.xml
   profiles/BLFS/trunk/chapter32/libglade1.xml
   profiles/BLFS/trunk/chapter32/oaf.xml
   profiles/BLFS/trunk/chapter32/orbit.xml
   profiles/BLFS/trunk/chapter32/soup.xml
   profiles/BLFS/trunk/chapter33/abiword.xml
   profiles/BLFS/trunk/chapter33/evolution.xml
   profiles/BLFS/trunk/chapter33/gimp.xml
   profiles/BLFS/trunk/chapter33/gnucash.xml
   profiles/BLFS/trunk/chapter33/gnumeric.xml
Log:
tidied chapters 32-33

Modified: profiles/BLFS/trunk/chapter32/bonobo.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/bonobo.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter32/bonobo.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch32.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,36 +10,28 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="bonobo" version="&bonobo-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&bonobo-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&bonobo-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/opt/gnome</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&bonobo-directory;</remove>
-	</stage>
-
-</package>
+  <package name="bonobo" version="&bonobo-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&bonobo-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&bonobo-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/opt/gnome</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&bonobo-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter32/gal.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/gal.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter32/gal.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch32.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,43 +10,40 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gal1" version="&gal1-version;">
-
-        <packageinfo>
-                <requires><name>gnome-print</name></requires>
-        	<requires><name>libglade1</name></requires>
-		<utilizes><name>gnome-vfs</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gal1-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gal1-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/opt/gnome</param>
-			<param>--disable-gtk-doc</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gal1-directory;</remove>
-	</stage>
-
-</package>
+  <package name="gal1" version="&gal1-version;">
+    <packageinfo>
+      <requires>
+        <name>gnome-print</name>
+      </requires>
+      <requires>
+        <name>libglade1</name>
+      </requires>
+      <utilizes>
+        <name>gnome-vfs</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gal1-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gal1-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/opt/gnome</param>
+        <param>--disable-gtk-doc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gal1-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter32/gconf.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/gconf.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter32/gconf.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch32.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,46 +10,44 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gconf" version="&gconf-version;">
-
-        <packageinfo>
-                <requires><name>oaf</name></requires>
-                <requires><name>gtk+</name></requires>
-                <requires><name>gdk-pixbuf</name></requires>
-		<utilizes><name>db</name></utilizes>
-		<utilizes><name>guile</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gconf-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gconf-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/opt/gnome</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-		&ldconfig;
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gconf-directory;</remove>
-	</stage>
-
-</package>
+  <package name="gconf" version="&gconf-version;">
+    <packageinfo>
+      <requires>
+        <name>oaf</name>
+      </requires>
+      <requires>
+        <name>gtk+</name>
+      </requires>
+      <requires>
+        <name>gdk-pixbuf</name>
+      </requires>
+      <utilizes>
+        <name>db</name>
+      </utilizes>
+      <utilizes>
+        <name>guile</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gconf-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+    <stageinfo>
+      <base>&build_dir;/&gconf-directory;</base>
+    </stageinfo>
+    <configure>
+      <param>--prefix=/opt/gnome</param>
+    </configure>
+    <make />
+    <make>
+      <param>install</param>
+    </make>&ldconfig;</stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gconf-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter32/gdk-pixbuf.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/gdk-pixbuf.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter32/gdk-pixbuf.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch32.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,47 +10,45 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gdk-pixbuf" version="&gdk-pixbuf-version;">
-
-        <packageinfo>
-        	<requires><name>gtk+</name></requires>
-                <requires><name>libjpeg</name></requires>
-                <requires><name>libtiff</name></requires>
-		<utilizes><name>gnome-libs</name></utilizes>
-		<utilizes><name>gtk-doc</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gdk-pixbuf-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gdk-pixbuf-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/opt/gnome</param>
-			<param>--disable-gtk-doc</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		&ldconfig;
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gdk-pixbuf-directory;</remove>
-	</stage>
-
-</package>
+  <package name="gdk-pixbuf" version="&gdk-pixbuf-version;">
+    <packageinfo>
+      <requires>
+        <name>gtk+</name>
+      </requires>
+      <requires>
+        <name>libjpeg</name>
+      </requires>
+      <requires>
+        <name>libtiff</name>
+      </requires>
+      <utilizes>
+        <name>gnome-libs</name>
+      </utilizes>
+      <utilizes>
+        <name>gtk-doc</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gdk-pixbuf-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+    <stageinfo>
+      <base>&build_dir;/&gdk-pixbuf-directory;</base>
+    </stageinfo>
+    <configure>
+      <param>--prefix=/opt/gnome</param>
+      <param>--disable-gtk-doc</param>
+    </configure>
+    <make />
+    <make>
+      <param>install</param>
+    </make>&ldconfig;</stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gdk-pixbuf-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter32/gnome-libs.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/gnome-libs.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter32/gnome-libs.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch32.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,49 +10,51 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gnome-libs" version="&gnome-libs-version;">
-
-        <packageinfo>
-                <requires><name>orbit</name></requires>
-        	<requires><name>gtk+</name></requires>
-        	<requires><name>imlib</name></requires>
-                <requires><name>db</name></requires>
-		<utilizes><name>audiofile</name></utilizes>
-		<utilizes><name>esound</name></utilizes>
-		<utilizes><name>gtk-doc</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gnome-libs-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gnome-libs-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/opt/gnome</param>
-			<param>--disable-gtk-doc</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		&ldconfig;
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gnome-libs-directory;</remove>
-	</stage>
-
-</package>
+  <package name="gnome-libs" version="&gnome-libs-version;">
+    <packageinfo>
+      <requires>
+        <name>orbit</name>
+      </requires>
+      <requires>
+        <name>gtk+</name>
+      </requires>
+      <requires>
+        <name>imlib</name>
+      </requires>
+      <requires>
+        <name>db</name>
+      </requires>
+      <utilizes>
+        <name>audiofile</name>
+      </utilizes>
+      <utilizes>
+        <name>esound</name>
+      </utilizes>
+      <utilizes>
+        <name>gtk-doc</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gnome-libs-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+    <stageinfo>
+      <base>&build_dir;/&gnome-libs-directory;</base>
+    </stageinfo>
+    <configure>
+      <param>--prefix=/opt/gnome</param>
+      <param>--disable-gtk-doc</param>
+    </configure>
+    <make />
+    <make>
+      <param>install</param>
+    </make>&ldconfig;</stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gnome-libs-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter32/gnome-print.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/gnome-print.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter32/gnome-print.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch32.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,53 +10,43 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gnome-print" version="&gnome-print-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gnome-print-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gnome-print-directory;</base>
-		</stageinfo>
-
-		<textdump>
-			<file>/opt/gnome/lib/xmlConf.sh</file>
-			<content>
-			=XML_LIBDIR="-L/usr/lib"
-			=XML_LIBS="-lxml"
-			=XML_INCLUDEDIR="-I/usr/include/gnome-xml"
-			=MODULE_VERSION=xml-1.8.17
-			</content>
-		</textdump>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&gnome-print-ft-patch;</param>
-		</patch>
-
-		<configure>
-			<param>--prefix=/opt/gnome</param>
-			<param>--with-zlib=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gnome-print-directory;</remove>
-	</stage>
-
-</package>
+  <package name="gnome-print" version="&gnome-print-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gnome-print-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gnome-print-directory;</base>
+      </stageinfo>
+      <textdump>
+        <file>/opt/gnome/lib/xmlConf.sh</file>
+        <content>
+	  =XML_LIBDIR="-L/usr/lib"
+	  =XML_LIBS="-lxml"
+	  =XML_INCLUDEDIR="-I/usr/include/gnome-xml"
+	  =MODULE_VERSION=xml-1.8.17
+	</content>
+      </textdump>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&gnome-print-ft-patch;</param>
+      </patch>
+      <configure>
+        <param>--prefix=/opt/gnome</param>
+        <param>--with-zlib=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gnome-print-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter32/gnome-vfs.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/gnome-vfs.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter32/gnome-vfs.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch32.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,48 +10,48 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gnome-vfs" version="&gnome-vfs-version;">
-
-	<packageinfo>
-		<requires><name>gnome-mime-date</name></requires>
-        	<requires><name>gconf</name></requires>
-        	<requires><name>gnome-libs</name></requires>
-		<utilizes><name>openssl</name></utilizes>
-		<utilizes><name>gtk-doc</name></utilizes>
-		<utilizes><name>cdparanoia</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gnome-vfs-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gnome-vfs-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/opt/gnome</param>
-			<param>--disable-gtk-doc</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		&ldconfig;
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gnome-vfs-directory;</remove>
-	</stage>
-
-</package>
+  <package name="gnome-vfs" version="&gnome-vfs-version;">
+    <packageinfo>
+      <requires>
+        <name>gnome-mime-date</name>
+      </requires>
+      <requires>
+        <name>gconf</name>
+      </requires>
+      <requires>
+        <name>gnome-libs</name>
+      </requires>
+      <utilizes>
+        <name>openssl</name>
+      </utilizes>
+      <utilizes>
+        <name>gtk-doc</name>
+      </utilizes>
+      <utilizes>
+        <name>cdparanoia</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gnome-vfs-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+    <stageinfo>
+      <base>&build_dir;/&gnome-vfs-directory;</base>
+    </stageinfo>
+    <configure>
+      <param>--prefix=/opt/gnome</param>
+      <param>--disable-gtk-doc</param>
+    </configure>
+    <make />
+    <make>
+      <param>install</param>
+    </make>&ldconfig;</stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gnome-vfs-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter32/gnome1-pre-installation.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/gnome1-pre-installation.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter32/gnome1-pre-installation.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch32.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,40 +10,32 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<stage name="GNOME 1 pre-installation.">
-	<textdump base="/root" mode="append">
-        	<file>.bash_profile</file>
-		<content>
-	        =export PATH=$PATH:/opt/gnome/bin
-		=export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/lib/pkgconfig
-        	</content>
-	</textdump>
-
-	<textdump base="/etc" mode="append">
-        	<file>ld.so.conf</file>
-	        <content>
-	        =# Begin Gnome 1.4 Libraries addition to /etc/ld.so.conf
-		=
-		=/opt/gnome/lib
-		=
-		=# End Gnome 1.4 Libraries addition
-        	</content>
-	</textdump>
-	
-	<textdump base="/etc" mode="append">
-        	<file>man.conf</file>
-	        <content>
-	        =# Begin Gnome 1.4 Libraries addition to man.conf
-		=
-		=MANPATH /opt/gnome/man
-		=
-		=# END Gnome 1.4 Libraries addition to man.conf
-        	</content>
-	</textdump>
-	
-	&ldconfig;
-
-</stage>
+  <stage name="GNOME 1 pre-installation.">
+  <textdump base="/root" mode="append">
+    <file>.bash_profile</file>
+    <content>
+      =export PATH=$PATH:/opt/gnome/bin
+      =export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/lib/pkgconfig
+    </content>
+  </textdump>
+  <textdump base="/etc" mode="append">
+    <file>ld.so.conf</file>
+    <content>
+      =# Begin Gnome 1.4 Libraries addition to /etc/ld.so.conf
+      =
+      =/opt/gnome/lib
+      =
+      =# End Gnome 1.4 Libraries addition
+    </content>
+  </textdump>
+  <textdump base="/etc" mode="append">
+    <file>man.conf</file>
+    <content>
+      =# Begin Gnome 1.4 Libraries addition to man.conf
+      =
+      =MANPATH /opt/gnome/man
+      =
+      =# End Gnome 1.4 Libraries addition to man.conf</content>
+  </textdump>&ldconfig;</stage>
 </alfs>

Modified: profiles/BLFS/trunk/chapter32/gtkhtml.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/gtkhtml.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter32/gtkhtml.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch32.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,45 +10,46 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gtkhtml1" version="&gtkhtml1-version;">
-	
-	<packageinfo>
-		<requires><name>gconf</name></requires>
-		<requires><name>gal1</name></requires>
-		<requires><name>libglade1</name></requires>
-		<requires><name>libcapplet</name></requires>
-		<utilizes><name>soup</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gtkhtml1-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gtkhtml1-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/opt/gnome</param>
-			<param>--disable-gtk-doc</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gtkhtml1-directory;</remove>
-	</stage>
-
-</package>
+  <package name="gtkhtml1" version="&gtkhtml1-version;">
+    <packageinfo>
+      <requires>
+        <name>gconf</name>
+      </requires>
+      <requires>
+        <name>gal1</name>
+      </requires>
+      <requires>
+        <name>libglade1</name>
+      </requires>
+      <requires>
+        <name>libcapplet</name>
+      </requires>
+      <utilizes>
+        <name>soup</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gtkhtml1-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gtkhtml1-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/opt/gnome</param>
+        <param>--disable-gtk-doc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gtkhtml1-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter32/guppi.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/guppi.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter32/guppi.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch32.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,42 +10,39 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="guppi" version="&guppi-version;">
-
-	<packageinfo>
-		<requires><name>bonobo</name></requires>
-		<requires><name>gal1</name></requires>
-		<utilizes><name>libglade1</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&guppi-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&guppi-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/opt/gnome</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&guppi-directory;</remove>
-	</stage>
-
-</package>
+  <package name="guppi" version="&guppi-version;">
+    <packageinfo>
+      <requires>
+        <name>bonobo</name>
+      </requires>
+      <requires>
+        <name>gal1</name>
+      </requires>
+      <utilizes>
+        <name>libglade1</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&guppi-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&guppi-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/opt/gnome</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&guppi-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter32/libcapplet.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/libcapplet.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter32/libcapplet.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch32.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,40 +10,33 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libcapplet" version="&libcapplet-version;">
-
-	<packageinfo>
-		<requires><name>gnome-libs</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libcapplet-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libcapplet-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/opt/gnome</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libcapplet-directory;</remove>
-	</stage>
-
-</package>
+  <package name="libcapplet" version="&libcapplet-version;">
+    <packageinfo>
+      <requires>
+        <name>gnome-libs</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libcapplet-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libcapplet-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/opt/gnome</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libcapplet-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter32/libghttp.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/libghttp.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter32/libghttp.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch32.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,40 +10,33 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libghttp" version="&libghttp-version;">
-
-	<packageinfo>
-		<utilizes><name>gtkhtml1</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libghttp-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libghttp-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/opt/gnome</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libghttp-directory;</remove>
-	</stage>
-
-</package>
+  <package name="libghttp" version="&libghttp-version;">
+    <packageinfo>
+      <utilizes>
+        <name>gtkhtml1</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libghttp-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libghttp-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/opt/gnome</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libghttp-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter32/libglade1.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/libglade1.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter32/libglade1.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch32.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,45 +10,44 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libglade1" version="&libglade1-version;">
-
-        <packageinfo>
-                <requires><name>libxml</name></requires>
-        	<requires><name>gtk+</name></requires>
-		<utilizes><name>gnome-libs</name></utilizes>
-		<utilizes><name>python</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libglade1-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libglade1-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/opt/gnome</param>
-			<param>--enable-bonobo</param>
-			<param>--disable-gtk-doc</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libglade1-directory;</remove>
-	</stage>
-
-</package>
+  <package name="libglade1" version="&libglade1-version;">
+    <packageinfo>
+      <requires>
+        <name>libxml</name>
+      </requires>
+      <requires>
+        <name>gtk+</name>
+      </requires>
+      <utilizes>
+        <name>gnome-libs</name>
+      </utilizes>
+      <utilizes>
+        <name>python</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libglade1-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libglade1-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/opt/gnome</param>
+        <param>--enable-bonobo</param>
+        <param>--disable-gtk-doc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libglade1-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter32/oaf.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/oaf.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter32/oaf.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch32.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,45 +10,39 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="oaf" version="&oaf-version;">
-
-        <packageinfo>
-                <requires><name>orbit</name></requires>
-                <requires><name>libxml</name></requires>
-		<utilizes><name>gtk-doc</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&oaf-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&oaf-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/opt/gnome</param>
-			<param>--disable-gtk-doc</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		&ldconfig;
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&oaf-directory;</remove>
-	</stage>
-
-</package>
+  <package name="oaf" version="&oaf-version;">
+    <packageinfo>
+      <requires>
+        <name>orbit</name>
+      </requires>
+      <requires>
+        <name>libxml</name>
+      </requires>
+      <utilizes>
+        <name>gtk-doc</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&oaf-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+    <stageinfo>
+      <base>&build_dir;/&oaf-directory;</base>
+    </stageinfo>
+    <configure>
+      <param>--prefix=/opt/gnome</param>
+      <param>--disable-gtk-doc</param>
+    </configure>
+    <make />
+    <make>
+      <param>install</param>
+    </make>&ldconfig;</stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&oaf-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter32/orbit.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/orbit.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter32/orbit.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch32.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,42 +10,32 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="orbit" version="&orbit-version;">
-
-        <packageinfo>
-        	<requires><name>glib</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&orbit-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&orbit-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/opt/gnome</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		&ldconfig;
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&orbit-directory;</remove>
-	</stage>
-
-</package>
+  <package name="orbit" version="&orbit-version;">
+    <packageinfo>
+      <requires>
+        <name>glib</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&orbit-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+    <stageinfo>
+      <base>&build_dir;/&orbit-directory;</base>
+    </stageinfo>
+    <configure>
+      <param>--prefix=/opt/gnome</param>
+    </configure>
+    <make />
+    <make>
+      <param>install</param>
+    </make>&ldconfig;</stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&orbit-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter32/soup.xml
===================================================================
--- profiles/BLFS/trunk/chapter32/soup.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter32/soup.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch32.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,36 +10,28 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="soup" version="&soup-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&soup-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&soup-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/opt/gnome</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&soup-directory;</remove>
-	</stage>
-
-</package>
+  <package name="soup" version="&soup-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&soup-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&soup-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/opt/gnome</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&soup-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter33/abiword.xml
===================================================================
--- profiles/BLFS/trunk/chapter33/abiword.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter33/abiword.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch33.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,56 +10,55 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="abiword" version="&abiword-version;">
-
-        <packageinfo>
-                <requires><name>libglade</name></requires>
-                <requires><name>fribidi</name></requires>
-		<utilizes><name>popt</name></utilizes>
-		<utilizes><name>aspell</name></utilizes>
-		<utilizes><name>gnome-libs</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&abiword-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&abiword-directory;/abi</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<copy>
-			<source>../abiword-docs/man/abiword.8</source>
-			<destination>/usr/share/man/man8</destination>
-		</copy>
-
-		<copy>
-			<option>recursive</option>
-			<option>force</option>
-			<source>../abiword-docs/help</source>
-			<destination>/usr/share/doc/abiword</destination>
-		</copy>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&abiword-directory;</remove>
-	</stage>
-
-</package>
+  <package name="abiword" version="&abiword-version;">
+    <packageinfo>
+      <requires>
+        <name>libglade</name>
+      </requires>
+      <requires>
+        <name>fribidi</name>
+      </requires>
+      <utilizes>
+        <name>popt</name>
+      </utilizes>
+      <utilizes>
+        <name>aspell</name>
+      </utilizes>
+      <utilizes>
+        <name>gnome-libs</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&abiword-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&abiword-directory;/abi</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <copy>
+        <source>../abiword-docs/man/abiword.8</source>
+        <destination>/usr/share/man/man8</destination>
+      </copy>
+      <copy>
+        <option>recursive</option>
+        <option>force</option>
+        <source>../abiword-docs/help</source>
+        <destination>/usr/share/doc/abiword</destination>
+      </copy>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&abiword-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter33/evolution.xml
===================================================================
--- profiles/BLFS/trunk/chapter33/evolution.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter33/evolution.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch33.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,70 +10,68 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="evolution" version="&evolution-version;">
-
-        <packageinfo>
-		<requires><name>openssl</name></requires>
-		<requires><name>libsoup</name></requires>
-		<requires><name>gal</name></requires>
-		<requires><name>gtkhtml</name></requires>
-		<utilizes><name>openldap</name></utilizes>
-		<utilizes><name>gtk-doc</name></utilizes>                
-        </packageinfo>
-
-	<stage name="Unpacking.">
-		<unpack>
-			<archive>&packages_dir;/&evolution-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&db3117-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing db-3.1.17.">
-		<stageinfo>
-			<base>&build_dir;/&db3117-directory;/build_unix</base>
-		</stageinfo>
-		
-		<configure command="../dist/configure">
-		        <param>--prefix=/opt/db-3.1.17</param>
-			<param>--enable-compat185</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Installing evolution.">
-		<stageinfo>
-			<base>&build_dir;/&evolution-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=`pkg-config --variable=prefix ORBit-2.0`</param>
-			<param>--with-db3=/opt/db-3.1.17</param>
-			<param>--enable-openssl</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&evolution-directory;</remove>
-		<remove>&build_dir;/&db3117-directory;</remove>
-	</stage>
-
-</package>
+  <package name="evolution" version="&evolution-version;">
+    <packageinfo>
+      <requires>
+        <name>openssl</name>
+      </requires>
+      <requires>
+        <name>libsoup</name>
+      </requires>
+      <requires>
+        <name>gal</name>
+      </requires>
+      <requires>
+        <name>gtkhtml</name>
+      </requires>
+      <utilizes>
+        <name>openldap</name>
+      </utilizes>
+      <utilizes>
+        <name>gtk-doc</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking.">
+      <unpack>
+        <archive>&packages_dir;/&evolution-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&db3117-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing db-3.1.17.">
+      <stageinfo>
+        <base>&build_dir;/&db3117-directory;/build_unix</base>
+      </stageinfo>
+      <configure command="../dist/configure">
+        <param>--prefix=/opt/db-3.1.17</param>
+        <param>--enable-compat185</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing evolution.">
+      <stageinfo>
+        <base>&build_dir;/&evolution-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=`pkg-config --variable=prefix ORBit-2.0`</param>
+        <param>--with-db3=/opt/db-3.1.17</param>
+        <param>--enable-openssl</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&evolution-directory;</remove>
+      <remove>&build_dir;/&db3117-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter33/gimp.xml
===================================================================
--- profiles/BLFS/trunk/chapter33/gimp.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter33/gimp.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch33.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,53 +10,62 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gimp" version="&gimp-version;">
-
-        <packageinfo>
-                <requires><name>gtk+2</name></requires>
-		<requires><name>libart-lgpl</name></requires>
-
-		<utilizes><name>gimp-print</name></utilizes>
-		<utilizes><name>libmng</name></utilizes>
-		<utilizes><name>librsvg</name></utilizes>
-		<utilizes><name>aalib</name></utilizes>
-		<utilizes><name>python</name></utilizes>
-		<utilizes><name>gtk-doc</name></utilizes>
-		<utilizes><name>libgtkhtml</name></utilizes>
-		<utilizes><name>lcms</name></utilizes>
-
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gimp-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gimp-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--sysconfdir=/etc</param>
-			<param>--disable-print</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gimp-directory;</remove>
-	</stage>
-
-</package>
+  <package name="gimp" version="&gimp-version;">
+    <packageinfo>
+      <requires>
+        <name>gtk+2</name>
+      </requires>
+      <requires>
+        <name>libart-lgpl</name>
+      </requires>
+      <utilizes>
+        <name>gimp-print</name>
+      </utilizes>
+      <utilizes>
+        <name>libmng</name>
+      </utilizes>
+      <utilizes>
+        <name>librsvg</name>
+      </utilizes>
+      <utilizes>
+        <name>aalib</name>
+      </utilizes>
+      <utilizes>
+        <name>python</name>
+      </utilizes>
+      <utilizes>
+        <name>gtk-doc</name>
+      </utilizes>
+      <utilizes>
+        <name>libgtkhtml</name>
+      </utilizes>
+      <utilizes>
+        <name>lcms</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gimp-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gimp-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+        <param>--disable-print</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gimp-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter33/gnucash.xml
===================================================================
--- profiles/BLFS/trunk/chapter33/gnucash.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter33/gnucash.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch33.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,45 +10,48 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gnucash" version="&gnucash-version;">
-
-        <packageinfo>
-                <requires><name>db</name></requires>
-        	<requires><name>gal1</name></requires>
-        	<requires><name>gtkhtml1</name></requires>
-        	<requires><name>libghttp</name></requires>
-        	<requires><name>guppi</name></requires>
-        	<requires><name>g-wrap</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gnucash-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gnucash-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/opt/gnome</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gnucash-directory;</remove>
-	</stage>
-
-</package>
+  <package name="gnucash" version="&gnucash-version;">
+    <packageinfo>
+      <requires>
+        <name>db</name>
+      </requires>
+      <requires>
+        <name>gal1</name>
+      </requires>
+      <requires>
+        <name>gtkhtml1</name>
+      </requires>
+      <requires>
+        <name>libghttp</name>
+      </requires>
+      <requires>
+        <name>guppi</name>
+      </requires>
+      <requires>
+        <name>g-wrap</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gnucash-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gnucash-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/opt/gnome</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gnucash-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter33/gnumeric.xml
===================================================================
--- profiles/BLFS/trunk/chapter33/gnumeric.xml	2004-07-19 18:59:38 UTC (rev 1469)
+++ profiles/BLFS/trunk/chapter33/gnumeric.xml	2004-07-19 19:10:00 UTC (rev 1470)
@@ -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/ch33.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,44 +10,39 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gnumeric" version="&gnumeric-version;">
-
-        <packageinfo>
-                <requires><name>libgnomeprintui</name></requires>
-                <requires><name>libgsf</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gnumeric-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gnumeric-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--libexecdir=/usr/sbin</param>
-			<param>--localstatedir=/var/lib</param>
-			<param>--sysconfdir=/etc</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gnumeric-directory;</remove>
-	</stage>
-
-</package>
+  <package name="gnumeric" version="&gnumeric-version;">
+    <packageinfo>
+      <requires>
+        <name>libgnomeprintui</name>
+      </requires>
+      <requires>
+        <name>libgsf</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gnumeric-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gnumeric-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libexecdir=/usr/sbin</param>
+        <param>--localstatedir=/var/lib</param>
+        <param>--sysconfdir=/etc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gnumeric-directory;</remove>
+    </stage>
+  </package>
 </alfs>




More information about the alfs-log mailing list