r1771 - in profiles/BLFS/trunk: . chapter12 chapter38 chapter39 chapter42 chapter43 chapter44 chapter45 config_standard/packages wget

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Sat Feb 12 10:49:55 PST 2005


Author: thomasp
Date: 2005-02-12 11:49:54 -0700 (Sat, 12 Feb 2005)
New Revision: 1771

Added:
   profiles/BLFS/trunk/chapter43/docbook-utils.xml
   profiles/BLFS/trunk/chapter45/fop.xml
Modified:
   profiles/BLFS/trunk/BLFS.xml
   profiles/BLFS/trunk/chapter12/j2sdk.xml
   profiles/BLFS/trunk/chapter38/cdparanoia.xml
   profiles/BLFS/trunk/chapter39/mplayer.xml
   profiles/BLFS/trunk/chapter42/sane.xml
   profiles/BLFS/trunk/chapter43/docbook-dsssl.xml
   profiles/BLFS/trunk/chapter43/opensp.xml
   profiles/BLFS/trunk/chapter43/sgml-dtd.xml
   profiles/BLFS/trunk/chapter43/sgml-dtd31.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/gsview.xml
   profiles/BLFS/trunk/chapter45/xpdf.xml
   profiles/BLFS/trunk/config_standard/packages/ch42.ent
   profiles/BLFS/trunk/config_standard/packages/ch43.ent
   profiles/BLFS/trunk/config_standard/packages/ch44.ent
   profiles/BLFS/trunk/config_standard/packages/ch45.ent
   profiles/BLFS/trunk/wget/chapter42.urls
   profiles/BLFS/trunk/wget/chapter43.urls
   profiles/BLFS/trunk/wget/chapter44.urls
   profiles/BLFS/trunk/wget/chapter45.urls
Log:
sync ch 42-45

Modified: profiles/BLFS/trunk/BLFS.xml
===================================================================
--- profiles/BLFS/trunk/BLFS.xml	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/BLFS.xml	2005-02-12 18:49:54 UTC (rev 1771)
@@ -480,6 +480,7 @@
       <xi:include href="chapter43/opensp.xml" />
       <xi:include href="chapter43/openjade.xml" />
       <xi:include href="chapter43/docbook-dsssl.xml" />
+      <xi:include href="chapter43/docbook-utils.xml" />
     </stage>
     <stage name="Chapter 44 (Extensible Markup Language - XML)">
       <xi:include href="chapter44/xml-dtd.xml" />
@@ -491,6 +492,7 @@
       <xi:include href="chapter45/psutils.xml" />
       <xi:include href="chapter45/gsview.xml" />
       <xi:include href="chapter45/xpdf.xml" />
+      <xi:include href="chapter45/fop.xml" />
     </stage>
     <stage name="Chapter 46 (Typesetting)">
       <xi:include href="chapter46/tex.xml" />

Modified: profiles/BLFS/trunk/chapter12/j2sdk.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/j2sdk.xml	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/chapter12/j2sdk.xml	2005-02-12 18:49:54 UTC (rev 1771)
@@ -57,6 +57,12 @@
         <source>*</source>
         <destination>/opt/j2sdk/j2sdk-precompiled-&j2sdk-version;</destination>
       </move>
+      <link>
+	<option>force</option>
+	<option>no-dereference</option>
+	<target>j2sdk-precompiled-&j2sdk-version;</target>
+	<name>/opt/j2sdk/j2sdk</name>
+      </link>
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/java-build/&j2sdk-bin-package;</remove>
@@ -164,6 +170,12 @@
         <source>j2sdk-image</source>
         <destination>/opt/j2sdk/j2sdk-&j2sdk-version;</destination>
       </copy>
+      <link>
+	<option>force</option>
+	<option>no-dereference</option>
+	<target>j2sdk-&j2sdk-version;</target>
+	<name>/opt/j2sdk/j2sdk</name>
+      </link>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter38/cdparanoia.xml
===================================================================
--- profiles/BLFS/trunk/chapter38/cdparanoia.xml	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/chapter38/cdparanoia.xml	2005-02-12 18:49:54 UTC (rev 1771)
@@ -40,8 +40,8 @@
         <param>install</param>
       </make>
       <permissions mode="755">
-        <file>/usr/lib/libcdda_interface.so.0.9.8</file>
-        <file>/usr/lib/libcdda_paranoia.so.0.9.8</file>
+        <name>/usr/lib/libcdda_interface.so.0.9.8</name>
+        <name>/usr/lib/libcdda_paranoia.so.0.9.8</name>
       </permissions>
       &ldconfig;
     </stage>

