r1464 - in profiles/BLFS/trunk: chapter16 chapter17 chapter18

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


Author: thomasp
Date: 2004-07-18 17:32:58 -0600 (Sun, 18 Jul 2004)
New Revision: 1464

Modified:
   profiles/BLFS/trunk/chapter16/curl.xml
   profiles/BLFS/trunk/chapter16/gnet.xml
   profiles/BLFS/trunk/chapter16/libsoup.xml
   profiles/BLFS/trunk/chapter16/wvstreams.xml
   profiles/BLFS/trunk/chapter17/links.xml
   profiles/BLFS/trunk/chapter17/lynx.xml
   profiles/BLFS/trunk/chapter17/w3m.xml
   profiles/BLFS/trunk/chapter18/cvs.xml
   profiles/BLFS/trunk/chapter18/inetutils.xml
   profiles/BLFS/trunk/chapter18/ncftp.xml
   profiles/BLFS/trunk/chapter18/ncpfs.xml
   profiles/BLFS/trunk/chapter18/nfs-utils.xml
   profiles/BLFS/trunk/chapter18/ntp.xml
   profiles/BLFS/trunk/chapter18/portmap.xml
   profiles/BLFS/trunk/chapter18/tcpwrappers.xml
   profiles/BLFS/trunk/chapter18/wget.xml
Log:
tidied chapters 16-18

Modified: profiles/BLFS/trunk/chapter16/curl.xml
===================================================================
--- profiles/BLFS/trunk/chapter16/curl.xml	2004-07-18 23:29:24 UTC (rev 1463)
+++ profiles/BLFS/trunk/chapter16/curl.xml	2004-07-18 23:32:58 UTC (rev 1464)
@@ -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/ch16.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,41 +10,36 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="curl" version="&curl-version;">
-
+  <package name="curl" version="&curl-version;">
     <packageinfo>
-            <utilizes><name>openssl</name></utilizes>
-            <utilizes><name>openldap</name></utilizes>
+      <utilizes>
+        <name>openssl</name>
+      </utilizes>
+      <utilizes>
+        <name>openldap</name>
+      </utilizes>
     </packageinfo>
-
     <stage name="Unpacking">
-	<unpack>
-		<archive>&packages_dir;/&curl-package;</archive>
-		<destination>&build_dir;</destination>
-	</unpack>
+      <unpack>
+        <archive>&packages_dir;/&curl-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
     </stage>
-
     <stage name="Installing">
-        <stageinfo>
-		<base>&build_dir;/&curl-directory;</base>
-	</stageinfo>
-
-	<configure>
-	        <param>--prefix=/usr</param>
-	</configure>
-	
-	<make />
-
-	<make>
-		<param>install</param>
-	</make>
+      <stageinfo>
+        <base>&build_dir;/&curl-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
     </stage>
-
     <stage name="Cleanup">
-	<remove>&build_dir;/&curl-directory;</remove>
+      <remove>&build_dir;/&curl-directory;</remove>
     </stage>
-
-</package>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter16/gnet.xml
===================================================================
--- profiles/BLFS/trunk/chapter16/gnet.xml	2004-07-18 23:29:24 UTC (rev 1463)
+++ profiles/BLFS/trunk/chapter16/gnet.xml	2004-07-18 23:32:58 UTC (rev 1464)
@@ -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/ch16.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,40 +10,33 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gnet" version="&gnet-version;">
-
+  <package name="gnet" version="&gnet-version;">
     <packageinfo>
-            <utilizes><name>glib2</name></utilizes>
+      <utilizes>
+        <name>glib2</name>
+      </utilizes>
     </packageinfo>
-
     <stage name="Unpacking">
-	<unpack>
-		<archive>&packages_dir;/&gnet-package;</archive>
-		<destination>&build_dir;</destination>
-	</unpack>
+      <unpack>
+        <archive>&packages_dir;/&gnet-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
     </stage>
-
     <stage name="Installing">
-        <stageinfo>
-		<base>&build_dir;/&gnet-directory;</base>
-	</stageinfo>
-
-	<configure>
-	        <param>--prefix=/usr</param>
-	</configure>
-	
-	<make />
-
-	<make>
-		<param>install</param>
-	</make>
+      <stageinfo>
+        <base>&build_dir;/&gnet-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
     </stage>
-
     <stage name="Cleanup">
