r1472 - in profiles/BLFS/trunk: chapter37 chapter38

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Jul 19 12:21:34 PDT 2004


Author: thomasp
Date: 2004-07-19 13:21:32 -0600 (Mon, 19 Jul 2004)
New Revision: 1472

Modified:
   profiles/BLFS/trunk/chapter37/alsa-driver.xml
   profiles/BLFS/trunk/chapter37/alsa-firmware.xml
   profiles/BLFS/trunk/chapter37/alsa-lib.xml
   profiles/BLFS/trunk/chapter37/alsa-oss.xml
   profiles/BLFS/trunk/chapter37/alsa-tools.xml
   profiles/BLFS/trunk/chapter37/alsa-utils.xml
   profiles/BLFS/trunk/chapter37/audiofile.xml
   profiles/BLFS/trunk/chapter37/esound.xml
   profiles/BLFS/trunk/chapter37/flac.xml
   profiles/BLFS/trunk/chapter37/id3lib.xml
   profiles/BLFS/trunk/chapter37/liba52.xml
   profiles/BLFS/trunk/chapter37/libao.xml
   profiles/BLFS/trunk/chapter37/libdv.xml
   profiles/BLFS/trunk/chapter37/libdvdcss.xml
   profiles/BLFS/trunk/chapter37/libdvdread.xml
   profiles/BLFS/trunk/chapter37/libfame.xml
   profiles/BLFS/trunk/chapter37/libmad.xml
   profiles/BLFS/trunk/chapter37/libmikmod.xml
   profiles/BLFS/trunk/chapter37/libmpeg3.xml
   profiles/BLFS/trunk/chapter37/libogg.xml
   profiles/BLFS/trunk/chapter37/libvorbis.xml
   profiles/BLFS/trunk/chapter37/nas.xml
   profiles/BLFS/trunk/chapter37/openquicktime.xml
   profiles/BLFS/trunk/chapter37/sdl.xml
   profiles/BLFS/trunk/chapter37/speex.xml
   profiles/BLFS/trunk/chapter37/xine-lib.xml
   profiles/BLFS/trunk/chapter37/xvid.xml
   profiles/BLFS/trunk/chapter38/cdparanoia.xml
   profiles/BLFS/trunk/chapter38/lame.xml
   profiles/BLFS/trunk/chapter38/mpg123.xml
   profiles/BLFS/trunk/chapter38/vorbis-tools.xml
   profiles/BLFS/trunk/chapter38/xmms.xml
Log:
tidied chapters 37-38

