r1467 - in profiles/BLFS/trunk: chapter25 chapter26 chapter27

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Sun Jul 18 17:19:33 PDT 2004


Author: thomasp
Date: 2004-07-18 18:19:31 -0600 (Sun, 18 Jul 2004)
New Revision: 1467

Modified:
   profiles/BLFS/trunk/chapter25/xfree86.xml
   profiles/BLFS/trunk/chapter25/xorg.xml
   profiles/BLFS/trunk/chapter26/atk.xml
   profiles/BLFS/trunk/chapter26/gtk+.xml
   profiles/BLFS/trunk/chapter26/gtk+2.xml
   profiles/BLFS/trunk/chapter26/hicolor-icon-theme.xml
   profiles/BLFS/trunk/chapter26/lesstif.xml
   profiles/BLFS/trunk/chapter26/libxklavier.xml
   profiles/BLFS/trunk/chapter26/pango.xml
   profiles/BLFS/trunk/chapter26/qt.xml
   profiles/BLFS/trunk/chapter26/shared-mime-info.xml
   profiles/BLFS/trunk/chapter26/startup-notification.xml
   profiles/BLFS/trunk/chapter27/fluxbox.xml
   profiles/BLFS/trunk/chapter27/metacity.xml
   profiles/BLFS/trunk/chapter27/sawfish.xml
   profiles/BLFS/trunk/chapter27/xfce.xml
Log:
tidied chapters 25-27