-	<remove>&build_dir;/&gnet-directory;</remove>
+      <remove>&build_dir;/&gnet-directory;</remove>
     </stage>
-
-</package>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter16/libsoup.xml
===================================================================
--- profiles/BLFS/trunk/chapter16/libsoup.xml	2004-07-18 23:29:24 UTC (rev 1463)
+++ profiles/BLFS/trunk/chapter16/libsoup.xml	2004-07-18 23:32:58 UTC (rev 1464)
@@ -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/ch16.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,44 +10,43 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libsoup" version="&libsoup-version;">
-
-	<packageinfo>
-		<requires><name>glib2</name></requires>
-		<utilizes><name>gtk-doc</name></utilizes>
-		<utilizes><name>openssl</name></utilizes>
-		<utilizes><name>gnutls</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libsoup-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libsoup-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--libexecdir=/usr/sbin</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libsoup-directory;</remove>
-	</stage>
-
-</package>
+  <package name="libsoup" version="&libsoup-version;">
+    <packageinfo>
+      <requires>
+        <name>glib2</name>
+      </requires>
+      <utilizes>
+        <name>gtk-doc</name>
+      </utilizes>
+      <utilizes>
+        <name>openssl</name>
+      </utilizes>
+      <utilizes>
+        <name>gnutls</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libsoup-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libsoup-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libexecdir=/usr/sbin</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libsoup-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter16/wvstreams.xml
===================================================================
--- profiles/BLFS/trunk/chapter16/wvstreams.xml	2004-07-18 23:29:24 UTC (rev 1463)
+++ profiles/BLFS/trunk/chapter16/wvstreams.xml	2004-07-18 23:32:58 UTC (rev 1464)
@@ -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/ch16.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,60 +10,48 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="wvstreams" version="&wvstreams-version;">
-
+  <package name="wvstreams" version="&wvstreams-version;">
     <packageinfo>
-            <requires><name>openssl</name></requires>
+      <requires>
+        <name>openssl</name>
+      </requires>
     </packageinfo>
-
     <stage name="Unpacking">
-	<unpack>
-		<archive>&packages_dir;/&wvstreams-package;</archive>
-		<destination>&build_dir;</destination>
-	</unpack>
+      <unpack>
+        <archive>&packages_dir;/&wvstreams-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
     </stage>
-
     <stage name="Patching">
-        <stageinfo>
-		<base>&build_dir;/&wvstreams-directory;</base>
-	</stageinfo>
-
-	<patch>
-		<param>-N</param>
-		<param>-p1</param>
-		<param>-i &packages_dir;/&wvstreams-wvcrypto-patch;</param>
-	</patch>
-
-	<patch>
-		<param>-N</param>
-		<param>-p1</param>
-		<param>-i &packages_dir;/&wvstreams-wvresolver-patch;</param>
-	</patch>
+      <stageinfo>
+        <base>&build_dir;/&wvstreams-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&wvstreams-wvcrypto-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&wvstreams-wvresolver-patch;</param>
+      </patch>
     </stage>
-
     <stage name="Installing">
-        <stageinfo>
-		<base>&build_dir;/&wvstreams-directory;</base>
-	</stageinfo>
-
-	<make>
-	        <param>PREFIX=/usr</param>
-	        <param>LDFLAGS="-lcrypt"</param>
-	</make>
-
-	<make>
-	        <param>PREFIX=/usr</param>
-		<param>install</param>
-	</make>
-
-	&ldconfig;
-    </stage>
-
+    <stageinfo>
+      <base>&build_dir;/&wvstreams-directory;</base>
+    </stageinfo>
+    <make>
+      <param>PREFIX=/usr</param>
+      <param>LDFLAGS="-lcrypt"</param>
+    </make>
+    <make>
+      <param>PREFIX=/usr</param>
+      <param>install</param>
+    </make>&ldconfig;</stage>
     <stage name="Cleanup">
-	<remove>&build_dir;/&wvstreams-directory;</remove>
+      <remove>&build_dir;/&wvstreams-directory;</remove>
     </stage>
