r1453 - in profiles/BLFS/trunk: chapter04 chapter06

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Wed Jul 14 13:43:11 PDT 2004


Author: thomasp
Date: 2004-07-14 14:43:10 -0600 (Wed, 14 Jul 2004)
New Revision: 1453

Modified:
   profiles/BLFS/trunk/chapter04/linuxpam.xml
   profiles/BLFS/trunk/chapter06/emacs.xml
   profiles/BLFS/trunk/chapter06/joe.xml
   profiles/BLFS/trunk/chapter06/nano.xml
   profiles/BLFS/trunk/chapter06/vim.xml
Log:
tidied chapter 6

Modified: profiles/BLFS/trunk/chapter04/linuxpam.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/linuxpam.xml	2004-07-14 20:35:57 UTC (rev 1452)
+++ profiles/BLFS/trunk/chapter04/linuxpam.xml	2004-07-14 20:43:10 UTC (rev 1453)
@@ -80,10 +80,10 @@
         <content>
 	  =# Begin /etc/pam.d/other
 	  =
-	  =auth required pam_unix.so nullok
-	  =account required pam_unix.so
-	  =session required pam_unix.so
-	  =password required pam_unix.so nullok
+	  =auth 	required 	pam_unix.so 	nullok
+	  =account 	required	pam_unix.so
+	  =session	required 	pam_unix.so
+	  =password 	required 	pam_unix.so 	nullok
 	  =
 	  =# End /etc/pam.d/other
 	</content>
@@ -93,10 +93,10 @@
         <content>
 	  =# Begin /etc/pam.conf
 	  =
-	  =other auth required pam_unix.so nullok
-	  =other account required pam_unix.so
-	  =other session required pam_unix.so
-	  =other password required pam_unix.so nullok
+	  =other 	auth 		required 	pam_unix.so 	nullok
+	  =other 	account 	required 	pam_unix.so
+	  =other 	session 	required	pam_unix.so
+	  =other 	password 	required 	pam_unix.so 	nullok
 	  =
 	  =# End /etc/pam.conf
 	</content>

Modified: profiles/BLFS/trunk/chapter06/emacs.xml
===================================================================
--- profiles/BLFS/trunk/chapter06/emacs.xml	2004-07-14 20:35:57 UTC (rev 1452)
+++ profiles/BLFS/trunk/chapter06/emacs.xml	2004-07-14 20:43:10 UTC (rev 1453)
@@ -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/ch06.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,57 +10,48 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="emacs" version="&emacs-version;">
-
+  <package name="emacs" version="&emacs-version;">
     <packageinfo>
-        <utilizes>
-		<name>xfree86</name>
-	</utilizes>
-        <utilizes>
-		<name>libjpeg</name>
-	</utilizes>
-        <utilizes>
-		<name>libpng</name>
-	</utilizes>
-        <utilizes>
-		<name>libtiff</name>
-	</utilizes>
-        <utilizes>
-		<name>libungif</name>
-	</utilizes>
+      <utilizes>
+        <name>xfree86</name>
+      </utilizes>
+      <utilizes>
+        <name>libjpeg</name>
+      </utilizes>
+      <utilizes>
+        <name>libpng</name>
+      </utilizes>
+      <utilizes>
+        <name>libtiff</name>
+      </utilizes>
+      <utilizes>
+        <name>libungif</name>
+      </utilizes>
     </packageinfo>
-
     <stage name="Unpacking">
-	<unpack>
-		<archive>&packages_dir;/&emacs-package;</archive>
-		<destination>&build_dir;</destination>
-	</unpack>
+      <unpack>
+        <archive>&packages_dir;/&emacs-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
     </stage>
-
     <stage name="Installing">