Modified: profiles/BLFS/trunk/chapter25/xfree86.xml
===================================================================
--- profiles/BLFS/trunk/chapter25/xfree86.xml	2004-07-19 00:06:47 UTC (rev 1466)
+++ profiles/BLFS/trunk/chapter25/xfree86.xml	2004-07-19 00:19:31 UTC (rev 1467)
@@ -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/ch25.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,249 +10,235 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="xfree86" version="&xfree86-version;">
-
-        <packageinfo>
-                <requires><name>expat</name></requires>
-                <requires><name>libpng</name></requires>
-		<requires><name>freetype</name></requires>
-		<requires><name>fontconfig</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&xfree86-package1;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&xfree86-package2;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&xfree86-package3;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&xfree86-package4;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&xfree86-package5;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&xfree86-package6;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&xfree86-package7;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&xfree86-directory;</base>
-		</stageinfo>
-
-		<textdump base="&build_dir;/&xfree86-directory;/config/cf">
-		    <file>host.def</file>
-		    <content>
-		    =/* Begin XFree86 host.def file */
-		    =
-		    =/* System Related Information.  If you read and configure only one
-		    = * section then it should be this one.  The Intel architecture defaults are 
-		    = * set for a i686 and higher.  Axp is for the Alpha architecture and Ppc is  
-		    = * for the Power PC.  Note that there have been reports that the Ppc 
-		    = * optimization line causes segmentation faults during build.  If that 
-		    = * happens, try building without the DefaultGcc2PpcOpt line.  **************/
-		    =
-		    =/* #define DefaultGcc2i386Opt  -O2 -fomit-frame-pointer -march=i686 */
-		    =/* #define DefaultGcc2AxpOpt   -O2 -mcpu=ev6 */
-		    =/* #define DefaultGcc2PpcOpt   -O2 -mcpu=750 */
-		    =
-		    =/* The following definitions are normally set properly by XFree86's scripts.
-		    = * You can uncomment them if you want to make sure. ************************/
-		    = 
-		    =/* #define HasMTRRSupport      YES  */ /* Enabled in kernel see kernel docs*/
-		    =/* #define HasMMXSupport        NO  */ /* Any i586 or above */
-		    =/* #define HasKatmaiSupport     NO  */ /* PIII SSE instructions */
-		    =/* #define Has3DNowSupport      NO  */ /* AMD instructions */
-		    =
-		    =
-		    =/* This setting reduces compile time a little by omitting rarely used input 
-		    = * devices.  You can find the complete list in config/cf/xfree86.cf ********/
-		    = 
-		    =#define XInputDrivers                 mouse void
-		    =
-		    =/* VIDEO DRIVERS ***********************************************************/
-		    =
-		    =/* If you are sure you only want the drivers for one or a few video cards,
-		    = * you can delete the drivers you do not want. *****************************/ 
-		    =
-		    =
-		    =#define XF86CardDrivers  mga glint nv tga s3 s3virge sis rendition \
-		    =                         neomagic i740 tdfx savage \
-		    =                         cirrus vmware tseng trident chips apm \
-		    =                         GlideDriver fbdev i128 nsc \
-		    =                         ati i810 AgpGartDrivers DevelDrivers ark \
-		    =                         cyrix siliconmotion \
-		    =                         vesa vga \
-		    =                         dummy XF86OSCardDrivers XF86ExtraCardDrivers
-		    =
-		    =
-		    =/* FONT SERVER AND LIBRARY SETTINGS ****************************************/
-		    =
-		    =/* These settings are the defaults   ***************************************/
-		    =
-		    =/* #define BuildFontServer          YES  */ /* For Ghostscript Print Server*/
-		    =/* #define SharedLibFont            YES  */
-		    =/* #define CompressAllFonts         YES  */
-		    =/* #define GzipFontCompression      YES  */
-		    =
-		    =/* These settings ensure we use our libraries ******************************/
-		    =#define HasFreetype2             YES
-		    =#define HasFontconfig            YES
-		    =#define HasExpat                 YES
-		    =#define HasLibpng                YES
-		    =#define HasZlib                  YES
-		    =
-		    =/* The font path can be redefined in the XF86Config file *******************/
-		    =
-		    =/*
-		    =#define DefaultFontPath                $(FONTDIR)/misc/,$(FONTDIR)/75dpi/,\
-		    =$(FONTDIR)/100dpi/,$(FONTDIR)/Type1,$(FONTDIR)/local,\
-		    =$(FONTDIR)/TrueType,$(FONTDIR)/CID,$(FONTDIR)/Speedo
-		    =*/
-		    =
-		    =
-		    =/* INTERNATIONAL FONTS.  Change to YES if you need any of them.  These  are
-		    = * the defaults. ***********************************************************/
-		    =
-		    =#define BuildCyrillicFonts            YES
-		    =#define BuildArabicFonts              YES
-		    =#define BuildISO8859_6Fonts           YES
-		    =#define BuildGreekFonts               YES
-		    =#define BuildISO8859_7Fonts           YES
-		    =#define BuildHebrewFonts              YES
-		    =#define BuildISO8859_8Fonts           YES
-		    =#define BuildKOI8_RFonts              YES
-		    =#define BuildJapaneseFonts            YES
-		    =#define BuildJISX0201Fonts            YES
-		    =#define BuildKoreanFonts              YES
-		    =#define BuildChineseFonts             YES
-		    =
-		    =/* DOCUMENTATION SETTINGS **************************************************/
-		    =
-		    =/* These setting are the defaults. *****************************************/
-		    =
-		    =/* #define BuildLinuxDocHtml             NO  */  /* X Docs in Html format */
-		    =/* #define BuildLinuxDocPS               NO  */  /* PostScript format */
-		    =/* #define BuildAllSpecsDocs             NO  */  /* Various docs */
-		    =/* #define BuildHtmlManPages             NO  */
-		    =
-		    =/* GENERAL SETTINGS: You generally want to leave these alone when
-		    = * building X on an LFS system *********************************************/
-		    =
-		    =#define GccWarningOptions         -pipe /* Speed up compiles */
-		    =#define TermcapLibrary            -lncurses
-		    =#define XprtServer                YES /* Needed by realplayer */
-		    =#define XnestServer               YES
-		    =#define XAppLoadDir               EtcX11Directory/app-defaults
-		    =#define VarLibDir                 /var/lib
-		    =#define XFree86Devel               NO
-		    =#define FSUseSyslog               YES
-		    =#define ThreadedX                 YES
-		    =#define HasPam                     NO        
-		    =#define SystemManDirectory        /usr/share/man  /* Instead of /usr/man */
-		    =#define HasLibCrypt               YES
-		    =#define InstallXinitConfig        YES
-		    =#define InstallXdmConfig          YES
-		    =#define ForceNormalLib            YES
-		    =#define BuildSpecsDocs             NO
-		    =
-		    =/* End XFree86 host.def file */
-		    </content>
-		</textdump>
-
-		<make>
-		        <param>World</param>
-		</make>
-
-		<make>
-		        <param>install</param>
-		</make>
-
-		<make>
-		        <param>install.man</param>
-		</make>
-
-                <link>
-		        <option>force</option>
-		        <target>/usr/X11R6/bin</target>
-			<name>/usr/bin/X11</name>
-		</link>
-
-                <link>
-		        <option>force</option>
-		        <target>/usr/X11R6/lib/X11</target>
-			<name>/usr/lib/X11</name>
-		</link>
-
-                <link>
-		        <option>force</option>
-		        <target>/usr/X11R6/include/X11</target>
-			<name>/usr/include/X11</name>
-		</link>
-		
-		
-		<!-- update /etc/ld.so.conf -->
-
-		<search_replace base="/etc">
-		    	<file>ld.so.conf</file>
-		    	<find>/usr/X11R6/lib</find>
-		    	<replace></replace>
-                </search_replace>
-
-		<textdump mode="append" base="/etc">
-		    	<file>ld.so.conf</file>
-		    	<content>
-                        =/usr/X11R6/lib
-		    	</content>
-		</textdump>
-		
-		&ldconfig;
-		
-		<link base="/dev">
-		    	<option>force</option>
-		    	<target>psaux</target>
-		    	<name>mouse</name>
-		</link>
-		
-		<textdump base="/root">
-		    	<file>.xinitrc</file>
-		    	<content>
-                        =# Begin .xinitrc file
-                        =xterm  -g 80x40+0+0   &real-amp;
-                        =xclock -g 100x100-0+0 &real-amp;
-                        =twm
-                        =# End .xinitrc file
-		    	</content>
-		</textdump>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&xfree86-directory;</remove>
-	</stage>
-
-</package>
+  <package name="xfree86" version="&xfree86-version;">
+    <packageinfo>
+      <requires>
+        <name>expat</name>
+      </requires>
+      <requires>
+        <name>libpng</name>
+      </requires>
+      <requires>
+        <name>freetype</name>
+      </requires>
+      <requires>
+        <name>fontconfig</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&xfree86-package1;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&xfree86-package2;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&xfree86-package3;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&xfree86-package4;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&xfree86-package5;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&xfree86-package6;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&xfree86-package7;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+    <stageinfo>
+      <base>&build_dir;/&xfree86-directory;</base>
+    </stageinfo>
+    <textdump base="&build_dir;/&xfree86-directory;/config/cf">
+      <file>host.def</file>
+      <content>
+	=/* Begin XFree86 host.def file */
+	=
+	=/* System Related Information.  If you read and configure only one
+	= * section then it should be this one.  The Intel architecture defaults are 
+	= * set for a i686 and higher.  Axp is for the Alpha architecture and Ppc is  
+	= * for the Power PC.  Note that there have been reports that the Ppc 
+	= * optimization line causes segmentation faults during build.  If that 
+	= * happens, try building without the DefaultGcc2PpcOpt line.  **************/
+	=
+	=/* #define DefaultGcc2i386Opt  -O2 -fomit-frame-pointer -march=i686 */
+	=/* #define DefaultGcc2AxpOpt   -O2 -mcpu=ev6 */
+	=/* #define DefaultGcc2PpcOpt   -O2 -mcpu=750 */
+	=
+	=/* The following definitions are normally set properly by XFree86's scripts.
+	= * You can uncomment them if you want to make sure. ************************/
+	= 
+	=/* #define HasMTRRSupport      YES  */ /* Enabled in kernel see kernel docs*/
+	=/* #define HasMMXSupport        NO  */ /* Any i586 or above */
+	=/* #define HasKatmaiSupport     NO  */ /* PIII SSE instructions */
+	=/* #define Has3DNowSupport      NO  */ /* AMD instructions */
+	=
+	=
+	=/* This setting reduces compile time a little by omitting rarely used input 
+	= * devices.  You can find the complete list in config/cf/xfree86.cf ********/
+	= 
+	=#define XInputDrivers                 mouse void
+	=
+	=/* VIDEO DRIVERS ***********************************************************/
+	=
+	=/* If you are sure you only want the drivers for one or a few video cards,
+	= * you can delete the drivers you do not want. *****************************/ 
+ 	=
+	=
+	=#define XF86CardDrivers  mga glint nv tga s3 s3virge sis rendition \
+	=                         neomagic i740 tdfx savage \
+	=                         cirrus vmware tseng trident chips apm \
+	=                         GlideDriver fbdev i128 nsc \
+	=                         ati i810 AgpGartDrivers DevelDrivers ark \
+	=                         cyrix siliconmotion \
+	=                         vesa vga \
+	=                         dummy XF86OSCardDrivers XF86ExtraCardDrivers
+	=
+	=
+	=/* USER AND SYSTEM DEFAULT PATHS *******************************************/
+	=
+	=/* These settings set the PATH variables used by xdm. See README for *******/
+	=/* detailed description and modify the following as per your need. *********/
+	=
+	=/* #define DefaultSystemPath /usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin */
+	=/* #define DefaultUserPath /usr/bin:/bin:/usr/X11R6/bin */
+	=
+	=/* FONT SERVER AND LIBRARY SETTINGS ****************************************/
+	=
+	=/* These settings are the defaults   ***************************************/
+	=
+	=/* #define BuildFontServer          YES  */ /* For Ghostscript Print Server*/
+	=/* #define SharedLibFont            YES  */
+	=/* #define CompressAllFonts         YES  */
+	=/* #define GzipFontCompression      YES  */
+	=
+	=/* These settings ensure we use our libraries ******************************/
+	=#define HasFreetype2             YES
+	=#define HasFontconfig            YES
+	=#define HasExpat                 YES
+	=#define HasLibpng                YES
+	=#define HasZlib                  YES
+	=
+	=/* The font path can be redefined in the XF86Config file *******************/
+	=
+	=/*
+	=#define DefaultFontPath                $(FONTDIR)/misc/,$(FONTDIR)/75dpi/,\
+	=$(FONTDIR)/100dpi/,$(FONTDIR)/Type1,$(FONTDIR)/local,\
+	=$(FONTDIR)/TrueType,$(FONTDIR)/CID,$(FONTDIR)/Speedo
+	=*/
+	=
+	=
+	=/* INTERNATIONAL FONTS.  Change to YES if you need any of them.  These  are
+	= * the defaults. ***********************************************************/
+	=
+	=/* #define BuildCyrillicFonts            NO  */
+	=/* #define BuildArabicFonts              NO  */
+	=/* #define BuildISO8859_6Fonts           NO  */
+	=/* #define BuildGreekFonts               NO  */
+	=/* #define BuildISO8859_7Fonts           NO  */
+	=/* #define BuildHebrewFonts              NO  */
+	=/* #define BuildISO8859_8Fonts           NO  */
+	=/* #define BuildKOI8_RFonts              NO  */
+	=/* #define BuildJapaneseFonts            NO  */
+	=/* #define BuildJISX0201Fonts            NO  */
+	=/* #define BuildKoreanFonts              NO  */
+	=/* #define BuildChineseFonts             NO  */
+	=
+	=/* DOCUMENTATION SETTINGS **************************************************/
+	=
+	=/* These setting are the defaults. *****************************************/
+	=
+	=/* #define BuildLinuxDocHtml             NO  */  /* X Docs in Html format */
+	=/* #define BuildLinuxDocPS               NO  */  /* PostScript format */
+	=/* #define BuildAllSpecsDocs             NO  */  /* Various docs */
+	=/* #define BuildHtmlManPages             NO  */
+	=
+	=/* GENERAL SETTINGS: You generally want to leave these alone when
+	= * building X on an LFS system *********************************************/
+	=
+	=#define GccWarningOptions         -pipe /* Speed up compiles */
+	=#define TermcapLibrary            -lncurses
+	=#define XprtServer                YES /* Needed by realplayer */
+	=#define XnestServer               YES
+	=#define XAppLoadDir               EtcX11Directory/app-defaults
+	=#define VarLibDir                 /var/lib
+	=#define XFree86Devel               NO
+	=#define FSUseSyslog               YES
+	=#define ThreadedX                 YES
+	=#define HasPam                     NO        
+	=#define SystemManDirectory        /usr/share/man  /* Instead of /usr/man */
+	=#define HasLibCrypt               YES
+	=#define InstallXinitConfig        YES
+	=#define InstallXdmConfig          YES
+	=#define ForceNormalLib            YES
+	=#define BuildSpecsDocs             NO
+	=
+	=/* End XFree86 host.def file */
+      </content>
+    </textdump>
+    <make>
+      <param>World</param>
+    </make>
+    <make>
+      <param>install</param>
+    </make>
+    <make>
+      <param>install.man</param>
+    </make>
+    <link>
+      <option>force</option>
+      <target>/usr/X11R6/bin</target>
+      <name>/usr/bin/X11</name>
+    </link>
+    <link>
+      <option>force</option>
+      <target>/usr/X11R6/lib/X11</target>
+      <name>/usr/lib/X11</name>
+    </link>
+    <link>
+      <option>force</option>
+      <target>/usr/X11R6/include/X11</target>
+      <name>/usr/include/X11</name>
+    </link>
+    <!-- update /etc/ld.so.conf -->
+    <search_replace base="/etc">
+      <file>ld.so.conf</file>
+      <find>/usr/X11R6/lib</find>
+      <replace></replace>
+    </search_replace>
+    <textdump mode="append" base="/etc">
+      <file>ld.so.conf</file>
+      <content>=/usr/X11R6/lib</content>
+    </textdump>&ldconfig; 
+    <link base="/dev">
+      <option>force</option>
+      <target>psaux</target>
+      <name>mouse</name>
+    </link>
+    <textdump base="/root">
+      <file>.xinitrc</file>
+      <content>
+	=# Begin .xinitrc file
+	=xterm -g 80x40+0+0 &real-amp;
+	=xclock -g 100x100-0+0 &real-amp;
+	=twm
+	=# End .xinitrc file
+      </content>
+    </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&xfree86-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter25/xorg.xml
===================================================================
--- profiles/BLFS/trunk/chapter25/xorg.xml	2004-07-19 00:06:47 UTC (rev 1466)
+++ profiles/BLFS/trunk/chapter25/xorg.xml	2004-07-19 00:19:31 UTC (rev 1467)
@@ -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/ch25.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,191 +10,166 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="xorg" version="&xorg-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&xorg-package1;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-		<unpack>
-                        <archive>&packages_dir;/&xorg-package2;</archive>
-                        <destination>&build_dir;</destination>
-                </unpack>
-		<unpack>
-                        <archive>&packages_dir;/&xorg-package3;</archive>
-                        <destination>&build_dir;</destination>
-                </unpack>
-		<unpack>
-                        <archive>&packages_dir;/&xorg-package4;</archive>
-                        <destination>&build_dir;</destination>
-                </unpack>
-		<unpack>
-                        <archive>&packages_dir;/&xorg-package5;</archive>
-                        <destination>&build_dir;</destination>
-                </unpack>
-		<unpack>
-                        <archive>&packages_dir;/&xorg-package6;</archive>
-                        <destination>&build_dir;</destination>
-                </unpack>
-		<unpack>
-                        <archive>&packages_dir;/&xorg-package7;</archive>
-                        <destination>&build_dir;</destination>
-                </unpack>
-	</stage>
-
-	<stage name="Installing lndir">
-		<stageinfo>
-			<base>&build_dir;/&xorg-directory;/config/util</base>
-		</stageinfo>
-
-		<make>
-			<param>-f Makefile.ini</param>
-			<param>lndir</param>
-		</make>
-
-		<copy>
-			<source>lndir</source>
-			<destination>/usr/bin</destination>
-		</copy>
-	</stage>
-
-	<stage name="Creating build directory">
-		<stageinfo>
-			<base>&build_dir;/&xorg-directory;</base>
-		</stageinfo>
-
-		<mkdir>
-			<name>../xcbuild</name>
-		</mkdir>
-	</stage>
-
-	<stage name="Populating build directory">
-		<stageinfo>
-			<base>&build_dir;/xcbuild</base>
-		</stageinfo>
-
-		<execute command="lndir">
-			<param>../xc</param>
-		</execute>
-	</stage>
-
-	<stage name="Creating configuration file">
-		<stageinfo>
-                        <base>&build_dir;/xcbuild</base>
-                </stageinfo>
-
-		<textdump base="&build_dir;/xcbuild/config/cf">
-			<file>host.def</file>
-			<content>
-			=/* Begin Xorg host.def file */
-			=		
-			=/* System Related Information.  If you read and configure only one
-			= * section then it should be this one.  The Intel architecture defaults are
-			= * set for a i686 and higher.  Axp is for the Alpha architecture and Ppc is
-			= * for the Power PC.  AMD64 is for the Opteron processor. Note that there have 
-			= * been reports that the Ppc optimization line causes segmentation faults during 
-			= * build.  If that happens, try building without the DefaultGcc2PpcOpt line.  ***********/
-			= 
-			=/* #define DefaultGcc2i386Opt -O2 -fno-strength-reduce -fno-strict-aliasing -march=i686 */
-			=/* #define DefaultGccAMD64Opt -O2 -fno-strength-reduce -fno-strict-aliasing */
-			=/* #define DefaultGcc2AxpOpt  -O2 -mcpu=ev6 */
-			=/* #define DefaultGcc2PpcOpt  -O2 -mcpu=750 */
-			=
-			=#define HasFreetype2             YES
-			=#define HasFontconfig            YES
-			=#define HasExpat                 YES
-			=#define HasLibpng                YES
-			=#define HasZlib                  YES
-			=
-			=/*
-			= * Which drivers to build.  When building a static server, each of these
-			= * will be included in it.  When building the loadable server each of these
-			= * modules will be built.
-			= *
-			=#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
-			=                                neomagic i740 tdfx savage \
-			=                                cirrus vmware tseng trident chips apm \
-			=                                GlideDriver fbdev i128 \
-			=                                ati AgpGartDrivers DevelDrivers ark cyrix \
-			=                                siliconmotion \
-			=                                vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
-			=*/
-			=
-			=/*
-			= * Select the XInput devices you want by uncommenting this.
-			= *
-			=#define XInputDrivers           mouse keyboard acecad calcomp citron \
-			=                                digitaledge dmc dynapro elographics \
-			=                                microtouch mutouch penmount spaceorb summa \
-			=                                wacom void magictouch aiptek
-			= */
-			=
-			=/* Most installs will only need this */
-			=
-			=#define XInputDrivers           mouse keyboard
-			=
-			=
-			=/* End Xorg host.def file */
-			</content>
-		</textdump>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/xcbuild</base>
-		</stageinfo>
-
-		<make>
-			<param>World</param>
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<make>
-			<param>install.man</param>
-		</make>
-
-		<link>
-			<option>force</option>
-			<target>../X11R6/bin</target>
-			<name>/usr/bin/X11</name>
-		</link>
-
-		<link>
-			<option>force</option>
-			<target>../X11R6/lib/X11</target>
-			<name>/usr/lib/X11</name>
-		</link>
-
-		<link>
-			<option>force</option>
-			<target>../X11R6/include/X11</target>
-			<name>/usr/include/X11</name>
-		</link>
-
-		<textdump mode="append" base="/etc">
-			<file>ld.so.conf</file>
-			<content>
-				=/usr/X11R6/lib
-			</content>
-		</textdump>
-
-		<execute command="ldconfig" />
-
-		<textdump mode="append" base="/etc/sysconfig">
-			<file>createfiles</file>
-			<content>
-				=/tmp/.ICE-unix dir 1777 root root
-			</content>
-		</textdump>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&xorg-directory;</remove>
-	</stage>
-</package>
+  <package name="xorg" version="&xorg-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&xorg-package1;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&xorg-package2;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&xorg-package3;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&xorg-package4;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&xorg-package5;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&xorg-package6;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&xorg-package7;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing lndir">
+      <stageinfo>
+        <base>&build_dir;/&xorg-directory;/config/util</base>
+      </stageinfo>
+      <make>
+        <param>-f Makefile.ini</param>
+        <param>lndir</param>
+      </make>
+      <copy>
+        <source>lndir</source>
+        <destination>/usr/bin</destination>
+      </copy>
+    </stage>
+    <stage name="Creating build directory">
+      <stageinfo>
+        <base>&build_dir;/&xorg-directory;</base>
+      </stageinfo>
+      <mkdir>
+        <name>../xcbuild</name>
+      </mkdir>
+    </stage>
+    <stage name="Populating build directory">
+      <stageinfo>
+        <base>&build_dir;/xcbuild</base>
+      </stageinfo>
+      <execute command="lndir">
+        <param>../xc</param>
+      </execute>
+    </stage>
+    <stage name="Creating configuration file">
+      <stageinfo>
+        <base>&build_dir;/xcbuild</base>
+      </stageinfo>
+      <textdump base="&build_dir;/xcbuild/config/cf">
+        <file>host.def</file>
+        <content>
+	  =/* Begin Xorg host.def file */
+	  = 
+	  =/* System Related Information.  If you read and configure only one
+	  = * section then it should be this one.  The Intel architecture defaults are
+	  = * set for a i686 and higher.  Axp is for the Alpha architecture and Ppc is
+	  = * for the Power PC.  AMD64 is for the Opteron processor. Note that there have 
+	  = * been reports that the Ppc optimization line causes segmentation faults during 
+	  = * build.  If that happens, try building without the DefaultGcc2PpcOpt line.  ***********/
+	  = 
+	  =/* #define DefaultGcc2i386Opt -O2 -fno-strength-reduce -fno-strict-aliasing -march=i686 */
+	  =/* #define DefaultGccAMD64Opt -O2 -fno-strength-reduce -fno-strict-aliasing */
+	  =/* #define DefaultGcc2AxpOpt  -O2 -mcpu=ev6 */
+	  =/* #define DefaultGcc2PpcOpt  -O2 -mcpu=750 */
+	  =
+	  =#define HasFreetype2             YES
+	  =#define HasFontconfig            YES
+	  =#define HasExpat                 YES
+	  =#define HasLibpng                YES
+	  =#define HasZlib                  YES
+	  =
+	  =/*
+	  = * Which drivers to build.  When building a static server, each of these
+	  = * will be included in it.  When building the loadable server each of these
+	  = * modules will be built.
+	  = *
+	  =#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
+	  =                                neomagic i740 tdfx savage \
+	  =                                cirrus vmware tseng trident chips apm \
+	  =                                GlideDriver fbdev i128 \
+	  =                                ati AgpGartDrivers DevelDrivers ark cyrix \
+	  =                                siliconmotion \
+	  =                                vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
+	  =*/
+	  =
+	  =/*
+	  = * Select the XInput devices you want by uncommenting this.
+	  = *
+	  =#define XInputDrivers           mouse keyboard acecad calcomp citron \
+	  =                                digitaledge dmc dynapro elographics \
+	  =                                microtouch mutouch penmount spaceorb summa \
+    	  =                                wacom void magictouch aiptek
+	  = */
+	  =
+	  =/* Most installs will only need this */
+	  =
+	  =#define XInputDrivers           mouse keyboard
+	  =
+	  =
+	  =/* End Xorg host.def file */
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/xcbuild</base>
+      </stageinfo>
+      <make>
+        <param>World</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+      <make>
+        <param>install.man</param>
+      </make>
+      <link>
+        <option>force</option>
+        <target>../X11R6/bin</target>
+        <name>/usr/bin/X11</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>../X11R6/lib/X11</target>
+        <name>/usr/lib/X11</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>../X11R6/include/X11</target>
+        <name>/usr/include/X11</name>
+      </link>
+      <textdump mode="append" base="/etc">
+        <file>ld.so.conf</file>
+        <content>=/usr/X11R6/lib</content>
+      </textdump>
+      <execute command="ldconfig" />
+      <textdump mode="append" base="/etc/sysconfig">
+        <file>createfiles</file>
+        <content>=/tmp/.ICE-unix dir 1777 root root</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&xorg-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter26/atk.xml
===================================================================
--- profiles/BLFS/trunk/chapter26/atk.xml	2004-07-19 00:06:47 UTC (rev 1466)
+++ profiles/BLFS/trunk/chapter26/atk.xml	2004-07-19 00:19:31 UTC (rev 1467)
@@ -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/ch26.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,42 +10,36 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="atk" version="&atk-version;">
-
-        <packageinfo>
-                <requires><name>glib2</name></requires>
-		<utilizes><name>gtk-doc</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&atk-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&atk-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&atk-directory;</remove>
-	</stage>
-
-</package>
+  <package name="atk" version="&atk-version;">
+    <packageinfo>
+      <requires>
+        <name>glib2</name>
+      </requires>
+      <utilizes>
+        <name>gtk-doc</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&atk-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&atk-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&atk-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter26/gtk+.xml
===================================================================
--- profiles/BLFS/trunk/chapter26/gtk+.xml	2004-07-19 00:06:47 UTC (rev 1466)
+++ profiles/BLFS/trunk/chapter26/gtk+.xml	2004-07-19 00:19:31 UTC (rev 1467)
@@ -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/ch26.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,44 +10,43 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gtk+" version="&gtkplus-version;">
-  <packageinfo>
-    <requires>
-      <name>glib</name>
-    </requires>
-    <requires>
-      <name>libpng</name>
-    </requires>
-    <requires>
-      <name>libtiff</name>
-    </requires>
-    <requires>
-      <name>libjpeg</name>
-    </requires>
-  </packageinfo>
-  <stage name="Unpacking">
-    <unpack>
-      <archive>&packages_dir;/&gtkplus-package;</archive>
-      <destination>&build_dir;</destination>
-    </unpack>
-  </stage>
-  <stage name="Installing">
-    <stageinfo>
-      <base>&build_dir;/&gtkplus-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;/&gtkplus-directory;</remove>
-  </stage>
-</package>
+  <package name="gtk+" version="&gtkplus-version;">
+    <packageinfo>
+      <requires>
+        <name>glib</name>
+      </requires>
+      <requires>
+        <name>libpng</name>
+      </requires>
+      <requires>
+        <name>libtiff</name>
+      </requires>
+      <requires>
+        <name>libjpeg</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gtkplus-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gtkplus-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;/&gtkplus-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter26/gtk+2.xml
===================================================================
--- profiles/BLFS/trunk/chapter26/gtk+2.xml	2004-07-19 00:06:47 UTC (rev 1466)
+++ profiles/BLFS/trunk/chapter26/gtk+2.xml	2004-07-19 00:19:31 UTC (rev 1467)
@@ -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/ch26.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,47 +10,49 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gtk+2" version="&gtkplus2-version;">
-
-        <packageinfo>
-		<requires><name>xfree86</name></requires>
-                <requires><name>pango</name></requires>
-                <requires><name>atk</name></requires>
-                <utilizes><name>libtiff</name></utilizes>
-                <utilizes><name>libjpeg</name></utilizes>
-		<utilizes><name>gtk-doc</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gtkplus2-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gtkplus2-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;/&gtkplus2-directory;</remove>
-	</stage>
-
-</package>
+  <package name="gtk+2" version="&gtkplus2-version;">
+    <packageinfo>
+      <requires>
+        <name>xfree86</name>
+      </requires>
+      <requires>
+        <name>pango</name>
+      </requires>
+      <requires>
+        <name>atk</name>
+      </requires>
+      <utilizes>
+        <name>libtiff</name>
+      </utilizes>
+      <utilizes>
+        <name>libjpeg</name>
+      </utilizes>
+      <utilizes>
+        <name>gtk-doc</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gtkplus2-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gtkplus2-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;/&gtkplus2-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter26/hicolor-icon-theme.xml
===================================================================
--- profiles/BLFS/trunk/chapter26/hicolor-icon-theme.xml	2004-07-19 00:06:47 UTC (rev 1466)
+++ profiles/BLFS/trunk/chapter26/hicolor-icon-theme.xml	2004-07-19 00:19:31 UTC (rev 1467)
@@ -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/ch26.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,16 +10,15 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="hicolor-icon-theme" version="&hicolor-icon-theme-version;">
-  <stage name="Unpacking.">
-    <unpack>
-      <archive>&packages_dir;/</archive>
-      <destination>&build_dir;</destination>
-    </unpack>
-  </stage>
-  <stage name="Installing.">
+  <package name="hicolor-icon-theme" version="&hicolor-icon-theme-version;">
+    <stage name="Unpacking.">
+      <unpack>
+        <archive>&packages_dir;/</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing.">
     <stageinfo>
       <base>&build_dir;/&hicolor-icon-theme-directory;</base>
     </stageinfo>
