r1866 - in profiles/BLFS/trunk: chapter40 chapter41 chapter42 chapter43 chapter44 chapter45 chapter46 config_standard config_standard/packages

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Wed Apr 27 17:27:43 PDT 2005


Author: thomasp
Date: 2005-04-27 18:27:38 -0600 (Wed, 27 Apr 2005)
New Revision: 1866

Modified:
   profiles/BLFS/trunk/chapter40/cdrdao.xml
   profiles/BLFS/trunk/chapter40/udftools.xml
   profiles/BLFS/trunk/chapter41/afplghostscript.xml
   profiles/BLFS/trunk/chapter41/espghostscript.xml
   profiles/BLFS/trunk/chapter42/sane.xml
   profiles/BLFS/trunk/chapter43/docbook-dsssl.xml
   profiles/BLFS/trunk/chapter43/openjade.xml
   profiles/BLFS/trunk/chapter43/opensp.xml
   profiles/BLFS/trunk/chapter43/sgml-common.xml
   profiles/BLFS/trunk/chapter44/docbook-xsl.xml
   profiles/BLFS/trunk/chapter44/xml-dtd.xml
   profiles/BLFS/trunk/chapter45/a2ps.xml
   profiles/BLFS/trunk/chapter45/fop.xml
   profiles/BLFS/trunk/chapter45/gsview.xml
   profiles/BLFS/trunk/chapter45/xpdf.xml
   profiles/BLFS/trunk/chapter46/jadetex.xml
   profiles/BLFS/trunk/chapter46/tex.xml
   profiles/BLFS/trunk/config_standard/config.ent
   profiles/BLFS/trunk/config_standard/packages/ch40.ent
Log:
Package Audit: Chapters 40-46

Modified: profiles/BLFS/trunk/chapter40/cdrdao.xml
===================================================================
--- profiles/BLFS/trunk/chapter40/cdrdao.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter40/cdrdao.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -50,15 +50,20 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
-    <stage name="Installing">
+    <stage name="Patching">
       <stageinfo>
-        <base>&build_dir;/&cdrdao-directory;</base>
+	<base>&build_dir;/&cdrdao-directory;</base>
       </stageinfo>
       <patch>
         <param>-N</param>
         <param>-p1</param>
         <param>-i &packages_dir;/&cdrdao-patch;</param>
       </patch>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&cdrdao-directory;</base>
+      </stageinfo>
       <configure>
         <param>--prefix=/usr</param>
       </configure>

Modified: profiles/BLFS/trunk/chapter40/udftools.xml
===================================================================
--- profiles/BLFS/trunk/chapter40/udftools.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter40/udftools.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -21,16 +21,25 @@
         <archive>&packages_dir;/&udftools-patch-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
+      <unpack>
+        <archive>&packages_dir;/&udftools-kernel-patch-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
     </stage>
-    <stage name="Installing">
+    <stage name="Patching">
       <stageinfo>
-        <base>&build_dir;/&udftools-directory;</base>
+	<base>&build_dir;/&udftools-directory;</base>
       </stageinfo>
       <patch>
         <param>-N</param>
         <param>-p1</param>
         <param>-i &build_dir;/&udftools-patch;</param>
       </patch>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&udftools-directory;</base>
+      </stageinfo>
       <configure>
         <param>--prefix=/usr</param>
       </configure>

Modified: profiles/BLFS/trunk/chapter41/afplghostscript.xml
===================================================================
--- profiles/BLFS/trunk/chapter41/afplghostscript.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter41/afplghostscript.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -11,7 +11,7 @@
 
 ]>
 <alfs>
-  <package name="afpl ghostscript" version="&afplghostscript-version;">
+  <package name="ghostscript" version="&afplghostscript-version;">
     <packageinfo>
       <utilizes>
         <name>libjpeg</name>

Modified: profiles/BLFS/trunk/chapter41/espghostscript.xml
===================================================================
--- profiles/BLFS/trunk/chapter41/espghostscript.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter41/espghostscript.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -11,7 +11,7 @@
 
 ]>
 <alfs>
-  <package name="espghostscript" version="&espghostscript-version;">
+  <package name="esp-ghostscript" version="&espghostscript-version;">
     <packageinfo>
       <utilizes>
         <name>cups</name>