-        <stageinfo>
-		<base>&build_dir;/&emacs-directory;</base>
-	</stageinfo>
-
-	<configure>
-	        <param>--prefix=/usr</param>
-	        <param>--libexecdir=/usr/sbin</param>
-	</configure>
-	
-	<make>
-		<param>bootstrap</param>
-	</make>
-
-	<make>
-		<param>install</param>
-	</make>
+      <stageinfo>
+        <base>&build_dir;/&emacs-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libexecdir=/usr/sbin</param>
+      </configure>
+      <make>
+        <param>bootstrap</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
     </stage>
-
     <stage name="Cleanup">
-	<remove>&build_dir;/&emacs-directory;</remove>
+      <remove>&build_dir;/&emacs-directory;</remove>
     </stage>
-
-</package>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter06/joe.xml
===================================================================
--- profiles/BLFS/trunk/chapter06/joe.xml	2004-07-14 20:35:57 UTC (rev 1452)
+++ profiles/BLFS/trunk/chapter06/joe.xml	2004-07-14 20:43:10 UTC (rev 1453)
@@ -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/ch06.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,37 +10,29 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="joe" version="&joe-version;">
-
+  <package name="joe" version="&joe-version;">
     <stage name="Unpacking">
-	<unpack>
-		<archive>&packages_dir;/&joe-package;</archive>
-		<destination>&build_dir;</destination>
-	</unpack>
+      <unpack>
+        <archive>&packages_dir;/&joe-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
     </stage>
-
     <stage name="Installing">
-        <stageinfo>
-		<base>&build_dir;/&joe-directory;</base>
-	</stageinfo>
-
-	<configure>
-	        <param>--prefix=/usr</param>
-	        <param>--sysconfdir=/etc</param>
-	</configure>
-	
-	<make />
-
-	<make>
-		<param>install</param>
-	</make>
+      <stageinfo>
+        <base>&build_dir;/&joe-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;/&joe-directory;</remove>
+      <remove>&build_dir;/&joe-directory;</remove>
     </stage>
-
-</package>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter06/nano.xml
===================================================================
--- profiles/BLFS/trunk/chapter06/nano.xml	2004-07-14 20:35:57 UTC (rev 1452)
+++ profiles/BLFS/trunk/chapter06/nano.xml	2004-07-14 20:43:10 UTC (rev 1453)
@@ -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/ch06.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,72 +10,59 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="nano" version="&nano-version;">
-
+  <package name="nano" version="&nano-version;">
     <packageinfo>
-        <utilizes><name>slang</name></utilizes>
+      <utilizes>
+        <name>slang</name>
+      </utilizes>
     </packageinfo>
-
- 
     <stage name="Unpacking">
-	<unpack>
-		<archive>&packages_dir;/&nano-package;</archive>
-		<destination>&build_dir;</destination>
-	</unpack>
+      <unpack>
+        <archive>&packages_dir;/&nano-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
     </stage>
-
     <stage name="Installing">
-        <stageinfo>
-		<base>&build_dir;/&nano-directory;</base>
-	</stageinfo>
-
-	<configure>
-	        <param>--prefix=/usr</param>
-		<param>--sysconfdir=/etc</param>
-		<param>--enable-color</param>
-		<param>--enable-multibuffer</param>
-		<param>--enable-nanorc</param>
-	</configure>
-
-	
-	<make />
-
-	<make>
-		<param>install</param>
-	</make>
-
-	<mkdir base="/usr/share/doc">
-	        <option>parents</option>
-		<name>nano/examples</name>
-	</mkdir>
-
-	<copy>
-	        <source>nanorc.sample</source>
-		<destination>/usr/share/doc/nano/examples</destination>
-	</copy>
-
-	<textdump base="/etc">
-		<file>nanorc</file>
-		<content>
-		=set autoindent
-		=set const
-		=set fill 72
-		=set historylog
-		=set multibuffer
-		=set nohelp
-		=set regexp
-		=set smooth
-		=set suspend
-        	</content>
-	</textdump>
-	
+      <stageinfo>
+        <base>&build_dir;/&nano-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+        <param>--enable-color</param>
+        <param>--enable-multibuffer</param>
+        <param>--enable-nanorc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <mkdir base="/usr/share/doc">
+        <option>parents</option>
+        <name>nano/examples</name>
+      </mkdir>
+      <copy>
+        <source>nanorc.sample</source>
+        <destination>/usr/share/doc/nano/examples</destination>
+      </copy>
+      <textdump base="/etc">
+        <file>nanorc</file>
+        <content>
+	  =set autoindent
+	  =set const
+	  =set fill 72
+	  =set historylog
+	  =set multibuffer
+	  =set nohelp
+	  =set regexp
+	  =set smooth
+	  =set suspend
+	</content>
+      </textdump>
     </stage>