@@ -28,11 +28,9 @@
     <make />
     <make>
       <param>install</param>
-    </make>
-    &ldconfig;
-  </stage>
-  <stage name="Cleanup.">
-    <remove>&build_dir;/&hicolor-icon-theme-directory;</remove>
-  </stage>
-</package>
+    </make>&ldconfig;</stage>
+    <stage name="Cleanup.">
+      <remove>&build_dir;/&hicolor-icon-theme-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter26/lesstif.xml
===================================================================
--- profiles/BLFS/trunk/chapter26/lesstif.xml	2004-07-19 00:06:47 UTC (rev 1466)
+++ profiles/BLFS/trunk/chapter26/lesstif.xml	2004-07-19 00:19:31 UTC (rev 1467)
@@ -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/ch26.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,51 +10,41 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="lesstif" version="&lesstif-version;">
-
-        <packageinfo>
-        	<requires><name>xfree86</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&lesstif-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&lesstif-directory;</base>
-		</stageinfo>
-
-		<execute command="find -name Makefile.in | 
-			xargs sed -i 's@$(prefix)/LessTif@$(prefix)/share/LessTif at g'"/>
-
-		<configure>
-			<param>--prefix=/usr</param>
-                        <param>--enable-build-20</param>
-                        <param>--enable-build-21</param>
-                        <param>--disable-debug</param>
-                        <param>--enable-production</param>
-                        <param>--disable-build-tests</param>
-                        <param>--with-xdnd</param>
-		</configure>
-
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&lesstif-directory;</remove>
-	</stage>
-
-</package>
+  <package name="lesstif" version="&lesstif-version;">
+    <packageinfo>
+      <requires>
+        <name>xfree86</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&lesstif-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&lesstif-directory;</base>
+      </stageinfo>
+      <execute command="find -name Makefile.in | 
+                              xargs sed -i 's@$(prefix)/LessTif@$(prefix)/share/LessTif at g'" />
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--enable-build-20</param>
+        <param>--enable-build-21</param>
+        <param>--disable-debug</param>
+        <param>--enable-production</param>
+        <param>--disable-build-tests</param>
+        <param>--with-xdnd</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&lesstif-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter26/libxklavier.xml
===================================================================
--- profiles/BLFS/trunk/chapter26/libxklavier.xml	2004-07-19 00:06:47 UTC (rev 1466)
+++ profiles/BLFS/trunk/chapter26/libxklavier.xml	2004-07-19 00:19:31 UTC (rev 1467)
@@ -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/ch26.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,27 +10,26 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="libxklavier" version="&libxklavier-version;">
-  <packageinfo>
-    <requires>
-      <name>xfree86</name>
-    </requires>
-    <requires>
-      <name>pkgconfig</name>
-    </requires>
-    <requires>
-      <name>libxml2</name>
-    </requires>
-  </packageinfo>
-  <stage name="Unpacking.">
-    <unpack>
-      <archive>&packages_dir;/</archive>
-      <destination>&build_dir;</destination>
-    </unpack>
-  </stage>
-  <stage name="Installing.">
+  <package name="libxklavier" version="&libxklavier-version;">
+    <packageinfo>
+      <requires>
+        <name>xfree86</name>
+      </requires>
+      <requires>
+        <name>pkgconfig</name>
+      </requires>
+      <requires>
+        <name>libxml2</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking.">
+      <unpack>
+        <archive>&packages_dir;/</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing.">
     <stageinfo>
       <base>&build_dir;/&libxklavier-directory;</base>
     </stageinfo>