Modified: profiles/BLFS/trunk/chapter42/sane.xml
===================================================================
--- profiles/BLFS/trunk/chapter42/sane.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter42/sane.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -20,6 +20,12 @@
         <name>libusb</name>
       </utilizes>
       <utilizes>
+	<name>libieee1284</name>
+      </utilizes>
+      <utilizes>
+	<name>gphoto2</name>
+      </utilizes>
+      <utilizes>
 	<name>tex</name>
       </utilizes>
       <utilizes>

Modified: profiles/BLFS/trunk/chapter43/docbook-dsssl.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/docbook-dsssl.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter43/docbook-dsssl.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -12,6 +12,11 @@
 ]>
 <alfs>
   <package name="docbook-dsssl" version="&docbook-dsssl-version;">
+    <packageinfo>
+      <requires>
+	<name>sgml-common</name>
+      </requires>
+    </packageinfo>
     <stage name="Unpacking">
       <unpack>
         <archive>&packages_dir;/&docbook-dsssl-package;</archive>

Modified: profiles/BLFS/trunk/chapter43/openjade.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/openjade.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter43/openjade.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -4,10 +4,12 @@
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch43.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % xml_version_entities SYSTEM "../config/packages/ch44.ent">
 
 %general_entities;
 %package_entities;
 %config_entities;
+%xml_version_entities;
 
 ]>
 <alfs>
@@ -82,9 +84,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/&xml-dtd-version;/docbookx.dtd\"</param>
+        <param>\"/usr/share/xml/docbook/xml-dtd-&xml-dtd-version;/docbookx.dtd\"" >></param>
+        <param>/usr/share/sgml/openjade-&openjade-version;/catalog</param>
       </execute>
     </stage>
     <stage name="Cleanup">

Modified: profiles/BLFS/trunk/chapter43/opensp.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/opensp.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter43/opensp.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -23,9 +23,9 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
-    <stage name="Installing">
+    <stage name="Patching">
       <stageinfo>
-        <base>&build_dir;/&opensp-directory;</base>
+	<base>&build_dir;/&opensp-directory;</base>
       </stageinfo>
       <patch>
         <param>-N</param>
@@ -37,6 +37,11 @@
         <param>-p1</param>
         <param>-i &packages_dir;/&opensp-gcc34-patch;</param>
       </patch>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&opensp-directory;</base>
+      </stageinfo>
       <configure>
         <param>--prefix=/usr</param>
         <param>--disable-static</param>

Modified: profiles/BLFS/trunk/chapter43/sgml-common.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/sgml-common.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter43/sgml-common.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -18,15 +18,20 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
-    <stage name="Installing">
+    <stage name="Patching">
       <stageinfo>
-        <base>&build_dir;/&sgml-common-directory;</base>
+	<base>&build_dir;/&sgml-common-directory;</base>
       </stageinfo>
       <patch>
         <param>-N</param>
         <param>-p1</param>
         <param>-i &packages_dir;/&sgml-common-manpage-patch;</param>
       </patch>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&sgml-common-directory;</base>
+      </stageinfo>
       <execute command="aclocal" />
       <execute command="automake -acf" />
       <execute command="autoconf" />

Modified: profiles/BLFS/trunk/chapter44/docbook-xsl.xml
===================================================================
--- profiles/BLFS/trunk/chapter44/docbook-xsl.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter44/docbook-xsl.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -29,9 +29,13 @@
       <stageinfo>
         <base>&build_dir;/&docbook-xsl-directory;</base>
       </stageinfo>
-      <execute command="install">
-        <param>-d /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;</param>
-      </execute>
+      <mkdir>
+	<name>/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;</name>
+      </mkdir>
+      <ownership user="root" group="root">
+	<option>recursive</option>
+	<name>.</name>
+      </ownership>
       <copy>
         <option>archive</option>
         <option>force</option>
@@ -89,6 +93,30 @@
         <param>"file:///etc/xml/docbook"</param>
         <param>/etc/xml/catalog</param>
       </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "rewriteSystem"</param>