Modified: profiles/BLFS/trunk/chapter39/mplayer.xml
===================================================================
--- profiles/BLFS/trunk/chapter39/mplayer.xml	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/chapter39/mplayer.xml	2005-02-12 18:49:54 UTC (rev 1771)
@@ -182,8 +182,8 @@
         <name>/usr/share/mplayer/Skin/Blue</name>
       </ownership>
       <permissions mode="0755">
-        <file>/usr/share/mplayer/Skin/Blue</file>
-        <file>/usr/share/mplayer/Skin/Blue/icons</file>
+        <name>/usr/share/mplayer/Skin/Blue</name>
+        <name>/usr/share/mplayer/Skin/Blue/icons</name>
       </permissions>
       <link type="symbolic">
         <option>force</option>
@@ -224,7 +224,7 @@
       <execute command="tar xjvf &packages_dir;/&mplayer-font-package; -C /usr/share/mplayer/font" />
       <ownership user="root" group="root">
         <option>recursive</option>
-        <file>/usr/share/mplayer/font</file>
+        <name>/usr/share/mplayer/font</name>
       </ownership>
       <link base="/usr/share/mplayer/font">
         <option>force</option>

Modified: profiles/BLFS/trunk/chapter42/sane.xml
===================================================================
--- profiles/BLFS/trunk/chapter42/sane.xml	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/chapter42/sane.xml	2005-02-12 18:49:54 UTC (rev 1771)
@@ -14,9 +14,15 @@
   <package name="sane" version="&sane-version;">
     <packageinfo>
       <utilizes>
+	<name>libjpeg</name>
+      </utilizes>
+      <utilizes>
         <name>libusb</name>
       </utilizes>
       <utilizes>
+	<name>tex</name>
+      </utilizes>
+      <utilizes>
         <name>&ximpl;</name>
       </utilizes>
       <utilizes>

Modified: profiles/BLFS/trunk/chapter43/docbook-dsssl.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/docbook-dsssl.xml	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/chapter43/docbook-dsssl.xml	2005-02-12 18:49:54 UTC (rev 1771)
@@ -36,11 +36,11 @@
         <name>test</name>
         <name>images</name>
       </mkdir>
-      <execute command="install">
-        <param>bin/collateindex.pl</param>
-        <param>/usr/bin</param>
-      </execute>
       <copy>
+        <source>bin/collateindex.pl</source>
+        <destination>/usr/bin</destination>
+      </copy>
+      <copy>
         <source>catalog</source>
         <source>VERSION</source>
         <destination>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;</destination>

Added: profiles/BLFS/trunk/chapter43/docbook-utils.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/docbook-utils.xml	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/chapter43/docbook-utils.xml	2005-02-12 18:49:54 UTC (rev 1771)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % package_entities SYSTEM "../config/packages/ch43.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+
+]>
+<alfs>
+<package name="docbook-utils" version="&docbook-utils-version;">
+  <packageinfo>
+    <requires>
+      <name>openjade</name>
+    </requires>
+    <requires>
+      <name>docbook-dsssl</name>
+    </requires>
+    <requires>
+      <name>sgml-dtd31</name>
+    </requires>
+    <utilizes>
+      <name>jadetex</name>
+    </utilizes>
+    <utilizes>
+      <name>SGMLSpm</name>
+    </utilizes>
+    <utilizes>
+      <name>lynx</name>
+    </utilizes>
+  </packageinfo>
+  <stage name="Unpacking.">
+    <unpack>
+      <archive>&packages_dir;/&docbook-utils-package;</archive>
+      <destination>&build_dir;</destination>
+    </unpack>
+  </stage>
+  <stage name="Installing.">
+    <stageinfo>
+      <base>&build_dir;/&docbook-utils-directory;</base>
+    </stageinfo>
+    <configure>
+      <param>--prefix=/usr</param>
+    </configure>
+    <make />
+    <make>
+      <param>install</param>
+    </make>
+    <link>
+      <option>force</option>
+      <target>docbook2html</target>
+      <name>/usr/bin/db2html</name>
+    </link>
+    <link>
+      <option>force</option>
+      <target>docbook2ps</target>
+      <name>/usr/bin/db2ps</name>
+    </link>
+    <link>
+      <option>force</option>
+      <target>docbook2dvi</target>
+      <name>/usr/bin/db2dvi</name>
+    </link>
+    <link>
+      <option>force</option>
+      <target>docbook2man</target>
+      <name>/usr/bin/db2man</name>
+    </link>
+    <link>
+      <option>force</option>
+      <target>docbook2pdf</target>
+      <name>/usr/bin/db2pdf</name>
+    </link>
+    <link>
+      <option>force</option>
+      <target>docbook2rtf</target>
+      <name>/usr/bin/db2rtf</name>
+    </link>
+    <link>
+      <option>force</option>
+      <target>docbook2tex</target>
+      <name>/usr/bin/db2tex</name>
+    </link>
+    <link>
+      <option>force</option>
+      <target>docbook2texi</target>
+      <name>/usr/bin/db2texi</name>
+    </link>
+    <link>
+      <option>force</option>
+      <target>docbook2txt</target>
+      <name>/usr/bin/db2txt</name>
+    </link>
+
+  </stage>
+  <stage name="Cleanup.">
+    <remove>&build_dir;/&docbook-utils-directory;</remove>
+  </stage>
+</package>
+</alfs>

