r1811 - in profiles/BLFS/trunk: chapter10 chapter12/perlmods chapter33 chapter43 chapter44 config_standard config_standard/x/xorg

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Thu Mar 24 17:57:34 PST 2005


Author: thomasp
Date: 2005-03-24 18:57:33 -0700 (Thu, 24 Mar 2005)
New Revision: 1811

Modified:
   profiles/BLFS/trunk/chapter10/intltool.xml
   profiles/BLFS/trunk/chapter10/xscreensaver.xml
   profiles/BLFS/trunk/chapter12/perlmods/Net-DNS.xml
   profiles/BLFS/trunk/chapter33/gimp.xml
   profiles/BLFS/trunk/chapter43/openjade.xml
   profiles/BLFS/trunk/chapter44/xml-dtd.xml
   profiles/BLFS/trunk/config_standard/config.ent
   profiles/BLFS/trunk/config_standard/x/xorg/host.def
Log:
various fixes thanks to Alex Potter

Modified: profiles/BLFS/trunk/chapter10/intltool.xml
===================================================================
--- profiles/BLFS/trunk/chapter10/intltool.xml	2005-03-25 01:41:08 UTC (rev 1810)
+++ profiles/BLFS/trunk/chapter10/intltool.xml	2005-03-25 01:57:33 UTC (rev 1811)
@@ -14,7 +14,7 @@
   <package name="intltool" version="&intltool-version;">
     <packageinfo>
       <requires>
-        <name>xml-parser</name>
+        <name>XML-Parser</name>
       </requires>
     </packageinfo>
     <stage name="Unpacking">

Modified: profiles/BLFS/trunk/chapter10/xscreensaver.xml
===================================================================
--- profiles/BLFS/trunk/chapter10/xscreensaver.xml	2005-03-25 01:41:08 UTC (rev 1810)
+++ profiles/BLFS/trunk/chapter10/xscreensaver.xml	2005-03-25 01:57:33 UTC (rev 1811)
@@ -12,6 +12,14 @@
 ]>
 <alfs>
 <package name="xscreensaver" version="&xscreensaver-version;">
+  <packageinfo>
+    <requires>
+      <name>bc</name>
+    </requires>
+    <requires>
+      <name>libglade</name>
+    </requires>
+  </packageinfo>
   <stage name="Unpacking.">
     <unpack>
       <archive>&packages_dir;/&xscreensaver-package;</archive>

Modified: profiles/BLFS/trunk/chapter12/perlmods/Net-DNS.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/perlmods/Net-DNS.xml	2005-03-25 01:41:08 UTC (rev 1810)
+++ profiles/BLFS/trunk/chapter12/perlmods/Net-DNS.xml	2005-03-25 01:57:33 UTC (rev 1811)
@@ -30,7 +30,10 @@
     <stageinfo>
       <base>&build_dir;/&Net-DNS-directory;</base>
     </stageinfo>
-    <execute command="perl Makefile.PL" />
+    <execute command="echo">
+	<param>"&nameserver-tests;" |</param>
+	<param>perl Makefile.PL</param>
+    </execute>
     <make />
     <make>
       <param>test</param>

Modified: profiles/BLFS/trunk/chapter33/gimp.xml
===================================================================
--- profiles/BLFS/trunk/chapter33/gimp.xml	2005-03-25 01:41:08 UTC (rev 1810)
+++ profiles/BLFS/trunk/chapter33/gimp.xml	2005-03-25 01:57:33 UTC (rev 1811)
@@ -20,7 +20,7 @@
         <name>libart-lgpl</name>
       </requires>
       <requires>
-        <name>xml-parser</name>
+        <name>XML-Parser</name>
       </requires>
       <utilizes>
         <name>gimp-print</name>

Modified: profiles/BLFS/trunk/chapter43/openjade.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/openjade.xml	2005-03-25 01:41:08 UTC (rev 1810)
+++ profiles/BLFS/trunk/chapter43/openjade.xml	2005-03-25 01:57:33 UTC (rev 1811)
@@ -82,9 +82,9 @@
         <param>/etc/sgml/openjade-&openjade-version;.cat</param>
       </execute>
       <execute command="echo">
-        <param>"SYSTEM \"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd\" \</param>
-        <param>\"/usr/share/xml/docbook/xml-dtd-4.3/docbookx.dtd\"" >> \</param>
-        <param>/usr/share/sgml/openjade-1.3.2/catalog'</param>
+        <param>"SYSTEM \"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd\"</param>
+        <param>\"/usr/share/xml/docbook/xml-dtd-4.3/docbookx.dtd\"" >></param>
+        <param>/usr/share/sgml/openjade-1.3.2/catalog</param>
       </execute>
     </stage>
     <stage name="Cleanup">

Modified: profiles/BLFS/trunk/chapter44/xml-dtd.xml
===================================================================
--- profiles/BLFS/trunk/chapter44/xml-dtd.xml	2005-03-25 01:41:08 UTC (rev 1810)
+++ profiles/BLFS/trunk/chapter44/xml-dtd.xml	2005-03-25 01:57:33 UTC (rev 1811)
@@ -188,7 +188,7 @@
         <param>/etc/xml/docbook</param>
       </execute>
       <execute command="xmlcatalog">
-        <param>--noout --add "rewriteURI""</param>
+        <param>--noout --add "rewriteURI"</param>
         <param>"http://www.oasis-open.org/docbook/xml/4.2"</param>
         <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
         <param>/etc/xml/docbook</param>

Modified: profiles/BLFS/trunk/config_standard/config.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/config.ent	2005-03-25 01:41:08 UTC (rev 1810)
+++ profiles/BLFS/trunk/config_standard/config.ent	2005-03-25 01:57:33 UTC (rev 1811)
@@ -26,6 +26,10 @@
 <!-- Needed for perl modules -->
 <!ENTITY perl-version "5.8.5">
 
+<!-- Net-DNS Perl Module Nameserver Tests -->
+<!-- Change this to "no" if you do not wish to perform these tests -->
+<!ENTITY nameserver-tests "yes">
+
 <!-- Java Implementation -->
 <!-- Set so packages that utilize or depend on java will use either the binary (j2sdk-binary) or 
   source (j2sdk-source) version -->

Modified: profiles/BLFS/trunk/config_standard/x/xorg/host.def
===================================================================
--- profiles/BLFS/trunk/config_standard/x/xorg/host.def	2005-03-25 01:41:08 UTC (rev 1810)
+++ profiles/BLFS/trunk/config_standard/x/xorg/host.def	2005-03-25 01:57:33 UTC (rev 1811)
@@ -1,14 +1,17 @@
 /* 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.  ***********/
+ * 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 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 */
 
@@ -19,17 +22,17 @@
 #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.
+ * 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
+                                ati AgpGartDrivers DevelDrivers ark \
+                                cyrix siliconmotion vesa vga \
+                                XF86OSCardDrivers XF86ExtraCardDrivers
 */
 
 /*
@@ -37,8 +40,8 @@
  *
 #define XInputDrivers           mouse keyboard acecad calcomp citron \
                                 digitaledge dmc dynapro elographics \
-                                microtouch mutouch penmount spaceorb summa \
-                                wacom void magictouch aiptek
+                                microtouch mutouch penmount spaceorb \
+                                summa wacom void magictouch aiptek
  */
 
 /* Most installs will only need this */




More information about the alfs-log mailing list