+        <param>"http://docbook.sourceforge.net/release/xsl/1.65.1"</param>
+        <param>"/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "rewriteURI"</param>
+        <param>"http://docbook.sourceforge.net/release/xsl/1.65.1"</param>
+        <param>"/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "rewriteSystem"</param>
+        <param>"http://docbook.sourceforge.net/release/xsl/current"</param>
+        <param>"/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
+      <execute command="xmlcatalog">
+        <param>--noout --add "rewriteURI"</param>
+        <param>"http://docbook.sourceforge.net/release/xsl/current"</param>
+        <param>"/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;"</param>
+        <param>/etc/xml/catalog</param>
+      </execute>
       <textdump>
       	<file>/etc/profile.d/xsl.sh</file>
 	<content>
@@ -100,7 +128,6 @@
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&docbook-xsl-directory;</remove>
-      <remove>&build_dir;/dircheck.sh</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter44/xml-dtd.xml
===================================================================
--- profiles/BLFS/trunk/chapter44/xml-dtd.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter44/xml-dtd.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -39,6 +39,10 @@
       	<option>parents</option>
 	<name>/usr/share/xml/docbook/xml-dtd-&xml-dtd-version;</name>
       </mkdir>
+      <ownership user="root" group="root">
+	<option>recursive</option>
+	<name>.</name>
+      </ownership>
       <copy>
         <option>archive</option>
         <option>force</option>
@@ -134,30 +138,6 @@
         <param>/etc/xml/catalog</param>
       </execute>
       <execute command="xmlcatalog">
-        <param>--noout --add "delegateSystem"</param>
-        <param>"/usr/share/docbook/"</param>
-        <param>"file:///etc/xml/docbook"</param>
-        <param>/etc/xml/catalog</param>
-      </execute>
-      <execute command="xmlcatalog">
-        <param>--noout --add "delegateURI"</param>
-        <param>"/usr/share/docbook/"</param>
-        <param>"file:///etc/xml/docbook"</param>
-        <param>/etc/xml/catalog</param>
-      </execute>
-      <execute command="xmlcatalog">
-        <param>--noout --add "rewriteSystem"</param>
-        <param>"/usr/share/docbook"</param>
-        <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
-        <param>/etc/xml/docbook</param>
-      </execute>
-      <execute command="xmlcatalog">
-        <param>--noout --add "rewriteURI"</param>
-        <param>"/usr/share/docbook"</param>
-        <param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
-        <param>/etc/xml/docbook</param>
-      </execute>
-      <execute command="xmlcatalog">
         <param>--noout --add "public"</param>
         <param>"-//OASIS//DTD DocBook XML V4.1.2//EN"</param>
         <param>"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"</param>
@@ -196,7 +176,6 @@
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&xml-dtd-directory;</remove>
-      <remove>&build_dir;/dircheck.sh</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter45/a2ps.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/a2ps.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter45/a2ps.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -43,8 +43,8 @@
       </search_replace>
       <search_replace>
         <file>configure</file>
-        <find>/usr/local/share/ghostscript</find>
-        <replace>/usr/share/ghostscript</replace>
+        <find>/usr/local/share</find>
+        <replace>/usr/share</replace>
       </search_replace>
       <search_replace>
 	<file>lib/path-concat.c</file>

Modified: profiles/BLFS/trunk/chapter45/fop.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/fop.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter45/fop.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -19,6 +19,15 @@
     <utilizes>
       <name>libxslt</name>
     </utilizes>
+    <utilizes>
+      <name>jimi</name>
+    </utilizes>
+    <utilizes>
+      <name>batik</name>
+    </utilizes>
+    <utilizes>
+      <name>forrest</name>
+    </utilizes>
   </packageinfo>
   <stage name="Unpacking.">
     <unpack>

Modified: profiles/BLFS/trunk/chapter45/gsview.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/gsview.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter45/gsview.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -26,6 +26,21 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
+    <stage name="Patching">
+      <stageinfo>
+	<base>&build_dir;/&gsview-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&gsview-pstotext-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&gsview-lang-patch;</param>
+      </patch>
+    </stage>
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&gsview-directory;</base>
@@ -44,16 +59,6 @@
         <find>GSVIEW_ROOT=/usr/local</find>
         <replace>GSVIEW_ROOT=/usr</replace>
       </search_replace>
