r2046 - in profiles/BLFS/trunk: chapter09 chapter10 chapter11 chapter12 config_standard/packages

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Sun Oct 2 13:14:25 PDT 2005


Author: thomasp
Date: 2005-10-02 14:14:24 -0600 (Sun, 02 Oct 2005)
New Revision: 2046

Modified:
   profiles/BLFS/trunk/chapter09/fontconfig.xml
   profiles/BLFS/trunk/chapter09/giflib.xml
   profiles/BLFS/trunk/chapter09/imlib.xml
   profiles/BLFS/trunk/chapter09/libmng.xml
   profiles/BLFS/trunk/chapter09/libungif.xml
   profiles/BLFS/trunk/chapter10/bc.xml
   profiles/BLFS/trunk/chapter10/imagemagick.xml
   profiles/BLFS/trunk/chapter10/xscreensaver.xml
   profiles/BLFS/trunk/chapter11/fcron.xml
   profiles/BLFS/trunk/chapter12/doxygen.xml
   profiles/BLFS/trunk/chapter12/php.xml
   profiles/BLFS/trunk/config_standard/packages/ch09.ent
Log:
Apply patch from Filip Bartmann. Thanks :).

Modified: profiles/BLFS/trunk/chapter09/fontconfig.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/fontconfig.xml	2005-10-02 18:03:13 UTC (rev 2045)
+++ profiles/BLFS/trunk/chapter09/fontconfig.xml	2005-10-02 20:14:24 UTC (rev 2046)
@@ -43,13 +43,28 @@
       <make>
         <param>install</param>
       </make>