-
     <stage name="Cleanup">
-	<remove>&build_dir;/&nano-directory;</remove>
+      <remove>&build_dir;/&nano-directory;</remove>
     </stage>
-
-</package>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter06/vim.xml
===================================================================
--- profiles/BLFS/trunk/chapter06/vim.xml	2004-07-14 20:35:57 UTC (rev 1452)
+++ profiles/BLFS/trunk/chapter06/vim.xml	2004-07-14 20:43:10 UTC (rev 1453)
@@ -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/ch06.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,66 +10,56 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="vim" version="&vim-version;">
-
+  <package name="vim" version="&vim-version;">
     <packageinfo>
-        <utilizes>
-		<name>xfree86</name>
-	</utilizes>
-        <utilizes>
-		<name>gtk+2</name>
-	</utilizes>
-        <utilizes>
-		<name>lesstif</name>
-	</utilizes>
-        <utilizes>
-		<name>python</name>
-	</utilizes>
-        <utilizes>
-		<name>tcl</name>
-	</utilizes>
-        <utilizes>
-		<name>ruby</name>
-	</utilizes>
+      <utilizes>
+        <name>xfree86</name>
+      </utilizes>
+      <utilizes>
+        <name>gtk+2</name>
+      </utilizes>
+      <utilizes>
+        <name>lesstif</name>
+      </utilizes>
+      <utilizes>
+        <name>python</name>
+      </utilizes>
+      <utilizes>
+        <name>tcl</name>
+      </utilizes>
+      <utilizes>
+        <name>ruby</name>
+      </utilizes>
     </packageinfo>
-
     <stage name="Unpacking">
-	<unpack>
-		<archive>&packages_dir;/&vim-package;</archive>
-		<destination>&build_dir;</destination>
-	</unpack>
+      <unpack>
+        <archive>&packages_dir;/&vim-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
     </stage>
-
     <stage name="Installing">
-        <stageinfo>
-		<base>&build_dir;/&vim-directory;</base>
-	</stageinfo>
-
-	<textdump mode="append">
-	        <file>src/feature.h</file>
-		<content>
-                =#define SYS_VIMRC_FILE "/etc/vimrc"
-                =#define SYS_GVIMRC_FILE "/etc/gvimrc"
-		</content>
-	</textdump>
-
-	<configure>
-	        <param>--prefix=/usr</param>
-	        <param>--with-features=huge</param>
-	</configure>
-	
-	<make />
-
-	<make>
-		<param>install</param>
-	</make>
+      <stageinfo>
+        <base>&build_dir;/&vim-directory;</base>
+      </stageinfo>
+      <textdump mode="append">
+        <file>src/feature.h</file>
+        <content>
+	  =#define SYS_VIMRC_FILE "/etc/vimrc"
+	  =#define SYS_GVIMRC_FILE "/etc/gvimrc"
+	</content>
+      </textdump>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--with-features=huge</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
     </stage>
-
     <stage name="Cleanup">
-	<remove>&build_dir;/&vim-directory;</remove>
+      <remove>&build_dir;/&vim-directory;</remove>
     </stage>
-
-</package>
+  </package>
 </alfs>




More information about the alfs-log mailing list