r2005 - in profiles/BLFS/trunk: . chapter09 chapter10 chapter11

jbeckers at linuxfromscratch.org jbeckers at linuxfromscratch.org
Mon Sep 19 10:36:13 PDT 2005


Author: jbeckers
Date: 2005-09-19 11:36:10 -0600 (Mon, 19 Sep 2005)
New Revision: 2005

Modified:
   profiles/BLFS/trunk/BLFS.xml
   profiles/BLFS/trunk/chapter09/imlib2.xml
   profiles/BLFS/trunk/chapter09/libmng.xml
   profiles/BLFS/trunk/chapter09/libpng.xml
   profiles/BLFS/trunk/chapter10/xscreensaver.xml
   profiles/BLFS/trunk/chapter11/sysstat.xml
   profiles/BLFS/trunk/chapter11/unzip.xml
   profiles/BLFS/trunk/chapter11/zip.xml
Log:
sysstat fix and patches from torsten

Modified: profiles/BLFS/trunk/BLFS.xml
===================================================================
--- profiles/BLFS/trunk/BLFS.xml	2005-09-17 08:13:11 UTC (rev 2004)
+++ profiles/BLFS/trunk/BLFS.xml	2005-09-19 17:36:10 UTC (rev 2005)
@@ -112,8 +112,8 @@
       <xi:include href="chapter09/libtiff.xml" />
       <xi:include href="chapter09/libungif.xml" />
       <xi:include href="chapter09/giflib.xml" />
+      <xi:include href="chapter09/lcms.xml" />
       <xi:include href="chapter09/libmng.xml" />
-      <xi:include href="chapter09/lcms.xml" />
       <xi:include href="chapter09/freetype.xml" />
       <xi:include href="chapter09/fontconfig.xml" />
       <xi:include href="chapter09/libart_lgpl.xml" />

Modified: profiles/BLFS/trunk/chapter09/imlib2.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/imlib2.xml	2005-09-17 08:13:11 UTC (rev 2004)
+++ profiles/BLFS/trunk/chapter09/imlib2.xml	2005-09-19 17:36:10 UTC (rev 2005)
@@ -14,7 +14,7 @@
   <package name="imlib2" version="&imlib2-version;">
     <packageinfo>
       <requires>
-        <name>freetype2</name>
+        <name>freetype</name>
       </requires>
       <requires>
         <name>libpng</name>
@@ -45,6 +45,8 @@
       </stageinfo>
       <configure>
         <param>--prefix=/usr</param>
+        <!-- uncomment if you don't have x installed -->
+        <!-- <param>- -without-x</param> -->
       </configure>
       <make />
       <make>

Modified: profiles/BLFS/trunk/chapter09/libmng.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/libmng.xml	2005-09-17 08:13:11 UTC (rev 2004)
+++ profiles/BLFS/trunk/chapter09/libmng.xml	2005-09-19 17:36:10 UTC (rev 2005)
@@ -31,15 +31,13 @@
       <stageinfo>
         <base>&build_dir;/&libmng-directory;</base>
       </stageinfo>
-      <permissions mode="755">
-	<name>autogen.sh</name>
-      </permissions>
-      <execute command="sh autogen.sh" />
-      <configure>
-        <param>--prefix=/usr</param>
-      </configure>
+      <copy>
+        <source>makefiles/makefile.linux</source>
+        <destination>Makefile</destination>
+      </copy>
       <make />
       <make>
+        <param>prefix=/usr</param>
         <param>install</param>
       </make>
       <copy>

Modified: profiles/BLFS/trunk/chapter09/libpng.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/libpng.xml	2005-09-17 08:13:11 UTC (rev 2004)
+++ profiles/BLFS/trunk/chapter09/libpng.xml	2005-09-19 17:36:10 UTC (rev 2005)
@@ -35,8 +35,8 @@
       </stageinfo>
       <make>
 	<param>prefix=/usr</param>
-	<param>ZLIBINC=/usr/include</param>
-	<param>ZLIBLIB=/usr/lib</param>
+	<param>ZLIBINC=</param>
+	<param>ZLIBLIB=</param>
 	<param>-f scripts/makefile.linux</param>
       </make>
       <make>

Modified: profiles/BLFS/trunk/chapter10/xscreensaver.xml
===================================================================
--- profiles/BLFS/trunk/chapter10/xscreensaver.xml	2005-09-17 08:13:11 UTC (rev 2004)
+++ profiles/BLFS/trunk/chapter10/xscreensaver.xml	2005-09-19 17:36:10 UTC (rev 2005)
@@ -58,11 +58,6 @@
     <stageinfo>
       <base>&build_dir;/&xscreensaver-directory;</base>
     </stageinfo>
-    <search_replace>
-      <file>driver/Makefile.in</file>
-      <find>@GNOME_DATADIR@</find>
-      <replace>&gnome-prefix;/share</replace>
-    </search_replace>
     <configure>
       <param>--prefix=/usr</param>
     </configure>

Modified: profiles/BLFS/trunk/chapter11/sysstat.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/sysstat.xml	2005-09-17 08:13:11 UTC (rev 2004)
+++ profiles/BLFS/trunk/chapter11/sysstat.xml	2005-09-19 17:36:10 UTC (rev 2005)
@@ -31,9 +31,11 @@
     <stageinfo>
       <base>&build_dir;/&sysstat-directory;</base>
     </stageinfo>
-    <make>
-      <param>config</param>
-    </make>
+    <search_replace base="&build_dir;/build">
+      <file>CONFIG</file>
+      <find>/usr/local</find>
+      <replace>/usr</replace>
+    </search_replace>
     <make />
     <make>
       <param>install</param>

Modified: profiles/BLFS/trunk/chapter11/unzip.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/unzip.xml	2005-09-17 08:13:11 UTC (rev 2004)
+++ profiles/BLFS/trunk/chapter11/unzip.xml	2005-09-19 17:36:10 UTC (rev 2005)
@@ -19,7 +19,7 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
-    <stage name="Installing">
+    <stage name="Patching">
       <stageinfo>
         <base>&build_dir;/&unzip-directory;</base>
       </stageinfo>

Modified: profiles/BLFS/trunk/chapter11/zip.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/zip.xml	2005-09-17 08:13:11 UTC (rev 2004)
+++ profiles/BLFS/trunk/chapter11/zip.xml	2005-09-19 17:36:10 UTC (rev 2005)
@@ -26,6 +26,7 @@
       <execute command="sed">
 	<param>-i</param>
 	<param>-e 's@$(INSTALL) man/zip.1@$(INSTALL_PROGRAM) man/zip.1@'</param>
+        <param>unix/Makefile</param>
       </execute>
       <make>
         <param>prefix=/usr</param>




More information about the alfs-log mailing list