-      <make>
-	<param>-C doc install</param>
-      </make>
+      <mkdir>
+      	<option>parents</option>
+	<name>/usr/share/doc/fontconfig/fontconfig-devel</name>
+      </mkdir>
       <copy>
 	<source>doc/*.3</source>
 	<destination>/usr/share/man/man3</destination>
       </copy>
+      <copy>
+      	<source>doc/*.5</source>
+	<destination>/usr/share/man/man5</destination>
+      </copy>
+      <copy>
+      	<source>doc/*.html</source>
+	<source>doc/*.pdf</source>
+	<source>doc/*.txt</source>
+	<destination>/usr/share/doc/fontconfig</destination>
+      </copy>
+      <copy>
+      	<source>doc/fontconfig-devel/*</source>
+	<destination>/usr/share/doc/fontconfig/fontconfig-devel</destination>
+      </copy>
       &ldconfig;
     </stage>
     <stage name="Cleanup">

Modified: profiles/BLFS/trunk/chapter09/giflib.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/giflib.xml	2005-10-02 18:03:13 UTC (rev 2045)
+++ profiles/BLFS/trunk/chapter09/giflib.xml	2005-10-02 20:14:24 UTC (rev 2046)
@@ -36,6 +36,19 @@
         <param>install</param>
       </make>
       &ldconfig;
+      <mkdir> 
+      	<option>parents</option>
+	<name>/usr/share/doc/giflib-&giflib-version;/html</name>
+      </mkdir>
+      <copy> 
+      	<source>doc/*.png</source>
+	<source>doc/*.html</source>
+	<destination>/usr/share/doc/giflib-&giflib-version;/html"</destination>
+      </copy>
+      <copy>
+      	<source>doc/*.txt</source>
+	<destination>/usr/share/doc/giflib-&giflib-version;</destination>
+      </copy>
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&giflib-directory;</remove>

Modified: profiles/BLFS/trunk/chapter09/imlib.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/imlib.xml	2005-10-02 18:03:13 UTC (rev 2045)
+++ profiles/BLFS/trunk/chapter09/imlib.xml	2005-10-02 20:14:24 UTC (rev 2046)
@@ -39,6 +39,15 @@
       <make>
         <param>install</param>
       </make>
+      <mkdir>
+      	<option>parents</option>
+	<name>usr/share/doc/imlib-&imlib-version;</name>
+      </mkdir>
+      <copy>
+      	<source>doc/index.html</source>
+	<source>doc/*.gif</source>
+	<destination>/usr/share/doc/imlib-&imlib-version;</destination>
+      </copy>
       &ldconfig;
     </stage>
     <stage name="Cleanup">

Modified: profiles/BLFS/trunk/chapter09/libmng.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/libmng.xml	2005-10-02 18:03:13 UTC (rev 2045)
+++ profiles/BLFS/trunk/chapter09/libmng.xml	2005-10-02 20:14:24 UTC (rev 2046)
@@ -48,6 +48,15 @@
         <source>doc/man/*.5</source>
         <destination>/usr/share/man/man5</destination>
       </copy>
+      <mkdir>
+      	<option>parents</option>
+	<name>/usr/share/doc/libmng-&libmng-version;</name>
+      </mkdir>
+      <copy>
+      	<source>doc/*.png</source>
+	<source>doc/*.txt</source>
+	<destination>/usr/share/doc/libmng-&libmng-version;</destination>
+      </copy>
       &ldconfig;
     </stage>
     <stage name="Cleanup">

Modified: profiles/BLFS/trunk/chapter09/libungif.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/libungif.xml	2005-10-02 18:03:13 UTC (rev 2045)
+++ profiles/BLFS/trunk/chapter09/libungif.xml	2005-10-02 20:14:24 UTC (rev 2046)
@@ -36,6 +36,19 @@
         <param>install</param>
       </make>
       &ldconfig;
+      <mkdir base="/usr/share/doc/libungif-&libungif-version;">
+      	<option>parents</option>
+	<name>/usr/share/doc/libungif-&libungif-version;/html</name>
+      </mkdir>
+      <copy> 
+      	<source>doc/*.png</source>
+	<source>doc/*.html</source>
+	<destination>/usr/share/doc/libungif-&libungif-version;/html</destination>
+      </copy>
+      <copy>
+      	<source>doc/*.txt</source>
+      	<destination>/usr/share/doc/libungif-&libungif-version;</destination>
+      </copy>
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&libungif-directory;</remove>

Modified: profiles/BLFS/trunk/chapter10/bc.xml
===================================================================
--- profiles/BLFS/trunk/chapter10/bc.xml	2005-10-02 18:03:13 UTC (rev 2045)
+++ profiles/BLFS/trunk/chapter10/bc.xml	2005-10-02 20:14:24 UTC (rev 2046)
@@ -12,6 +12,11 @@
 ]>
 <alfs>
   <package name="bc" version="&bc-version;">
+    <packageinfo>
+       <utilizes>
+       	<name>libedit</name>
+       </utilizes>
+    </packageinfo>
     <stage name="Unpacking">
       <unpack>
         <digest>&bc-md5;</digest>

Modified: profiles/BLFS/trunk/chapter10/imagemagick.xml
===================================================================
--- profiles/BLFS/trunk/chapter10/imagemagick.xml	2005-10-02 18:03:13 UTC (rev 2045)
+++ profiles/BLFS/trunk/chapter10/imagemagick.xml	2005-10-02 20:14:24 UTC (rev 2046)
@@ -16,9 +16,9 @@
       <requires>
         <name>&ximpl;</name>
       </requires>
-      <requires>
+      <utilizes>
         <name>&ghostscript-impl;</name>
-      </requires>
+      </utilizes>
       <utilizes>
         <name>lcms</name>
       </utilizes>

Modified: profiles/BLFS/trunk/chapter10/xscreensaver.xml
===================================================================
--- profiles/BLFS/trunk/chapter10/xscreensaver.xml	2005-10-02 18:03:13 UTC (rev 2045)
+++ profiles/BLFS/trunk/chapter10/xscreensaver.xml	2005-10-02 20:14:24 UTC (rev 2046)
@@ -29,15 +29,9 @@
       <name>netpbm</name>
     </utilizes>
     <utilizes>
-      <name>fortune-mod</name>
-    </utilizes>
-    <utilizes>
       <name>xdaliclock</name>
     </utilizes>
     <utilizes>
-      <name>yelp</name>
-    </utilizes>
-    <utilizes>
       <name>linuxpam</name>
     </utilizes>
     <utilizes>

Modified: profiles/BLFS/trunk/chapter11/fcron.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/fcron.xml	2005-10-02 18:03:13 UTC (rev 2045)
+++ profiles/BLFS/trunk/chapter11/fcron.xml	2005-10-02 20:14:24 UTC (rev 2046)
@@ -27,9 +27,6 @@
       <utilizes>
         <name>docbook-utils</name>
       </utilizes>
-      <utilizes>
-        <name>vim</name>
-      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>

Modified: profiles/BLFS/trunk/chapter12/doxygen.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/doxygen.xml	2005-10-02 18:03:13 UTC (rev 2045)
+++ profiles/BLFS/trunk/chapter12/doxygen.xml	2005-10-02 20:14:24 UTC (rev 2046)
@@ -17,15 +17,9 @@
         <name>qt</name>
       </utilizes>
       <utilizes>
-        <name>python</name>
-      </utilizes>
-      <utilizes>
         <name>tex</name>
       </utilizes>
       <utilizes>
-        <name>&ghostscript-impl;</name>
-      </utilizes>
-      <utilizes>
         <name>graphviz</name>
       </utilizes>
     </packageinfo>

Modified: profiles/BLFS/trunk/chapter12/php.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/php.xml	2005-10-02 18:03:13 UTC (rev 2045)
+++ profiles/BLFS/trunk/chapter12/php.xml	2005-10-02 20:14:24 UTC (rev 2046)
@@ -104,6 +104,9 @@
         <name>mhash</name>
       </utilizes>
       <utilizes>
+      	<name>ossp_mm</name>
+      </utilizes>
+      <utilizes>
         <name>net-snmp</name>
       </utilizes>
       <utilizes>
@@ -184,10 +187,12 @@
         <param>--enable-exif</param>
         <param>--enable-ftp</param>
         <param>--with-gettext</param>
-        <param>--with-iconv</param>
+	<param>--enable-mbstring</param>
         <param>--with-ncurses</param>
 	<param>--with-readline</param>
 	<param>--disable-libxml</param>
+	<!-- Uncomment this section,if you want use MySQL with PHP -->
+	<!-- <param>- -with-mysql</param> -->
       </configure>
       <make />
       <make>

Modified: profiles/BLFS/trunk/config_standard/packages/ch09.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch09.ent	2005-10-02 18:03:13 UTC (rev 2045)
+++ profiles/BLFS/trunk/config_standard/packages/ch09.ent	2005-10-02 20:14:24 UTC (rev 2046)
@@ -28,11 +28,6 @@
 <!ENTITY giflib-md5       "22efc9599ccf91d288374dcf0679abf1">
 <!ENTITY giflib-directory "giflib-&giflib-version;">
 
-<!ENTITY libmng-version   "1.0.9">
-<!ENTITY libmng-package   "libmng-&libmng-version;.tar.bz2">
-<!ENTITY libmng-md5       "1bfa1b59cd66c24106815744fc6499b1">
-<!ENTITY libmng-directory "libmng-&libmng-version;">
-
 <!ENTITY lcms-version   "1.14">
 <!ENTITY lcms-package   "lcms-&lcms-version;.tar.bz2">
 <!ENTITY lcms-md5       "399957403c76d20ea571a1b1232bda09">
@@ -40,6 +35,11 @@
 
 <!ENTITY lcms-gcc34-patch "lcms-&lcms-version;-gcc343-1.patch">
 
+<!ENTITY libmng-version   "1.0.9">
+<!ENTITY libmng-package   "libmng-&libmng-version;.tar.bz2">
+<!ENTITY libmng-md5       "1bfa1b59cd66c24106815744fc6499b1">
+<!ENTITY libmng-directory "libmng-&libmng-version;">
+
 <!ENTITY freetype-version   "2.1.10">
 <!ENTITY freetype-package   "freetype-&freetype-version;.tar.bz2">
 <!ENTITY freetype-md5       "a4012e7d1f6400df44a16743b11b8423">




More information about the alfs-log mailing list