Modified: profiles/BLFS/trunk/chapter37/alsa-driver.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/alsa-driver.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/alsa-driver.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,65 +10,52 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="alsa-driver" version="&alsa-driver-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&alsa-driver-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&alsa-driver-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<prefix>CC=/opt/gcc-2.95.3/bin/gcc</prefix>
-		        <param>--with-moddir=/lib/modules/`uname -r`/kernel/drivers/sound/</param>
-			<param>--with-kernel=/lib/modules/`uname -r`/build</param>
-			<param>--with-sequencer=yes</param>
-			<param>--with-oss=yes</param>
-			<param>--with-isapnp=no</param> 
-			<param>--with-cards=&sound-card;</param>
-		</configure>
-
-		<make/>
-		
-		<make>
-			<param>install</param>
-		</make>
-
-		<execute command="./snddevices" />
-
-		<textdump base="/etc" mode="append">
-		        <file>modules.conf</file>
-			
-		        <content>
-			        =alias char-major-14 soundcore
-				=alias char-major-116 snd
-				=
-				=alias snd-card-0 snd-&sound-card;
-				=
-				=alias sound-slot-0 snd-card-0
-				=
-				=alias sound-service-0-0 snd-mixer-oss
-				=alias sound-service-0-1 snd-seq-oss
-				=alias sound-service-0-3 snd-pcm-oss
-				=alias sound-service-0-8 snd-seq-midi
-			</content>
-		</textdump>
-
-		<execute command="/sbin/depmod" />
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&alsa-driver-directory;</remove>
-	</stage>
-
-</package>
+  <package name="alsa-driver" version="&alsa-driver-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&alsa-driver-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&alsa-driver-directory;</base>
+      </stageinfo>
+      <configure>
+        <prefix>CC=/opt/gcc-2.95.3/bin/gcc</prefix>
+        <param>--with-moddir=/lib/modules/`uname -r`/kernel/drivers/sound/</param>
+        <param>--with-kernel=/lib/modules/`uname -r`/build</param>
+        <param>--with-sequencer=yes</param>
+        <param>--with-oss=yes</param>
+        <param>--with-isapnp=no</param>
+        <param>--with-cards=&sound-card;</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <execute command="./snddevices" />
+      <textdump base="/etc" mode="append">
+        <file>modules.conf</file>
+        <content>
+	  =alias char-major-14 soundcore
+	  =alias char-major-116 snd
+	  =
+	  =alias snd-card-0 snd-&sound-card;
+	  =
+	  =alias sound-slot-0 snd-card-0
+	  =
+	  =alias sound-service-0-0 snd-mixer-oss
+	  =alias sound-service-0-1 snd-seq-oss
+	  =alias sound-service-0-3 snd-pcm-oss
+	  =alias sound-service-0-8 snd-seq-midi
+	</content>
+      </textdump>
+      <execute command="/sbin/depmod" />
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&alsa-driver-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/alsa-firmware.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/alsa-firmware.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/alsa-firmware.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,40 +10,33 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="alsa-firmware" version="&alsa-firmware-version;">
-
-	<packageinfo>
-		<requires><name>alsa-tools</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&alsa-firmware-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&alsa-firmware-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-		
-		<make/>
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&alsa-firmware-directory;</remove>
-	</stage>
-
-</package>
+  <package name="alsa-firmware" version="&alsa-firmware-version;">
+    <packageinfo>
+      <requires>
+        <name>alsa-tools</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&alsa-firmware-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&alsa-firmware-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&alsa-firmware-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/alsa-lib.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/alsa-lib.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/alsa-lib.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,42 +10,32 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="alsa-lib" version="&alsa-lib-version;">
-
-	<packageinfo>
-		<requires><name>alsa-driver</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&alsa-lib-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&alsa-lib-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--enable-static</param>
-		</configure>
-		
-		<make/>
-		
-		<make>
-			<param>install</param>
-		</make>
-
-		&ldconfig;
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&alsa-lib-directory;</remove>
-	</stage>
-
-</package>
+  <package name="alsa-lib" version="&alsa-lib-version;">
+    <packageinfo>
+      <requires>
+        <name>alsa-driver</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&alsa-lib-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+    <stageinfo>
+      <base>&build_dir;/&alsa-lib-directory;</base>
+    </stageinfo>
+    <configure>
+      <param>--enable-static</param>
+    </configure>
+    <make />
+    <make>
+      <param>install</param>
+    </make>&ldconfig;</stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&alsa-lib-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/alsa-oss.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/alsa-oss.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/alsa-oss.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,38 +10,31 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="alsa-oss" version="&alsa-oss-version;">
-
-	<packageinfo>
-		<requires><name>alsa-lib</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&alsa-oss-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&alsa-oss-directory;</base>
-		</stageinfo>
-
-		<configure />
-
-		<make/>
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&alsa-oss-directory;</remove>
-	</stage>
-
-</package>
+  <package name="alsa-oss" version="&alsa-oss-version;">
+    <packageinfo>
+      <requires>
+        <name>alsa-lib</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&alsa-oss-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&alsa-oss-directory;</base>
+      </stageinfo>
+      <configure />
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&alsa-oss-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/alsa-tools.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/alsa-tools.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/alsa-tools.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,106 +10,84 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="alsa-tools" version="&alsa-tools-version;">
-
-        <packageinfo>
-                <requires><name>alsa-lib</name></requires>
-		<utilizes><name>gtk+</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&alsa-tools-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing ac3dec">
-		<stageinfo>
-			<base>&build_dir;/&alsa-tools-directory;/ac3dec</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Installing as10k1">
-		<stageinfo>
-			<base>&build_dir;/&alsa-tools-directory;/as10k1</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Installing envy24control">
-		<stageinfo>
-			<base>&build_dir;/&alsa-tools-directory;/envy24control</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Installing sb16_csp">
-		<stageinfo>
-			<base>&build_dir;/&alsa-tools-directory;/sb16_csp</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Installing sbiload">
-		<stageinfo>
-			<base>&build_dir;/&alsa-tools-directory;/seq/sbiload</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&alsa-tools-directory;</remove>
-	</stage>
-
-</package>
+  <package name="alsa-tools" version="&alsa-tools-version;">
+    <packageinfo>
+      <requires>
+        <name>alsa-lib</name>
+      </requires>
+      <utilizes>
+        <name>gtk+</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&alsa-tools-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing ac3dec">
+      <stageinfo>
+        <base>&build_dir;/&alsa-tools-directory;/ac3dec</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing as10k1">
+      <stageinfo>
+        <base>&build_dir;/&alsa-tools-directory;/as10k1</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing envy24control">
+      <stageinfo>
+        <base>&build_dir;/&alsa-tools-directory;/envy24control</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing sb16_csp">
+      <stageinfo>
+        <base>&build_dir;/&alsa-tools-directory;/sb16_csp</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing sbiload">
+      <stageinfo>
+        <base>&build_dir;/&alsa-tools-directory;/seq/sbiload</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&alsa-tools-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/alsa-utils.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/alsa-utils.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/alsa-utils.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,63 +10,51 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="alsa-utils" version="&alsa-utils-version;">
-
-	<packageinfo>
-		<requires><name>alsa-lib</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&alsa-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;/&alsa-utils-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&alsa-utils-arecord-patch;</param>
-		</patch>
-
-		<configure />
-
-		<make />
-		
-		<make>
-			<param>install</param>
-		</make>
-
-		<execute command="touch /etc/asound.state" />
-		<execute command="alsactl store" />
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-alsa</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&alsa-utils-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-
-</package>
+  <package name="alsa-utils" version="&alsa-utils-version;">
+    <packageinfo>
+      <requires>
+        <name>alsa-lib</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&alsa-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;/&alsa-utils-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&alsa-utils-arecord-patch;</param>
+      </patch>
+      <configure />
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <execute command="touch /etc/asound.state" />
+      <execute command="alsactl store" />
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-alsa</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&alsa-utils-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/audiofile.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/audiofile.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/audiofile.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,36 +10,28 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="audiofile" version="&audiofile-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&audiofile-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&audiofile-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&audiofile-directory;</remove>
-	</stage>
-
-</package>
+  <package name="audiofile" version="&audiofile-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&audiofile-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&audiofile-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&audiofile-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/esound.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/esound.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/esound.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,43 +10,40 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="esound" version="&esound-version;">
-
-        <packageinfo>
-                <requires><name>audiofile</name></requires>
-		<utilizes><name>alsa-lib</name></utilizes>
-		<utilizes><name>tcpwrappers</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&esound-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&esound-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;/&esound-directory;</remove>
-	</stage>
-
-</package>
+  <package name="esound" version="&esound-version;">
+    <packageinfo>
+      <requires>
+        <name>audiofile</name>
+      </requires>
+      <utilizes>
+        <name>alsa-lib</name>
+      </utilizes>
+      <utilizes>
+        <name>tcpwrappers</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&esound-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&esound-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;/&esound-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/flac.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/flac.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/flac.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,43 +10,42 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="flac" version="&flac-version;">
-
-        <packageinfo>
-                <utilizes><name>libogg</name></utilizes>
-                <utilizes><name>xmms</name></utilizes>
-                <utilizes><name>id3lib</name></utilizes>
-                <utilizes><name>nasm</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&flac-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&flac-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&flac-directory;</remove>
-	</stage>
-
-</package>
+  <package name="flac" version="&flac-version;">
+    <packageinfo>
+      <utilizes>
+        <name>libogg</name>
+      </utilizes>
+      <utilizes>
+        <name>xmms</name>
+      </utilizes>
+      <utilizes>
+        <name>id3lib</name>
+      </utilizes>
+      <utilizes>
+        <name>nasm</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&flac-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&flac-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&flac-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/id3lib.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/id3lib.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/id3lib.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,36 +10,28 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="id3lib" version="&id3lib-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&id3lib-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&id3lib-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&id3lib-directory;</remove>
-	</stage>
-
-</package>
+  <package name="id3lib" version="&id3lib-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&id3lib-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&id3lib-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&id3lib-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/liba52.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/liba52.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/liba52.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,37 +10,29 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="liba52" version="&liba52-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&liba52-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&liba52-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-			<param>--enable-shared</param>
-		</configure>
-
-		<make />
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&liba52-directory;</remove>
-	</stage>
-
-</package>
+  <package name="liba52" version="&liba52-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&liba52-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&liba52-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--enable-shared</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&liba52-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/libao.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/libao.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/libao.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,44 +10,45 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libao" version="&libao-version;">
-
-	<packageinfo>
-		<utilizes><name>xfree86</name></utilizes>
-		<utilizes><name>esound</name></utilizes>
-		<utilizes><name>alsa-lib</name></utilizes>
-		<utilizes><name>arts</name></utilizes>
-		<utilizes><name>nas</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libao-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libao-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libao-directory;</remove>
-	</stage>
-
-</package>
+  <package name="libao" version="&libao-version;">
+    <packageinfo>
+      <utilizes>
+        <name>xfree86</name>
+      </utilizes>
+      <utilizes>
+        <name>esound</name>
+      </utilizes>
+      <utilizes>
+        <name>alsa-lib</name>
+      </utilizes>
+      <utilizes>
+        <name>arts</name>
+      </utilizes>
+      <utilizes>
+        <name>nas</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libao-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libao-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libao-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/libdv.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/libdv.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/libdv.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,43 +10,42 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libdv" version="&libdv-version;">
-
-        <packageinfo>
-		 <utilizes><name>popt</name></utilizes>
-	         <utilizes><name>sdl</name></utilizes>
-	         <utilizes><name>gtk+</name></utilizes>
-	         <utilizes><name>xfree86</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libdv-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libdv-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libdv-directory;</remove>
-	</stage>
-
-</package>
+  <package name="libdv" version="&libdv-version;">
+    <packageinfo>
+      <utilizes>
+        <name>popt</name>
+      </utilizes>
+      <utilizes>
+        <name>sdl</name>
+      </utilizes>
+      <utilizes>
+        <name>gtk+</name>
+      </utilizes>
+      <utilizes>
+        <name>xfree86</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libdv-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libdv-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libdv-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/libdvdcss.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/libdvdcss.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/libdvdcss.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,36 +10,28 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libdvdcss" version="&libdvdcss-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libdvdcss-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libdvdcss-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libdvdcss-directory;</remove>
-	</stage>
-
-</package>
+  <package name="libdvdcss" version="&libdvdcss-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libdvdcss-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libdvdcss-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libdvdcss-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/libdvdread.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/libdvdread.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/libdvdread.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,41 +10,34 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libdvdread" version="&libdvdread-version;">
-
-        <packageinfo>
-                <utilizes><name>libdvdcss</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libdvdread-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libdvdread-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-			<param>--with-libdvdcss</param>
-		</configure>
-
-		<make />
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libdvdread-directory;</remove>
-	</stage>
-
-</package>
+  <package name="libdvdread" version="&libdvdread-version;">
+    <packageinfo>
+      <utilizes>
+        <name>libdvdcss</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libdvdread-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libdvdread-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--with-libdvdcss</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libdvdread-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/libfame.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/libfame.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/libfame.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,36 +10,28 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libfame" version="&libfame-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libfame-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libfame-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libfame-directory;</remove>
-	</stage>
-
-</package>
+  <package name="libfame" version="&libfame-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libfame-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libfame-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libfame-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/libmad.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/libmad.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/libmad.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,36 +10,28 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libmad" version="&libmad-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libmad-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libmad-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libmad-directory;</remove>
-	</stage>
-
-</package>
+  <package name="libmad" version="&libmad-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libmad-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libmad-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libmad-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/libmikmod.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/libmikmod.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/libmikmod.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,40 +10,33 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libmikmod" version="&libmikmod-version;">
-
-        <packageinfo>
-                <utilizes><name>esound</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libmikmod-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libmikmod-directory;/</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libmikmod-directory;</remove>
-	</stage>
-
-</package>
+  <package name="libmikmod" version="&libmikmod-version;">
+    <packageinfo>
+      <utilizes>
+        <name>esound</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libmikmod-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libmikmod-directory;/</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libmikmod-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/libmpeg3.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/libmpeg3.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/libmpeg3.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,48 +10,40 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libmpeg3" version="&libmpeg3-version;">
-
-        <packageinfo>
-                <requires><name>nasm</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libmpeg3-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libmpeg3-directory;</base>
-		</stageinfo>
-
-		<make />
-		
-		<make>
-			<param>install</param>
-		</make>
-
-		<copy>
-		        <source>i686/libmpeg3.a</source>
-			<destination>/usr/lib</destination>
-		</copy>
-
-		<copy>
-		        <source>libmpeg3.h</source>
-			<source>mpeg3private.h</source>
-			<source>mpeg3protos.h</source>
-			<destination>/usr/include</destination>
-		</copy>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libmpeg3-directory;</remove>
-	</stage>
-
-</package>
+  <package name="libmpeg3" version="&libmpeg3-version;">
+    <packageinfo>
+      <requires>
+        <name>nasm</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libmpeg3-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libmpeg3-directory;</base>
+      </stageinfo>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <copy>
+        <source>i686/libmpeg3.a</source>
+        <destination>/usr/lib</destination>
+      </copy>
+      <copy>
+        <source>libmpeg3.h</source>
+        <source>mpeg3private.h</source>
+        <source>mpeg3protos.h</source>
+        <destination>/usr/include</destination>
+      </copy>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libmpeg3-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/libogg.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/libogg.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/libogg.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,36 +10,28 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libogg" version="&libogg-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libogg-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libogg-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libogg-directory;</remove>
-	</stage>
-
-</package>
+  <package name="libogg" version="&libogg-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libogg-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libogg-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libogg-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/libvorbis.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/libvorbis.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/libvorbis.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,48 +10,40 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libvorbis" version="&libvorbis-version;">
-
-        <packageinfo>
-                <requires><name>libogg</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&libvorbis-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&libvorbis-directory;/</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<!-- this is used to avoid a compiler error on some
+  <package name="libvorbis" version="&libvorbis-version;">
+    <packageinfo>
+      <requires>
+        <name>libogg</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&libvorbis-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&libvorbis-directory;/</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <!-- this is used to avoid a compiler error on some
                      machines -->