Modified: profiles/BLFS/trunk/chapter43/opensp.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/opensp.xml	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/chapter43/opensp.xml	2005-02-12 18:49:54 UTC (rev 1771)
@@ -30,8 +30,13 @@
       <patch>
         <param>-N</param>
         <param>-p1</param>
-        <param>-i &packages_dir;/&opensp-patch;</param>
+        <param>-i &packages_dir;/&opensp-litlen-patch;</param>
       </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&opensp-gcc34-patch;</param>
+      </patch>
       <configure>
         <param>--prefix=/usr</param>
         <param>--disable-static</param>
@@ -86,32 +91,6 @@
         <target>libosp.so</target>
         <name>libsp.so</name>
       </link>
-      <!-- remove comments if you update
-                     and remove the space in - -remove
-
-                <execute command="install-catalog">
-                        <param>- -remove</param>
-                        <param>/etc/sgml/OpenSP-1.5.cat</param>
-                        <param>/usr/share/sgml/OpenSP-1.5/catalog</param>
-                </execute>
-
-                <execute command="install-catalog">
-                        <param>- -remove</param>
-                        <param>/etc/sgml/sgml-docbook.cat</param>
-                        <param>/etc/sgml/OpenSP-1.5.cat</param>
-                </execute>
-
-                -->
-      <execute command="install-catalog">
-        <param>--add</param>
-        <param>/etc/sgml/OpenSP-&opensp-version;.cat</param>
-        <param>/usr/share/sgml/OpenSP-&opensp-version;/catalog</param>
-      </execute>
-      <execute command="install-catalog">
-        <param>--add</param>
-        <param>/etc/sgml/sgml-docbook.cat</param>
-        <param>/etc/sgml/OpenSP-&opensp-version;.cat</param>
-      </execute>
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&opensp-directory;</remove>

Modified: profiles/BLFS/trunk/chapter43/sgml-dtd.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/sgml-dtd.xml	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/chapter43/sgml-dtd.xml	2005-02-12 18:49:54 UTC (rev 1771)
@@ -47,17 +47,19 @@
         <find>gml</find>
         <replace></replace>
       </search_replace>
-      <execute command="install -d /usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;" />
+      <mkdir>
+	<option>parents</option>
+	<name>/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;</name>
+      </mkdir>
       <ownership user="root" group="root">
         <option>recursive</option>
         <name>.</name>
       </ownership>
-      <permissions mode="755">
-        <option>recursive</option>
-        <name>.</name>
-      </permissions>
-      <execute command="install docbook.cat /usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;/catalog" />
       <copy>
+	<source>docbook.cat</source>
+	<destination>/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;/catalog</destination>
+      </copy>
+      <copy>
         <option>archive</option>
         <option>force</option>
         <source>*.dtd</source>

Modified: profiles/BLFS/trunk/chapter43/sgml-dtd31.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/sgml-dtd31.xml	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/chapter43/sgml-dtd31.xml	2005-02-12 18:49:54 UTC (rev 1771)
@@ -44,36 +44,33 @@
       </search_replace>
       <search_replace>
         <file>docbook.cat</file>
-        <find>gml</find>
-        <replace></replace>
-      </search_replace>
-      <search_replace>
-        <file>docbook.cat</file>
         <find>DTDDECL "-//OASIS//DTD DocBook V3.1//EN"</find>
         <replace>SGMLDECL</replace>
       </search_replace>
