r1474 - in profiles/BLFS/trunk: chapter42 chapter43 chapter44 chapter45 chapter46

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Jul 19 12:37:51 PDT 2004


Author: thomasp
Date: 2004-07-19 13:37:49 -0600 (Mon, 19 Jul 2004)
New Revision: 1474

Modified:
   profiles/BLFS/trunk/chapter42/sane.xml
   profiles/BLFS/trunk/chapter42/xsane.xml
   profiles/BLFS/trunk/chapter43/docbook-dsssl.xml
   profiles/BLFS/trunk/chapter43/openjade.xml
   profiles/BLFS/trunk/chapter43/opensp.xml
   profiles/BLFS/trunk/chapter43/sgml-common.xml
   profiles/BLFS/trunk/chapter43/sgml-dtd.xml
   profiles/BLFS/trunk/chapter43/sgml-dtd31.xml
   profiles/BLFS/trunk/chapter44/docbook-xsl.xml
   profiles/BLFS/trunk/chapter44/xml-dtd.xml
   profiles/BLFS/trunk/chapter45/a2ps.xml
   profiles/BLFS/trunk/chapter45/enscript.xml
   profiles/BLFS/trunk/chapter45/gsview.xml
   profiles/BLFS/trunk/chapter45/psutils.xml
   profiles/BLFS/trunk/chapter45/xpdf.xml
   profiles/BLFS/trunk/chapter46/tex.xml
Log:
tidied chapters 42-46