-		<search_replace>
-		        <file>lib/Makefile</file>
-		        <find>-mno-ieee-fp</find>
-		        <replace></replace>
-		</search_replace>
-
-		<make/>
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&libvorbis-directory;</remove>
-	</stage>
-
-</package>
+      <search_replace>
+        <file>lib/Makefile</file>
+        <find>-mno-ieee-fp</find>
+        <replace></replace>
+      </search_replace>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&libvorbis-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/nas.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/nas.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/nas.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,57 +10,46 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="nas" version="&nas-version;">
-
-	<packageinfo>
-		<requires><name>xfree86</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&nas-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&nas-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&nas-patch;</param>
-		</patch>
-
-		<execute command="xmkmf" />
-
-		<make>
-		        <param>Makefiles</param>
-		</make>
-		
-		<make>
-			<param>includes</param>
-		</make>
-
-		<make>
-			<param>depend</param>
-		</make>
-
-		<make />
-
-		<make>
-			<param>install</param>
-			<param>install.man</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&nas-directory;</remove>
-	</stage>
-
-</package>
+  <package name="nas" version="&nas-version;">
+    <packageinfo>
+      <requires>
+        <name>xfree86</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&nas-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&nas-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&nas-patch;</param>
+      </patch>
+      <execute command="xmkmf" />
+      <make>
+        <param>Makefiles</param>
+      </make>
+      <make>
+        <param>includes</param>
+      </make>
+      <make>
+        <param>depend</param>
+      </make>
+      <make />
+      <make>
+        <param>install</param>
+        <param>install.man</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&nas-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/openquicktime.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/openquicktime.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/openquicktime.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,41 +10,36 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="openquicktime" version="&openquicktime-version;">
-
-        <packageinfo>
-                <requires><name>glib</name></requires>
-                <utilizes><name>libjpeg</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&openquicktime-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&openquicktime-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&openquicktime-directory;</remove>
-	</stage>
-
-</package>
+  <package name="openquicktime" version="&openquicktime-version;">
+    <packageinfo>
+      <requires>
+        <name>glib</name>
+      </requires>
+      <utilizes>
+        <name>libjpeg</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&openquicktime-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&openquicktime-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&openquicktime-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/sdl.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/sdl.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/sdl.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,49 +10,58 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="sdl" version="&sdl-version;">
-
-        <packageinfo>
-                <utilizes><name>alsa-lib</name></utilizes>
-                <utilizes><name>esound</name></utilizes>
-		<utilizes><name>arts</name></utilizes>
-		<utilizes><name>nas</name></utilizes>
-		<utilizes><name>nasm</name></utilizes>
-		<utilizes><name>xfree86</name></utilizes>
-		<utilizes><name>aalib</name></utilizes>
-		<utilizes><name>directfb</name></utilizes>
-		<utilizes><name>svgalib</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&sdl-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&sdl-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		        <param>--disable-debug</param>
-		</configure>
-
-		<make/>
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&sdl-directory;</remove>
-	</stage>
-
-</package>
+  <package name="sdl" version="&sdl-version;">
+    <packageinfo>
+      <utilizes>
+        <name>alsa-lib</name>
+      </utilizes>
+      <utilizes>
+        <name>esound</name>
+      </utilizes>
+      <utilizes>
+        <name>arts</name>
+      </utilizes>
+      <utilizes>
+        <name>nas</name>
+      </utilizes>
+      <utilizes>
+        <name>nasm</name>
+      </utilizes>
+      <utilizes>
+        <name>xfree86</name>
+      </utilizes>
+      <utilizes>
+        <name>aalib</name>
+      </utilizes>
+      <utilizes>
+        <name>directfb</name>
+      </utilizes>
+      <utilizes>
+        <name>svgalib</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&sdl-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&sdl-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--disable-debug</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&sdl-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/speex.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/speex.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/speex.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,40 +10,33 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="speex" version="&speex-version;">
-
-        <packageinfo>
-                <requires><name>libogg</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&speex-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&speex-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-		
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&speex-directory;</remove>
-	</stage>
-
-</package>
+  <package name="speex" version="&speex-version;">
+    <packageinfo>
+      <requires>
+        <name>libogg</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&speex-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&speex-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&speex-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/xine-lib.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/xine-lib.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/xine-lib.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,52 +10,66 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="xine-lib" version="&xine-lib-version;">
-
-        <packageinfo>
-                <requires><name>xfree86</name></requires>
-                <requires><name>esound</name></requires>
-		<utilizes><name>aalib</name></utilizes>
-		<utilizes><name>libmng</name></utilizes>
-		<utilizes><name>gnome-vfs2</name></utilizes>
-		<utilizes><name>sdl</name></utilizes>
-		<utilizes><name>directfb</name></utilizes>
-		<utilizes><name>flac</name></utilizes>
-		<utilizes><name>libfame</name></utilizes>
-		<utilizes><name>libogg</name></utilizes>
-		<utilizes><name>libvorbis</name></utilizes>
-		<utilizes><name>speex</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&xine-lib-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&xine-lib-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&xine-lib-directory;</remove>
-	</stage>
-
-</package>
+  <package name="xine-lib" version="&xine-lib-version;">
+    <packageinfo>
+      <requires>
+        <name>xfree86</name>
+      </requires>
+      <requires>
+        <name>esound</name>
+      </requires>
+      <utilizes>
+        <name>aalib</name>
+      </utilizes>
+      <utilizes>
+        <name>libmng</name>
+      </utilizes>
+      <utilizes>
+        <name>gnome-vfs2</name>
+      </utilizes>
+      <utilizes>
+        <name>sdl</name>
+      </utilizes>
+      <utilizes>
+        <name>directfb</name>
+      </utilizes>
+      <utilizes>
+        <name>flac</name>
+      </utilizes>
+      <utilizes>
+        <name>libfame</name>
+      </utilizes>
+      <utilizes>
+        <name>libogg</name>
+      </utilizes>
+      <utilizes>
+        <name>libvorbis</name>
+      </utilizes>
+      <utilizes>
+        <name>speex</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&xine-lib-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&xine-lib-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&xine-lib-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/xvid.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/xvid.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter37/xvid.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch37.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,52 +10,43 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="xvid" version="&xvid-version;">
-
-        <packageinfo>
-                <utilizes><name>nasm</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&xvid-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&xvid-directory;/build/generic</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-		        <param>install</param>
-		</make>
-
-		<link>
-			<option>force</option>
-			<target>libxvidcore.so.4.0</target>
-			<name>libxvidcore.so.4</name>
-		</link>
-
-		<link>
-			<option>force</option>
-			<target>libxvidcore.so.4</target>
-			<name>libxvidcore.so</name>
-		</link>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&xvid-directory;</remove>
-	</stage>
-
-</package>
+  <package name="xvid" version="&xvid-version;">
+    <packageinfo>
+      <utilizes>
+        <name>nasm</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&xvid-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&xvid-directory;/build/generic</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <link>
+        <option>force</option>
+        <target>libxvidcore.so.4.0</target>
+        <name>libxvidcore.so.4</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>libxvidcore.so.4</target>
+        <name>libxvidcore.so</name>
+      </link>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&xvid-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter38/cdparanoia.xml
===================================================================
--- profiles/BLFS/trunk/chapter38/cdparanoia.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter38/cdparanoia.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch38.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,38 +10,27 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="cdparanoia" version="&cdparanoia-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&cdparanoia-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&cdparanoia-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		&ldconfig;
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&cdparanoia-directory;</remove>
-	</stage>
-
-</package>
+  <package name="cdparanoia" version="&cdparanoia-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&cdparanoia-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+    <stageinfo>
+      <base>&build_dir;/&cdparanoia-directory;</base>
+    </stageinfo>
+    <configure>
+      <param>--prefix=/usr</param>
+    </configure>
+    <make />
+    <make>
+      <param>install</param>
+    </make>&ldconfig;</stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&cdparanoia-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter38/lame.xml
===================================================================
--- profiles/BLFS/trunk/chapter38/lame.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter38/lame.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch38.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,42 +10,37 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="lame" version="&lame-version;">
-	
-	<packageinfo>
-		<utilizes><name>gtk+</name></utilizes>
-		<utilizes><name>nasm</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&lame-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&lame-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--enable-mp3rtp</param>			
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&lame-directory;</remove>
-	</stage>
-
-</package>
+  <package name="lame" version="&lame-version;">
+    <packageinfo>
+      <utilizes>
+        <name>gtk+</name>
+      </utilizes>
+      <utilizes>
+        <name>nasm</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&lame-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&lame-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--enable-mp3rtp</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&lame-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter38/mpg123.xml
===================================================================
--- profiles/BLFS/trunk/chapter38/mpg123.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter38/mpg123.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch38.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,40 +10,34 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="mpg123" version="&mpg123-version;">
-
-	<packageinfo>
-		<requires><name>alsa-oss</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&mpg123-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&mpg123-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>PREFIX=/usr</param>
-			<param>linux</param>
-		</make>
-
-		<make>
-			<param>PREFIX=/usr</param>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&mpg123-directory;</remove>
-	</stage>
-
-</package>
+  <package name="mpg123" version="&mpg123-version;">
+    <packageinfo>
+      <requires>
+        <name>alsa-oss</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&mpg123-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&mpg123-directory;</base>
+      </stageinfo>
+      <make>
+        <param>PREFIX=/usr</param>
+        <param>linux</param>
+      </make>
+      <make>
+        <param>PREFIX=/usr</param>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&mpg123-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter38/vorbis-tools.xml
===================================================================
--- profiles/BLFS/trunk/chapter38/vorbis-tools.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter38/vorbis-tools.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch38.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,44 +10,45 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="vorbis-tools" version="&vorbis-tools-version;">
-
-        <packageinfo>
-		<requires><name>libvorbis</name></requires>
-		<utilizes><name>curl</name></utilizes>
-        	<utilizes><name>libao</name></utilizes>
-		<utilizes><name>flac</name></utilizes>
-		<utilizes><name>speex</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&vorbis-tools-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&vorbis-tools-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&vorbis-tools-directory;</remove>
-	</stage>
-
-</package>
+  <package name="vorbis-tools" version="&vorbis-tools-version;">
+    <packageinfo>
+      <requires>
+        <name>libvorbis</name>
+      </requires>
+      <utilizes>
+        <name>curl</name>
+      </utilizes>
+      <utilizes>
+        <name>libao</name>
+      </utilizes>
+      <utilizes>
+        <name>flac</name>
+      </utilizes>
+      <utilizes>
+        <name>speex</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&vorbis-tools-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&vorbis-tools-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&vorbis-tools-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter38/xmms.xml
===================================================================
--- profiles/BLFS/trunk/chapter38/xmms.xml	2004-07-19 19:17:41 UTC (rev 1471)
+++ profiles/BLFS/trunk/chapter38/xmms.xml	2004-07-19 19:21:32 UTC (rev 1472)
@@ -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/ch38.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,47 +10,54 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="xmms" version="&xmms-version;">
-
-        <packageinfo>
-        	<requires><name>gtk+</name></requires>
-		<utilizes><name>alsa-lib</name></utilizes>
-		<utilizes><name>esound</name></utilizes>
-		<utilizes><name>libogg</name></utilizes>
-		<utilizes><name>libvorbis</name></utilizes>
-		<utilizes><name>libmikmod</name></utilizes>
-		<utilizes><name>libxml</name></utilizes>
-		<utilizes><name>gnome-libs</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&xmms-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&xmms-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&xmms-directory;</remove>
-	</stage>
-
-</package>
+  <package name="xmms" version="&xmms-version;">
+    <packageinfo>
+      <requires>
+        <name>gtk+</name>
+      </requires>
+      <utilizes>
+        <name>alsa-lib</name>
+      </utilizes>
+      <utilizes>
+        <name>esound</name>
+      </utilizes>
+      <utilizes>
+        <name>libogg</name>
+      </utilizes>
+      <utilizes>
+        <name>libvorbis</name>
+      </utilizes>
+      <utilizes>
+        <name>libmikmod</name>
+      </utilizes>
+      <utilizes>
+        <name>libxml</name>
+      </utilizes>
+      <utilizes>
+        <name>gnome-libs</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&xmms-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&xmms-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&xmms-directory;</remove>
+    </stage>
+  </package>
 </alfs>




More information about the alfs-log mailing list