-      <execute command="install -d /usr/share/sgml/docbook/sgml-dtd-3.1" />
+      <mkdir>
+      	<option>parents</option>
+	<name>/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd31-version;</name>
+      </mkdir>
       <ownership user="root" group="root">
         <option>recursive</option>
         <name>.</name>
       </ownership>
-      <permissions mode="755">
-        <option>recursive</option>
-        <name>.</name>
-      </permissions>
-      <execute command="install docbook.cat /usr/share/sgml/docbook/sgml-dtd-3.1/catalog" />
       <copy>
+	<source>docbook.cat</source>
+	<destination>/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd31-version;/catalog</destination>
+      </copy>
+      <copy>
         <option>archive</option>
         <option>force</option>
         <source>*.dtd</source>
         <source>*.mod</source>
         <source>*.dcl</source>
-        <destination>/usr/share/sgml/docbook/sgml-dtd-3.1</destination>
+        <destination>/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd31-version;</destination>
       </copy>
-      <execute command="install-catalog --add /etc/sgml/sgml-docbook-dtd-3.1.cat /usr/share/sgml/docbook/sgml-dtd-3.1/catalog" />
-      <execute command="install-catalog --add /etc/sgml/sgml-docbook-dtd-3.1.cat /etc/sgml/sgml-docbook.cat" />
+      <execute command="install-catalog --add /etc/sgml/sgml-docbook-dtd-&sgml-dtd31-version;.cat /usr/share/sgml/docbook/sgml-dtd-&sgml-dtd31-version;/catalog" />
+      <execute command="install-catalog --add /etc/sgml/sgml-docbook-dtd-&sgml-dtd31-version;.cat /etc/sgml/sgml-docbook.cat" />
       <textdump>
-        <file>/usr/share/sgml/docbook/sgml-dtd-3.1/catalog</file>
+        <file>/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd31-version;/catalog</file>
         <content>
 	  = -- Begin Single Major Version catalog changes --
 	  =

Modified: profiles/BLFS/trunk/chapter44/docbook-xsl.xml
===================================================================
--- profiles/BLFS/trunk/chapter44/docbook-xsl.xml	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/chapter44/docbook-xsl.xml	2005-02-12 18:49:54 UTC (rev 1771)
@@ -33,8 +33,10 @@
       <copy>
         <option>archive</option>
         <option>force</option>
+	<source>INSTALL</source>
         <source>VERSION</source>
         <source>common</source>
+	<source>eclipse</source>
         <source>extensions</source>
         <source>fo</source>
         <source>html</source>
@@ -46,19 +48,20 @@
         <source>params</source>
         <source>profiling</source>
         <source>template</source>
-        <source>tools</source>
         <source>xhtml</source>
         <destination>/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;</destination>
       </copy>
-      <execute command="install">
-        <param>-d /usr/share/doc/xml</param>
-      </execute>
+      <mkdir>
+      	<option>parents</option>
+	<name>/usr/share/doc/xml</name>
+      </mkdir>
       <copy>
         <option>archive</option>
         <option>force</option>
         <source>doc/*</source>
         <destination>/usr/share/doc/xml</destination>
       </copy>
+      <execute command="sh INSTALL" base="/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" />
       <textdump>
         <file>&build_dir;/dircheck.sh</file>
         <content>
@@ -85,18 +88,6 @@
         <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>
-      <execute command="xmlcatalog">
         <param>--noout --add "delegateSystem"</param>
         <param>"http://docbook.sourceforge.net/release/xsl/"</param>
         <param>"file:///etc/xml/docbook"</param>
@@ -108,6 +99,14 @@
         <param>"file:///etc/xml/docbook"</param>
         <param>/etc/xml/catalog</param>
       </execute>
+      <textdump>
+      	<file>/etc/profile.d/xsl.sh</file>
+	<content>
+	  =# Set up Environment Variable for XSL Processing
+	  =export XML_CATALOG_FILES="/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;/catalog.xml \
+	  =  /etc/xml/catalog"
+	</content>
+      </textdump>
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&docbook-xsl-directory;</remove>

Modified: profiles/BLFS/trunk/chapter44/xml-dtd.xml
===================================================================
--- profiles/BLFS/trunk/chapter44/xml-dtd.xml	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/chapter44/xml-dtd.xml	2005-02-12 18:49:54 UTC (rev 1771)
@@ -33,7 +33,10 @@
       <stageinfo>
         <base>&build_dir;/&xml-dtd-directory;</base>
       </stageinfo>
-      <execute command="install -d /usr/share/xml/docbook/xml-dtd-&xml-dtd-version;" />
+      <mkdir>
+      	<option>parents</option>
+	<name>/usr/share/xml/docbook/xml-dtd-&xml-dtd-version;</name>
+      </mkdir>
       <copy>
         <option>archive</option>
         <option>force</option>

Modified: profiles/BLFS/trunk/chapter45/a2ps.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/a2ps.xml	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/chapter45/a2ps.xml	2005-02-12 18:49:54 UTC (rev 1771)
@@ -14,11 +14,17 @@
   <package name="a2ps" version="&a2ps-version;">
     <packageinfo>
       <utilizes>
+        <name>&ximpl;</name>
+      </utilizes>
+      <utilizes>
         <name>psutils</name>
       </utilizes>
       <utilizes>
-        <name>ghostscript</name>
+      	<name>tex</name>
       </utilizes>
+      <utilizes>
+	<name>&ghostscript-impl;</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -40,10 +46,16 @@
         <find>/usr/local/share/ghostscript</find>
         <replace>/usr/share/ghostscript</replace>
       </search_replace>
+      <search_replace>
+	<file>lib/path-concat.c</file>
+	<find>char *malloc ();</find>
+	<replace>/* char *malloc (); */</replace>
+      </search_replace>
       <configure>
         <param>--prefix=/usr</param>
         <param>--sysconfdir=/etc/a2ps</param>
         <param>--localstatedir=/var</param>