@@ -39,11 +39,9 @@
     <make />
     <make>
       <param>install</param>
-    </make>
-    &ldconfig;
-  </stage>
-  <stage name="Cleanup.">
-    <remove>&build_dir;/&libxklavier-directory;</remove>
-  </stage>
-</package>
+    </make>&ldconfig;</stage>
+    <stage name="Cleanup.">
+      <remove>&build_dir;/&libxklavier-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter26/pango.xml
===================================================================
--- profiles/BLFS/trunk/chapter26/pango.xml	2004-07-19 00:06:47 UTC (rev 1466)
+++ profiles/BLFS/trunk/chapter26/pango.xml	2004-07-19 00:19:31 UTC (rev 1467)
@@ -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/ch26.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,46 +10,46 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="pango" version="&pango-version;">
-
-        <packageinfo>
-                <requires><name>glib2</name></requires>
-        	<utilizes><name>xfree86</name></utilizes>
-		<utilizes><name>freetype</name></utilizes>
-		<utilizes><name>fontconfig</name></utilizes>
-		<utilizes><name>gtk-doc</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&pango-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&pango-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;/&pango-directory;</remove>
-	</stage>
-
-</package>
+  <package name="pango" version="&pango-version;">
+    <packageinfo>
+      <requires>
+        <name>glib2</name>
+      </requires>
+      <utilizes>
+        <name>xfree86</name>
+      </utilizes>
+      <utilizes>
+        <name>freetype</name>
+      </utilizes>
+      <utilizes>
+        <name>fontconfig</name>
+      </utilizes>
+      <utilizes>
+        <name>gtk-doc</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&pango-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&pango-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;/&pango-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter26/qt.xml
===================================================================
--- profiles/BLFS/trunk/chapter26/qt.xml	2004-07-19 00:06:47 UTC (rev 1466)
+++ profiles/BLFS/trunk/chapter26/qt.xml	2004-07-19 00:19:31 UTC (rev 1467)
@@ -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/ch26.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,78 +10,77 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="qt" version="&qt-version;">
-  <packageinfo>
-    <requires>
-      <name>xfree86</name>
-    </requires>
-    <requires>
-      <name>libpng</name>
-    </requires>
-    <requires>
-      <name>libmng</name>
-    </requires>
-    <requires>
-      <name>libjpeg</name>
-    </requires>
-  </packageinfo>
-  <stage name="Unpacking">
-    <unpack>
-      <archive>&packages_dir;/&qt-package;</archive>
-      <destination>&build_dir;</destination>
-    </unpack>
-  </stage>
-  <stage name="Installing">
-    <stageinfo>
-      <environment>
-        <variable name="PATH" mode="prepend">&build_dir;/&qt-directory;/bin:</variable>
-        <variable name="LD_LIBRARY_PATH">&build_dir;/&qt-directory;/lib</variable>
-      </environment>
-      <base>&build_dir;/&qt-directory;</base>
-    </stageinfo>
-    <execute command="sed -i "s:cp -f:install:" mkspecs/linux-g++/qmake.conf" />
-    <configure command="echo yes | ./configure">
-      <param>-prefix /usr</param>
-      <param>-docdir /usr/share/doc/qt</param>
-      <param>-headerdir /usr/include/qt</param>
-      <param>-plugindir /usr/lib/qt/plugins</param>
-      <param>-datadir /usr/share/qt</param>
-      <param>-translationdir /usr/share/qt/translations</param>
-      <param>-sysconfdir /etc/qt</param>
-      <param>-release</param>
-      <param>-shared</param>
-      <param>-qt-gif</param>
-      <param>-system-zlib</param>
-      <param>-no-g++-execeptions</param>
-      <param>-thread</param>
-      <param>-plugin-imgfmt-png</param>
-      <param>-system-libpng</param>
-    </configure>
-    <make />
-    <execute command="find -type f -name Makefile | xargs sed -i "s at -Wl,-rpath,/usr/lib@@g"" />
-    <make>
-      <param>install</param>
-    </make>
-    <link>
-      <option>force</option>
-      <target>libqt-mt.so</target>
-      <name>/usr/lib/libqt.so</name>
-    </link>
-    <copy>
-      <option>recursive</option>
-      <source>doc/man</source>
-      <destination>/usr/share</destination>
-    </copy>
-    <copy>
-      <option>recursive</option>
-      <source>examples</source>
-      <destination>/usr/share/doc/qt</destination>
-    </copy>
-  </stage>
-  <stage name="Cleanup">
-    <remove>&build_dir;/&qt-directory;</remove>
-  </stage>
-</package>
+  <package name="qt" version="&qt-version;">
+    <packageinfo>
+      <requires>
+        <name>xfree86</name>
+      </requires>
+      <requires>
+        <name>libpng</name>
+      </requires>
+      <requires>
+        <name>libmng</name>
+      </requires>
+      <requires>
+        <name>libjpeg</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&qt-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="PATH" mode="prepend">&build_dir;/&qt-directory;/bin:</variable>
+          <variable name="LD_LIBRARY_PATH">&build_dir;/&qt-directory;/lib</variable>
+        </environment>
+        <base>&build_dir;/&qt-directory;</base>
+      </stageinfo>
+      <execute command="sed -i "s:cp -f:install:" mkspecs/linux-g++/qmake.conf" />
+      <configure command="echo yes | ./configure">
+        <param>-prefix /usr</param>
+        <param>-docdir /usr/share/doc/qt</param>
+        <param>-headerdir /usr/include/qt</param>
+        <param>-plugindir /usr/lib/qt/plugins</param>
+        <param>-datadir /usr/share/qt</param>
+        <param>-translationdir /usr/share/qt/translations</param>
+        <param>-sysconfdir /etc/qt</param>
+        <param>-release</param>
+        <param>-shared</param>
+        <param>-qt-gif</param>
+        <param>-system-zlib</param>
+        <param>-no-g++-execeptions</param>
+        <param>-thread</param>
+        <param>-plugin-imgfmt-png</param>
+        <param>-system-libpng</param>
+      </configure>
+      <make />
+      <execute command="find -type f -name Makefile | xargs sed -i "s at -Wl,-rpath,/usr/lib@@g"" />
+      <make>
+        <param>install</param>
+      </make>
+      <link>
+        <option>force</option>
+        <target>libqt-mt.so</target>
+        <name>/usr/lib/libqt.so</name>
+      </link>
+      <copy>
+        <option>recursive</option>
+        <source>doc/man</source>
+        <destination>/usr/share</destination>
+      </copy>
+      <copy>
+        <option>recursive</option>
+        <source>examples</source>
+        <destination>/usr/share/doc/qt</destination>
+      </copy>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&qt-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter26/shared-mime-info.xml
===================================================================
--- profiles/BLFS/trunk/chapter26/shared-mime-info.xml	2004-07-19 00:06:47 UTC (rev 1466)
+++ profiles/BLFS/trunk/chapter26/shared-mime-info.xml	2004-07-19 00:19:31 UTC (rev 1467)
@@ -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/ch26.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,24 +10,23 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="shared-mime-info" version="&shared-mime-info-version;">
-  <packageinfo>
-    <requires>
-      <name>glib2</name>
-    </requires>
-    <requires>
-      <name>libxml2</name>
-    </requires>
-  </packageinfo>
-  <stage name="Unpacking.">
-    <unpack>
-      <archive>&packages_dir;/&shared-mime-info-package;</archive>
-      <destination>&build_dir;</destination>
-    </unpack>
-  </stage>
-  <stage name="Installing.">
+  <package name="shared-mime-info" version="&shared-mime-info-version;">
+    <packageinfo>
+      <requires>
+        <name>glib2</name>
+      </requires>
+      <requires>
+        <name>libxml2</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking.">
+      <unpack>
+        <archive>&packages_dir;/&shared-mime-info-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing.">
     <stageinfo>
       <base>&build_dir;/&shared-mime-info-directory;</base>
     </stageinfo>