-      <patch>
-        <param>-N</param>
-        <param>-p1</param>
-        <param>-i &packages_dir;/&gsview-pstotext-patch;</param>
-      </patch>
-      <patch>
-        <param>-N</param>
-        <param>-p1</param>
-        <param>-i &packages_dir;/&gsview-lang-patch;</param>
-      </patch>
       <make />
       <make>
         <param>install</param>

Modified: profiles/BLFS/trunk/chapter45/xpdf.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/xpdf.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter45/xpdf.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -21,6 +21,12 @@
       <utilizes>
         <name>&ghostscript-impl;</name>
       </utilizes>
+      <utilizes>
+	<name>t1lib</name>
+      </utilizes>
+      <utilizes>
+	<name>libpaper</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -28,9 +34,9 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
-    <stage name="Installing">
+    <stage name="Patching">
       <stageinfo>
-        <base>&build_dir;/&xpdf-directory;</base>
+	<base>&build_dir;/&xpdf-directory;</base>
       </stageinfo>
       <patch>
 	<param>-d xpdf</param>
@@ -55,6 +61,11 @@
         <param>-p1</param>
         <param>-i &packages_dir;/&xpdf-freetype-patch;</param>
       </patch>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&xpdf-directory;</base>
+      </stageinfo>
       <configure>
         <param>--prefix=/usr</param>
         <param>--sysconfdir=/etc</param>

Modified: profiles/BLFS/trunk/chapter46/jadetex.xml
===================================================================
--- profiles/BLFS/trunk/chapter46/jadetex.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter46/jadetex.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -12,6 +12,14 @@
 ]>
 <alfs>
 <package name="jadetex" version="&jadetex-version;">
+  <packageinfo>
+    <requires>
+      <name>tex</name>
+    </requires>
+    <requires>
+      <name>openjade</name>
+    </requires>
+  </packageinfo>
   <stage name="Unpacking.">
     <unpack>
       <archive>&packages_dir;/&jadetex-package;</archive>

Modified: profiles/BLFS/trunk/chapter46/tex.xml
===================================================================
--- profiles/BLFS/trunk/chapter46/tex.xml	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/chapter46/tex.xml	2005-04-28 00:27:38 UTC (rev 1866)
@@ -31,6 +31,12 @@
       <utilizes>
 	<name>Perl-Tk</name>
       </utilizes>
+      <utilizes>
+	<name>t1lib</name>
+      </utilizes>
+      <utilizes>
+	<name>libwww</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>

Modified: profiles/BLFS/trunk/config_standard/config.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/config.ent	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/config_standard/config.ent	2005-04-28 00:27:38 UTC (rev 1866)
@@ -81,7 +81,7 @@
 
 <!-- Ghostscript implementation -->
 <!-- esp-gs (espghostscript) or afpl-gs (ghostscript)-->
-<!ENTITY ghostscript-impl "espghostscript">
+<!ENTITY ghostscript-impl "esp-ghostscript">
 
 <!-- GIF library implementation-->
 <!-- libungif or giflib -->

Modified: profiles/BLFS/trunk/config_standard/packages/ch40.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch40.ent	2005-04-27 23:13:41 UTC (rev 1865)
+++ profiles/BLFS/trunk/config_standard/packages/ch40.ent	2005-04-28 00:27:38 UTC (rev 1866)
@@ -19,8 +19,9 @@
 <!ENTITY udftools-directory "udftools-&udftools-version;">
 
 <!ENTITY udftools-patch         "udftools-&udftools-version;.patch">
-<!ENTITY udftools-patch-package "&udftools-patch;.bz">
+<!ENTITY udftools-patch-package "&udftools-patch;.bz2">
 <!ENTITY udftools-patch-md5     "4fe44166cf7c636ec41758ae763d79be">
 
-<!ENTITY udftools-kernel-patch "udftools-packet-2.6.8-2.patch.bz2">
+<!ENTITY udftools-kernel-patch "udftools-packet-2.6.8-2.patch">
+<!ENTITY udftools-kernel-patch-package "&udftools-kernel-patch;.bz2">
 <!ENTITY udftools-kernel-md5   "a96b61f5137fdcc9050804d48aa66983">




More information about the alfs-log mailing list