+	<param>--enable-shared</param>
         <param>--with-medium=letter</param>
       </configure>
       <make />

Added: profiles/BLFS/trunk/chapter45/fop.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/fop.xml	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/chapter45/fop.xml	2005-02-12 18:49:54 UTC (rev 1771)
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % package_entities SYSTEM "../config/packages/ch45.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+
+]>
+<alfs>
+<package name="fop" version="&fop-version;">
+  <packageinfo>
+    <requires>
+      <name>&j2sdk;</name>
+    </requires>
+    <utilizes>
+      <name>libxslt</name>
+    </utilizes>
+  </packageinfo>
+  <stage name="Unpacking.">
+    <unpack>
+      <archive>&packages_dir;/&fop-package;</archive>
+      <destination>&build_dir;</destination>
+    </unpack>
+  </stage>
+  <stage name="Installing JAI.">
+    <stageinfo>
+      <environment>
+	<variable name="JAVA_HOME">/opt/j2sdk/j2sdk</variable>
+      </environment>
+      <base>/opt/j2sdk/j2sdk</base>
+    </stageinfo>
+    <permissions mode="755">
+      <name>&packages_dir;/&fop-jai-binary;</name>
+    </permissions>
+    <execute command="yes | &packages_dir;/&fop-jai-binary;" />
+  </stage>
+  <stage name="Installing FOP.">
+    <stageinfo>
+      <environment>
+	<variable name="JAVA_HOME">/opt/j2sdk/j2sdk</variable>
+      </environment>
+      <base>&build_dir;/&fop-directory;</base>
+    </stageinfo>
+    <execute command="./build.sh" />
+    <search_replace>
+      <file>fop.sh</file>
+      <find>build</find>
+      <replace>lib</replace>
+    </search_replace>
+    <mkdir>
+      <option>parents</option>
+      <name>/opt/fop-&fop-version;</name>
+    </mkdir>
+    <mkdir base="/opt/fop-&fop-version;">
+      <option>parents</option>
+      <name>bin</name>
+      <name>lib</name>
+      <name>docs/general</name>
+      <name>docs/lib</name>
+      <name>docs/site</name>
+    </mkdir>
+    <copy>
+      <source>fop.sh</source>
+      <destination>/opt/fop-&fop-version;/bin</destination>
+    </copy>
+    <permissions mode="755" base="/opt/fop-&fop-version;">
+      <name>bin/fop.sh</name>
+    </permissions>
+    <copy>
+      <source>build/fop.jar</source>
+      <source>lib/avalon-framework-cvs-20020806.jar</source>
+      <destination>/opt/fop-&fop-version;/lib</destination>
+    </copy>
+    <copy>
+      <source>docs/*</source>
+      <destination>/opt/fop-&fop-version;/docs</destination>
+    </copy>
+    <copy>
+      <source>CHANGES</source>
+      <source>LICENSE</source>
+      <source>README</source>
+      <source>ReleaseNotes.html</source>
+      <source>STATUS</source>
+      <destination>/opt/fop-&fop-version;/docs/general</destination>
+    </copy>
+    <copy>
+      <source>lib/avalon.LICENSE.txt</source>
+      <source>lib/readme</source>
+      <destination>/opt/fop-&fop-version;/docs/lib</destination>
+    </copy>
+    <copy>
+      <option>recursive</option>
+      <source>build/site/*</source>
+      <destination>/opt/fop-&fop-version;/docs/site</destination>
+    </copy>
+    <link>
+      <option>force</option>
+      <target>fop-&fop-version;</target>
+      <name>/opt/fop</name>
+    </link>
+  </stage>
+  <!-- Note: The following two stages are optional if you have the corresponding packages already installed -->
+  <stage name="Installing Batik JAR (Optional)">
+    <stageinfo>
+      <base>&build_dir;/&fop-directory;</base>
+    </stageinfo>
+    <copy>
+      <source>lib/batik.jar</source>
+      <destination>/opt/fop-&fop-version;/lib</destination>
+    </copy>
+    <copy>
+      <source>lib/batik.LICENSE.txt</source>
+      <destination>/opt/fop-&fop-version;/docs/lib</destination>
+    </copy>
+  </stage>
+  <stage name="Installing Xalan-Java Components (Optional)">
+    <stageinfo>
+      <base>&build_dir;/&fop-directory;</base>
+    </stageinfo>
+    <search_replace>
+      <file>xalan.sh</file>
+      <find>build</find>
+      <replace>lib</replace>
+    </search_replace>
+    <copy>
+      <source>xalan.sh</source>
+      <destination>/opt/fop-&fop-version;/bin</destination>
+    </copy>
+    <permissions mode="755" base="/opt/fop-&fop-version;">
+      <name>bin/xalan.sh</name>
+    </permissions>
+    <copy>
+      <source>lib/xml-apis.jar</source>
+      <source>lib/xercesImpl-2.2.1.jar</source>
+      <source>lib/xalan-2.4.1.jar</source>
+      <destination>/opt/fop-&fop-version;/lib</destination>
+    </copy>
+    <copy>
+      <source>lib/xml-apis.LICENSE.txt</source>
+      <source>lib/xerces.LICENSE.txt</source>
+      <source>lib/xalan.LICENSE.txt</source>
+      <source>lib/xml-apis.README.txt</source>
+      <destination>/opt/fop-&fop-version;/docs/lib</destination>
+    </copy>
+  </stage>
+  <stage name="Cleanup.">
+    <remove>&build_dir;/&fop-directory;</remove>
+  </stage>
+</package>
+</alfs>

Modified: profiles/BLFS/trunk/chapter45/gsview.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/gsview.xml	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/chapter45/gsview.xml	2005-02-12 18:49:54 UTC (rev 1771)
@@ -17,7 +17,7 @@
         <name>gtk+</name>
       </requires>
       <requires>
-        <name>ghostscript</name>
+        <name>&ghostscript-impl;</name>
       </requires>
     </packageinfo>
     <stage name="Unpacking">

Modified: profiles/BLFS/trunk/chapter45/xpdf.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/xpdf.xml	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/chapter45/xpdf.xml	2005-02-12 18:49:54 UTC (rev 1771)
@@ -17,7 +17,7 @@
         <name>lesstif</name>
       </requires>
       <utilizes>
-        <name>ghostscript</name>
+        <name>&ghostscript-impl;</name>
       </utilizes>
     </packageinfo>
     <stage name="Unpacking">
@@ -32,6 +32,11 @@
       </stageinfo>
       <patch>
         <param>-N</param>
+        <param>-p0</param>
+        <param>-i &packages_dir;/&xpdf-pl1-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
         <param>-p1</param>
         <param>-i &packages_dir;/&xpdf-freetype-patch;</param>
       </patch>

Modified: profiles/BLFS/trunk/config_standard/packages/ch42.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch42.ent	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/config_standard/packages/ch42.ent	2005-02-12 18:49:54 UTC (rev 1771)
@@ -1,13 +1,13 @@
 <!--************* packages for chapter 42 *************-->
 
-<!ENTITY sane-version   "1.0.14">
-<!ENTITY sane-frontend-version   "1.0.12">
+<!ENTITY sane-version   "1.0.15">
+<!ENTITY sane-frontend-version   "1.0.13">
 <!ENTITY sane-frontend-package   "sane-frontends-&sane-frontend-version;.tar.gz">
 <!ENTITY sane-frontend-directory "sane-frontends-&sane-frontend-version;">
 <!ENTITY sane-backend-version   "&sane-version;">
 <!ENTITY sane-backend-package   "sane-backends-&sane-backend-version;.tar.gz">
 <!ENTITY sane-backend-directory "sane-backends-&sane-backend-version;">
 
-<!ENTITY xsane-version   "0.93">
+<!ENTITY xsane-version   "0.97">
 <!ENTITY xsane-package   "xsane-&xsane-version;.tar.gz">
 <!ENTITY xsane-directory "xsane-&xsane-version;">

Modified: profiles/BLFS/trunk/config_standard/packages/ch43.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch43.ent	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/config_standard/packages/ch43.ent	2005-02-12 18:49:54 UTC (rev 1771)
@@ -16,7 +16,8 @@
 <!ENTITY opensp-version   "1.5.1">
 <!ENTITY opensp-package   "OpenSP-&opensp-version;.tar.gz">
 <!ENTITY opensp-directory "OpenSP-&opensp-version;">
-<!ENTITY opensp-patch     "OpenSP-&opensp-version;-LITLEN.patch">
+<!ENTITY opensp-litlen-patch "OpenSP-&opensp-version;-LITLEN-1.patch">
+<!ENTITY opensp-gcc34-patch "OpenSP-&opensp-version;-gcc34-1.patch">
 
 <!ENTITY openjade-version   "1.3.2">
 <!ENTITY openjade-package   "openjade-&openjade-version;.tar.gz">
@@ -25,3 +26,8 @@
 <!ENTITY docbook-dsssl-version   "1.78">
 <!ENTITY docbook-dsssl-package   "docbook-dsssl-&docbook-dsssl-version;.tar.gz">
 <!ENTITY docbook-dsssl-directory "docbook-dsssl-&docbook-dsssl-version;">
+
+<!ENTITY docbook-utils-version "0.6.14">
+<!ENTITY docbook-utils-package "docbook-utils-&docbook-utils-version;.tar.gz">
+<!ENTITY docbook-utils-directory "docbook-utils-&docbook-utils-version;">
+

Modified: profiles/BLFS/trunk/config_standard/packages/ch44.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch44.ent	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/config_standard/packages/ch44.ent	2005-02-12 18:49:54 UTC (rev 1771)
@@ -4,6 +4,6 @@
 <!ENTITY xml-dtd-package   "docbook-xml-&xml-dtd-version;.zip">
 <!ENTITY xml-dtd-directory "docbook-xml-&xml-dtd-version;">
 
-<!ENTITY docbook-xsl-version   "1.65.1">
-<!ENTITY docbook-xsl-package   "docbook-xsl-&docbook-xsl-version;.tar.gz">
+<!ENTITY docbook-xsl-version   "1.67.2">
+<!ENTITY docbook-xsl-package   "docbook-xsl-&docbook-xsl-version;.tar.bz2">
 <!ENTITY docbook-xsl-directory "docbook-xsl-&docbook-xsl-version;">

Modified: profiles/BLFS/trunk/config_standard/packages/ch45.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch45.ent	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/config_standard/packages/ch45.ent	2005-02-12 18:49:54 UTC (rev 1771)
@@ -4,7 +4,7 @@
 <!ENTITY a2ps-package   "a2ps-&a2ps-version;.tar.gz">
 <!ENTITY a2ps-directory "a2ps-4.13">
 
-<!ENTITY enscript-version   "1.6.1">
+<!ENTITY enscript-version   "1.6.4">
 <!ENTITY enscript-package   "enscript-&enscript-version;.tar.gz">
 <!ENTITY enscript-directory "enscript-&enscript-version;">
 
@@ -15,10 +15,17 @@
 <!ENTITY gsview-version   "4.6">
 <!ENTITY gsview-package   "gsview-&gsview-version;.tar.gz">
 <!ENTITY gsview-directory "gsview-&gsview-version;">
-<!ENTITY gsview-pstotext-patch "gsview-&gsview-version;-pstotext.patch">
-<!ENTITY gsview-lang-patch "gsview-&gsview-version;-lang.patch">
+<!ENTITY gsview-pstotext-patch "gsview-&gsview-version;-pstotext-1.patch">
+<!ENTITY gsview-lang-patch "gsview-&gsview-version;-lang-1.patch">
 
 <!ENTITY xpdf-version   "3.00">
 <!ENTITY xpdf-package   "xpdf-&xpdf-version;.tar.gz">
 <!ENTITY xpdf-directory "xpdf-&xpdf-version;">
-<!ENTITY xpdf-freetype-patch "xpdf-&xpdf-version;-freetype-2.1.7-hack.patch">
+<!ENTITY xpdf-pl1-patch "xpdf-&xpdf-version;pl1.patch">
+<!ENTITY xpdf-freetype-patch "xpdf-&xpdf-version;pl1-freetype_2.1.7_hack-2.patch">
+
+<!ENTITY fop-version "0.20.5">
+<!ENTITY fop-package "fop-&fop-version;-src.tar.gz">
+<!ENTITY fop-directory "fop-&fop-version;">
+<!ENTITY fop-jai-binary "jai-1_1_2_01-lib-linux-i586-jdk.bin">
+

Modified: profiles/BLFS/trunk/wget/chapter42.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter42.urls	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/wget/chapter42.urls	2005-02-12 18:49:54 UTC (rev 1771)
@@ -1,5 +1,3 @@
-ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.14/sane-backends-1.0.14.tar.gz
-
-ftp://ftp.sane-project.org/pub/sane/sane-frontends-1.0.12/sane-frontends-1.0.12.tar.gz
-
-http://gd.tuwien.ac.at/hci/sane/xsane/xsane-0.93.tar.gz
+ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.15/sane-backends-1.0.15.tar.gz
+ftp://ftp.sane-project.org/pub/sane/sane-frontends-1.0.13/sane-frontends-1.0.13.tar.gz
+ftp://ftp.sane-project.org/pub/sane/xsane-0.97.tar.gz

Modified: profiles/BLFS/trunk/wget/chapter43.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter43.urls	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/wget/chapter43.urls	2005-02-12 18:49:54 UTC (rev 1771)
@@ -1,13 +1,16 @@
 ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-0.6.3.tgz
-http://www.linuxfromscratch.org/patches/blfs/5.1/sgml-common-0.6.3-manpage-1.patch
+http://www.linuxfromscratch.org/blfs/downloads/svn/sgml-common-0.6.3-manpage-1.patch
 
 ftp://ftp.rutgers.edu/pub/kde/devel/docbook/SOURCES/docbk31.zip
 
 http://www.docbook.org/sgml/4.3/docbook-4.3.zip
 
-http://download.sourceforge.net/openjade/OpenSP-1.5.1.tar.gz
-http://www.linuxfromscratch.org/patches/blfs/5.1/OpenSP-1.5.1-LITLEN.patch
+ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/OpenSP-1.5.1.tar.gz
+http://www.linuxfromscratch.org/blfs/downloads/svn/OpenSP-1.5.1-LITLEN-1.patch
+http://www.linuxfromscratch.org/blfs/downloads/svn/OpenSP-1.5.1-gcc34-1.patch
 
 ftp://ftp.freestandards.org/pub/lsb/app-battery/packages/openjade-1.3.2.tar.gz
 
 http://unc.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-1.78.tar.gz
+
+ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz

Modified: profiles/BLFS/trunk/wget/chapter44.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter44.urls	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/wget/chapter44.urls	2005-02-12 18:49:54 UTC (rev 1771)
@@ -1,3 +1,3 @@
 http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip
 
-http://umn.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.65.1.tar.gz
+http://voxel.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.67.2.tar.bz2

Modified: profiles/BLFS/trunk/wget/chapter45.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter45.urls	2005-02-12 18:23:14 UTC (rev 1770)
+++ profiles/BLFS/trunk/wget/chapter45.urls	2005-02-12 18:49:54 UTC (rev 1771)
@@ -5,8 +5,11 @@
 http://gd.tuwien.ac.at/publishing/tex/tex-utils/psutils/psutils-p17.tar.gz
 
 ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-4.6.tar.gz
-http://www.linuxfromscratch.org/patches/blfs/5.1/gsview-4.6-pstotext.patch
-http://www.linuxfromscratch.org/patches/blfs/5.1/gsview-4.6-lang.patch
+http://www.linuxfromscratch.org/blfs/downloads/svn/gsview-4.6-pstotext-1.patch
+http://www.linuxfromscratch.org/blfs/downloads/svn/gsview-4.6-lang-1.patch
 
 ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.00.tar.gz
-http://www.linuxfromscratch.org/patches/blfs/5.1/xpdf-3.00-freetype-2.1.7-hack.patch
+ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.00pl1.patch
+http://www.linuxfromscratch.org/blfs/downloads/svn/xpdf-3.00pl1-freetype_2.1.7_hack-2.patch
+
+ftp://apache.mirrors.pair.com/xml/fop/source/fop-0.20.5-src.tar.gz




More information about the alfs-log mailing list