-
-</package>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter17/links.xml
===================================================================
--- profiles/BLFS/trunk/chapter17/links.xml	2004-07-18 23:29:24 UTC (rev 1463)
+++ profiles/BLFS/trunk/chapter17/links.xml	2004-07-18 23:32:58 UTC (rev 1464)
@@ -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/ch17.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,47 +10,51 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="links" version="&links-version;">
-
-        <packageinfo>
-                <utilizes><name>gpm</name></utilizes>
-                <utilizes><name>openssl</name></utilizes>
-                <utilizes><name>libpng</name></utilizes>
-                <utilizes><name>libjpeg</name></utilizes>
-                <utilizes><name>libtiff</name></utilizes>
-                <utilizes><name>svgalib</name></utilizes>
-                <utilizes><name>xfree86</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&links-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&links-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&links-directory;</remove>
-	</stage>
-
-</package>
+  <package name="links" version="&links-version;">
+    <packageinfo>
+      <utilizes>
+        <name>gpm</name>
+      </utilizes>
+      <utilizes>
+        <name>openssl</name>
+      </utilizes>
+      <utilizes>
+        <name>libpng</name>
+      </utilizes>
+      <utilizes>
+        <name>libjpeg</name>
+      </utilizes>
+      <utilizes>
+        <name>libtiff</name>
+      </utilizes>
+      <utilizes>
+        <name>svgalib</name>
+      </utilizes>
+      <utilizes>
+        <name>xfree86</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&links-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&links-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&links-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter17/lynx.xml
===================================================================
--- profiles/BLFS/trunk/chapter17/lynx.xml	2004-07-18 23:29:24 UTC (rev 1463)
+++ profiles/BLFS/trunk/chapter17/lynx.xml	2004-07-18 23:32:58 UTC (rev 1464)
@@ -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/ch17.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,57 +10,54 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="lynx" version="&lynx-version;">
-
-        <packageinfo>
-                <utilizes><name>openssl</name></utilizes>
-                <utilizes><name>gnutls</name></utilizes>
-                <utilizes><name>mta</name></utilizes>
-                <utilizes><name>zip</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&lynx-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&lynx-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--libdir=/etc</param>
-			<param>--with-zlib</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<make>
-			<param>docdir=/usr/share/doc/lynx-&lynx-version;/lynx_doc</param>
-			<param>helpdir=/usr/share/doc/lynx-&lynx-version;/lynx_help</param>
-			<param>install-doc</param>
-		</make>
-
-		<make>
-			<param>docdir=/usr/share/doc/lynx-&lynx-version;/lynx_doc</param>
-			<param>helpdir=/usr/share/doc/lynx-&lynx-version;/lynx_help</param>
-			<param>install-help</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&lynx-directory;</remove>
-	</stage>
-
-</package>
+  <package name="lynx" version="&lynx-version;">
+    <packageinfo>
+      <utilizes>
+        <name>openssl</name>
+      </utilizes>
+      <utilizes>
+        <name>gnutls</name>
+      </utilizes>
+      <utilizes>
+        <name>mta</name>
+      </utilizes>
+      <utilizes>
+        <name>zip</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&lynx-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&lynx-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libdir=/etc</param>
+        <param>--with-zlib</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <make>
+        <param>docdir=/usr/share/doc/lynx-&lynx-version;/lynx_doc</param>
+        <param>helpdir=/usr/share/doc/lynx-&lynx-version;/lynx_help</param>
+        <param>install-doc</param>
+      </make>
+      <make>
+        <param>docdir=/usr/share/doc/lynx-&lynx-version;/lynx_doc</param>
+        <param>helpdir=/usr/share/doc/lynx-&lynx-version;/lynx_help</param>
+        <param>install-help</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&lynx-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter17/w3m.xml
===================================================================
--- profiles/BLFS/trunk/chapter17/w3m.xml	2004-07-18 23:29:24 UTC (rev 1463)
+++ profiles/BLFS/trunk/chapter17/w3m.xml	2004-07-18 23:32:58 UTC (rev 1464)
@@ -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/ch17.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,58 +10,61 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="w3m" version="&w3m-version;">
-
-        <packageinfo>
-                <requires><name>gc</name></requires>
-                <utilizes><name>gpm</name></utilizes>
-                <utilizes><name>openssl</name></utilizes>
-                <utilizes><name>imlib</name></utilizes>
-                <utilizes><name>imlib2</name></utilizes>
-                <utilizes><name>gdk-pixbuf</name></utilizes>
-                <utilizes><name>compface</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&w3m-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&w3m-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--libexecdir=/usr/lib</param>
-			<param>--sysconfdir=/etc</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<copy base="&build_dir;/&w3m-directory;">
-			<source>doc/keymap.default</source>
-			<destination>/etc/w3m/keymap</destination>
-		</copy>
-
-		<copy base="&build_dir;/&w3m-directory;">
-			<source>doc/menu.default</source>
-			<destination>/etc/w3m/menu</destination>
-		</copy>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&w3m-directory;</remove>
-	</stage>
-</package>
+  <package name="w3m" version="&w3m-version;">
+    <packageinfo>
+      <requires>
+        <name>gc</name>
+      </requires>
+      <utilizes>
+        <name>gpm</name>
+      </utilizes>
+      <utilizes>
+        <name>openssl</name>
+      </utilizes>
+      <utilizes>
+        <name>imlib</name>
+      </utilizes>
+      <utilizes>
+        <name>imlib2</name>
+      </utilizes>
+      <utilizes>
+        <name>gdk-pixbuf</name>
+      </utilizes>
+      <utilizes>
+        <name>compface</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&w3m-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&w3m-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libexecdir=/usr/lib</param>
+        <param>--sysconfdir=/etc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <copy base="&build_dir;/&w3m-directory;">
+        <source>doc/keymap.default</source>
+        <destination>/etc/w3m/keymap</destination>
+      </copy>
+      <copy base="&build_dir;/&w3m-directory;">
+        <source>doc/menu.default</source>
+        <destination>/etc/w3m/menu</destination>
+      </copy>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&w3m-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter18/cvs.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/cvs.xml	2004-07-18 23:29:24 UTC (rev 1463)
+++ profiles/BLFS/trunk/chapter18/cvs.xml	2004-07-18 23:32:58 UTC (rev 1464)
@@ -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/ch18.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,35 +10,28 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="cvs" version="&cvs-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&cvs-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&cvs-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&cvs-directory;</remove>
-	</stage>
-</package>
+  <package name="cvs" version="&cvs-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&cvs-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&cvs-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&cvs-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter18/inetutils.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/inetutils.xml	2004-07-18 23:29:24 UTC (rev 1463)
+++ profiles/BLFS/trunk/chapter18/inetutils.xml	2004-07-18 23:32:58 UTC (rev 1464)
@@ -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/ch18.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,51 +10,46 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="inetutils" version="&inetutils-version;">
-
-        <packageinfo>
-                <utilizes><name>linuxpam</name></utilizes>
-                <utilizes><name>tcpwrappers</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&inetutils-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&inetutils-directory;</base>
-		</stageinfo>
-
-		<configure>
-		         <param>--prefix=/usr</param>
-			 <param>--disable-syslogd</param>
-			 <param>--libexecdir=/usr/sbin</param>
-			 <param>--infodir=/usr/share/info</param>
-			 <param>--sysconfdir=/etc</param>
-			 <param>--localstatedir=/var</param>
-			 <param>--mandir=/usr/share/man</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<move>
-		        <source>/usr/bin/ping</source>
-			<destination>/bin</destination>
-		</move>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&inetutils-directory;</remove>
-	</stage>
-</package>
+  <package name="inetutils" version="&inetutils-version;">
+    <packageinfo>
+      <utilizes>
+        <name>linuxpam</name>
+      </utilizes>
+      <utilizes>
+        <name>tcpwrappers</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&inetutils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&inetutils-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--disable-syslogd</param>
+        <param>--libexecdir=/usr/sbin</param>
+        <param>--infodir=/usr/share/info</param>
+        <param>--sysconfdir=/etc</param>
+        <param>--localstatedir=/var</param>
+        <param>--mandir=/usr/share/man</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <move>
+        <source>/usr/bin/ping</source>
+        <destination>/bin</destination>
+      </move>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&inetutils-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter18/ncftp.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/ncftp.xml	2004-07-18 23:29:24 UTC (rev 1463)
+++ profiles/BLFS/trunk/chapter18/ncftp.xml	2004-07-18 23:32:58 UTC (rev 1464)
@@ -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/ch18.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,45 +10,34 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="ncftp" version="&ncftp-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&ncftp-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&ncftp-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make base="&build_dir;/&ncftp-directory;/libncftp">
-		        <param>shared</param>
-		</make>
-
-		<make base="&build_dir;/&ncftp-directory;/libncftp">
-		        <param>soinstall</param>
-		</make>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&ncftp-directory;</remove>
-	</stage>
-
-</package>
+  <package name="ncftp" version="&ncftp-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&ncftp-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&ncftp-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make base="&build_dir;/&ncftp-directory;/libncftp">
+        <param>shared</param>
+      </make>
+      <make base="&build_dir;/&ncftp-directory;/libncftp">
+        <param>soinstall</param>
+      </make>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&ncftp-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter18/ncpfs.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/ncpfs.xml	2004-07-18 23:29:24 UTC (rev 1463)
+++ profiles/BLFS/trunk/chapter18/ncpfs.xml	2004-07-18 23:32:58 UTC (rev 1464)
@@ -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/ch18.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,74 +10,64 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="ncpfs" version="&ncpfs-version;">
-
-        <packageinfo>
-                <utilizes><name>linux-pam</name></utilizes>
-                <utilizes><name>php</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&ncpfs-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&ncpfs-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=""</param>
-			<param>--includedir=/usr/include</param>
-			<param>--mandir=/usr/share/man</param>
-			<param>--datadir=/usr/share</param>
-		</configure>
-
-		<make/>
-
-		<make>
-		        <param>install</param>
-		</make>
-
-		<make>
-			<param>install-dev</param>
-		</make>
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>make install-service-ipx</param>
-		</make>
-
-		<textdump base="/etc/sysconfig/network-devices/">
-			<file>ifconfig.ipx0</file>
-			<content>
-			=ONBOOT=yes
-			=SERVICE=ipx
-			=IPXDEV=eth0
-			=FRAME=802.2
-			</content>
-		</textdump>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&ncpfs-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-
-</package>
+  <package name="ncpfs" version="&ncpfs-version;">
+    <packageinfo>
+      <utilizes>
+        <name>linux-pam</name>
+      </utilizes>
+      <utilizes>
+        <name>php</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&ncpfs-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&ncpfs-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=""</param>
+        <param>--includedir=/usr/include</param>
+        <param>--mandir=/usr/share/man</param>
+        <param>--datadir=/usr/share</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <make>
+        <param>install-dev</param>
+      </make>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>make install-service-ipx</param>
+      </make>
+      <textdump base="/etc/sysconfig/network-devices/">
+        <file>ifconfig.ipx0</file>
+        <content>
+	  =ONBOOT=yes
+	  =SERVICE=ipx
+	  =IPXDEV=eth0
+	  =FRAME=802.2
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&ncpfs-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter18/nfs-utils.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/nfs-utils.xml	2004-07-18 23:29:24 UTC (rev 1463)
+++ profiles/BLFS/trunk/chapter18/nfs-utils.xml	2004-07-18 23:32:58 UTC (rev 1464)
@@ -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/ch18.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,60 +10,50 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="nfs-utils" version="&nfs-utils-version;">
-
-        <packageinfo>
-                <requires><name>portmap</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&nfs-utils-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&nfs-utils-directory;</base>
-		</stageinfo>
-
-		<configure>
-		         <param>--prefix=/usr</param>
-			 <param>--sysconfdir=/etc</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-nfs-server</param>
-		</make>
-
-		<make>
-			<param>install-nfs-client</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&nfs-utils-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-</package>
+  <package name="nfs-utils" version="&nfs-utils-version;">
+    <packageinfo>
+      <requires>
+        <name>portmap</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&nfs-utils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&nfs-utils-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-nfs-server</param>
+      </make>
+      <make>
+        <param>install-nfs-client</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&nfs-utils-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter18/ntp.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/ntp.xml	2004-07-18 23:29:24 UTC (rev 1463)
+++ profiles/BLFS/trunk/chapter18/ntp.xml	2004-07-18 23:32:58 UTC (rev 1464)
@@ -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/ch18.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,68 +10,60 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="ntp" version="&ntp-version;">
-
-        <packageinfo>
-                <utilizes><name>readline</name></utilizes>
-                <utilizes><name>openssl</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&ntp-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&ntp-directory;</base>
-		</stageinfo>
-
-		<configure>
-		         <param>--prefix=/usr</param>
-		         <param>--bindir=/usr/sbin</param>
-		         <param>--sysconfdir=/etc</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<textdump base="/etc">
-		<file>ntp.conf</file>
-		<content>
-		=server time-a.nist.gov prefer
-		=server time-b.nist.gov
-		=server tick.usno.navy.mil
-		=driftfile /var/cache/ntp.drift
-		</content>
-		</textdump>
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-ntp</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&ntp-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-</package>
+  <package name="ntp" version="&ntp-version;">
+    <packageinfo>
+      <utilizes>
+        <name>readline</name>
+      </utilizes>
+      <utilizes>
+        <name>openssl</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&ntp-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&ntp-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--bindir=/usr/sbin</param>
+        <param>--sysconfdir=/etc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <textdump base="/etc">
+        <file>ntp.conf</file>
+        <content>
+	  =server time-a.nist.gov prefer
+	  =server time-b.nist.gov
+	  =server tick.usno.navy.mil
+	  =driftfile /var/cache/ntp.drift
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-ntp</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&ntp-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter18/portmap.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/portmap.xml	2004-07-18 23:29:24 UTC (rev 1463)
+++ profiles/BLFS/trunk/chapter18/portmap.xml	2004-07-18 23:32:58 UTC (rev 1464)
@@ -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/ch18.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,72 +10,58 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="portmap" version="&portmap-version;">
-
-        <packageinfo>
-                <requires><name>tcpwrappers</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&portmap-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Patching">
-		<stageinfo>
-			<base>&build_dir;/&portmap-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&portmap-compilation-fixes-patch;</param>
-		</patch>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&portmap-glibc-errno-fix-patch;</param>
-		</patch>
-
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&portmap-directory;</base>
-		</stageinfo>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-portmap</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&portmap-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-
-</package>
+  <package name="portmap" version="&portmap-version;">
+    <packageinfo>
+      <requires>
+        <name>tcpwrappers</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&portmap-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Patching">
+      <stageinfo>
+        <base>&build_dir;/&portmap-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&portmap-compilation-fixes-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&portmap-glibc-errno-fix-patch;</param>
+      </patch>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&portmap-directory;</base>
+      </stageinfo>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-portmap</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&portmap-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter18/tcpwrappers.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/tcpwrappers.xml	2004-07-18 23:29:24 UTC (rev 1463)
+++ profiles/BLFS/trunk/chapter18/tcpwrappers.xml	2004-07-18 23:32:58 UTC (rev 1464)
@@ -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/ch18.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,47 +10,39 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="tcpwrappers" version="&tcpwrappers-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&tcpwrappers-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Patching">
-		<stageinfo>
-			<base>&build_dir;/&tcpwrappers-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&tcpwrappers-shared-libs-plus-plus-patch;</param>
-		</patch>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&tcpwrappers-directory;</base>
-		</stageinfo>
-
-		<make>
-		         <param>REAL_DAEMON_DIR=/usr/sbin</param>
-		         <param>STYLE=-DPROCESS_OPTIONS</param>
-			 <param>linux</param>
-		</make>
-
-		<make>
-		         <param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&tcpwrappers-directory;</remove>
-	</stage>
-</package>
+  <package name="tcpwrappers" version="&tcpwrappers-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&tcpwrappers-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Patching">
+      <stageinfo>
+        <base>&build_dir;/&tcpwrappers-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&tcpwrappers-shared-libs-plus-plus-patch;</param>
+      </patch>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&tcpwrappers-directory;</base>
+      </stageinfo>
+      <make>
+        <param>REAL_DAEMON_DIR=/usr/sbin</param>
+        <param>STYLE=-DPROCESS_OPTIONS</param>
+        <param>linux</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&tcpwrappers-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter18/wget.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/wget.xml	2004-07-18 23:29:24 UTC (rev 1463)
+++ profiles/BLFS/trunk/chapter18/wget.xml	2004-07-18 23:32:58 UTC (rev 1464)
@@ -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/ch18.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,43 +10,37 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="wget" version="&wget-version;">
-
-        <packageinfo>
-                <utilizes><name>openssl</name></utilizes>
-                <utilizes><name>dante</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&wget-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&wget-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--sysconfdir=/etc</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&wget-directory;</remove>
-	</stage>
-
-</package>
+  <package name="wget" version="&wget-version;">
+    <packageinfo>
+      <utilizes>
+        <name>openssl</name>
+      </utilizes>
+      <utilizes>
+        <name>dante</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&wget-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&wget-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&wget-directory;</remove>
+    </stage>
+  </package>
 </alfs>




More information about the alfs-log mailing list