r1471 - in profiles/BLFS/trunk: chapter34 chapter35 chapter36

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Jul 19 12:17:43 PDT 2004


Author: thomasp
Date: 2004-07-19 13:17:41 -0600 (Mon, 19 Jul 2004)
New Revision: 1471

Modified:
   profiles/BLFS/trunk/chapter34/koffice.xml
   profiles/BLFS/trunk/chapter34/openoffice.xml
   profiles/BLFS/trunk/chapter35/dillo.xml
   profiles/BLFS/trunk/chapter35/firefox.xml
   profiles/BLFS/trunk/chapter35/galeon.xml
   profiles/BLFS/trunk/chapter35/mozilla.xml
   profiles/BLFS/trunk/chapter36/balsa.xml
   profiles/BLFS/trunk/chapter36/pan.xml
   profiles/BLFS/trunk/chapter36/thunderbird.xml
Log:
tidied chapters 34-36

Modified: profiles/BLFS/trunk/chapter34/koffice.xml
===================================================================
--- profiles/BLFS/trunk/chapter34/koffice.xml	2004-07-19 19:10:00 UTC (rev 1470)
+++ profiles/BLFS/trunk/chapter34/koffice.xml	2004-07-19 19:17:41 UTC (rev 1471)
@@ -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/ch34.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,48 +10,53 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="koffice" version="&koffice-version;">
-
-        <packageinfo>
-                <requires><name>kdebase</name></requires>
-		<utilizes><name>libart-lgpl</name></utilizes>
-		<utilizes><name>python</name></utilizes>
-		<utilizes><name>libxml2</name></utilizes>
-		<utilizes><name>libxslt</name></utilizes>
-		<utilizes><name>aspell</name></utilizes>
-		<utilizes><name>imagemagick</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&koffice-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&koffice-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=&kde-prefix;</param>
-			<param>--disable-debug</param>
-			<param>--disable-dependency-tracking</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&koffice-directory;</remove>
-	</stage>
-
-</package>
+  <package name="koffice" version="&koffice-version;">
+    <packageinfo>
+      <requires>
+        <name>kdebase</name>
+      </requires>
+      <utilizes>
+        <name>libart-lgpl</name>
+      </utilizes>
+      <utilizes>
+        <name>python</name>
+      </utilizes>
+      <utilizes>
+        <name>libxml2</name>
+      </utilizes>
+      <utilizes>
+        <name>libxslt</name>
+      </utilizes>
+      <utilizes>
+        <name>aspell</name>
+      </utilizes>
+      <utilizes>
+        <name>imagemagick</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&koffice-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&koffice-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=&kde-prefix;</param>
+        <param>--disable-debug</param>
+        <param>--disable-dependency-tracking</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&koffice-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter34/openoffice.xml
===================================================================
--- profiles/BLFS/trunk/chapter34/openoffice.xml	2004-07-19 19:10:00 UTC (rev 1470)
+++ profiles/BLFS/trunk/chapter34/openoffice.xml	2004-07-19 19:17:41 UTC (rev 1471)
@@ -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/ch34.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,150 +10,148 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="openoffice" version="&openoffice-version;">
-
-        <!--<packageinfo>
-                <requires><name>xfree86</name></requires>
-        	<requires><name>j2sdk</name></requires>
-        	<requires><name>zip</name></requires>
-        	<requires><name>unzip</name></requires>
-        	<requires><name>tcsh</name></requires>
-        	<requires><name>which</name></requires>
-		<utilizes><name>linuxpam</name></utilizes>
-		<utilizes><name>libart-lgpl</name></utilizes>
-		<utilizes><name>startup-notification</name></utilizes>
-        	<utilizes><name>ant</name></utilizes>
-        </packageinfo>-->
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&openoffice-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&gpc-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-				<variable name="JAVA_HOME">/opt/j2sdk/j2sdk</variable>
-				<variable name="PATH" mode="append">:/opt/j2sdk/j2sdk/bin</variable>
-				<variable name="LS_COLORS" />
-			</environment>
-			<base>&build_dir;/&openoffice-directory;</base>
-		</stageinfo>
-
-		<move>
-		        <option>force</option>
-		        <source>&build_dir;/&gpc-directory;/gpc.c</source>
-			<destination>&build_dir;/&openoffice-directory;/external/gpc</destination>
-		</move>
-
-		<move>
-		        <option>force</option>
-		        <source>&build_dir;/&gpc-directory;/gpc.h</source>
-			<destination>&build_dir;/&openoffice-directory;/external/gpc</destination>
-		</move>
-
-		<remove>../&gpc-directory;</remove>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&openoffice-test-bin-patch;</param>
-		</patch>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&openoffice-no-pam-patch;</param>
-		</patch>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&openoffice-jdk-patch;</param>
-		</patch>
-		
-		<search_replace base="&build_dir;/&openoffice-directory;/solenv/inc">
-		    <file>unxlngi4.mk</file>
-		    <find>-mcpu=pentiumpro</find>
-		    <replace></replace>
-		</search_replace>
-
-		<configure base="&build_dir;/&openoffice-directory;/config_office">
-			<param>--with-lang=ALL</param>
-			<param>--with-dict=ALL</param>
-			<param>--without-fonts</param>
-			<param>--enable-libsn</param>
-			<param>--with-system-zlib</param>
-		</configure>
-
-		<execute command="./bootstrap" />
-
-		<execute command="bash -c "source LinuxIntelEnv.Set.sh; dmake"" />
-
-		<!-- the following is so an instance of X does not need to be running for the installer to function -->
-		<textdump>
-			<file>&build_dir;/install-oo.sh</file>
-			<content>
-			=cd instsetoo/unxlngi4.pro/01/normal &real-amp;&real-amp;
-			=sed -i "s:^oo_home=.*.:oo_home=openoffice:" install &real-amp;&real-amp;
-			=# The following code was extracted from Tushar Teredesai's build
-			=# scripts for openoffice at 
-			=# http://www.linuxfromscratch.org/~tushar/openoffice
-			=
-			=DISPLAY_NUM=0
-			=while true
-			=do
-			=echo "Checking if Display Number $DISPLAY_NUM is available..."
-			=	# Check if there is a lock file
-			=	if [ ! -f /tmp/.X$DISPLAY_NUM-lock ]
-			=	then
-			=		sleep 10s
-			=		# Start a Xserver
-			=		Xvfb :$DISPLAY_NUM >&real-amp; /dev/null &real-amp;
-			=		sleep 10s
-			=		# Check if server started properly
-			=		if [ -f /tmp/.X$DISPLAY_NUM-lock ]
-			=		then
-			=			break
-			=		fi
-			=	fi
-			=	DISPLAY_NUM=$(($DISPLAY_NUM+1))
-			=done
-			=echo "Using Display Number $DISPLAY_NUM..."
-			=export DISPLAY=:$DISPLAY_NUM
-			=./install --prefix=/opt &real-amp;&real-amp;
-			=kill `cat /tmp/.X$DISPLAY_NUM-lock` >&real-amp; /dev/null
-			=unset DISPLAY
-			=for appl in swriter scalc sdraw simpress smath soffice
-			=do
-			=ln -sf /opt/openoffice/program/$appl /usr/bin/$appl
-			=done
-			</content>
-		</textdump>
-
-		<permissions mode="755">
-			<name>&build_dir;/install-oo.sh</name>
-		</permissions>
-
-		<execute command="&build_dir;/install-oo.sh" />
-
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&openoffice-directory;</remove>
-		<remove>&build_dir;/&gpc-directory;</remove>
-		<remove>&build_dir;/install-oo.sh</remove>
-	</stage>
-
-</package>
+  <package name="openoffice" version="&openoffice-version;">
+    <packageinfo>
+      <requires>
+        <name>xfree86</name>
+      </requires>
+      <requires>
+        <name>j2sdk</name>
+      </requires>
+      <requires>
+        <name>zip</name>
+      </requires>
+      <requires>
+        <name>unzip</name>
+      </requires>
+      <requires>
+        <name>tcsh</name>
+      </requires>
+      <requires>
+        <name>which</name>
+      </requires>
+      <utilizes>
+        <name>linuxpam</name>
+      </utilizes>
+      <utilizes>
+        <name>libart-lgpl</name>
+      </utilizes>
+      <utilizes>
+        <name>startup-notification</name>
+      </utilizes>
+      <utilizes>
+        <name>ant</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&openoffice-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&gpc-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="JAVA_HOME">/opt/j2sdk/j2sdk</variable>
+          <variable name="PATH" mode="append">:/opt/j2sdk/j2sdk/bin</variable>
+          <variable name="LS_COLORS" />
+        </environment>
+        <base>&build_dir;/&openoffice-directory;</base>
+      </stageinfo>
+      <move>
+        <option>force</option>
+        <source>&build_dir;/&gpc-directory;/gpc.c</source>
+        <destination>&build_dir;/&openoffice-directory;/external/gpc</destination>
+      </move>
+      <move>
+        <option>force</option>
+        <source>&build_dir;/&gpc-directory;/gpc.h</source>
+        <destination>&build_dir;/&openoffice-directory;/external/gpc</destination>
+      </move>
+      <remove>../&gpc-directory;</remove>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&openoffice-test-bin-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&openoffice-no-pam-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&openoffice-jdk-patch;</param>
+      </patch>
+      <search_replace base="&build_dir;/&openoffice-directory;/solenv/inc">
+        <file>unxlngi4.mk</file>
+        <find>-mcpu=pentiumpro</find>
+        <replace></replace>
+      </search_replace>
+      <configure base="&build_dir;/&openoffice-directory;/config_office">
+        <param>--with-lang=ALL</param>
+        <param>--with-dict=ALL</param>
+        <param>--without-fonts</param>
+        <param>--enable-libsn</param>
+        <param>--with-system-zlib</param>
+      </configure>
+      <execute command="./bootstrap" />
+      <execute command="bash -c "source LinuxIntelEnv.Set.sh; dmake"" />
+      <!-- the following is so an instance of X does not need to be running for the installer to function -->
+      <textdump>
+        <file>&build_dir;/install-oo.sh</file>
+        <content>
+	  =cd instsetoo/unxlngi4.pro/01/normal &real-amp;&real-amp;
+	  =sed -i "s:^oo_home=.*.:oo_home=openoffice:" install &real-amp;&real-amp;
+	  =# The following code was extracted from Tushar Teredesai's build
+	  =# scripts for openoffice at 
+	  =# http://www.linuxfromscratch.org/~tushar/openoffice
+	  =
+	  =DISPLAY_NUM=0
+	  =while true
+	  =do
+	  =echo "Checking if Display Number $DISPLAY_NUM is available..."
+	  =	# Check if there is a lock file
+	  =	if [ ! -f /tmp/.X$DISPLAY_NUM-lock ]
+	  =	then
+	  =		sleep 10s
+	  =		# Start a Xserver
+	  =		Xvfb :$DISPLAY_NUM >&real-amp; /dev/null &real-amp;
+	  =		sleep 10s
+	  =		# Check if server started properly
+	  =		if [ -f /tmp/.X$DISPLAY_NUM-lock ]
+	  =		then
+	  =			break
+	  =		fi
+	  =	fi
+	  =	DISPLAY_NUM=$(($DISPLAY_NUM+1))
+	  =done
+	  =echo "Using Display Number $DISPLAY_NUM..."
+	  =export DISPLAY=:$DISPLAY_NUM
+	  =./install --prefix=/opt &real-amp;&real-amp;
+	  =kill `cat /tmp/.X$DISPLAY_NUM-lock` >&real-amp; /dev/null
+	  =unset DISPLAY
+	  =for appl in swriter scalc sdraw simpress smath soffice
+	  =do
+	  =ln -sf /opt/openoffice/program/$appl /usr/bin/$appl
+	  =done
+	</content>
+      </textdump>
+      <permissions mode="755">
+        <name>&build_dir;/install-oo.sh</name>
+      </permissions>
+      <execute command="&build_dir;/install-oo.sh" />
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&openoffice-directory;</remove>
+      <remove>&build_dir;/&gpc-directory;</remove>
+      <remove>&build_dir;/install-oo.sh</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter35/dillo.xml
===================================================================
--- profiles/BLFS/trunk/chapter35/dillo.xml	2004-07-19 19:10:00 UTC (rev 1470)
+++ profiles/BLFS/trunk/chapter35/dillo.xml	2004-07-19 19:17:41 UTC (rev 1471)
@@ -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/ch35.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,43 +10,34 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="dillo" version="&dillo-version;">
-
-        <packageinfo>
-                <requires><name>gtk+</name></requires>
-        </packageinfo>
-
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&dillo-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&dillo-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;/&dillo-directory;</remove>
-	</stage>
-
-</package>
+  <package name="dillo" version="&dillo-version;">
+    <packageinfo>
+      <requires>
+        <name>gtk+</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&dillo-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&dillo-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;/&dillo-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter35/firefox.xml
===================================================================
--- profiles/BLFS/trunk/chapter35/firefox.xml	2004-07-19 19:10:00 UTC (rev 1470)
+++ profiles/BLFS/trunk/chapter35/firefox.xml	2004-07-19 19:17:41 UTC (rev 1471)
@@ -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/ch35.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,91 +10,86 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="firefox" version="&firefox-version;">
-
-        <packageinfo>
-        	<requires><name>zip</name></requires>
-        	<requires><name>gtk+2</name></requires>
-        	<requires><name>libidl</name></requires>
-        	<requires><name>libmng</name></requires>
-        	<requires><name>which</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&firefox-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>		
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-			        <variable name="MOZILLA_OFFICIAL">1</variable>
-			        <variable name="BUILD_OFFICIAL">1</variable>
-				<variable name="MOZ_PHOENIX">1</variable>
-			</environment>
-			<base>&build_dir;/&firefox-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/opt/firefox-&firefox-version;</param>
-			<param>--enable-default-toolkit=gtk2</param>
-			<param>--with-x</param>
-			<param>--with-system-zlib</param>
-			<param>--with-system-jpeg </param>
-			<param>--with-system-png</param>
-			<param>--with-system-mng</param>
-			<param>--enable-xft</param>
-			<param>--enable-crypto</param>
-			<param>--disable-accessibility</param>
-			<param>--disable-tests</param>
-			<param>--disable-debug</param>
-			<param>--disable-logging</param>
-			<param>--enable-reorder</param>
-			<param>--enable-strip</param>
-			<param>--disable-pedantic</param>
-			<param>--enable-cpp-rtti</param>
-			<param>--enable-extensions=all</param>
-			<param>--disable-calendar</param>
-			<param>--disable-mailnews</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-		<link>
-			<option>force</option>
-			<target>/opt/firefox-&firefox-version;/bin/firefox</target>
-			<name>/usr/bin/MozillaFirefox</name>
-		</link>
-
-		<stage name="Multi-User Operation Setup">
-		        <stageinfo>
-				<environment>
-					<variable name="LD_LIBRARY_PATH">
-						/opt/firefox-&firefox-version;/lib/mozilla-&firefox-moz-lib-version;</variable>
-					<variable name="MOZILLA_FIVE_HOME">
-						/opt/firefox-&firefox-version;/lib/mozilla-&firefox-moz-lib-version;</variable>
-				</environment>
-			        <base>/opt/firefox-&firefox-version;/lib/mozilla-&firefox-moz-lib-version;</base>
-			</stageinfo>
-
-			<execute command="./regxpcom" />
-			<execute command="./regchrome" />
-			<execute command="touch `find /opt/firefox-&firefox-version;/lib/mozilla-&firefox-moz-lib-version; -name *.rdf`" />
-
-		</stage>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&firefox-directory;</remove>
-	</stage>
-
-</package>
+  <package name="firefox" version="&firefox-version;">
+    <packageinfo>
+      <requires>
+        <name>zip</name>
+      </requires>
+      <requires>
+        <name>gtk+2</name>
+      </requires>
+      <requires>
+        <name>libidl</name>
+      </requires>
+      <requires>
+        <name>libmng</name>
+      </requires>
+      <requires>
+        <name>which</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&firefox-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="MOZILLA_OFFICIAL">1</variable>
+          <variable name="BUILD_OFFICIAL">1</variable>
+          <variable name="MOZ_PHOENIX">1</variable>
+        </environment>
+        <base>&build_dir;/&firefox-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/opt/firefox-&firefox-version;</param>
+        <param>--enable-default-toolkit=gtk2</param>
+        <param>--with-x</param>
+        <param>--with-system-zlib</param>
+        <param>--with-system-jpeg</param>
+        <param>--with-system-png</param>
+        <param>--with-system-mng</param>
+        <param>--enable-xft</param>
+        <param>--enable-crypto</param>
+        <param>--disable-accessibility</param>
+        <param>--disable-tests</param>
+        <param>--disable-debug</param>
+        <param>--disable-logging</param>
+        <param>--enable-reorder</param>
+        <param>--enable-strip</param>
+        <param>--disable-pedantic</param>
+        <param>--enable-cpp-rtti</param>
+        <param>--enable-extensions=all</param>
+        <param>--disable-calendar</param>
+        <param>--disable-mailnews</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <link>
+        <option>force</option>
+        <target>/opt/firefox-&firefox-version;/bin/firefox</target>
+        <name>/usr/bin/MozillaFirefox</name>
+      </link>
+      <stage name="Multi-User Operation Setup">
+        <stageinfo>
+          <environment>
+            <variable name="LD_LIBRARY_PATH">/opt/firefox-&firefox-version;/lib/mozilla-&firefox-moz-lib-version;</variable>
+            <variable name="MOZILLA_FIVE_HOME">/opt/firefox-&firefox-version;/lib/mozilla-&firefox-moz-lib-version;</variable>
+          </environment>
+          <base>/opt/firefox-&firefox-version;/lib/mozilla-&firefox-moz-lib-version;</base>
+        </stageinfo>
+        <execute command="./regxpcom" />
+        <execute command="./regchrome" />
+        <execute command="touch `find /opt/firefox-&firefox-version;/lib/mozilla-&firefox-moz-lib-version; -name *.rdf`" />
+      </stage>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&firefox-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter35/galeon.xml
===================================================================
--- profiles/BLFS/trunk/chapter35/galeon.xml	2004-07-19 19:10:00 UTC (rev 1470)
+++ profiles/BLFS/trunk/chapter35/galeon.xml	2004-07-19 19:17:41 UTC (rev 1471)
@@ -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/ch35.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,46 +10,41 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="galeon" version="&galeon-version;">
-
-        <packageinfo>
-                <requires><name>libgnomeui</name></requires>
-		<requires><name>scrollkeeper</name></requires>
-                <requires><name>mozilla</name></requires>
-        </packageinfo>
-
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&galeon-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&galeon-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=`pkg-config --variable=prefix ORBit-2.0`</param>
-			<param>--sysconfdir=/etc/gnome</param>
-			<param>--localstatedir=/var/lib</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&galeon-directory;</remove>
-	</stage>
-
-</package>
+  <package name="galeon" version="&galeon-version;">
+    <packageinfo>
+      <requires>
+        <name>libgnomeui</name>
+      </requires>
+      <requires>
+        <name>scrollkeeper</name>
+      </requires>
+      <requires>
+        <name>mozilla</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&galeon-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&galeon-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=`pkg-config --variable=prefix ORBit-2.0`</param>
+        <param>--sysconfdir=/etc/gnome</param>
+        <param>--localstatedir=/var/lib</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&galeon-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter35/mozilla.xml
===================================================================
--- profiles/BLFS/trunk/chapter35/mozilla.xml	2004-07-19 19:10:00 UTC (rev 1470)
+++ profiles/BLFS/trunk/chapter35/mozilla.xml	2004-07-19 19:17:41 UTC (rev 1471)
@@ -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/ch35.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,115 +10,106 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="mozilla" version="&mozilla-version;">
-
-        <packageinfo>
-        	<requires><name>zip</name></requires>
-        	<requires><name>gtk+2</name></requires>
-        	<requires><name>libidl</name></requires>
-        	<requires><name>libmng</name></requires>
-        	<requires><name>which</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&mozilla-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>		
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-			        <variable name="MOZILLA_OFFICIAL">1</variable>
-			        <variable name="BUILD_OFFICIAL">1</variable>
-			</environment>
-			<base>&build_dir;/&mozilla-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--with-default-mozilla-five-home=/usr/lib/mozilla</param>
-			<param>--enable-default-toolkit=gtk2</param>
-			<param>--with-x</param>
-			<param>--with-system-zlib</param>
-			<param>--with-system-jpeg </param>
-			<param>--with-system-png</param>
-			<param>--with-system-mng</param>
-			<param>--enable-xft</param>
-			<param>--enable-crypto</param>
-			<param>--disable-accessibility</param>
-			<param>--disable-tests</param>
-			<param>--disable-debug</param>
-			<param>--disable-logging</param>
-			<param>--enable-reorder</param>
-			<param>--enable-strip</param>
-			<param>--disable-pedantic</param>
-			<param>--enable-cpp-rtti</param>
-			<param>--enable-extensions=all</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<execute command="install -d /usr/include/mozilla-&mozilla-version;/nss" />
-
-		<execute command="cp -Lf dist/private/nss/*.h dist/public/nss/*.h /usr/include/mozilla-&mozilla-version;/nss" />
-
-		<execute command="ln -nsf mozilla-&mozilla-version; /usr/include/mozilla" />
-
-		<execute command="ln -nsf mozilla-&mozilla-version; /usr/lib/mozilla" />
-
-		<move base="/usr/lib/mozilla-&mozilla-version;">
-			<source>libnspr4.so</source>
-			<source>libplc4.so</source>
-			<source>libplds4.so</source>
-			<source>libnss3.so</source>
-			<source>libsmime3.so</source>
-			<source>libsoftokn3.so</source>
-			<source>libssl3.so</source>
-			<source>libsoftokn3.chk</source>
-			<destination>/usr/lib</destination>
-		</move>
-	
-		<link>
-			<option>force</option>
-			<target>../libnspr4.so</target>
-			<target>../libplc4.so</target>
-			<target>../libplds4.so</target>
-			<target>../libnss3.so</target>
-			<target>../libsmime3.so</target>
-			<target>../libsoftokn3.so</target>
-			<target>../libssl3.so</target>
-			<target>../libsoftokn3.chk</target>
-			<name>/usr/lib/mozilla-&mozilla-version;</name>
-		</link>
-
-
-		<stage name="Multi-User Operation Setup">
-		        <stageinfo>
-				<environment>
-					<variable name="LD_LIBRARY_PATH">/usr/lib/mozilla-&mozilla-version;</variable>
-					<variable name="MOZILLA_FIVE_HOME">/usr/lib/mozilla-&mozilla-version;</variable>
-				</environment>
-			        <base>/usr/lib/mozilla-&mozilla-version;</base>
-			</stageinfo>
-
-			<execute command="./regxpcom" />
-			<execute command="./regchrome" />
-			<execute command="touch `find /usr/lib/mozilla-&mozilla-version; -name *.rdf`" />
-
-		</stage>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&mozilla-directory;</remove>
-	</stage>
-
-</package>
+  <package name="mozilla" version="&mozilla-version;">
+    <packageinfo>
+      <requires>
+        <name>zip</name>
+      </requires>
+      <requires>
+        <name>gtk+2</name>
+      </requires>
+      <requires>
+        <name>libidl</name>
+      </requires>
+      <requires>
+        <name>libmng</name>
+      </requires>
+      <requires>
+        <name>which</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&mozilla-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="MOZILLA_OFFICIAL">1</variable>
+          <variable name="BUILD_OFFICIAL">1</variable>
+        </environment>
+        <base>&build_dir;/&mozilla-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--with-default-mozilla-five-home=/usr/lib/mozilla</param>
+        <param>--enable-default-toolkit=gtk2</param>
+        <param>--with-x</param>
+        <param>--with-system-zlib</param>
+        <param>--with-system-jpeg</param>
+        <param>--with-system-png</param>
+        <param>--with-system-mng</param>
+        <param>--enable-xft</param>
+        <param>--enable-crypto</param>
+        <param>--disable-accessibility</param>
+        <param>--disable-tests</param>
+        <param>--disable-debug</param>
+        <param>--disable-logging</param>
+        <param>--enable-reorder</param>
+        <param>--enable-strip</param>
+        <param>--disable-pedantic</param>
+        <param>--enable-cpp-rtti</param>
+        <param>--enable-extensions=all</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <execute command="install -d /usr/include/mozilla-&mozilla-version;/nss" />
+      <execute command="cp -Lf dist/private/nss/*.h dist/public/nss/*.h /usr/include/mozilla-&mozilla-version;/nss" />
+      <execute command="ln -nsf mozilla-&mozilla-version; /usr/include/mozilla" />
+      <execute command="ln -nsf mozilla-&mozilla-version; /usr/lib/mozilla" />
+      <move base="/usr/lib/mozilla-&mozilla-version;">
+        <source>libnspr4.so</source>
+        <source>libplc4.so</source>
+        <source>libplds4.so</source>
+        <source>libnss3.so</source>
+        <source>libsmime3.so</source>
+        <source>libsoftokn3.so</source>
+        <source>libssl3.so</source>
+        <source>libsoftokn3.chk</source>
+        <destination>/usr/lib</destination>
+      </move>
+      <link>
+        <option>force</option>
+        <target>../libnspr4.so</target>
+        <target>../libplc4.so</target>
+        <target>../libplds4.so</target>
+        <target>../libnss3.so</target>
+        <target>../libsmime3.so</target>
+        <target>../libsoftokn3.so</target>
+        <target>../libssl3.so</target>
+        <target>../libsoftokn3.chk</target>
+        <name>/usr/lib/mozilla-&mozilla-version;</name>
+      </link>
+      <stage name="Multi-User Operation Setup">
+        <stageinfo>
+          <environment>
+            <variable name="LD_LIBRARY_PATH">/usr/lib/mozilla-&mozilla-version;</variable>
+            <variable name="MOZILLA_FIVE_HOME">/usr/lib/mozilla-&mozilla-version;</variable>
+          </environment>
+          <base>/usr/lib/mozilla-&mozilla-version;</base>
+        </stageinfo>
+        <execute command="./regxpcom" />
+        <execute command="./regchrome" />
+        <execute command="touch `find /usr/lib/mozilla-&mozilla-version; -name *.rdf`" />
+      </stage>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&mozilla-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter36/balsa.xml
===================================================================
--- profiles/BLFS/trunk/chapter36/balsa.xml	2004-07-19 19:10:00 UTC (rev 1470)
+++ profiles/BLFS/trunk/chapter36/balsa.xml	2004-07-19 19:17:41 UTC (rev 1471)
@@ -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/ch36.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,54 +10,59 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="balsa" version="&balsa-version;">
-
-        <packageinfo>
-                <requires><name>libgtkhtml</name></requires>
-                <requires><name>libgnomeprintui</name></requires>
-                <requires><name>openssl</name></requires>
-                <requires><name>aspell</name></requires>
-                <requires><name>libesmtp</name></requires>
-		<utilizes><name>pcre</name></utilizes>
-		<utilizes><name>gnupg</name></utilizes>
-		<utilizes><name>openldap</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&balsa-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&balsa-directory;</base>
-		</stageinfo>
-
-
-		<configure>
-			<param>--prefix=`pkg-config --variable=prefix ORBit-2.0`</param>
-			<param>--localstatedir=/var/lib</param>
-			<param>--with-ssl</param>
-			<param>--sysconfdir=/etc/gnome</param>
-			<param>--with-ldap</param>
-			<param>--with-gpgme</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&balsa-directory;</remove>
-	</stage>
-
-</package>
+  <package name="balsa" version="&balsa-version;">
+    <packageinfo>
+      <requires>
+        <name>libgtkhtml</name>
+      </requires>
+      <requires>
+        <name>libgnomeprintui</name>
+      </requires>
+      <requires>
+        <name>openssl</name>
+      </requires>
+      <requires>
+        <name>aspell</name>
+      </requires>
+      <requires>
+        <name>libesmtp</name>
+      </requires>
+      <utilizes>
+        <name>pcre</name>
+      </utilizes>
+      <utilizes>
+        <name>gnupg</name>
+      </utilizes>
+      <utilizes>
+        <name>openldap</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&balsa-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&balsa-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=`pkg-config --variable=prefix ORBit-2.0`</param>
+        <param>--localstatedir=/var/lib</param>
+        <param>--with-ssl</param>
+        <param>--sysconfdir=/etc/gnome</param>
+        <param>--with-ldap</param>
+        <param>--with-gpgme</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&balsa-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter36/pan.xml
===================================================================
--- profiles/BLFS/trunk/chapter36/pan.xml	2004-07-19 19:10:00 UTC (rev 1470)
+++ profiles/BLFS/trunk/chapter36/pan.xml	2004-07-19 19:17:41 UTC (rev 1471)
@@ -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/ch36.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,43 +10,45 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="pan" version="&pan-version;">
-
-        <packageinfo>
-                <requires><name>gtk+2</name></requires>
-		<requires><name>gnet</name></requires>
-		<requires><name>intltool</name></requires>
-                <requires><name>libxml2</name></requires>
-		<utilizes><name>gtkspell</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&pan-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&pan-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&pan-directory;</remove>
-	</stage>
-</package>
+  <package name="pan" version="&pan-version;">
+    <packageinfo>
+      <requires>
+        <name>gtk+2</name>
+      </requires>
+      <requires>
+        <name>gnet</name>
+      </requires>
+      <requires>
+        <name>intltool</name>
+      </requires>
+      <requires>
+        <name>libxml2</name>
+      </requires>
+      <utilizes>
+        <name>gtkspell</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&pan-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&pan-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&pan-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter36/thunderbird.xml
===================================================================
--- profiles/BLFS/trunk/chapter36/thunderbird.xml	2004-07-19 19:10:00 UTC (rev 1470)
+++ profiles/BLFS/trunk/chapter36/thunderbird.xml	2004-07-19 19:17:41 UTC (rev 1471)
@@ -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/ch36.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,99 +10,94 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="thunderbird" version="&thunderbird-version;">
-
-        <packageinfo>
-        	<requires><name>zip</name></requires>
-        	<requires><name>gtk+2</name></requires>
-        	<requires><name>libidl</name></requires>
-        	<requires><name>libmng</name></requires>
-        	<requires><name>which</name></requires>
-		<requires><name>hd2u</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&thunderbird-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&build_dir;/mozilla-thunderbird/archives/&thunderbird-thunderbird-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-			        <variable name="MOZILLA_OFFICIAL">1</variable>
-			        <variable name="BUILD_OFFICIAL">1</variable>
-				<variable name="MOZ_THUNDERBIRD">1</variable>
-			</environment>
-			<base>&build_dir;/&thunderbird-directory;</base>
-		</stageinfo>
-
-		<execute command="find -type f -print0 | xargs -0 dos2unix --d2u" />
-
-		<configure>
-			<param>--prefix=/opt/thunderbird-&thunderbird-version;</param>
-			<param>--enable-default-toolkit=gtk2</param>
-			<param>--with-x</param>
-			<param>--with-system-zlib</param>
-			<param>--with-system-jpeg </param>
-			<param>--with-system-png</param>
-			<param>--with-system-mng</param>
-			<param>--enable-xft</param>
-			<param>--enable-crypto</param>
-			<param>--disable-accessibility</param>
-			<param>--disable-tests</param>
-			<param>--disable-debug</param>
-			<param>--disable-logging</param>
-			<param>--enable-reorder</param>
-			<param>--enable-strip</param>
-			<param>--disable-pedantic</param>
-			<param>--enable-cpp-rtti</param>
-			<param>--enable-extensions=all</param>
-			<param>--disable-calendar</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-		
-		<link>
-			<option>force</option>
-			<target>/opt/thunderbird-&thunderbird-version;/bin/thunderbird</target>
-			<name>/usr/bin/MozillaThunderbird</name>
-		</link>
-
-		<stage name="Multi-User Operation Setup">
-		        <stageinfo>
-				<environment>
-					<variable name="LD_LIBRARY_PATH">
-						/opt/thunderbird-&thunderbird-version;/lib/mozilla-&thunderbird-moz-lib-version;</variable>
-					<variable name="MOZILLA_FIVE_HOME">
-						/opt/thunderbird-&thunderbird-version;/lib/mozilla-&thunderbird-moz-lib-version;</variable>
-				</environment>
-			        <base>/opt/thunderbird-&thunderbird-version;/lib/mozilla-&thunderbird-moz-lib-version;</base>
-			</stageinfo>
-
-			<execute command="./regxpcom" />
-			<execute command="./regchrome" />
-			<execute command="touch `find /opt/thunderbird-&thunderbird-version;/lib/mozilla-&thunderbird-moz-lib-version; -name *.rdf`" />
-
-		</stage>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&thunderbird-directory;</remove>
-		<remove>&build_dir;/mozilla-thunderbird</remove>
-	</stage>
-
-</package>
+  <package name="thunderbird" version="&thunderbird-version;">
+    <packageinfo>
+      <requires>
+        <name>zip</name>
+      </requires>
+      <requires>
+        <name>gtk+2</name>
+      </requires>
+      <requires>
+        <name>libidl</name>
+      </requires>
+      <requires>
+        <name>libmng</name>
+      </requires>
+      <requires>
+        <name>which</name>
+      </requires>
+      <requires>
+        <name>hd2u</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&thunderbird-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&build_dir;/mozilla-thunderbird/archives/&thunderbird-thunderbird-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="MOZILLA_OFFICIAL">1</variable>
+          <variable name="BUILD_OFFICIAL">1</variable>
+          <variable name="MOZ_THUNDERBIRD">1</variable>
+        </environment>
+        <base>&build_dir;/&thunderbird-directory;</base>
+      </stageinfo>
+      <execute command="find -type f -print0 | xargs -0 dos2unix --d2u" />
+      <configure>
+        <param>--prefix=/opt/thunderbird-&thunderbird-version;</param>
+        <param>--enable-default-toolkit=gtk2</param>
+        <param>--with-x</param>
+        <param>--with-system-zlib</param>
+        <param>--with-system-jpeg</param>
+        <param>--with-system-png</param>
+        <param>--with-system-mng</param>
+        <param>--enable-xft</param>
+        <param>--enable-crypto</param>
+        <param>--disable-accessibility</param>
+        <param>--disable-tests</param>
+        <param>--disable-debug</param>
+        <param>--disable-logging</param>
+        <param>--enable-reorder</param>
+        <param>--enable-strip</param>
+        <param>--disable-pedantic</param>
+        <param>--enable-cpp-rtti</param>
+        <param>--enable-extensions=all</param>
+        <param>--disable-calendar</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <link>
+        <option>force</option>
+        <target>/opt/thunderbird-&thunderbird-version;/bin/thunderbird</target>
+        <name>/usr/bin/MozillaThunderbird</name>
+      </link>
+      <stage name="Multi-User Operation Setup">
+        <stageinfo>
+          <environment>
+            <variable name="LD_LIBRARY_PATH">/opt/thunderbird-&thunderbird-version;/lib/mozilla-&thunderbird-moz-lib-version;</variable>
+            <variable name="MOZILLA_FIVE_HOME">/opt/thunderbird-&thunderbird-version;/lib/mozilla-&thunderbird-moz-lib-version;</variable>
+          </environment>
+          <base>/opt/thunderbird-&thunderbird-version;/lib/mozilla-&thunderbird-moz-lib-version;</base>
+        </stageinfo>
+        <execute command="./regxpcom" />
+        <execute command="./regchrome" />
+        <execute command="touch `find /opt/thunderbird-&thunderbird-version;/lib/mozilla-&thunderbird-moz-lib-version; -name *.rdf`" />
+      </stage>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&thunderbird-directory;</remove>
+      <remove>&build_dir;/mozilla-thunderbird</remove>
+    </stage>
+  </package>
 </alfs>




More information about the alfs-log mailing list