@@ -36,11 +36,9 @@
     <make />
     <make>
       <param>install</param>
-    </make>
-    &ldconfig;
-  </stage>
-  <stage name="Cleanup.">
-    <remove>&build_dir;/&shared-mime-info-directory;</remove>
-  </stage>
-</package>
+    </make>&ldconfig;</stage>
+    <stage name="Cleanup.">
+      <remove>&build_dir;/&shared-mime-info-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter26/startup-notification.xml
===================================================================
--- profiles/BLFS/trunk/chapter26/startup-notification.xml	2004-07-19 00:06:47 UTC (rev 1466)
+++ profiles/BLFS/trunk/chapter26/startup-notification.xml	2004-07-19 00:19:31 UTC (rev 1467)
@@ -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/ch26.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,41 +10,33 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="startup-notification" version="&startup-notification-version;">
-
-        <packageinfo>
-        	<requires><name>xfree86</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&startup-notification-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&startup-notification-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&startup-notification-directory;</remove>
-	</stage>
-
-</package>
+  <package name="startup-notification" version="&startup-notification-version;">
+    <packageinfo>
+      <requires>
+        <name>xfree86</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&startup-notification-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&startup-notification-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&startup-notification-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter27/fluxbox.xml
===================================================================
--- profiles/BLFS/trunk/chapter27/fluxbox.xml	2004-07-19 00:06:47 UTC (rev 1466)
+++ profiles/BLFS/trunk/chapter27/fluxbox.xml	2004-07-19 00:19:31 UTC (rev 1467)
@@ -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/ch27.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,49 +10,40 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="fluxbox" version="&fluxbox-version;">
-
-	<packageinfo>
-        	<requires><name>xfree86</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&fluxbox-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&fluxbox-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&fluxbox-gcc33-patch;</param>
-		</patch>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--enable-kde</param>
-			<param>--enable-gnome</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&fluxbox-directory;</remove>
-	</stage>
-
-</package>
+  <package name="fluxbox" version="&fluxbox-version;">
+    <packageinfo>
+      <requires>
+        <name>xfree86</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&fluxbox-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&fluxbox-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&fluxbox-gcc33-patch;</param>
+      </patch>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--enable-kde</param>
+        <param>--enable-gnome</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&fluxbox-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter27/metacity.xml
===================================================================
--- profiles/BLFS/trunk/chapter27/metacity.xml	2004-07-19 00:06:47 UTC (rev 1466)
+++ profiles/BLFS/trunk/chapter27/metacity.xml	2004-07-19 00:19:31 UTC (rev 1467)
@@ -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/ch27.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,46 +10,44 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="metacity" version="&metacity-version;">
-
-	<packageinfo>
-        	<requires><name>intltool</name></requires>
-        	<requires><name>gtk+2</name></requires>
-		<utilizes><name>startup-notification</name></utilizes>
-		<utilizes><name>gconf</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&metacity-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&metacity-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--libexec=/usr/sbin</param>
-			<param>--sysconfdir=/etc</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&metacity-directory;</remove>
-	</stage>
-
-</package>
+  <package name="metacity" version="&metacity-version;">
+    <packageinfo>
+      <requires>
+        <name>intltool</name>
+      </requires>
+      <requires>
+        <name>gtk+2</name>
+      </requires>
+      <utilizes>
+        <name>startup-notification</name>
+      </utilizes>
+      <utilizes>
+        <name>gconf</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&metacity-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&metacity-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libexec=/usr/sbin</param>
+        <param>--sysconfdir=/etc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&metacity-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter27/sawfish.xml
===================================================================
--- profiles/BLFS/trunk/chapter27/sawfish.xml	2004-07-19 00:06:47 UTC (rev 1466)
+++ profiles/BLFS/trunk/chapter27/sawfish.xml	2004-07-19 00:19:31 UTC (rev 1467)
@@ -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/ch27.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,49 +10,51 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="sawfish" version="&sawfish-version;">
-
-	<packageinfo>
-        	<requires><name>xfree86</name></requires>
-                <requires><name>librep</name></requires>
-                <requires><name>rep-gtk</name></requires>
-                <requires><name>esound</name></requires>
-                <requires><name>gtk+2</name></requires>
-		<utilizes><name>libglade</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&sawfish-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&sawfish-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--libexec=/usr/sbin</param>
-			<param>--infodir=/usr/share/info</param>
-			<param>--with-gnome-prefix=&gnome-prefix;</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&sawfish-directory;</remove>
-	</stage>
-
-</package>
+  <package name="sawfish" version="&sawfish-version;">
+    <packageinfo>
+      <requires>
+        <name>xfree86</name>
+      </requires>
+      <requires>
+        <name>librep</name>
+      </requires>
+      <requires>
+        <name>rep-gtk</name>
+      </requires>
+      <requires>
+        <name>esound</name>
+      </requires>
+      <requires>
+        <name>gtk+2</name>
+      </requires>
+      <utilizes>
+        <name>libglade</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&sawfish-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&sawfish-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libexec=/usr/sbin</param>
+        <param>--infodir=/usr/share/info</param>
+        <param>--with-gnome-prefix=&gnome-prefix;</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&sawfish-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter27/xfce.xml
===================================================================
--- profiles/BLFS/trunk/chapter27/xfce.xml	2004-07-19 00:06:47 UTC (rev 1466)
+++ profiles/BLFS/trunk/chapter27/xfce.xml	2004-07-19 00:19:31 UTC (rev 1467)
@@ -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/ch27.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,195 +10,161 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="xfce" version="&xfce-version;">
-
-	<packageinfo>
-               	<requires><name>gtk+2</name></requires>
-        	<requires><name>libxml2</name></requires>
-		<utilizes><name>libgtkhtml</name></utilizes>
-		<utilizes><name>startup-notification</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&xfce-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&build_dir;/&xfce-directory;/src/&xfce-libxfce4util-package;</archive>
-			<destination>&build_dir;/&xfce-directory;/src</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&build_dir;/&xfce-directory;/src/&xfce-libxfcegui4-package;</archive>
-			<destination>&build_dir;/&xfce-directory;/src</destination>
-		</unpack>
-		
-		<unpack>
-			<archive>&build_dir;/&xfce-directory;/src/&xfce-libxfce4mcs-package;</archive>
-			<destination>&build_dir;/&xfce-directory;/src</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&build_dir;/&xfce-directory;/src/&xfce-xfcemcsmanager-package;</archive>
-			<destination>&build_dir;/&xfce-directory;/src</destination>
-		</unpack>
-	
-		<unpack>
-			<archive>&build_dir;/&xfce-directory;/src/&xfce-xfwm4-package;</archive>
-			<destination>&build_dir;/&xfce-directory;/src</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&build_dir;/&xfce-directory;/src/&xfce-xfdesktop-package;</archive>
-			<destination>&build_dir;/&xfce-directory;/src</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&build_dir;/&xfce-directory;/src/&xfce-xfce4panel-package;</archive>
-			<destination>&build_dir;/&xfce-directory;/src</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&build_dir;/&xfce-directory;/src/&xfce-xfceutils-package;</archive>
-			<destination>&build_dir;/&xfce-directory;/src</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&xfce-directory;/src/&xfce-libxfce4util-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-	</stage>
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&xfce-directory;/src/&xfce-libxfcegui4-directory;</base>
-		</stageinfo>	
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-	</stage>
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&xfce-directory;/src/&xfce-libxfce4mcs-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&xfce-directory;/src/&xfce-xfcemcsmanager-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&xfce-directory;/src/&xfce-xfwm4-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&xfce-directory;/src/&xfce-xfdesktop-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--sysconfdir=/etc</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&xfce-directory;/src/&xfce-xfce4panel-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--sysconfdir=/etc</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&xfce-directory;/src/&xfce-xfceutils-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;/&xfce-directory;</remove>
-	</stage>
-
-</package>
+  <package name="xfce" version="&xfce-version;">
+    <packageinfo>
+      <requires>
+        <name>gtk+2</name>
+      </requires>
+      <requires>
+        <name>libxml2</name>
+      </requires>
+      <utilizes>
+        <name>libgtkhtml</name>
+      </utilizes>
+      <utilizes>
+        <name>startup-notification</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&xfce-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&build_dir;/&xfce-directory;/src/&xfce-libxfce4util-package;</archive>
+        <destination>&build_dir;/&xfce-directory;/src</destination>
+      </unpack>
+      <unpack>
+        <archive>&build_dir;/&xfce-directory;/src/&xfce-libxfcegui4-package;</archive>
+        <destination>&build_dir;/&xfce-directory;/src</destination>
+      </unpack>
+      <unpack>
+        <archive>&build_dir;/&xfce-directory;/src/&xfce-libxfce4mcs-package;</archive>
+        <destination>&build_dir;/&xfce-directory;/src</destination>
+      </unpack>
+      <unpack>
+        <archive>&build_dir;/&xfce-directory;/src/&xfce-xfcemcsmanager-package;</archive>
+        <destination>&build_dir;/&xfce-directory;/src</destination>
+      </unpack>
+      <unpack>
+        <archive>&build_dir;/&xfce-directory;/src/&xfce-xfwm4-package;</archive>
+        <destination>&build_dir;/&xfce-directory;/src</destination>
+      </unpack>
+      <unpack>
+        <archive>&build_dir;/&xfce-directory;/src/&xfce-xfdesktop-package;</archive>
+        <destination>&build_dir;/&xfce-directory;/src</destination>
+      </unpack>
+      <unpack>
+        <archive>&build_dir;/&xfce-directory;/src/&xfce-xfce4panel-package;</archive>
+        <destination>&build_dir;/&xfce-directory;/src</destination>
+      </unpack>
+      <unpack>
+        <archive>&build_dir;/&xfce-directory;/src/&xfce-xfceutils-package;</archive>
+        <destination>&build_dir;/&xfce-directory;/src</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&xfce-directory;/src/&xfce-libxfce4util-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&xfce-directory;/src/&xfce-libxfcegui4-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&xfce-directory;/src/&xfce-libxfce4mcs-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&xfce-directory;/src/&xfce-xfcemcsmanager-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&xfce-directory;/src/&xfce-xfwm4-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&xfce-directory;/src/&xfce-xfdesktop-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&xfce-directory;/src/&xfce-xfce4panel-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&xfce-directory;/src/&xfce-xfceutils-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;/&xfce-directory;</remove>
+    </stage>
+  </package>
 </alfs>




More information about the alfs-log mailing list