r1465 - in profiles/BLFS/trunk: chapter19 chapter20 chapter21

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


Author: thomasp
Date: 2004-07-18 17:40:54 -0600 (Sun, 18 Jul 2004)
New Revision: 1465

Modified:
   profiles/BLFS/trunk/chapter19/bind-utils.xml
   profiles/BLFS/trunk/chapter19/nmap.xml
   profiles/BLFS/trunk/chapter19/traceroute.xml
   profiles/BLFS/trunk/chapter19/whois.xml
   profiles/BLFS/trunk/chapter20/fetchmail.xml
   profiles/BLFS/trunk/chapter20/mutt.xml
   profiles/BLFS/trunk/chapter20/nail.xml
   profiles/BLFS/trunk/chapter20/pine.xml
   profiles/BLFS/trunk/chapter20/procmail.xml
   profiles/BLFS/trunk/chapter20/slrn.xml
   profiles/BLFS/trunk/chapter21/courier.xml
   profiles/BLFS/trunk/chapter21/exim.xml
   profiles/BLFS/trunk/chapter21/postfix.xml
   profiles/BLFS/trunk/chapter21/qpopper.xml
   profiles/BLFS/trunk/chapter21/sendmail.xml
Log:
tidied chapters 19-21

Modified: profiles/BLFS/trunk/chapter19/bind-utils.xml
===================================================================
--- profiles/BLFS/trunk/chapter19/bind-utils.xml	2004-07-18 23:32:58 UTC (rev 1464)
+++ profiles/BLFS/trunk/chapter19/bind-utils.xml	2004-07-18 23:40:54 UTC (rev 1465)
@@ -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/ch19.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,47 +10,37 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="bind-utils" version="&bind-utils-version;">
-
-	<stage name="Unpacking.">
-		<unpack>
-			<archive>&packages_dir;/&bind-utils-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-
-	<stage name="Installing.">
-		<stageinfo>
-			<base>&build_dir;/&bind-utils-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make>
-			<param>-C lib/dns</param>
-		</make>
-
-		<make>
-			<param>-C lib/isc</param>
-		</make>
-
-		<make>
-			<param>-C bin/dig</param>
-		</make>
-
-		<make>
-			<param>-C bin/dig</param>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup.">
-		<remove>&build_dir;/&bind-utils-directory;</remove>
-	</stage>
-</package>
+  <package name="bind-utils" version="&bind-utils-version;">
+    <stage name="Unpacking.">
+      <unpack>
+        <archive>&packages_dir;/&bind-utils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing.">
+      <stageinfo>
+        <base>&build_dir;/&bind-utils-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make>
+        <param>-C lib/dns</param>
+      </make>
+      <make>
+        <param>-C lib/isc</param>
+      </make>
+      <make>
+        <param>-C bin/dig</param>
+      </make>
+      <make>
+        <param>-C bin/dig</param>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup.">
+      <remove>&build_dir;/&bind-utils-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter19/nmap.xml
===================================================================
--- profiles/BLFS/trunk/chapter19/nmap.xml	2004-07-18 23:32:58 UTC (rev 1464)
+++ profiles/BLFS/trunk/chapter19/nmap.xml	2004-07-18 23:40:54 UTC (rev 1465)
@@ -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/ch19.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,44 +10,42 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="nmap" version="&nmap-version;">
-
-        <packageinfo>
-		<utilizes><name>openssl</name></utilizes>
-		<utilizes><name>pcre</name></utilizes>
-	        <utilizes><name>gtk+</name></utilizes>
-		<utilizes><name>libpcap</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&nmap-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&nmap-directory;</base>
-		</stageinfo>
-		
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&nmap-directory;</remove>
-	</stage>
-
-</package>
+  <package name="nmap" version="&nmap-version;">
+    <packageinfo>
+      <utilizes>
+        <name>openssl</name>
+      </utilizes>
+      <utilizes>
+        <name>pcre</name>
+      </utilizes>
+      <utilizes>
+        <name>gtk+</name>
+      </utilizes>
+      <utilizes>
+        <name>libpcap</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&nmap-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&nmap-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&nmap-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter19/traceroute.xml
===================================================================
--- profiles/BLFS/trunk/chapter19/traceroute.xml	2004-07-18 23:32:58 UTC (rev 1464)
+++ profiles/BLFS/trunk/chapter19/traceroute.xml	2004-07-18 23:40:54 UTC (rev 1465)
@@ -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/ch19.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,53 +10,41 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="traceroute" version="&traceroute-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&traceroute-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Patching">
-		<stageinfo>
-			<base>&build_dir;/&traceroute-directory;</base>
-		</stageinfo>
-		
-		<search_replace>
-		        <file>Makefile.in</file>
-		        <find>-o bin</find>
-		        <replace>-o root</replace>
-		</search_replace>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&traceroute-directory;</base>
-		</stageinfo>
-		
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-		<make>
-			<param>install-man</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&traceroute-directory;</remove>
-	</stage>
-
-</package>
+  <package name="traceroute" version="&traceroute-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&traceroute-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Patching">
+      <stageinfo>
+        <base>&build_dir;/&traceroute-directory;</base>
+      </stageinfo>
+      <search_replace>
+        <file>Makefile.in</file>
+        <find>-o bin</find>
+        <replace>-o root</replace>
+      </search_replace>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&traceroute-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <make>
+        <param>install-man</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&traceroute-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter19/whois.xml
===================================================================
--- profiles/BLFS/trunk/chapter19/whois.xml	2004-07-18 23:32:58 UTC (rev 1464)
+++ profiles/BLFS/trunk/chapter19/whois.xml	2004-07-18 23:40:54 UTC (rev 1465)
@@ -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/ch19.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,34 +10,26 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="whois" version="&whois-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&whois-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&whois-directory;</base>
-		</stageinfo>
-		
-		<make/>
-
-		<make>
-			<param>prefix=/usr</param>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&whois-directory;</remove>
-	</stage>
-
-</package>
+  <package name="whois" version="&whois-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&whois-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&whois-directory;</base>
+      </stageinfo>
+      <make />
+      <make>
+        <param>prefix=/usr</param>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&whois-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter20/fetchmail.xml
===================================================================
--- profiles/BLFS/trunk/chapter20/fetchmail.xml	2004-07-18 23:32:58 UTC (rev 1464)
+++ profiles/BLFS/trunk/chapter20/fetchmail.xml	2004-07-18 23:40:54 UTC (rev 1465)
@@ -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/ch20.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,44 +10,38 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="fetchmail" version="&fetchmail-version;">
-
-	<packageinfo>
-        	<requires><name>openssl</name></requires>
-        	<requires><name>procmail</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&fetchmail-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&fetchmail-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-			<param>--with-ssl</param>
-			<param>--enable-fallback=procmail</param>
-		</configure>
-		
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&fetchmail-directory;</remove>
-	</stage>
-
-</package>
+  <package name="fetchmail" version="&fetchmail-version;">
+    <packageinfo>
+      <requires>
+        <name>openssl</name>
+      </requires>
+      <requires>
+        <name>procmail</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&fetchmail-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&fetchmail-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--with-ssl</param>
+        <param>--enable-fallback=procmail</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&fetchmail-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter20/mutt.xml
===================================================================
--- profiles/BLFS/trunk/chapter20/mutt.xml	2004-07-18 23:32:58 UTC (rev 1464)
+++ profiles/BLFS/trunk/chapter20/mutt.xml	2004-07-18 23:40:54 UTC (rev 1465)
@@ -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/ch20.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,54 +10,45 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="mutt" version="&mutt-version;">
-
-	<packageinfo>
-		<utilizes><name>gnupg</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&mutt-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&mutt-directory;</base>
-		</stageinfo>
-
-		<!-- uncomment if no MTA is installed
-		
-		<execute command="groupadd">
-		        <param>mail</param>
-		</execute>
-		
-		<ownership group="mail">
-		        <name>/var/mail</name>
-		</ownership>
-		
-		 -->
-
-		<configure>
-		        <param>--prefix=/usr</param>
-			<param>--sysconfdir=/etc</param>
-		</configure>
-		
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&mutt-directory;</remove>
-	</stage>
-
-</package>
+  <package name="mutt" version="&mutt-version;">
+    <packageinfo>
+      <utilizes>
+        <name>gnupg</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&mutt-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&mutt-directory;</base>
+      </stageinfo>
+      <!-- uncomment if no MTA is installed
+                
+                <execute command="groupadd">
+                        <param>mail</param>
+                </execute>
+                
+                <ownership group="mail">
+                        <name>/var/mail</name>
+                </ownership>
+                
+                 -->
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&mutt-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter20/nail.xml
===================================================================
--- profiles/BLFS/trunk/chapter20/nail.xml	2004-07-18 23:32:58 UTC (rev 1464)
+++ profiles/BLFS/trunk/chapter20/nail.xml	2004-07-18 23:40:54 UTC (rev 1465)
@@ -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/ch20.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,47 +10,38 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="nail" version="&nail-version;">
-
-        <packageinfo>
-	        <utilizes><name>openssl</name></utilizes>
-	</packageinfo>
-
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&nail-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&nail-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-		
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<link>
-		        <option>force</option>
-			<target>nail</target>
-			<name>/usr/bin/mail</name>
-		</link>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&nail-directory;</remove>
-	</stage>
-
-</package>
+  <package name="nail" version="&nail-version;">
+    <packageinfo>
+      <utilizes>
+        <name>openssl</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&nail-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&nail-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <link>
+        <option>force</option>
+        <target>nail</target>
+        <name>/usr/bin/mail</name>
+      </link>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&nail-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter20/pine.xml
===================================================================
--- profiles/BLFS/trunk/chapter20/pine.xml	2004-07-18 23:32:58 UTC (rev 1464)
+++ profiles/BLFS/trunk/chapter20/pine.xml	2004-07-18 23:40:54 UTC (rev 1465)
@@ -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/ch20.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,76 +10,69 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="pine" version="&pine-version;">
-
-	<packageinfo>
-		<requires><name>openssl</name></requires>
-		<utilizes><name>openldap</name></utilizes>
-		<utilizes><name>mitkrb</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&pine-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Patching">
-		<stageinfo>
-			<base>&build_dir;/&pine-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&pine-patch;</param>
-		</patch>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&pine-directory;</base>
-		</stageinfo>
-
-		<execute command="./build">
-		        <param>DEBUG=-O</param>
-			<param>MAILSPOOL=/var/mail</param>
-			<param>SSLDIR=/usr</param>
-			<param>SSLCERTS=/etc/ssl/certs</param>
-			<param>slx</param>
-		</execute>
-
-		<copy>
-		        <source>doc/pine.1</source>
-		        <source>doc/pico.1</source>
-		        <source>doc/rpdump.1</source>
-		        <source>doc/rpload.1</source>
-			<destination>/usr/share/man/man1</destination>
-		</copy>
-
-		<execute command="install" 
-		         base="&build_dir;/&pine-directory;/bin">
-		        <param>pine</param>
-		        <param>imapd</param>
-		        <param>ipop2d</param>
-		        <param>ipop3d</param>
-		        <param>mailutil</param>
-		        <param>mtest</param>
-		        <param>pico</param>
-		        <param>pilot</param>
-		        <param>rpdump</param>
-		        <param>rpload</param>
-		        <param>/usr/bin</param>
-		</execute>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&pine-directory;</remove>
-	</stage>
-
-</package>
+  <package name="pine" version="&pine-version;">
+    <packageinfo>
+      <requires>
+        <name>openssl</name>
+      </requires>
+      <utilizes>
+        <name>openldap</name>
+      </utilizes>
+      <utilizes>
+        <name>mitkrb</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&pine-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Patching">
+      <stageinfo>
+        <base>&build_dir;/&pine-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&pine-patch;</param>
+      </patch>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&pine-directory;</base>
+      </stageinfo>
+      <execute command="./build">
+        <param>DEBUG=-O</param>
+        <param>MAILSPOOL=/var/mail</param>
+        <param>SSLDIR=/usr</param>
+        <param>SSLCERTS=/etc/ssl/certs</param>
+        <param>slx</param>
+      </execute>
+      <copy>
+        <source>doc/pine.1</source>
+        <source>doc/pico.1</source>
+        <source>doc/rpdump.1</source>
+        <source>doc/rpload.1</source>
+        <destination>/usr/share/man/man1</destination>
+      </copy>
+      <execute command="install" base="&build_dir;/&pine-directory;/bin">
+        <param>pine</param>
+        <param>imapd</param>
+        <param>ipop2d</param>
+        <param>ipop3d</param>
+        <param>mailutil</param>
+        <param>mtest</param>
+        <param>pico</param>
+        <param>pilot</param>
+        <param>rpdump</param>
+        <param>rpload</param>
+        <param>/usr/bin</param>
+      </execute>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&pine-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter20/procmail.xml
===================================================================
--- profiles/BLFS/trunk/chapter20/procmail.xml	2004-07-18 23:32:58 UTC (rev 1464)
+++ profiles/BLFS/trunk/chapter20/procmail.xml	2004-07-18 23:40:54 UTC (rev 1465)
@@ -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/ch20.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,37 +10,29 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="procmail" version="&procmail-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&procmail-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&procmail-directory;</base>
-		</stageinfo>
-		
-		<make>
-			<param>BASENAME=/usr</param>
-			<param>LOCKINGTEST=/tmp</param>
-			<param>install</param>
-		</make>
-
-		<make>
-			<param>install-suid</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&procmail-directory;</remove>
-	</stage>
-
-</package>
+  <package name="procmail" version="&procmail-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&procmail-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&procmail-directory;</base>
+      </stageinfo>
+      <make>
+        <param>BASENAME=/usr</param>
+        <param>LOCKINGTEST=/tmp</param>
+        <param>install</param>
+      </make>
+      <make>
+        <param>install-suid</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&procmail-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter20/slrn.xml
===================================================================
--- profiles/BLFS/trunk/chapter20/slrn.xml	2004-07-18 23:32:58 UTC (rev 1464)
+++ profiles/BLFS/trunk/chapter20/slrn.xml	2004-07-18 23:40:54 UTC (rev 1465)
@@ -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/ch20.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,45 +10,37 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="slrn" version="&slrn-version;">
-
-        <packageinfo>
-	        <requires><name>slang</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&slrn-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&slrn-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-			<param>--sysconfdir=/etc</param>
-			<param>--with-slrnpull</param>
-		</configure>
-		
-		<make>
-		        <param>LDFLAGS="-ldl"</param>
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&slrn-directory;</remove>
-	</stage>
-
-</package>
+  <package name="slrn" version="&slrn-version;">
+    <packageinfo>
+      <requires>
+        <name>slang</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&slrn-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&slrn-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+        <param>--with-slrnpull</param>
+      </configure>
+      <make>
+        <param>LDFLAGS="-ldl"</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&slrn-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter21/courier.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/courier.xml	2004-07-18 23:32:58 UTC (rev 1464)
+++ profiles/BLFS/trunk/chapter21/courier.xml	2004-07-18 23:40:54 UTC (rev 1465)
@@ -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/ch21.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,89 +10,75 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="courier" version="&courier-version;">
-
-	<packageinfo>
-		<requires><name>gdbm</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking.">
-		<unpack>
-			<archive>&packages_dir;/&courier-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Creating user and group">
-		<execute command="groupadd">
-			<param>-f</param>
-			<param>courier</param>
-		</execute>
-
-		<execute command="grep -q ^courier /etc/passwd || useradd">
-		        <param>-c courier</param>
-			<param>-d /dev/null</param>
-			<param>-g courier</param>
-			<param>-s /bin/false</param>
-			<param>courier</param>
-		</execute>
-
-		<execute command="grep -q ^bin /etc/passwd || useradd">
-		        <param>-c bin</param>
-			<param>-d /dev/null</param>
-			<param>-g bin</param>
-			<param>-u 1</param>
-			<param>bin</param>
-		</execute>
-	</stage>
-
-	<stage name="Installing.">
-		<stageinfo>
-			<base>&build_dir;/&courier-directory;</base>
-		</stageinfo>
-
-		<mkdir>
-			<option>parents</option>
-			<name>/var/run/courier</name>
-		</mkdir>
-
-		<ownership user="courier" group="courier">
-			<name>/var/run/courier</name>
-		</ownership>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--libexecdir=/usr/lib/courier</param>
-			<param>--datadir=/usr/share/courier</param>
-			<param>--sysconfdir=/etc/courier</param>
-			<param>--localstatedir=/var/lib/courier</param>
-			<param>--with-piddir=/var/run/courier</param>
-			<param>--disable-root-check</param>
-			<param>--with-mailuser=courier</param>
-			<param>--with-mailgroup=courier</param>
-			<param>--with-paranoid-smtpext</param>
-			<param>--disable-autorenamesent</param>
-			<param>--enable-workarounds-for-imap-client-bugs</param>
-			<param>--with-db=gdbm</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<make>
-			<param>install-configure</param>
-		</make>
-	</stage>
-
-	
-
-	<stage name="Cleanup.">
-		<remove>&build_dir;/&courier-directory;</remove>
-	</stage>
-</package>
+  <package name="courier" version="&courier-version;">
+    <packageinfo>
+      <requires>
+        <name>gdbm</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking.">
+      <unpack>
+        <archive>&packages_dir;/&courier-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Creating user and group">
+      <execute command="groupadd">
+        <param>-f</param>
+        <param>courier</param>
+      </execute>
+      <execute command="grep -q ^courier /etc/passwd || useradd">
+        <param>-c courier</param>
+        <param>-d /dev/null</param>
+        <param>-g courier</param>
+        <param>-s /bin/false</param>
+        <param>courier</param>
+      </execute>
+      <execute command="grep -q ^bin /etc/passwd || useradd">
+        <param>-c bin</param>
+        <param>-d /dev/null</param>
+        <param>-g bin</param>
+        <param>-u 1</param>
+        <param>bin</param>
+      </execute>
+    </stage>
+    <stage name="Installing.">
+      <stageinfo>
+        <base>&build_dir;/&courier-directory;</base>
+      </stageinfo>
+      <mkdir>
+        <option>parents</option>
+        <name>/var/run/courier</name>
+      </mkdir>
+      <ownership user="courier" group="courier">
+        <name>/var/run/courier</name>
+      </ownership>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libexecdir=/usr/lib/courier</param>
+        <param>--datadir=/usr/share/courier</param>
+        <param>--sysconfdir=/etc/courier</param>
+        <param>--localstatedir=/var/lib/courier</param>
+        <param>--with-piddir=/var/run/courier</param>
+        <param>--disable-root-check</param>
+        <param>--with-mailuser=courier</param>
+        <param>--with-mailgroup=courier</param>
+        <param>--with-paranoid-smtpext</param>
+        <param>--disable-autorenamesent</param>
+        <param>--enable-workarounds-for-imap-client-bugs</param>
+        <param>--with-db=gdbm</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <make>
+        <param>install-configure</param>
+      </make>
+    </stage>
+    <stage name="Cleanup.">
+      <remove>&build_dir;/&courier-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter21/exim.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/exim.xml	2004-07-18 23:32:58 UTC (rev 1464)
+++ profiles/BLFS/trunk/chapter21/exim.xml	2004-07-18 23:40:54 UTC (rev 1465)
@@ -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/ch21.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,88 +10,73 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="exim" version="&exim-version;">
-
-	<packageinfo>
-		<requires><name>db</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking.">
-		<unpack>
-			<archive>&packages_dir;/&exim-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Creating user and group">
-		<execute command="groupadd">
-			<param>-f</param>
-			<param>exim</param>
-		</execute>
-
-		<execute command="grep -q ^exim /etc/passwd || useradd">
-		        <param>-c exim</param>
-			<param>-d /dev/null</param>
-			<param>-g exim</param>
-			<param>-s /bin/false</param>
-			<param>exim</param>
-		</execute>
-	</stage>
-
-	<stage name="Installing.">
-		<stageinfo>
-			<base>&build_dir;/&exim-directory;</base>
-		</stageinfo>
-
-		<execute command="sed -e 's/^BIN_DIR.*$/BIN_DIRECTORY=\/usr\/sbin/' src/EDITME | \
-  			sed -e 's/^CONF.*$/CONFIGURE_FILE=\/etc\/exim.conf/' | \
- 			sed -e 's/^EXIM_USER.*$/EXIM_USER=exim/' | \
-  			sed -e 's/^EXIM_MONITOR/#EXIM_MONITOR/' > Local/Makefile" />
-		
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<copy>
-			<source>doc/exim.8</source>
-			<destination>/usr/share/man/man8</destination>
-		</copy>
-		
-		<link>
-			<option>force</option>
-			<target>exim-4.24-1</target>
-			<name>/usr/sbin/exim</name>
-		</link>
-
-		<link>
-			<option>force</option>
-			<target>exim</target>
-			<name>/usr/sbin/sendmail</name>
-		</link>
-
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-exim</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup.">
-		<remove>&build_dir;/&exim-directory;</remove>
-	</stage>
-</package>
+  <package name="exim" version="&exim-version;">
+    <packageinfo>
+      <requires>
+        <name>db</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking.">
+      <unpack>
+        <archive>&packages_dir;/&exim-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Creating user and group">
+      <execute command="groupadd">
+        <param>-f</param>
+        <param>exim</param>
+      </execute>
+      <execute command="grep -q ^exim /etc/passwd || useradd">
+        <param>-c exim</param>
+        <param>-d /dev/null</param>
+        <param>-g exim</param>
+        <param>-s /bin/false</param>
+        <param>exim</param>
+      </execute>
+    </stage>
+    <stage name="Installing.">
+      <stageinfo>
+        <base>&build_dir;/&exim-directory;</base>
+      </stageinfo>
+      <execute command="sed -e 's/^BIN_DIR.*$/BIN_DIRECTORY=\/usr\/sbin/' src/EDITME | 
+                        sed -e 's/^CONF.*$/CONFIGURE_FILE=\/etc\/exim.conf/' | 
+                        sed -e 's/^EXIM_USER.*$/EXIM_USER=exim/' | 
+                              sed -e 's/^EXIM_MONITOR/#EXIM_MONITOR/' > Local/Makefile" />
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <copy>
+        <source>doc/exim.8</source>
+        <destination>/usr/share/man/man8</destination>
+      </copy>
+      <link>
+        <option>force</option>
+        <target>exim-4.24-1</target>
+        <name>/usr/sbin/exim</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>exim</target>
+        <name>/usr/sbin/sendmail</name>
+      </link>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-exim</param>
+      </make>
+    </stage>
+    <stage name="Cleanup.">
+      <remove>&build_dir;/&exim-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter21/postfix.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/postfix.xml	2004-07-18 23:32:58 UTC (rev 1464)
+++ profiles/BLFS/trunk/chapter21/postfix.xml	2004-07-18 23:40:54 UTC (rev 1465)
@@ -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/ch21.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,129 +10,108 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="postfix" version="&postfix-version;">
-
-        <packageinfo>
-                <requires><name>db</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&postfix-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Creating user and group">
-		<execute command="groupadd">
-			<param>-f</param>
-			<param>postfix</param>
-		</execute>
-
-		<execute command="groupadd">
-			<param>-f</param>
-			<param>postdrop</param>
-		</execute>
-
-		<execute command="groupadd">
-			<param>-f</param>
-			<param>-g 65534</param>
-			<param>nogroup</param>
-		</execute>
-
-		<execute command="grep -q ^postfix /etc/passwd || useradd">
-		        <param>-c postfix</param>
-			<param>-d /dev/null</param>
-			<param>-g postfix</param>
-			<param>-s /bin/false</param>
-			<param>postfix</param>
-		</execute>
-
-		<execute command="grep -q ^nobody /etc/passwd || useradd">
-		        <param>-c nobody</param>
-			<param>-d /home</param>
-			<param>-g nogroup</param>
-			<param>-s /bin/bash</param>
-			<param>-u 65534</param>
-			<param>nobody</param>
-		</execute>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&postfix-directory;</base>
-		</stageinfo>
-
-		<ownership user="postfix" group="postfix">
-		        <name>/var/mail</name>
-                </ownership>
-		
-		<make />
-
-		<execute command="sh">
-			<param>postfix-install</param>
-			<param>daemon_directory=/usr/sbin</param>
-			<param>manpage_directory=/usr/share/man</param>
-			<param>sample_directory=/usr/share/doc/postfix</param>
-			<param>-non-interactive</param>
-		</execute>
-
-		<mkdir>
-			<option>parents</option>
-			<name>/usr/share/doc/postfix</name>
-		</mkdir>
-
-		<copy>
-			<option>recursive</option>
-			<option>force</option>
-			<source>html/*</source>
-			<destination>/usr/share/doc/postfix</destination>
-		</copy>
-		
-		<textdump>
-		        <file>/etc/aliases</file>
-			<content>
-		        	=# Begin /etc/aliases
-				=
-				=MAILER-DAEMON:    postmaster
-				=postmaster:       root
-				=
-				=root:             &username;
-				=# End /etc/aliases
-			</content>
-		</textdump>
-
-		<search_replace base="/etc/postfix">
-			<file>main.cf</file>
-			<find>#myhostname = host.domain.tld</find>
-			<replace>myhostname = &hostname;</replace>
-		</search_replace>
-
-		<execute command="/usr/bin/newaliases" />
-
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-postfix</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&postfix-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-
-</package>
+  <package name="postfix" version="&postfix-version;">
+    <packageinfo>
+      <requires>
+        <name>db</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&postfix-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Creating user and group">
+      <execute command="groupadd">
+        <param>-f</param>
+        <param>postfix</param>
+      </execute>
+      <execute command="groupadd">
+        <param>-f</param>
+        <param>postdrop</param>
+      </execute>
+      <execute command="groupadd">
+        <param>-f</param>
+        <param>-g 65534</param>
+        <param>nogroup</param>
+      </execute>
+      <execute command="grep -q ^postfix /etc/passwd || useradd">
+        <param>-c postfix</param>
+        <param>-d /dev/null</param>
+        <param>-g postfix</param>
+        <param>-s /bin/false</param>
+        <param>postfix</param>
+      </execute>
+      <execute command="grep -q ^nobody /etc/passwd || useradd">
+        <param>-c nobody</param>
+        <param>-d /home</param>
+        <param>-g nogroup</param>
+        <param>-s /bin/bash</param>
+        <param>-u 65534</param>
+        <param>nobody</param>
+      </execute>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&postfix-directory;</base>
+      </stageinfo>
+      <ownership user="postfix" group="postfix">
+        <name>/var/mail</name>
+      </ownership>
+      <make />
+      <execute command="sh">
+        <param>postfix-install</param>
+        <param>daemon_directory=/usr/sbin</param>
+        <param>manpage_directory=/usr/share/man</param>
+        <param>sample_directory=/usr/share/doc/postfix</param>
+        <param>-non-interactive</param>
+      </execute>
+      <mkdir>
+        <option>parents</option>
+        <name>/usr/share/doc/postfix</name>
+      </mkdir>
+      <copy>
+        <option>recursive</option>
+        <option>force</option>
+        <source>html/*</source>
+        <destination>/usr/share/doc/postfix</destination>
+      </copy>
+      <textdump>
+        <file>/etc/aliases</file>
+        <content>
+	  =# Begin /etc/aliases
+	  =
+	  =MAILER-DAEMON: postmaster
+	  =postmaster: root
+	  =
+	  =root: &username;
+	  =# End /etc/aliases
+	</content>
+      </textdump>
+      <search_replace base="/etc/postfix">
+        <file>main.cf</file>
+        <find>#myhostname = host.domain.tld</find>
+        <replace>myhostname = &hostname;</replace>
+      </search_replace>
+      <execute command="/usr/bin/newaliases" />
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-postfix</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&postfix-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter21/qpopper.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/qpopper.xml	2004-07-18 23:32:58 UTC (rev 1464)
+++ profiles/BLFS/trunk/chapter21/qpopper.xml	2004-07-18 23:40:54 UTC (rev 1465)
@@ -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/ch21.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,83 +10,63 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="qpopper" version="&qpopper-version;">
-
-        <packageinfo>
-                <requires><name>postfix</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&qpopper-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&qpopper-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-		        <param>install</param>
-		</make>
-
-		<textdump mode="append">
-		        <file>/etc/inetd.conf</file>
-			<content>
-		        	=pop stream tcp nowait root /usr/sbin/popper popper
-			</content>
-		</textdump>
-		
-		<textdump mode="append">
-		        <file>/etc/services</file>
-			<content>
-		       		=pop 110/tcp
-			</content>
-		</textdump>
-
-		<execute command="killall inetd || inetd" />
-
-		<textdump mode="append">
-		        <file>/etc/syslog.conf</file>
-			<content>
-		        	=local0.notice;local0.debug        /var/log/POP.log
-			</content>
-		</textdump>
-
-		<execute command="/etc/rc.d/init.d/sysklogd restart" />
-
-		<textdump mode="append">
-		        <file>/etc/xinetd.conf</file>
-			<content>
-			=     service pop
-			=     {
-			=          port        = 110
-			=          socket_type = stream
-			=          protocol    = tcp
-			=          wait        = no
-			=          user        = root
-			=          passenv     = PATH
-			=          server      = /usr/sbin/popper
-			=         server_args = popper
-			=     }
-			</content>
-		</textdump>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&qpopper-directory;</remove>
-	</stage>
-
-</package>
+  <package name="qpopper" version="&qpopper-version;">
+    <packageinfo>
+      <requires>
+        <name>postfix</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&qpopper-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&qpopper-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <textdump mode="append">
+        <file>/etc/inetd.conf</file>
+        <content>=pop stream tcp nowait root /usr/sbin/popper popper</content>
+      </textdump>
+      <textdump mode="append">
+        <file>/etc/services</file>
+        <content>=pop 110/tcp</content>
+      </textdump>
+      <execute command="killall inetd || inetd" />
+      <textdump mode="append">
+        <file>/etc/syslog.conf</file>
+        <content>=local0.notice;local0.debug /var/log/POP.log</content>
+      </textdump>
+      <execute command="/etc/rc.d/init.d/sysklogd restart" />
+      <textdump mode="append">
+        <file>/etc/xinetd.conf</file>
+        <content>
+	  = service pop
+	  = {
+	  =   port = 110
+	  =   socket_type = stream
+	  =   protocol = tcp
+	  =   wait = no
+	  =   user = root
+	  =   passenv = PATH 
+	  =   server = /usr/sbin/popper
+	  =   server_args = popper
+	  = }
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&qpopper-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter21/sendmail.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/sendmail.xml	2004-07-18 23:32:58 UTC (rev 1464)
+++ profiles/BLFS/trunk/chapter21/sendmail.xml	2004-07-18 23:40:54 UTC (rev 1465)
@@ -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/ch21.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,118 +10,99 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="sendmail" version="&sendmail-version;">
-
-	<packageinfo>
-		<requires><name>db</name></requires>
-		<requires><name>procmail</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking.">
-		<unpack>
-			<archive>&packages_dir;/&sendmail-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Creating user and group">
-		<execute command="groupadd">
-			<param>-f</param>
-			<param>smmsp</param>
-		</execute>
-
-		<execute command="groupadd">
-			<param>-f</param>
-			<param>mail</param>
-		</execute>
-
-		<execute command="grep -q ^smmsp /etc/passwd || useradd">
-			<param>-g smmsp</param>
-			<param>-G mail</param>
-			<param>-s /bin/false</param>
-			<param>smmsp</param>
-		</execute>
-	</stage>
-
-	<stage name="Installing.">
-		<stageinfo>
-			<base>&build_dir;/&sendmail-directory;</base>
-		</stageinfo>
-
-		<textdump>
-			<file>devtools/Site/site.config.m4</file>
-			<content>
-			=define(`confMANGRP',`root')
-			=define(`confMANOWN',`root')
-			=define(`confSBINGRP',`root')
-			=define(`confUBINGRP',`root')
-			=define(`confUBINOWN',`root')
-			</content>
-		</textdump>
-
-		<execute base="&build_dir;/&sendmail-directory;/sendmail" command="sh Build" />
-
-		<copy base="&build_dir;/&sendmail-directory;/cf/cf">
-			<source>generic-linux.mc</source>
-			<destination>sendmail.mc</destination>
-		</copy>
-
-		<mkdir>
-		        <option>parents</option>
-			<name>/etc/mail</name>
-		</mkdir>
-
-		<execute base="&build_dir;/&sendmail-directory;/cf/cf" command="sh Build sendmail.mc" />
-		<execute base="&build_dir;/&sendmail-directory;/cf/cf" command="sh Build install-cf" />
-
-		<execute command="sh Build install" />
-
-		<execute command="echo `hostname` > /etc/mail/local-host-names" />
-
-		<textdump>
-			<file>/etc/mail/aliases</file>
-			<content>
-			=postmaster: root
-			=MAILER-DAEMON: root
-			</content>
-		</textdump>
-
-		<copy>
-			<option>recursive</option>
-			<source>cf/*</source>
-			<destination>/etc/mail</destination>
-		</copy>
-
-		<copy>
-			<source>cf/cf/submit.mc</source>
-			<source>cf/cf/sendmail.mc</source>
-			<destination>/etc/mail</destination>
-		</copy>
-	
-		<execute command="newaliases -v" />
-
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-sendmail</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup.">
-		<remove>&build_dir;/&sendmail-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-</package>
+  <package name="sendmail" version="&sendmail-version;">
+    <packageinfo>
+      <requires>
+        <name>db</name>
+      </requires>
+      <requires>
+        <name>procmail</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking.">
+      <unpack>
+        <archive>&packages_dir;/&sendmail-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Creating user and group">
+      <execute command="groupadd">
+        <param>-f</param>
+        <param>smmsp</param>
+      </execute>
+      <execute command="groupadd">
+        <param>-f</param>
+        <param>mail</param>
+      </execute>
+      <execute command="grep -q ^smmsp /etc/passwd || useradd">
+        <param>-g smmsp</param>
+        <param>-G mail</param>
+        <param>-s /bin/false</param>
+        <param>smmsp</param>
+      </execute>
+    </stage>
+    <stage name="Installing.">
+      <stageinfo>
+        <base>&build_dir;/&sendmail-directory;</base>
+      </stageinfo>
+      <textdump>
+        <file>devtools/Site/site.config.m4</file>
+        <content>
+	  =define(`confMANGRP',`root')
+	  =define(`confMANOWN',`root')
+	  =define(`confSBINGRP',`root')
+	  =define(`confUBINGRP',`root')
+	  =define(`confUBINOWN',`root')
+	</content>
+      </textdump>
+      <execute base="&build_dir;/&sendmail-directory;/sendmail" command="sh Build" />
+      <copy base="&build_dir;/&sendmail-directory;/cf/cf">
+        <source>generic-linux.mc</source>
+        <destination>sendmail.mc</destination>
+      </copy>
+      <mkdir>
+        <option>parents</option>
+        <name>/etc/mail</name>
+      </mkdir>
+      <execute base="&build_dir;/&sendmail-directory;/cf/cf" command="sh Build sendmail.mc" />
+      <execute base="&build_dir;/&sendmail-directory;/cf/cf" command="sh Build install-cf" />
+      <execute command="sh Build install" />
+      <execute command="echo `hostname` > /etc/mail/local-host-names" />
+      <textdump>
+        <file>/etc/mail/aliases</file>
+        <content>
+	  =postmaster: root
+	  =MAILER-DAEMON: root
+	</content>
+      </textdump>
+      <copy>
+        <option>recursive</option>
+        <source>cf/*</source>
+        <destination>/etc/mail</destination>
+      </copy>
+      <copy>
+        <source>cf/cf/submit.mc</source>
+        <source>cf/cf/sendmail.mc</source>
+        <destination>/etc/mail</destination>
+      </copy>
+      <execute command="newaliases -v" />
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-sendmail</param>
+      </make>
+    </stage>
+    <stage name="Cleanup.">
+      <remove>&build_dir;/&sendmail-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>




More information about the alfs-log mailing list