Modified: profiles/BLFS/trunk/chapter42/sane.xml
===================================================================
--- profiles/BLFS/trunk/chapter42/sane.xml	2004-07-19 19:29:18 UTC (rev 1473)
+++ profiles/BLFS/trunk/chapter42/sane.xml	2004-07-19 19:37:49 UTC (rev 1474)
@@ -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/ch42.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,66 +10,60 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="sane" version="&sane-version;">
-
-        <packageinfo>
-                <utilizes><name>libusb</name></utilizes>
-        	<utilizes><name>xfree86</name></utilizes>
-        	<utilizes><name>gtk+2</name></utilizes>
-		<utilizes><name>gimp</name></utilizes>		
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&sane-frontend-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&sane-backend-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing backend">
-		<stageinfo>
-			<base>&build_dir;/&sane-backend-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-			<param>--sysconfdir=/etc</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Installing frontend">
-		<stageinfo>
-			<base>&build_dir;/&sane-frontend-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&sane-frontend-directory;</remove>
-		<remove>&build_dir;/&sane-backend-directory;</remove>
-	</stage>
-
-</package>
+  <package name="sane" version="&sane-version;">
+    <packageinfo>
+      <utilizes>
+        <name>libusb</name>
+      </utilizes>
+      <utilizes>
+        <name>xfree86</name>
+      </utilizes>
+      <utilizes>
+        <name>gtk+2</name>
+      </utilizes>
+      <utilizes>
+        <name>gimp</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&sane-frontend-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&sane-backend-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing backend">
+      <stageinfo>
+        <base>&build_dir;/&sane-backend-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing frontend">
+      <stageinfo>
+        <base>&build_dir;/&sane-frontend-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&sane-frontend-directory;</remove>
+      <remove>&build_dir;/&sane-backend-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter42/xsane.xml
===================================================================
--- profiles/BLFS/trunk/chapter42/xsane.xml	2004-07-19 19:29:18 UTC (rev 1473)
+++ profiles/BLFS/trunk/chapter42/xsane.xml	2004-07-19 19:37:49 UTC (rev 1474)
@@ -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/ch42.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,44 +10,45 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="xsane" version="&xsane-version;">
-
-	<packageinfo>
-        	<requires><name>sane</name></requires>
-        	<requires><name>gtk+2</name></requires>
-        	<utilizes><name>libtiff</name></utilizes>
-        	<utilizes><name>libjpeg</name></utilizes>
-		<utilizes><name>gimp</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&xsane-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing frontend">
-		<stageinfo>
-			<base>&build_dir;/&xsane-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&xsane-directory;</remove>
-	</stage>
-
-</package>
+  <package name="xsane" version="&xsane-version;">
+    <packageinfo>
+      <requires>
+        <name>sane</name>
+      </requires>
+      <requires>
+        <name>gtk+2</name>
+      </requires>
+      <utilizes>
+        <name>libtiff</name>
+      </utilizes>
+      <utilizes>
+        <name>libjpeg</name>
+      </utilizes>
+      <utilizes>
+        <name>gimp</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&xsane-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing frontend">
+      <stageinfo>
+        <base>&build_dir;/&xsane-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&xsane-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter43/docbook-dsssl.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/docbook-dsssl.xml	2004-07-19 19:29:18 UTC (rev 1473)
+++ profiles/BLFS/trunk/chapter43/docbook-dsssl.xml	2004-07-19 19:37:49 UTC (rev 1474)
@@ -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/ch43.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,106 +10,86 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="docbook-dsssl" version="&docbook-dsssl-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&docbook-dsssl-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&docbook-dsssl-directory;</base>
-		</stageinfo>
-
-		<mkdir>
-		       <option>parents</option>
-		       <name>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;</name>
-		</mkdir>
-
-		<mkdir base="/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;">
-		        <option>parents</option>
-			<name>dtds/decls</name>
-			<name>lib</name>
-			<name>common</name>
-			<name>html</name>
-			<name>print</name>
-			<name>test</name>
-			<name>images</name>
-		</mkdir>
-
-		<execute command="install">
-		        <param>bin/collateindex.pl</param>
-			<param>/usr/bin</param>
-		</execute>
-
-		<copy>
-		        <source>catalog</source>
-			<source>VERSION</source>
-			<destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;</destination>
-		</copy>
-
-		<copy>
-		        <source>dtds/decls/*.dcl</source>
-			<destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/dtds/decls</destination>
-		</copy>
-
-		<copy>
-			<source>lib/dblib.dsl</source>
-			<destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/lib</destination>
-		</copy>
-
-		<copy>
-		        <source>common/*.dsl</source>
-			<destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/common</destination>
-		</copy>
-
-		<copy>
-		        <source>common/*.ent</source>
-			<destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/common</destination>
-		</copy>
-
-		<copy>
-		        <source>html/*.dsl</source>
-			<destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/html</destination>
-		</copy>
-
-		<copy>
-		        <source>lib/*.dsl</source>
-			<destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/lib</destination>
-		</copy>
-
-		<copy>
-		        <source>print/*.dsl</source>
-			<destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/print</destination>
-		</copy>
-
-		<copy>
-		        <source>images/*.gif</source>
-			<destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/images</destination>
-		</copy>
-
-		<execute command="install-catalog">
-		        <param>--add</param>
-			<param>/etc/sgml/dsssl-docbook-stylesheets.cat</param>
-			<param>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/catalog</param>
-		</execute>
-
-		<execute command="install-catalog">
-		        <param>--add</param>
-			<param>/etc/sgml/sgml-docbook.cat</param>
-			<param>/etc/sgml/dsssl-docbook-stylesheets.cat</param>
-		</execute>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&docbook-dsssl-directory;</remove>
-	</stage>
-
-</package>
+  <package name="docbook-dsssl" version="&docbook-dsssl-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&docbook-dsssl-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&docbook-dsssl-directory;</base>
+      </stageinfo>
+      <mkdir>
+        <option>parents</option>
+        <name>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;</name>
+      </mkdir>
+      <mkdir base="/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;">
+        <option>parents</option>
+        <name>dtds/decls</name>
+        <name>lib</name>
+        <name>common</name>
+        <name>html</name>
+        <name>print</name>
+        <name>test</name>
+        <name>images</name>
+      </mkdir>
+      <execute command="install">
+        <param>bin/collateindex.pl</param>
+        <param>/usr/bin</param>
+      </execute>
+      <copy>
+        <source>catalog</source>
+        <source>VERSION</source>
+        <destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;</destination>
+      </copy>
+      <copy>
+        <source>dtds/decls/*.dcl</source>
+        <destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/dtds/decls</destination>
+      </copy>
+      <copy>
+        <source>lib/dblib.dsl</source>
+        <destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/lib</destination>
+      </copy>
+      <copy>
+        <source>common/*.dsl</source>
+        <destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/common</destination>
+      </copy>
+      <copy>
+        <source>common/*.ent</source>
+        <destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/common</destination>
+      </copy>
+      <copy>
+        <source>html/*.dsl</source>
+        <destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/html</destination>
+      </copy>
+      <copy>
+        <source>lib/*.dsl</source>
+        <destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/lib</destination>
+      </copy>
+      <copy>
+        <source>print/*.dsl</source>
+        <destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/print</destination>
+      </copy>
+      <copy>
+        <source>images/*.gif</source>
+        <destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/images</destination>
+      </copy>
+      <execute command="install-catalog">
+        <param>--add</param>
+        <param>/etc/sgml/dsssl-docbook-stylesheets.cat</param>
+        <param>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/catalog</param>
+      </execute>
+      <execute command="install-catalog">
+        <param>--add</param>
+        <param>/etc/sgml/sgml-docbook.cat</param>
+        <param>/etc/sgml/dsssl-docbook-stylesheets.cat</param>
+      </execute>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&docbook-dsssl-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter43/openjade.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/openjade.xml	2004-07-19 19:29:18 UTC (rev 1473)
+++ profiles/BLFS/trunk/chapter43/openjade.xml	2004-07-19 19:37:49 UTC (rev 1474)
@@ -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/ch43.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,102 +10,85 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="openjade" version="&openjade-version;">
-
-        <packageinfo>
-                <requires><name>opensp</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&openjade-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&openjade-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-			<param>--enable-http</param>
-			<param>--disable-static</param>
-			<param>--enable-default-catalog=/etc/sgml/catalog</param>
-			<param>--enable-default-search-path=/usr/share/sgml</param>
-			<param>--datadir=/usr/share/sgml/openjade-&openjade-version;</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<link base="/usr/bin">
-		        <option>force</option>
-			<target>openjade</target>
-			<name>jade</name>
-		</link>
-
-		<link base="/usr/lib">
-		        <option>force</option>
-			<target>libogrove.so</target>
-			<name>libgrove.so</name>
-		</link>
-
-		<link base="/usr/lib">
-		        <option>force</option>
-			<target>libospgrove.so</target>
-			<name>libspgrove.so</name>
-		</link>
-
-		<link base="/usr/lib">
-		        <option>force</option>
-			<target>libostyle.so</target>
-			<name>libstyle.so</name>
-		</link>
-
-		<execute command="install">
-		        <param>-m644</param>
-			<param>dsssl/catalog</param>
-			<param>/usr/share/sgml/openjade-&openjade-version;/</param>
-		</execute>
-
-		<execute command="install">
-		        <param>-m644</param>
-			<param>dsssl/*.dtd</param>
-			<param>dsssl/*.dsl</param>
-			<param>dsssl/*.sgm</param>
-			<param>/usr/share/sgml/openjade-&openjade-version;</param>
-		</execute>
-
-		<execute command="install-catalog">
-			 <param>--add</param>
-			 <param>/etc/sgml/openjade-&openjade-version;.cat</param>
-			 <param>/usr/share/sgml/openjade-&openjade-version;/catalog</param>
-		</execute>
-
-		<execute command="install-catalog">
-		         <param>--add</param>
-			 <param>/etc/sgml/sgml-docbook.cat</param>
-			 <param>/etc/sgml/openjade-&openjade-version;.cat</param>
-		</execute>
-
-		<execute command="echo">
-			<param>"SYSTEM \"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd\" \</param>
-    			<param>\"/usr/share/xml/docbook/xml-dtd-4.3/docbookx.dtd\"" >> \</param>
-    			<param>/usr/share/sgml/openjade-1.3.2/catalog'</param>
-		</execute>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&openjade-directory;</remove>
-	</stage>
-
-</package>
+  <package name="openjade" version="&openjade-version;">
+    <packageinfo>
+      <requires>
+        <name>opensp</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&openjade-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&openjade-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--enable-http</param>
+        <param>--disable-static</param>
+        <param>--enable-default-catalog=/etc/sgml/catalog</param>
+        <param>--enable-default-search-path=/usr/share/sgml</param>
+        <param>--datadir=/usr/share/sgml/openjade-&openjade-version;</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <link base="/usr/bin">
+        <option>force</option>
+        <target>openjade</target>
+        <name>jade</name>
+      </link>
+      <link base="/usr/lib">
+        <option>force</option>
+        <target>libogrove.so</target>
+        <name>libgrove.so</name>
+      </link>
+      <link base="/usr/lib">
+        <option>force</option>
+        <target>libospgrove.so</target>
+        <name>libspgrove.so</name>
+      </link>
+      <link base="/usr/lib">
+        <option>force</option>
+        <target>libostyle.so</target>
+        <name>libstyle.so</name>
+      </link>
+      <execute command="install">
+        <param>-m644</param>
+        <param>dsssl/catalog</param>
+        <param>/usr/share/sgml/openjade-&openjade-version;/</param>
+      </execute>
+      <execute command="install">
+        <param>-m644</param>
+        <param>dsssl/*.dtd</param>
+        <param>dsssl/*.dsl</param>
+        <param>dsssl/*.sgm</param>
+        <param>/usr/share/sgml/openjade-&openjade-version;</param>
+      </execute>
+      <execute command="install-catalog">
+        <param>--add</param>
+        <param>/etc/sgml/openjade-&openjade-version;.cat</param>
+        <param>/usr/share/sgml/openjade-&openjade-version;/catalog</param>
+      </execute>
+      <execute command="install-catalog">
+        <param>--add</param>
+        <param>/etc/sgml/sgml-docbook.cat</param>
+        <param>/etc/sgml/openjade-&openjade-version;.cat</param>
+      </execute>
+      <execute command="echo">
+        <param>"SYSTEM \"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd\" \</param>
+        <param>\"/usr/share/xml/docbook/xml-dtd-4.3/docbookx.dtd\"" >> \</param>
+        <param>/usr/share/sgml/openjade-1.3.2/catalog'</param>
+      </execute>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&openjade-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter43/opensp.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/opensp.xml	2004-07-19 19:29:18 UTC (rev 1473)
+++ profiles/BLFS/trunk/chapter43/opensp.xml	2004-07-19 19:37:49 UTC (rev 1474)
@@ -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/ch43.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,131 +10,111 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="opensp" version="&opensp-version;">
+  <package name="opensp" version="&opensp-version;">
+    <packageinfo>
+      <requires>
+        <name>sgml-common</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&opensp-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&opensp-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&opensp-patch;</param>
+      </patch>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--disable-static</param>
+        <param>--enable-http</param>
+        <param>--enable-default-catalog=/etc/sgml/catalog</param>
+        <param>--enable-default-search-path=/usr/share/sgml</param>
+      </configure>
+      <make>
+        <param>pkgdatadir=/usr/share/sgml/OpenSP-&opensp-version;</param>
+      </make>
+      <make>
+        <param>pkgdatadir=/usr/share/sgml/OpenSP-&opensp-version;</param>
+        <param>install</param>
+      </make>
+      <link base="/usr/bin">
+        <option>force</option>
+        <target>onsgmls</target>
+        <name>nsgmls</name>
+      </link>
+      <link base="/usr/bin">
+        <option>force</option>
+        <target>osgmlnorm</target>
+        <name>sgmlnorm</name>
+      </link>
+      <link base="/usr/bin">
+        <option>force</option>
+        <target>ospam</target>
+        <name>spam</name>
+      </link>
+      <link base="/usr/bin">
+        <option>force</option>
+        <target>ospcat</target>
+        <name>spcat</name>
+      </link>
+      <link base="/usr/bin">
+        <option>force</option>
+        <target>ospent</target>
+        <name>spent</name>
+      </link>
+      <link base="/usr/bin">
+        <option>force</option>
+        <target>osx</target>
+        <name>sx</name>
+      </link>
+      <link base="/usr/bin">
+        <option>force</option>
+        <target>osx</target>
+        <name>sgml2xml</name>
+      </link>
+      <link base="/usr/lib">
+        <option>force</option>
+        <target>libosp.so</target>
+        <name>libsp.so</name>
+      </link>
+      <!-- remove comments if you update
+                     and remove the space in - -remove
 
-        <packageinfo>
-                <requires><name>sgml-common</name></requires>
-        </packageinfo>
+                <execute command="install-catalog">
+                        <param>- -remove</param>
+                        <param>/etc/sgml/OpenSP-1.5.cat</param>
+                        <param>/usr/share/sgml/OpenSP-1.5/catalog</param>
+                </execute>
 
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&opensp-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
+                <execute command="install-catalog">
+                        <param>- -remove</param>
+                        <param>/etc/sgml/sgml-docbook.cat</param>
+                        <param>/etc/sgml/OpenSP-1.5.cat</param>
+                </execute>
 
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&opensp-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&opensp-patch;</param>
-		</patch>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-			<param>--disable-static</param>
-			<param>--enable-http</param>
-			<param>--enable-default-catalog=/etc/sgml/catalog</param>
-			<param>--enable-default-search-path=/usr/share/sgml</param>
-		</configure>
-
-		<make>
-		        <param>pkgdatadir=/usr/share/sgml/OpenSP-&opensp-version;</param>
-		</make>
-
-		<make>
-		        <param>pkgdatadir=/usr/share/sgml/OpenSP-&opensp-version;</param>
-			<param>install</param>
-		</make>
-
-		<link base="/usr/bin">
-		        <option>force</option>
-			<target>onsgmls</target>
-			<name>nsgmls</name>
-		</link>
-
-		<link base="/usr/bin">
-		        <option>force</option>
-			<target>osgmlnorm</target>
-			<name>sgmlnorm</name>
-		</link>
-
-		<link base="/usr/bin">
-		        <option>force</option>
-			<target>ospam</target>
-			<name>spam</name>
-		</link>
-
-		<link base="/usr/bin">
-		        <option>force</option>
-			<target>ospcat</target>
-			<name>spcat</name>
-		</link>
-
-		<link base="/usr/bin">
-		        <option>force</option>
-			<target>ospent</target>
-			<name>spent</name>
-		</link>
-
-		<link base="/usr/bin">
-		        <option>force</option>
-			<target>osx</target>
-			<name>sx</name>
-		</link>
-
-		<link base="/usr/bin">
-		        <option>force</option>
-			<target>osx</target>
-			<name>sgml2xml</name>
-		</link>
-
-		<link base="/usr/lib">
-		        <option>force</option>
-			<target>libosp.so</target>
-			<name>libsp.so</name>
-		</link>
-
-		<!-- remove comments if you update
-		     and remove the space in - -remove
-
-		<execute command="install-catalog">
-		        <param>- -remove</param>
-			<param>/etc/sgml/OpenSP-1.5.cat</param>
-			<param>/usr/share/sgml/OpenSP-1.5/catalog</param>
-		</execute>
-
-		<execute command="install-catalog">
-		        <param>- -remove</param>
-			<param>/etc/sgml/sgml-docbook.cat</param>
-			<param>/etc/sgml/OpenSP-1.5.cat</param>
-		</execute>
-
-		-->
-
-
-		<execute command="install-catalog">
-		        <param>--add</param>
-			<param>/etc/sgml/OpenSP-&opensp-version;.cat</param>
-			<param>/usr/share/sgml/OpenSP-&opensp-version;/catalog</param>
-		</execute>
-
-		<execute command="install-catalog">
-		        <param>--add</param>
-			<param>/etc/sgml/sgml-docbook.cat</param>
-			<param>/etc/sgml/OpenSP-&opensp-version;.cat</param>
-		</execute>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&opensp-directory;</remove>
-	</stage>
-
-</package>
+                -->
+      <execute command="install-catalog">
+        <param>--add</param>
+        <param>/etc/sgml/OpenSP-&opensp-version;.cat</param>
+        <param>/usr/share/sgml/OpenSP-&opensp-version;/catalog</param>
+      </execute>
+      <execute command="install-catalog">
+        <param>--add</param>
+        <param>/etc/sgml/sgml-docbook.cat</param>
+        <param>/etc/sgml/OpenSP-&opensp-version;.cat</param>
+      </execute>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&opensp-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter43/sgml-common.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/sgml-common.xml	2004-07-19 19:29:18 UTC (rev 1473)
+++ profiles/BLFS/trunk/chapter43/sgml-common.xml	2004-07-19 19:37:49 UTC (rev 1474)
@@ -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/ch43.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,77 +10,63 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="sgml-common" version="&sgml-common-version;">
+  <package name="sgml-common" version="&sgml-common-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&sgml-common-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&sgml-common-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&sgml-common-manpage-patch;</param>
+      </patch>
+      <execute command="aclocal" />
+      <execute command="automake -acf" />
+      <execute command="autoconf" />
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <!-- remove comments if you update
+                     and remove the space in - -remove
 
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&sgml-common-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
+                <execute command="install-catalog">
+                        <param>- -remove</param>
+                        <param>/etc/sgml/sgml-ent.cat</param>
+                        <param>/usr/share/sgml/sgml-iso-entities-8879.1986/catalog</param>
+                </execute>
 
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&sgml-common-directory;</base>
-		</stageinfo>
+                <execute command="install-catalog">
+                        <param>- -remove</param>
+                        <param>/etc/sgml/sgml-docbook.cat</param>
+                        <param>/etc/sgml/sgml-ent.cat</param>
+                </execute>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&sgml-common-manpage-patch;</param>
-		</patch>
-
-		<execute command="aclocal" />
-		<execute command="automake -acf" />
-		<execute command="autoconf" />
-
-		<configure>
-		        <param>--prefix=/usr</param>
-			<param>--sysconfdir=/etc</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<!-- remove comments if you update
-		     and remove the space in - -remove
-
-		<execute command="install-catalog">
-		        <param>- -remove</param>
-			<param>/etc/sgml/sgml-ent.cat</param>
-			<param>/usr/share/sgml/sgml-iso-entities-8879.1986/catalog</param>
-		</execute>
-
-		<execute command="install-catalog">
-		        <param>- -remove</param>
-			<param>/etc/sgml/sgml-docbook.cat</param>
-			<param>/etc/sgml/sgml-ent.cat</param>
-		</execute>
-
-		-->
-
-		<execute command="install-catalog">
-		        <param>--add</param>
-			<param>/etc/sgml/sgml-ent.cat</param>
-			<param>/usr/share/sgml/sgml-iso-entities-8879.1986/catalog</param>
-		</execute>
-
-		<execute command="install-catalog">
-		        <param>--add</param>
-			<param>/etc/sgml/sgml-docbook.cat</param>
-			<param>/etc/sgml/sgml-ent.cat</param>
-		</execute>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&sgml-common-directory;</remove>
-	</stage>
-
-</package>
+                -->
+      <execute command="install-catalog">
+        <param>--add</param>
+        <param>/etc/sgml/sgml-ent.cat</param>
+        <param>/usr/share/sgml/sgml-iso-entities-8879.1986/catalog</param>
+      </execute>
+      <execute command="install-catalog">
+        <param>--add</param>
+        <param>/etc/sgml/sgml-docbook.cat</param>
+        <param>/etc/sgml/sgml-ent.cat</param>
+      </execute>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&sgml-common-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter43/sgml-dtd.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/sgml-dtd.xml	2004-07-19 19:29:18 UTC (rev 1473)
+++ profiles/BLFS/trunk/chapter43/sgml-dtd.xml	2004-07-19 19:37:49 UTC (rev 1474)
@@ -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/ch43.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,93 +10,78 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="sgml-dtd" version="&sgml-dtd-version;">
-
-        <packageinfo>
-                <requires><name>unzip</name></requires>
-        	<requires><name>sgml-common</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-
-	        <mkdir>
-		        <name>&build_dir;/&sgml-dtd-directory;</name>
-		</mkdir>
-
-		<unpack>
-			<archive>&packages_dir;/&sgml-dtd-package;</archive>
-			<destination>&build_dir;/&sgml-dtd-directory;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&sgml-dtd-directory;</base>
-		</stageinfo>
-
-		<copy>
-		        <source>docbook.cat</source>
-			<destination>docbook.cat.orig</destination>
-		</copy>
-
-		<search_replace>
-			<file>docbook.cat</file>
-			<find>ISO 8879</find>
-			<replace></replace>
-		</search_replace>
-
-		<search_replace>
-			<file>docbook.cat</file>
-			<find>gml</find>
-			<replace></replace>
-		</search_replace>
-
-		<execute command="install -d /usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;" />
-
-		<ownership user="root" group="root">
-		        <option>recursive</option>
-			<name>.</name>
-		</ownership>
-
-		<permissions mode="755">
-		        <option>recursive</option>
-			<name>.</name>
-		</permissions>
-
-		<execute command="install docbook.cat /usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;/catalog" />
-
-		<copy>
-		        <option>archive</option>
-			<option>force</option>
-		        <source>*.dtd</source>
-			<source>*.mod</source>
-			<source>*.dcl</source>
-			<destination>/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;</destination>
-		</copy>
-
-		<execute command="install-catalog --add /etc/sgml/sgml-docbook-dtd-&sgml-dtd-version;.cat /usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;/catalog" />
-
-		<execute command="install-catalog --add /etc/sgml/sgml-docbook-dtd-&sgml-dtd-version;.cat /etc/sgml/sgml-docbook.cat" />
-
-		<textdump mode="append">
-			<file>/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;/catalog</file>
-			<content>
-			=  -- Begin Single Major Version catalog changes --
-			=
-			=PUBLIC "-//OASIS//DTD DocBook V4.2//EN" "docbook.dtd"
-			=PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd"
-			=PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
-			=
-			=  -- End Single Major Version catalog changes --
-			</content>
-		</textdump>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&sgml-dtd-directory;</remove>
-	</stage>
-
-</package>
+  <package name="sgml-dtd" version="&sgml-dtd-version;">
+    <packageinfo>
+      <requires>
+        <name>unzip</name>
+      </requires>
+      <requires>
+        <name>sgml-common</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <mkdir>
+        <name>&build_dir;/&sgml-dtd-directory;</name>
+      </mkdir>
+      <unpack>
+        <archive>&packages_dir;/&sgml-dtd-package;</archive>
+        <destination>&build_dir;/&sgml-dtd-directory;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&sgml-dtd-directory;</base>
+      </stageinfo>
+      <copy>
+        <source>docbook.cat</source>
+        <destination>docbook.cat.orig</destination>
+      </copy>
+      <search_replace>
+        <file>docbook.cat</file>
+        <find>ISO 8879</find>
+        <replace></replace>
+      </search_replace>
+      <search_replace>
+        <file>docbook.cat</file>
+        <find>gml</find>
+        <replace></replace>
+      </search_replace>
+      <execute command="install -d /usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;" />
+      <ownership user="root" group="root">
+        <option>recursive</option>
+        <name>.</name>
+      </ownership>
+      <permissions mode="755">
+        <option>recursive</option>
+        <name>.</name>
+      </permissions>
+      <execute command="install docbook.cat /usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;/catalog" />
+      <copy>
+        <option>archive</option>
+        <option>force</option>
+        <source>*.dtd</source>
+        <source>*.mod</source>
+        <source>*.dcl</source>
+        <destination>/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;</destination>
+      </copy>
+      <execute command="install-catalog --add /etc/sgml/sgml-docbook-dtd-&sgml-dtd-version;.cat /usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;/catalog" />
+      <execute command="install-catalog --add /etc/sgml/sgml-docbook-dtd-&sgml-dtd-version;.cat /etc/sgml/sgml-docbook.cat" />
+      <textdump mode="append">
+        <file>/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;/catalog</file>
+        <content>
+	  = -- Begin Single Major Version catalog changes --
+	  =
+	  =PUBLIC "-//OASIS//DTD DocBook V4.2//EN" "docbook.dtd"
+	  =PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd"
+	  =PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
+	  =
+	  = -- End Single Major Version catalog changes --
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&sgml-dtd-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter43/sgml-dtd31.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/sgml-dtd31.xml	2004-07-19 19:29:18 UTC (rev 1473)
+++ profiles/BLFS/trunk/chapter43/sgml-dtd31.xml	2004-07-19 19:37:49 UTC (rev 1474)
@@ -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/ch43.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,97 +10,81 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="sgml-dtd31" version="&sgml-dtd31-version;">
-
-        <packageinfo>
-                <requires><name>unzip</name></requires>
-        	<requires><name>sgml-common</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-
-	        <mkdir>
-		        <name>&build_dir;/&sgml-dtd31-directory;</name>
-		</mkdir>
-
-		<unpack>
-			<archive>&packages_dir;/&sgml-dtd31-package;</archive>
-			<destination>&build_dir;/&sgml-dtd31-directory;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&sgml-dtd31-directory;</base>
-		</stageinfo>
-
-		<copy>
-		        <source>docbook.cat</source>
-			<destination>docbook.cat.orig</destination>
-		</copy>
-
-		<search_replace>
-			<file>docbook.cat</file>
-			<find>ISO 8879</find>
-			<replace></replace>
-		</search_replace>
-
-		<search_replace>
-			<file>docbook.cat</file>
-			<find>gml</find>
-			<replace></replace>
-		</search_replace>
-
-		<search_replace>
-			<file>docbook.cat</file>
-			<find>DTDDECL "-//OASIS//DTD DocBook V3.1//EN"</find>
-			<replace>SGMLDECL</replace>
-		</search_replace>
-
-		<execute command="install -d /usr/share/sgml/docbook/sgml-dtd-3.1" />
-
-		<ownership user="root" group="root">
-		        <option>recursive</option>
-			<name>.</name>
-		</ownership>
-
-		<permissions mode="755">
-		        <option>recursive</option>
-			<name>.</name>
-		</permissions>
-
-		<execute command="install docbook.cat /usr/share/sgml/docbook/sgml-dtd-3.1/catalog" />
-
-		<copy>
-		        <option>archive</option>
-			<option>force</option>
-		        <source>*.dtd</source>
-			<source>*.mod</source>
-			<source>*.dcl</source>
-			<destination>/usr/share/sgml/docbook/sgml-dtd-3.1</destination>
-		</copy>
-
-		<execute command="install-catalog --add /etc/sgml/sgml-docbook-dtd-3.1.cat /usr/share/sgml/docbook/sgml-dtd-3.1/catalog" />
-
-		<execute command="install-catalog --add /etc/sgml/sgml-docbook-dtd-3.1.cat /etc/sgml/sgml-docbook.cat" />
-
-		<textdump>
-			<file>/usr/share/sgml/docbook/sgml-dtd-3.1/catalog</file>
-			<content>
-			= -- Begin Single Major Version catalog changes --
-			=
-			=PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"
-			=
-			= -- End Single Major Version catalog changes --
-			</content>
-		</textdump>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&sgml-dtd31-directory;</remove>
-	</stage>
-
-</package>
+  <package name="sgml-dtd31" version="&sgml-dtd31-version;">
+    <packageinfo>
+      <requires>
+        <name>unzip</name>
+      </requires>
+      <requires>
+        <name>sgml-common</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <mkdir>
+        <name>&build_dir;/&sgml-dtd31-directory;</name>
+      </mkdir>
+      <unpack>
+        <archive>&packages_dir;/&sgml-dtd31-package;</archive>
+        <destination>&build_dir;/&sgml-dtd31-directory;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&sgml-dtd31-directory;</base>
+      </stageinfo>
+      <copy>
+        <source>docbook.cat</source>
+        <destination>docbook.cat.orig</destination>
+      </copy>
+      <search_replace>
+        <file>docbook.cat</file>
+        <find>ISO 8879</find>
+        <replace></replace>
+      </search_replace>
+      <search_replace>
+        <file>docbook.cat</file>
+        <find>gml</find>
+        <replace></replace>
+      </search_replace>
+      <search_replace>
+        <file>docbook.cat</file>
+        <find>DTDDECL "-//OASIS//DTD DocBook V3.1//EN"</find>
+        <replace>SGMLDECL</replace>
+      </search_replace>
+      <execute command="install -d /usr/share/sgml/docbook/sgml-dtd-3.1" />
+      <ownership user="root" group="root">
+        <option>recursive</option>
+        <name>.</name>
+      </ownership>
+      <permissions mode="755">
+        <option>recursive</option>
+        <name>.</name>
+      </permissions>
+      <execute command="install docbook.cat /usr/share/sgml/docbook/sgml-dtd-3.1/catalog" />
+      <copy>
+        <option>archive</option>
+        <option>force</option>
+        <source>*.dtd</source>
+        <source>*.mod</source>
+        <source>*.dcl</source>
+        <destination>/usr/share/sgml/docbook/sgml-dtd-3.1</destination>
+      </copy>
+      <execute command="install-catalog --add /etc/sgml/sgml-docbook-dtd-3.1.cat /usr/share/sgml/docbook/sgml-dtd-3.1/catalog" />
+      <execute command="install-catalog --add /etc/sgml/sgml-docbook-dtd-3.1.cat /etc/sgml/sgml-docbook.cat" />
+      <textdump>
+        <file>/usr/share/sgml/docbook/sgml-dtd-3.1/catalog</file>
+        <content>
+	  = -- Begin Single Major Version catalog changes --
+	  =
+	  =PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"
+	  =
+	  = -- End Single Major Version catalog changes --
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&sgml-dtd31-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter44/docbook-xsl.xml
===================================================================
--- profiles/BLFS/trunk/chapter44/docbook-xsl.xml	2004-07-19 19:29:18 UTC (rev 1473)
+++ profiles/BLFS/trunk/chapter44/docbook-xsl.xml	2004-07-19 19:37:49 UTC (rev 1474)
@@ -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/ch44.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,126 +10,108 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="docbook-xsl" version="&docbook-xsl-version;">
-
-        <packageinfo>
-                <requires><name>libxslt</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&docbook-xsl-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&docbook-xsl-directory;</base>
-		</stageinfo>
-
-		<execute command="install">
-			<param>-d /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;</param>
-		</execute>
-
-		<copy>
-			<option>archive</option>
-			<option>force</option>
-			<source>VERSION</source>
-			<source>common</source>
-			<source>extensions</source>
-			<source>fo</source>
-			<source>html</source>
-			<source>htmlhelp</source>
-			<source>images</source>
-			<source>javahelp</source>
-			<source>lib</source>
-			<source>manpages</source>
-			<source>params</source>
-			<source>profiling</source>
-			<source>template</source>
-			<source>tools</source>
-			<source>xhtml</source>
-			<destination>/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;</destination>
-		</copy>
-
-		<execute command="install">
-			<param>-d /usr/share/doc/xml</param>
-		</execute>
-
-		<copy>
-			<option>archive</option>
-			<option>force</option>
-			<source>doc/*</source>
-			<destination>/usr/share/doc/xml</destination>
-		</copy>
-
-		<textdump>
-			<file>&build_dir;/dircheck.sh</file>
-			<content>
-			=if [ ! -e /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog --noout \
-			=--create /etc/xml/catalog; fi &real-amp;&real-amp;
-			=if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create \
-			=/etc/xml/docbook; fi
-			</content>
-		</textdump>
-
-		<permissions mode="755">
-			<name>&build_dir;/dircheck.sh</name>
-		</permissions>
-
-		<execute command="&build_dir;/dircheck.sh"/>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "rewriteSystem"</param>
-			<param>"http://docbook.sourceforge.net/release/xsl/&docbook-xsl-version;"</param>
-			<param>"/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;"</param>
-			<param>/etc/xml/catalog</param>
-		</execute>
-	
-		<execute command="xmlcatalog">
-			<param>--noout --add "rewriteURI"</param>
-			<param>"http://docbook.sourceforge.net/release/xsl/&docbook-xsl-version;"</param>
-			<param>"/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;"</param>
-			<param>/etc/xml/catalog</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "rewriteSystem"</param>
-			<param>"http://docbook.sourceforge.net/release/xsl/current"</param>
-			<param>"/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;"</param>
-			<param>/etc/xml/catalog</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "rewriteURI"</param>
-			<param>"http://docbook.sourceforge.net/release/xsl/current"</param>
-			<param>"/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;"</param>
-			<param>/etc/xml/catalog</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "delegateSystem"</param>
-			<param>"http://docbook.sourceforge.net/release/xsl/"</param>
-			<param>"file:///etc/xml/docbook"</param>
-			<param>/etc/xml/catalog</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "delegateURI"</param>
-			<param>"http://docbook.sourceforge.net/release/xsl/"</param>
-			<param>"file:///etc/xml/docbook"</param>
-			<param>/etc/xml/catalog</param>
-		</execute>
-	</stage>
-
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&docbook-xsl-directory;</remove>
-		<remove>&build_dir;/dircheck.sh</remove>
-	</stage>
-
-</package>
+  <package name="docbook-xsl" version="&docbook-xsl-version;">
+    <packageinfo>
+      <requires>
+        <name>libxslt</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&docbook-xsl-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&docbook-xsl-directory;</base>
+      </stageinfo>
+      <execute command="install">
+        <param>-d /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;</param>
+      </execute>
+      <copy>
+        <option>archive</option>
+        <option>force</option>
+        <source>VERSION</source>
+        <source>common</source>
+        <source>extensions</source>
+        <source>fo</source>
+        <source>html</source>
+        <source>htmlhelp</source>
+        <source>images</source>
+        <source>javahelp</source>
+        <source>lib</source>
+        <source>manpages</source>
+        <source>params</source>
+        <source>profiling</source>
+        <source>template</source>
+        <source>tools</source>
+        <source>xhtml</source>
+        <destination>/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;</destination>
+      </copy>
+      <execute command="install">
+        <param>-d /usr/share/doc/xml</param>
+      </execute>
+      <copy>
+        <option>archive</option>
+        <option>force</option>
+        <source>doc/*</source>
+        <destination>/usr/share/doc/xml</destination>
+      </copy>
+      <textdump>
+        <file>&build_dir;/dircheck.sh</file>
+        <content>
+	  =if [ ! -e /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog --noout \
+	  =--create /etc/xml/catalog; fi &real-amp;&real-amp;
+	  =if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create \
+	  =/etc/xml/docbook; fi
+	</content>
+      </textdump>
+      <permissions mode="755">
+        <name>&build_dir;/dircheck.sh</name>
+      </permissions>
+      <execute command="&build_dir;/dircheck.sh" />
+      <execute command="xmlcatalog">
+        <param>--noout --add "rewriteSystem"</param>
+        <param>"http://docbook.sourceforge.net/release/xsl/&docbook-xsl-version;"</param>
+        <param>"/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "rewriteURI"</param>
+        <param>"http://docbook.sourceforge.net/release/xsl/&docbook-xsl-version;"</param>
+        <param>"/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "rewriteSystem"</param>
+        <param>"http://docbook.sourceforge.net/release/xsl/current"</param>
+        <param>"/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "rewriteURI"</param>
+        <param>"http://docbook.sourceforge.net/release/xsl/current"</param>
+        <param>"/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "delegateSystem"</param>
+        <param>"http://docbook.sourceforge.net/release/xsl/"</param>
+        <param>"file:///etc/xml/docbook"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "delegateURI"</param>
+        <param>"http://docbook.sourceforge.net/release/xsl/"</param>
+        <param>"file:///etc/xml/docbook"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&docbook-xsl-directory;</remove>
+      <remove>&build_dir;/dircheck.sh</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter44/xml-dtd.xml
===================================================================
--- profiles/BLFS/trunk/chapter44/xml-dtd.xml	2004-07-19 19:29:18 UTC (rev 1473)
+++ profiles/BLFS/trunk/chapter44/xml-dtd.xml	2004-07-19 19:37:49 UTC (rev 1474)
@@ -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/ch44.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,234 +10,200 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="xml-dtd" version="&xml-dtd-version;">
-
-        <packageinfo>
-                <requires><name>libxml2</name></requires>
-        	<requires><name>unzip</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-	
-	        <mkdir>
-		        <name>&build_dir;/&xml-dtd-directory;</name>
-		</mkdir>
-
-		<unpack>
-			<archive>&packages_dir;/&xml-dtd-package;</archive>
-			<destination>&build_dir;/&xml-dtd-directory;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&xml-dtd-directory;</base>
-		</stageinfo>
-		
-		<execute command="install -d /usr/share/xml/docbook/xml-dtd-&xml-dtd-version;" />
-		
-		<copy>
-			<option>archive</option>
-			<option>force</option>
-			<source>docbook.cat</source>
-			<source>*.dtd</source>
-			<source>ent/</source>
-			<source>*.mod</source>
-			<destination>/usr/share/xml/docbook/xml-dtd-&xml-dtd-version;</destination>
-		</copy>
-
-		<textdump>
-			<file>&build_dir;/dircheck.sh</file>
-			<content>
-			=if [ ! -e /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog --noout \
-			=--create /etc/xml/catalog; fi &real-amp;&real-amp;
-			=if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create \
-			=/etc/xml/docbook; fi
-			</content>
-		</textdump>
-
-		<permissions mode="755">
-			<name>&build_dir;/dircheck.sh</name>
-		</permissions>
-
-		<execute command="&build_dir;/dircheck.sh"/>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "public"</param>
-			<param>"-//OASIS//ELEMENTS DocBook XML Information Pool V&xml-dtd-version;//EN"</param>
-			<param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;/dbpoolx.mod"</param>
-			<param>/etc/xml/docbook</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "public"</param>
-			<param>"-//OASIS//DTD DocBook XML V&xml-dtd-version;//EN"</param>
-			<param>"http://oasis-open.org/docbook/xml/&xml-dtd-version;/docbookx.dtd"</param>
-			<param>/etc/xml/docbook</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "public"</param>
-			<param>"-//OASIS//ENTITIES DocBook XML Character Entities V&xml-dtd-version;//EN"</param>
-			<param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;/dbcentx.mod"</param>
-			<param>/etc/xml/docbook</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "public"</param>
-			<param>"-//OASIS//ENTITIES DocBook XML Notations V&xml-dtd-version;//EN"</param>
-			<param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;/dbnotnx.mod"</param>
-			<param>/etc/xml/docbook</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "public"</param>
-			<param>"-//OASIS//ENTITIES DocBook XML Additional General Entities V&xml-dtd-version;//EN"</param>
-			<param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;/dbgenent.mod"</param>
-			<param>/etc/xml/docbook</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "public"</param>
-			<param>"-//OASIS//ELEMENTS DocBook XML Document Hierarchy V&xml-dtd-version;//EN"</param>
-			<param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;/dbhierx.mod"</param>
-			<param>/etc/xml/docbook</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "public"</param>
-			<param>"-//OASIS//DTD XML Exchange Table Model 19990315//EN"</param>
-			<param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;/soextblx.dtd"</param>
-			<param>/etc/xml/docbook</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "public"</param>
-			<param>"-//OASIS//DTD DocBook XML CALS Table Model V&xml-dtd-version;//EN"</param>
-			<param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;/calstblx.dtd"</param>
-			<param>/etc/xml/docbook</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "rewriteSystem"</param>
-			<param>"http://www.oasis-open.org/docbook/xml/&xml-dtd-version;"</param>
-			<param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
-			<param>/etc/xml/docbook</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "rewriteURI"</param>
-			<param>"http://www.oasis-open.org/docbook/xml/&xml-dtd-version;"</param>
-			<param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
-			<param>/etc/xml/docbook</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "delegatePublic"</param>
-			<param>"-//OASIS//ENTITIES DocBook XML"</param>
-			<param>"file:///etc/xml/docbook"</param>
-			<param>/etc/xml/catalog</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "delegatePublic"</param>
-			<param>"-//OASIS//DTD DocBook XML"</param>
-			<param>"file:///etc/xml/docbook"</param>
-			<param>/etc/xml/catalog</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "delegateSystem"</param>
-			<param>"http://www.oasis-open.org/docbook/"</param>
-			<param>"file:///etc/xml/docbook"</param>
-			<param>/etc/xml/catalog</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "delegateURI"</param>
-			<param>"http://www.oasis-open.org/docbook/"</param>
-			<param>"file:///etc/xml/docbook"</param>
-			<param>/etc/xml/catalog</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "delegateSystem"</param>
-			<param>"/usr/share/docbook/"</param>
-			<param>"file:///etc/xml/docbook"</param>
-			<param>/etc/xml/catalog</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "delegateURI"</param>
-			<param>"/usr/share/docbook/"</param>
-			<param>"file:///etc/xml/docbook"</param>
-			<param>/etc/xml/catalog</param>
-		</execute>
-	
-		<execute command="xmlcatalog">
-			<param>--noout --add "rewriteSystem"</param>
-			<param>"/usr/share/docbook"</param>
-			<param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
-			<param>/etc/xml/docbook</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "rewriteURI"</param>
-			<param>"/usr/share/docbook"</param>
-			<param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
-			<param>/etc/xml/docbook</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "public"</param>
-			<param>"-//OASIS//DTD DocBook XML V4.1.2//EN"</param>
-			<param>"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"</param>
-			<param>/etc/xml/docbook</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "delegateSystem"</param>
-			<param>"http://www.oasis-open.org/docbook/xml/4.1.2/"</param>
-			<param>"file:///etc/xml/docbook"</param>
-			<param>/etc/xml/catalog</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "delegateURI"</param>
-			<param>"http://www.oasis-open.org/docbook/xml/4.1.2/"</param>
-			<param>"file:///etc/xml/docbook"</param>
-			<param>/etc/xml/catalog</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "rewriteSystem"</param>
-			<param>"http://www.oasis-open.org/docbook/xml/4.1.2"</param>
-			<param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
-			<param>/etc/xml/docbook</param>
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "rewriteURI"</param>
-			<param>"http://www.oasis-open.org/docbook/xml/4.1.2"</param>
-			<param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
-			<param>/etc/xml/docbook</param>	
-		</execute>
-
-		<execute command="xmlcatalog">
-			<param>--noout --add "rewriteURI""</param>
-			<param>"http://www.oasis-open.org/docbook/xml/4.2"</param>
-			<param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
-			<param>/etc/xml/docbook</param>
-		</execute>
-	</stage>
-
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&xml-dtd-directory;</remove>
-		<remove>&build_dir;/dircheck.sh</remove>
-	</stage>
-
-</package>
+  <package name="xml-dtd" version="&xml-dtd-version;">
+    <packageinfo>
+      <requires>
+        <name>libxml2</name>
+      </requires>
+      <requires>
+        <name>unzip</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <mkdir>
+        <name>&build_dir;/&xml-dtd-directory;</name>
+      </mkdir>
+      <unpack>
+        <archive>&packages_dir;/&xml-dtd-package;</archive>
+        <destination>&build_dir;/&xml-dtd-directory;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&xml-dtd-directory;</base>
+      </stageinfo>
+      <execute command="install -d /usr/share/xml/docbook/xml-dtd-&xml-dtd-version;" />
+      <copy>
+        <option>archive</option>
+        <option>force</option>
+        <source>docbook.cat</source>
+        <source>*.dtd</source>
+        <source>ent/</source>
+        <source>*.mod</source>
+        <destination>/usr/share/xml/docbook/xml-dtd-&xml-dtd-version;</destination>
+      </copy>
+      <textdump>
+        <file>&build_dir;/dircheck.sh</file>
+        <content>
+	  =if [ ! -e /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog --noout \
+	  =--create /etc/xml/catalog; fi &real-amp;&real-amp;
+	  =if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create \
+	  =/etc/xml/docbook; fi
+	</content>
+      </textdump>
+      <permissions mode="755">
+        <name>&build_dir;/dircheck.sh</name>
+      </permissions>
+      <execute command="&build_dir;/dircheck.sh" />
+      <execute command="xmlcatalog">
+        <param>--noout --add "public"</param>
+        <param>"-//OASIS//ELEMENTS DocBook XML Information Pool V&xml-dtd-version;//EN"</param>
+        <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;/dbpoolx.mod"</param>
+        <param>/etc/xml/docbook</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "public"</param>
+        <param>"-//OASIS//DTD DocBook XML V&xml-dtd-version;//EN"</param>
+        <param>"http://oasis-open.org/docbook/xml/&xml-dtd-version;/docbookx.dtd"</param>
+        <param>/etc/xml/docbook</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "public"</param>
+        <param>"-//OASIS//ENTITIES DocBook XML Character Entities V&xml-dtd-version;//EN"</param>
+        <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;/dbcentx.mod"</param>
+        <param>/etc/xml/docbook</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "public"</param>
+        <param>"-//OASIS//ENTITIES DocBook XML Notations V&xml-dtd-version;//EN"</param>
+        <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;/dbnotnx.mod"</param>
+        <param>/etc/xml/docbook</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "public"</param>
+        <param>"-//OASIS//ENTITIES DocBook XML Additional General Entities V&xml-dtd-version;//EN"</param>
+        <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;/dbgenent.mod"</param>
+        <param>/etc/xml/docbook</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "public"</param>
+        <param>"-//OASIS//ELEMENTS DocBook XML Document Hierarchy V&xml-dtd-version;//EN"</param>
+        <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;/dbhierx.mod"</param>
+        <param>/etc/xml/docbook</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "public"</param>
+        <param>"-//OASIS//DTD XML Exchange Table Model 19990315//EN"</param>
+        <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;/soextblx.dtd"</param>
+        <param>/etc/xml/docbook</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "public"</param>
+        <param>"-//OASIS//DTD DocBook XML CALS Table Model V&xml-dtd-version;//EN"</param>
+        <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;/calstblx.dtd"</param>
+        <param>/etc/xml/docbook</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "rewriteSystem"</param>
+        <param>"http://www.oasis-open.org/docbook/xml/&xml-dtd-version;"</param>
+        <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
+        <param>/etc/xml/docbook</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "rewriteURI"</param>
+        <param>"http://www.oasis-open.org/docbook/xml/&xml-dtd-version;"</param>
+        <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
+        <param>/etc/xml/docbook</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "delegatePublic"</param>
+        <param>"-//OASIS//ENTITIES DocBook XML"</param>
+        <param>"file:///etc/xml/docbook"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "delegatePublic"</param>
+        <param>"-//OASIS//DTD DocBook XML"</param>
+        <param>"file:///etc/xml/docbook"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "delegateSystem"</param>
+        <param>"http://www.oasis-open.org/docbook/"</param>
+        <param>"file:///etc/xml/docbook"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "delegateURI"</param>
+        <param>"http://www.oasis-open.org/docbook/"</param>
+        <param>"file:///etc/xml/docbook"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "delegateSystem"</param>
+        <param>"/usr/share/docbook/"</param>
+        <param>"file:///etc/xml/docbook"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "delegateURI"</param>
+        <param>"/usr/share/docbook/"</param>
+        <param>"file:///etc/xml/docbook"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "rewriteSystem"</param>
+        <param>"/usr/share/docbook"</param>
+        <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
+        <param>/etc/xml/docbook</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "rewriteURI"</param>
+        <param>"/usr/share/docbook"</param>
+        <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
+        <param>/etc/xml/docbook</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "public"</param>
+        <param>"-//OASIS//DTD DocBook XML V4.1.2//EN"</param>
+        <param>"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"</param>
+        <param>/etc/xml/docbook</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "delegateSystem"</param>
+        <param>"http://www.oasis-open.org/docbook/xml/4.1.2/"</param>
+        <param>"file:///etc/xml/docbook"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "delegateURI"</param>
+        <param>"http://www.oasis-open.org/docbook/xml/4.1.2/"</param>
+        <param>"file:///etc/xml/docbook"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "rewriteSystem"</param>
+        <param>"http://www.oasis-open.org/docbook/xml/4.1.2"</param>
+        <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
+        <param>/etc/xml/docbook</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "rewriteURI"</param>
+        <param>"http://www.oasis-open.org/docbook/xml/4.1.2"</param>
+        <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
+        <param>/etc/xml/docbook</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "rewriteURI""</param>
+        <param>"http://www.oasis-open.org/docbook/xml/4.2"</param>
+        <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
+        <param>/etc/xml/docbook</param>
+      </execute>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&xml-dtd-directory;</remove>
+      <remove>&build_dir;/dircheck.sh</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter45/a2ps.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/a2ps.xml	2004-07-19 19:29:18 UTC (rev 1473)
+++ profiles/BLFS/trunk/chapter45/a2ps.xml	2004-07-19 19:37:49 UTC (rev 1474)
@@ -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/ch45.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,56 +10,49 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="a2ps" version="&a2ps-version;">
-	
-	<packageinfo>
-		<utilizes><name>psutils</name></utilizes>
-		<utilizes><name>ghostscript</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&a2ps-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&a2ps-directory;</base>
-		</stageinfo>
-
-		<search_replace>
-			<file>contrib/Makefile.in</file>
-			<find>emacs</find>
-			<replace></replace>
-		</search_replace>
-
-		<search_replace>
-			<file>configure</file>
-			<find>/usr/local/share/ghostscript</find>
-			<replace>/usr/share/ghostscript</replace>
-		</search_replace>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--sysconfdir=/etc/a2ps</param>
-			<param>--localstatedir=/var</param>
-			<param>--with-medium=letter</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&a2ps-directory;</remove>
-	</stage>
-
-</package>
+  <package name="a2ps" version="&a2ps-version;">
+    <packageinfo>
+      <utilizes>
+        <name>psutils</name>
+      </utilizes>
+      <utilizes>
+        <name>ghostscript</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&a2ps-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&a2ps-directory;</base>
+      </stageinfo>
+      <search_replace>
+        <file>contrib/Makefile.in</file>
+        <find>emacs</find>
+        <replace></replace>
+      </search_replace>
+      <search_replace>
+        <file>configure</file>
+        <find>/usr/local/share/ghostscript</find>
+        <replace>/usr/share/ghostscript</replace>
+      </search_replace>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc/a2ps</param>
+        <param>--localstatedir=/var</param>
+        <param>--with-medium=letter</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&a2ps-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter45/enscript.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/enscript.xml	2004-07-19 19:29:18 UTC (rev 1473)
+++ profiles/BLFS/trunk/chapter45/enscript.xml	2004-07-19 19:37:49 UTC (rev 1474)
@@ -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/ch45.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,39 +10,31 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="enscript" version="&enscript-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&enscript-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&enscript-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-			<param>--sysconfdir=/etc/enscript</param>
-			<param>--localstatedir=/var</param>
-			<param>--with-media=Letter</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&enscript-directory;</remove>
-	</stage>
-
-</package>
+  <package name="enscript" version="&enscript-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&enscript-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&enscript-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc/enscript</param>
+        <param>--localstatedir=/var</param>
+        <param>--with-media=Letter</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&enscript-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter45/gsview.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/gsview.xml	2004-07-19 19:29:18 UTC (rev 1473)
+++ profiles/BLFS/trunk/chapter45/gsview.xml	2004-07-19 19:37:49 UTC (rev 1474)
@@ -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/ch45.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,66 +10,57 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gsview" version="&gsview-version;">
-
-        <packageinfo>
-                <requires><name>gtk+</name></requires>
-		<requires><name>ghostscript</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gsview-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gsview-directory;</base>
-		</stageinfo>
-
-		<search_replace>
-		        <file>srcunx/gvxreg.c</file>
-			<find>netscape</find>
-			<replace>mozilla</replace>
-		</search_replace>
-
-		<copy>
-		        <source>srcunx/unx.mak</source>
-			<destination>Makefile</destination>
-		</copy>
-
-		<search_replace>
-			<file>Makefile</file>
-			<find>GSVIEW_ROOT=/usr/local</find>
-			<replace>GSVIEW_ROOT=/usr</replace>
-		</search_replace>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&gsview-pstotext-patch;</param>
-		</patch>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&gsview-lang-patch;</param>
-		</patch>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gsview-directory;</remove>
-	</stage>
-
-</package>
+  <package name="gsview" version="&gsview-version;">
+    <packageinfo>
+      <requires>
+        <name>gtk+</name>
+      </requires>
+      <requires>
+        <name>ghostscript</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gsview-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gsview-directory;</base>
+      </stageinfo>
+      <search_replace>
+        <file>srcunx/gvxreg.c</file>
+        <find>netscape</find>
+        <replace>mozilla</replace>
+      </search_replace>
+      <copy>
+        <source>srcunx/unx.mak</source>
+        <destination>Makefile</destination>
+      </copy>
+      <search_replace>
+        <file>Makefile</file>
+        <find>GSVIEW_ROOT=/usr/local</find>
+        <replace>GSVIEW_ROOT=/usr</replace>
+      </search_replace>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&gsview-pstotext-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&gsview-lang-patch;</param>
+      </patch>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gsview-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter45/psutils.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/psutils.xml	2004-07-19 19:29:18 UTC (rev 1473)
+++ profiles/BLFS/trunk/chapter45/psutils.xml	2004-07-19 19:37:49 UTC (rev 1474)
@@ -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/ch45.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,43 +10,34 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="psutils" version="&psutils-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&psutils-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&psutils-directory;</base>
-		</stageinfo>
-
-		<copy>
-		        <source>Makefile.unix</source>
-			<destination>Makefile</destination>
-		</copy>
-
-		<search_replace>
-		        <file>Makefile</file>
-			<find>/usr/local</find>
-			<replace>/usr</replace>
-		</search_replace>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&psutils-directory;</remove>
-	</stage>
-
-</package>
+  <package name="psutils" version="&psutils-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&psutils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&psutils-directory;</base>
+      </stageinfo>
+      <copy>
+        <source>Makefile.unix</source>
+        <destination>Makefile</destination>
+      </copy>
+      <search_replace>
+        <file>Makefile</file>
+        <find>/usr/local</find>
+        <replace>/usr</replace>
+      </search_replace>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&psutils-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter45/xpdf.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/xpdf.xml	2004-07-19 19:29:18 UTC (rev 1473)
+++ profiles/BLFS/trunk/chapter45/xpdf.xml	2004-07-19 19:37:49 UTC (rev 1474)
@@ -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/ch45.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,82 +10,75 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="xpdf" version="&xpdf-version;">
-
-        <packageinfo>
-        	<requires><name>lesstif</name></requires>
-        	<utilizes><name>ghostscript</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&xpdf-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&xpdf-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&xpdf-freetype-patch;</param>
-		</patch>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--sysconfdir=/etc</param>
-			<param>--with-freetype2-includes=/usr/include/freetype2</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<textdump>
-		         <file>/etc/xpdfrc</file>
-			 <content>
-			 =# Example .xpdfrc
-			 =displayFontT1 Times-Roman               /usr/share/ghostscript/fonts/n021003l.pfb
-			 =displayFontT1 Times-Italic              /usr/share/ghostscript/fonts/n021023l.pfb
-			 =displayFontT1 Times-Bold                /usr/share/ghostscript/fonts/n021004l.pfb
-			 =displayFontT1 Times-BoldItalic          /usr/share/ghostscript/fonts/n021024l.pfb
-			 =displayFontT1 Helvetica                 /usr/share/ghostscript/fonts/n019003l.pfb
-			 =displayFontT1 Helvetica-Oblique         /usr/share/ghostscript/fonts/n019023l.pfb
-			 =displayFontT1 Helvetica-Bold            /usr/share/ghostscript/fonts/n019004l.pfb
-			 =displayFontT1 Helvetica-BoldOblique     /usr/share/ghostscript/fonts/n019024l.pfb
-			 =displayFontT1 Courier                   /usr/share/ghostscript/fonts/n022003l.pfb
-			 =displayFontT1 Courier-Oblique           /usr/share/ghostscript/fonts/n022023l.pfb
-			 =displayFontT1 Courier-Bold              /usr/share/ghostscript/fonts/n022004l.pfb
-			 =displayFontT1 Courier-BoldOblique       /usr/share/ghostscript/fonts/n022024l.pfb
-			 =displayFontT1 Symbol                    /usr/share/ghostscript/fonts/s050000l.pfb
-			 =displayFontT1 ZapfDingbats              /usr/share/ghostscript/fonts/d050000l.pfb
-			 =
-			 =fontDir                 /usr/X11R6/lib/X11/fonts/TTF
-			 =
-			 =psFile                  "|lpr"
-			 =psPaperSize             letter
-			 =textEOL                 unix
-			 =
-			 =enableT1lib             yes
-			 =enableFreeType          yes
-			 =antialias               yes
-			 =
-			 =urlCommand              "links -g %s"			 
-			</content>
-		</textdump>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&xpdf-directory;</remove>
-	</stage>
-
-</package>
+  <package name="xpdf" version="&xpdf-version;">
+    <packageinfo>
+      <requires>
+        <name>lesstif</name>
+      </requires>
+      <utilizes>
+        <name>ghostscript</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&xpdf-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&xpdf-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&xpdf-freetype-patch;</param>
+      </patch>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+        <param>--with-freetype2-includes=/usr/include/freetype2</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <textdump>
+        <file>/etc/xpdfrc</file>
+        <content>
+	  =# Example .xpdfrc
+	  =displayFontT1 Times-Roman               /usr/share/ghostscript/fonts/n021003l.pfb
+	  =displayFontT1 Times-Italic              /usr/share/ghostscript/fonts/n021023l.pfb
+	  =displayFontT1 Times-Bold                /usr/share/ghostscript/fonts/n021004l.pfb
+	  =displayFontT1 Times-BoldItalic          /usr/share/ghostscript/fonts/n021024l.pfb
+	  =displayFontT1 Helvetica                 /usr/share/ghostscript/fonts/n019003l.pfb
+	  =displayFontT1 Helvetica-Oblique         /usr/share/ghostscript/fonts/n019023l.pfb
+	  =displayFontT1 Helvetica-Bold            /usr/share/ghostscript/fonts/n019004l.pfb
+	  =displayFontT1 Helvetica-BoldOblique     /usr/share/ghostscript/fonts/n019024l.pfb
+	  =displayFontT1 Courier                   /usr/share/ghostscript/fonts/n022003l.pfb
+	  =displayFontT1 Courier-Oblique           /usr/share/ghostscript/fonts/n022023l.pfb
+	  =displayFontT1 Courier-Bold              /usr/share/ghostscript/fonts/n022004l.pfb
+	  =displayFontT1 Courier-BoldOblique       /usr/share/ghostscript/fonts/n022024l.pfb
+	  =displayFontT1 Symbol                    /usr/share/ghostscript/fonts/s050000l.pfb
+	  =displayFontT1 ZapfDingbats              /usr/share/ghostscript/fonts/d050000l.pfb
+	  =
+	  =fontDir                 /usr/X11R6/lib/X11/fonts/TTF
+	  =
+	  =psFile                  "|lpr"
+	  =psPaperSize             letter
+	  =textEOL                 unix
+	  =
+	  =enableT1lib             yes
+	  =enableFreeType          yes
+	  =antialias               yes
+	  =
+	  =urlCommand              "links -g %s"
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&xpdf-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter46/tex.xml
===================================================================
--- profiles/BLFS/trunk/chapter46/tex.xml	2004-07-19 19:29:18 UTC (rev 1473)
+++ profiles/BLFS/trunk/chapter46/tex.xml	2004-07-19 19:37:49 UTC (rev 1474)
@@ -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/ch46.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,59 +10,46 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="tex" version="&tex-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&tex-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&tex-directory;</base>
-		</stageinfo>
-
-		<mkdir>
-		        <option>parents</option>
-		        <name>/usr/share/texmf</name>
-		</mkdir>
-
-		<execute command="gzip -dc &packages_dir;/&tex-texmf-package; | (umask 0; cd /usr/share/texmf; tar xvf -)" />
-
-		<execute command="gzip -dc &packages_dir;/&tex-texmfsrc-package; | (umask 0; cd /usr/share/texmf; tar xvf -)" />
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&tex-readlink-patch;</param>
-		</patch>
-
-		<configure>
-		        <param>--with-x=no</param>
-			<param>--prefix=/usr</param>
-			<param>--without-texinfo</param>
-			<param>--with-system-ncurses</param>
-			<param>--with-system-zlib</param>
-			<param>--exec-prefix=/usr</param>
-			<param>--bindir=/usr/bin</param>
-		</configure>
-
-		<make>
-		        <param>world</param>
-		</make>
-
-		<execute command="texconfig dvips paper letter" />
-
-		<execute command="texconfig font rw" />
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&tex-directory;</remove>
-	</stage>
-
-</package>
+  <package name="tex" version="&tex-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&tex-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&tex-directory;</base>
+      </stageinfo>
+      <mkdir>
+        <option>parents</option>
+        <name>/usr/share/texmf</name>
+      </mkdir>
+      <execute command="gzip -dc &packages_dir;/&tex-texmf-package; | (umask 0; cd /usr/share/texmf; tar xvf -)" />
+      <execute command="gzip -dc &packages_dir;/&tex-texmfsrc-package; | (umask 0; cd /usr/share/texmf; tar xvf -)" />
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&tex-readlink-patch;</param>
+      </patch>
+      <configure>
+        <param>--with-x=no</param>
+        <param>--prefix=/usr</param>
+        <param>--without-texinfo</param>
+        <param>--with-system-ncurses</param>
+        <param>--with-system-zlib</param>
+        <param>--exec-prefix=/usr</param>
+        <param>--bindir=/usr/bin</param>
+      </configure>
+      <make>
+        <param>world</param>
+      </make>
+      <execute command="texconfig dvips paper letter" />
+      <execute command="texconfig font rw" />
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&tex-directory;</remove>
+    </stage>
+  </package>
 </alfs>




More information about the alfs-log mailing list