r1923 - in profiles/BLFS/trunk: . chapter04 chapter10 chapter11 chapter12 chapter18 chapter23 chapter28 chapter29 chapter31 chapter34 chapter41 chapter45 config_standard config_standard/etc/profile.d config_standard/packages wget

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Wed Jun 29 17:08:57 PDT 2005


Author: thomasp
Date: 2005-06-29 18:08:54 -0600 (Wed, 29 Jun 2005)
New Revision: 1923

Added:
   profiles/BLFS/trunk/chapter12/jdk.xml
   profiles/BLFS/trunk/config_standard/etc/profile.d/jdk.sh
Removed:
   profiles/BLFS/trunk/chapter12/j2sdk.xml
Modified:
   profiles/BLFS/trunk/BLFS.xml
   profiles/BLFS/trunk/chapter04/cyrus-sasl.xml
   profiles/BLFS/trunk/chapter10/pilot-link.xml
   profiles/BLFS/trunk/chapter11/apache-ant.xml
   profiles/BLFS/trunk/chapter18/openssh.xml
   profiles/BLFS/trunk/chapter18/subversion.xml
   profiles/BLFS/trunk/chapter23/db.xml
   profiles/BLFS/trunk/chapter28/kdebase.xml
   profiles/BLFS/trunk/chapter29/kdebindings.xml
   profiles/BLFS/trunk/chapter31/java-access-bridge.xml
   profiles/BLFS/trunk/chapter34/openoffice.xml
   profiles/BLFS/trunk/chapter41/cups.xml
   profiles/BLFS/trunk/chapter45/fop.xml
   profiles/BLFS/trunk/config_standard/config.ent
   profiles/BLFS/trunk/config_standard/packages/ch12.ent
   profiles/BLFS/trunk/wget/chapter12.urls
Log:
Update to jdk-1.5.0
All references to j2sdk are now changed to jdk


Modified: profiles/BLFS/trunk/BLFS.xml
===================================================================
--- profiles/BLFS/trunk/BLFS.xml	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/BLFS.xml	2005-06-30 00:08:54 UTC (rev 1923)
@@ -158,7 +158,7 @@
       <xi:include href="chapter12/gcc-34.xml" />
       <xi:include href="chapter12/gcc-33.xml" />
       <xi:include href="chapter12/guile.xml" />
-      <xi:include href="chapter12/j2sdk.xml" />
+      <xi:include href="chapter12/jdk.xml" />
       <xi:include href="chapter12/librep.xml" />
       <xi:include href="chapter12/nasm.xml" />
       <xi:include href="chapter12/perlmodules.xml" />

Modified: profiles/BLFS/trunk/chapter04/cyrus-sasl.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/cyrus-sasl.xml	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/chapter04/cyrus-sasl.xml	2005-06-30 00:08:54 UTC (rev 1923)
@@ -29,7 +29,7 @@
       <name>&krb-impl;</name>
     </utilizes>
     <utilizes>
-      <name>&j2sdk;</name>
+      <name>&jdk;</name>
     </utilizes>
     <utilizes>
       <name>mysql</name>

Modified: profiles/BLFS/trunk/chapter10/pilot-link.xml
===================================================================
--- profiles/BLFS/trunk/chapter10/pilot-link.xml	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/chapter10/pilot-link.xml	2005-06-30 00:08:54 UTC (rev 1923)
@@ -17,7 +17,7 @@
       <name>libpng</name>
     </utilizes>
     <utilizes>
-      <name>&j2sdk;</name>
+      <name>&jdk;</name>
     </utilizes>
     <utilizes>
       <name>tcl</name>

Modified: profiles/BLFS/trunk/chapter11/apache-ant.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/apache-ant.xml	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/chapter11/apache-ant.xml	2005-06-30 00:08:54 UTC (rev 1923)
@@ -14,7 +14,7 @@
 <package name="apache-ant" version="&apache-ant-version;">
   <packageinfo>
     <requires>
-      <name>&j2sdk;</name>
+      <name>&jdk;</name>
     </requires>
   </packageinfo>
   <stage name="Unpacking.">

Deleted: profiles/BLFS/trunk/chapter12/j2sdk.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/j2sdk.xml	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/chapter12/j2sdk.xml	2005-06-30 00:08:54 UTC (rev 1923)
@@ -1,189 +0,0 @@
-<?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/ch12.ent">
-<!ENTITY % config_entities SYSTEM  "../config/config.ent">
-
-%general_entities;
-%package_entities;
-%config_entities;
-
-]>
-<alfs>
-  <package name="j2sdk-binary" version="&j2sdk-version;_&j2sdk-suffix;">
-    <stage name="Unpacking">
-      <stageinfo>
-        <base>&build_dir;</base>
-      </stageinfo>
-      <remove>&build_dir;/java-build</remove>
-      <mkdir>
-	<option>parents</option>
-        <name>java-build</name>
-      </mkdir>
-      <copy>
-        <source>&packages_dir;/&j2sdk-bin-package;</source>
-        <destination>&build_dir;/java-build</destination>
-      </copy>
-    </stage>
-    <stage name="Installing">
-      <stageinfo>
-        <base>&build_dir;/java-build</base>
-      </stageinfo>
-      <execute command="sed">
-        <param>-i</param>
-        <param>"s:^PATH=.*::"</param>
-        <param>&j2sdk-bin-package;</param>
-      </execute>
-      <permissions mode="711">
-        <name>&j2sdk-bin-package;</name>
-      </permissions>
-      <mkdir>
-        <option>parents</option>
-        <name>bin</name>
-      </mkdir>
-      <link>
-        <option>force</option>
-        <target>/bin/true</target>
-        <name>bin/more</name>
-      </link>
-      <execute command="yes | PATH=$PWD/bin:$PATH ./&j2sdk-bin-package;" />
-      <mkdir>
-        <option>parents</option>
-        <name>/opt/j2sdk/j2sdk-precompiled-&j2sdk-version;</name>
-      </mkdir>
-      <move base="&build_dir;/java-build/&j2sdk-bin-directory;">
-        <option>force</option>
-        <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>
-      <remove>&build_dir;/java-build/&j2sdk-bin-directory;</remove>
-    </stage>
-  </package>
-  <package name="j2sdk-source" version="&j2sdk-version;">
-    <packageinfo>
-      <requires>
-        <name>&ximpl;</name>
-      </requires>
-      <requires>
-        <name>zip</name>
-      </requires>
-      <requires>
-        <name>unzip</name>
-      </requires>
-      <requires>
-        <name>cpio</name>
-      </requires>
-      <requires>
-        <name>alsa-lib</name>
-      </requires>
-      <requires>
-        <name>tcsh</name>
-      </requires>
-      <requires>
-        <name>gcc-3.3</name>
-      </requires>
-    </packageinfo>
-    <stage name="Unpacking">
-      <unpack>
-        <digest>&j2sdk-src-md5;</digest>
-	<archive>&packages_dir;/&j2sdk-src-package;</archive>
-        <destination>&build_dir;/java-build</destination>
-      </unpack>
-      <unpack>
-        <digest>&j2sdk-src-bin-md5;</digest>
-	<archive>&packages_dir;/&j2sdk-src-bin-package;</archive>
-        <destination>&build_dir;/java-build</destination>
-      </unpack>
-      <unpack>
-        <digest>&j2sdk-src-mozilla-headers-md5;</digest>
-	<archive>&packages_dir;/&j2sdk-src-mozilla-headers-package;</archive>
-        <destination>&build_dir;/java-build</destination>
-      </unpack>
-    </stage>
-    <stage name="Patching">
-      <stageinfo>
-	<base>&build_dir;/java-build</base>
-      </stageinfo>
-      <patch>
-        <param>-N</param>
-        <param>-p1</param>
-        <param>-i &packages_dir;/&j2sdk-asm-patch;</param>
-      </patch>
-      <patch>
-        <param>-N</param>
-        <param>-p1</param>
-        <param>-i &packages_dir;/&j2sdk-gcc33-patch;</param>
-      </patch>
-      <patch>
-        <param>-N</param>
-        <param>-p1</param>
-        <param>-i &packages_dir;/&j2sdk-motif-patch;</param>
-      </patch>
-      <patch>
-	<param>-N</param>
-	<param>-p1</param>
-	<param>-i &packages_dir;/&j2sdk-nptl-patch;</param>
-      </patch>
-      <patch>
-        <param>-N</param>
-        <param>-p1</param>
-        <param>-i &packages_dir;/&j2sdk-remove-debug-patch;</param>
-      </patch>
-      <patch>
-        <param>-N</param>
-        <param>-p1</param>
-        <param>-i &packages_dir;/&j2sdk-fixed-paths-patch;</param>
-      </patch>
-      <patch>
-        <param>-N</param>
-        <param>-p1</param>
-        <param>-i &packages_dir;/&j2sdk-static-cxx-patch;</param>
-      </patch>
-    </stage>
-    <stage name="Installing">
-      <stageinfo>
-        <environment>
-          <variable name="JAVA_HOME">/opt/j2sdk/j2sdk-precompiled-&j2sdk-version;</variable>
-	  <variable name="PATH" mode="prepend">/opt/gcc-&gcc-33-version;/bin:</variable>
-          <variable name="PATH" mode="append">:/opt/j2sdk/j2sdk-precompiled-&j2sdk-version;/bin</variable>
-          <variable name="ALT_BOOTDIR">/opt/j2sdk/j2sdk-precompiled-&j2sdk-version;</variable>
-          <variable name="CLASSPATH" />
-          <variable name="CFLAGS" />
-          <variable name="CXXFLAGS" />
-          <variable name="LDFLAGS" />
-          <variable name="ALT_DEVTOOLS_PATH">"/usr/bin"</variable>
-          <variable name="BUILD_NUMBER">blfs-&blfs-version;</variable>
-          <variable name="DEV_ONLY">true</variable>
-          <variable name="ALT_MOZILLA_PATH">&build_dir;/java-build</variable>
-          <variable name="INSANE">true</variable>
-          <variable name="MAKE_VERBOSE">true</variable>
-          <variable name="ALT_CACERTS_FILE">/opt/j2sdk/j2sdk-precompiled-&j2sdk-version;/jre/lib/security/cacerts</variable>
-        </environment>
-        <base>&build_dir;/java-build</base>
-      </stageinfo>
-      <make base="&build_dir;/java-build/motif/lib/Xm" />
-      <make base="&build_dir;/java-build/control/make" />
-      <copy base="&build_dir;/java-build/control/build/linux-i586">
-        <option>archive</option>
-        <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>

Copied: profiles/BLFS/trunk/chapter12/jdk.xml (from rev 1874, profiles/BLFS/trunk/chapter12/j2sdk.xml)
===================================================================
--- profiles/BLFS/trunk/chapter12/j2sdk.xml	2005-05-01 22:53:19 UTC (rev 1874)
+++ profiles/BLFS/trunk/chapter12/jdk.xml	2005-06-30 00:08:54 UTC (rev 1923)
@@ -0,0 +1,209 @@
+<?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/ch12.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+%files;
+
+]>
+<alfs>
+  <package name="jdk-binary" version="&jdk-version;_&jdk-suffix;">
+    <stage name="Unpacking">
+      <stageinfo>
+        <base>&build_dir;</base>
+      </stageinfo>
+      <remove>&build_dir;/jdk-build</remove>
+      <mkdir>
+	<option>parents</option>
+        <name>jdk-build</name>
+      </mkdir>
+      <copy>
+        <source>&packages_dir;/&jdk-bin-package;</source>
+        <destination>&build_dir;/jdk-build</destination>
+      </copy>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/jdk-build</base>
+      </stageinfo>
+      <execute command="sed">
+        <param>-i</param>
+        <param>"s:^PATH=.*::"</param>
+        <param>&jdk-bin-package;</param>
+      </execute>
+      <permissions mode="711">
+        <name>&jdk-bin-package;</name>
+      </permissions>
+      <mkdir>
+        <option>parents</option>
+        <name>bin</name>
+      </mkdir>
+      <link>
+        <option>force</option>
+        <target>/bin/true</target>
+        <name>bin/more</name>
+      </link>
+      <execute command="yes | PATH=$PWD/bin:$PATH ./&jdk-bin-package;" />
+      <mkdir>
+        <option>parents</option>
+        <name>/opt/jdk/jdk-precompiled-&jdk-version;</name>
+      </mkdir>
+      <move base="&build_dir;/jdk-build/&jdk-bin-directory;">
+        <option>force</option>
+        <source>*</source>
+        <destination>/opt/jdk/jdk-precompiled-&jdk-version;</destination>
+      </move>
+    </stage>
+    <stage name="Configuration">
+      <link>
+	<option>force</option>
+	<option>no-dereference</option>
+	<target>jdk-precompiled-&jdk-version;</target>
+	<name>/opt/jdk/jdk</name>
+      </link>
+      <copy base="&blfs-config;/etc/profile.d">
+	<source>jdk.sh</source>
+	<destination>/etc/profile.d</destination>
+      </copy>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/jdk-build/&jdk-bin-package;</remove>
+      <remove>&build_dir;/jdk-build/&jdk-bin-directory;</remove>
+    </stage>
+  </package>
+  <package name="jdk-source" version="&jdk-version;">
+    <packageinfo>
+      <requires>
+        <name>&ximpl;</name>
+      </requires>
+      <requires>
+        <name>zip</name>
+      </requires>
+      <requires>
+        <name>unzip</name>
+      </requires>
+      <requires>
+        <name>cpio</name>
+      </requires>
+      <requires>
+        <name>alsa-lib</name>
+      </requires>
+      <requires>
+        <name>tcsh</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&jdk-src-md5;</digest>
+	<archive>&packages_dir;/&jdk-src-package;</archive>
+        <destination>&build_dir;/jdk-build</destination>
+      </unpack>
+      <unpack>
+        <digest>&jdk-src-bin-md5;</digest>
+	<archive>&packages_dir;/&jdk-src-bin-package;</archive>
+        <destination>&build_dir;/jdk-build</destination>
+      </unpack>
+      <unpack>
+        <digest>&jdk-src-mozilla-headers-md5;</digest>
+	<archive>&packages_dir;/&jdk-src-mozilla-headers-package;</archive>
+        <destination>&build_dir;/jdk-build</destination>
+      </unpack>
+    </stage>
+    <stage name="Patching">
+      <stageinfo>
+	<base>&build_dir;/jdk-build</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&jdk-gcc34-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&jdk-motif-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&jdk-nptl-patch;</param>
+      </patch>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&jdk-remove-broken-demo-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&jdk-fixed-paths-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&jdk-remove-debug-patch;</param>
+      </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&jdk-static-cxx-patch;</param>
+      </patch>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="PATH" mode="append">:/opt/jdk/jdk-precompiled-&jdk-version;/bin</variable>
+          <variable name="ALT_BOOTDIR">/opt/jdk/jdk-precompiled-&jdk-version;</variable>
+          <variable name="CLASSPATH" />
+          <variable name="CFLAGS" />
+          <variable name="CXXFLAGS" />
+          <variable name="LDFLAGS" />
+          <variable name="ALT_DEVTOOLS_PATH">"/usr/bin"</variable>
+          <variable name="BUILD_NUMBER">blfs-&blfs-version;</variable>
+          <variable name="DEV_ONLY">true</variable>
+          <variable name="ALT_MOZILLA_PATH">&build_dir;/jdk-build</variable>
+          <variable name="INSANE">true</variable>
+          <variable name="MAKE_VERBOSE">true</variable>
+          <variable name="ALT_CACERTS_FILE">/opt/jdk/jdk-precompiled-&jdk-version;/jre/lib/security/cacerts</variable>
+        </environment>
+        <base>&build_dir;/jdk-build</base>
+      </stageinfo>
+      <make base="&build_dir;/jdk-build/control/make" />
+      <copy base="&build_dir;/jdk-build/control/build/linux-i586">
+        <option>archive</option>
+        <source>j2dk-image</source>
+        <destination>/opt/jdk/jdk-&jdk-version;</destination>
+      </copy>
+      <ownership user="root" group="root">
+	<option>recursive</option>
+	<name>/opt/jdk/jdk-&jdk-version;</name>
+      </ownership>
+      <link>
+	<option>force</option>
+	<target>motif21/libmawt.so</target>
+	<name>/opt/jdk/jdk-&jdk-version;/jre/lib/i386</name>
+      </link>
+    </stage>
+    <stage name="Configuration">
+      <link>
+	<option>force</option>
+	<option>no-dereference</option>
+	<target>jdk-&jdk-version;</target>
+	<name>/opt/jdk/jdk</name>
+      </link>
+      <copy base="&blfs-config;/etc/profile.d">
+	<source>jdk.sh</source>
+	<destination>/etc/profile.d</destination>
+      </copy>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/jdk-build</remove>
+    </stage>
+  </package>
+</alfs>

Modified: profiles/BLFS/trunk/chapter18/openssh.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/openssh.xml	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/chapter18/openssh.xml	2005-06-30 00:08:54 UTC (rev 1923)
@@ -29,7 +29,7 @@
 	<name>&krb-impl;</name>
       </utilizes>
       <utilizes>
-	<name>&j2sdk;</name>
+	<name>&jdk;</name>
       </utilizes>
       <utilizes>
 	<name>net-tools</name>

Modified: profiles/BLFS/trunk/chapter18/subversion.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/subversion.xml	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/chapter18/subversion.xml	2005-06-30 00:08:54 UTC (rev 1923)
@@ -35,7 +35,7 @@
       <name>apache</name>
     </utilizes>
     <utilizes>
-      <name>&j2sdk;</name>
+      <name>&jdk;</name>
     </utilizes>
     <utilizes>
       <name>openssl</name>

Modified: profiles/BLFS/trunk/chapter23/db.xml
===================================================================
--- profiles/BLFS/trunk/chapter23/db.xml	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/chapter23/db.xml	2005-06-30 00:08:54 UTC (rev 1923)
@@ -17,7 +17,7 @@
 	<name>tcl</name>
       </utilizes>
       <utilizes>
-	<name>&j2sdk;</name>
+	<name>&jdk;</name>
       </utilizes>
     </packageinfo>
     <stage name="Unpacking">

Modified: profiles/BLFS/trunk/chapter28/kdebase.xml
===================================================================
--- profiles/BLFS/trunk/chapter28/kdebase.xml	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/chapter28/kdebase.xml	2005-06-30 00:08:54 UTC (rev 1923)
@@ -29,7 +29,7 @@
         <name>openssl</name>
       </utilizes>
       <utilizes>
-        <name>&j2sdk;</name>
+        <name>&jdk;</name>
       </utilizes>
       <utilizes>
         <name>libtiff</name>

Modified: profiles/BLFS/trunk/chapter29/kdebindings.xml
===================================================================
--- profiles/BLFS/trunk/chapter29/kdebindings.xml	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/chapter29/kdebindings.xml	2005-06-30 00:08:54 UTC (rev 1923)
@@ -38,7 +38,7 @@
         <name>ruby</name>
       </utilizes>
       <utilizes>
-        <name>&j2sdk;</name>
+        <name>&jdk;</name>
       </utilizes>
       <utilizes>
 	<name>mozilla</name>

Modified: profiles/BLFS/trunk/chapter31/java-access-bridge.xml
===================================================================
--- profiles/BLFS/trunk/chapter31/java-access-bridge.xml	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/chapter31/java-access-bridge.xml	2005-06-30 00:08:54 UTC (rev 1923)
@@ -17,7 +17,7 @@
       <name>at-spi</name>
     </requires>
     <requires>
-      <name>&j2sdk;</name>
+      <name>&jdk;</name>
     </requires>
   </packageinfo>
   <stage name="Unpacking.">

Modified: profiles/BLFS/trunk/chapter34/openoffice.xml
===================================================================
--- profiles/BLFS/trunk/chapter34/openoffice.xml	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/chapter34/openoffice.xml	2005-06-30 00:08:54 UTC (rev 1923)
@@ -19,7 +19,7 @@
         <name>&ximpl;</name>
       </requires>
       <requires>
-        <name>&j2sdk;</name>
+        <name>&jdk;</name>
       </requires>
       <requires>
         <name>zip</name>
@@ -80,9 +80,9 @@
     <stage name="Installing">
       <stageinfo>
         <environment>
-          <variable name="JAVA_HOME">/opt/j2sdk/j2sdk</variable>
+          <variable name="JAVA_HOME">/opt/jdk/jdk</variable>
 	  <variable name="PATH" mode="prepend">/opt/gcc-&gcc-33-version;/bin:</variable>
-          <variable name="PATH" mode="append">:/opt/j2sdk/j2sdk/bin</variable>
+          <variable name="PATH" mode="append">:/opt/jdk/jdk/bin</variable>
           <variable name="LS_COLORS" />
         </environment>
         <base>&build_dir;/OOo-build/&openoffice-directory;</base>

Modified: profiles/BLFS/trunk/chapter41/cups.xml
===================================================================
--- profiles/BLFS/trunk/chapter41/cups.xml	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/chapter41/cups.xml	2005-06-30 00:08:54 UTC (rev 1923)
@@ -41,7 +41,7 @@
         <name>python</name>
       </utilizes>
       <utilizes>
-        <name>&j2sdk;</name>
+        <name>&jdk;</name>
       </utilizes>
       <utilizes>
         <name>openslp</name>

Modified: profiles/BLFS/trunk/chapter45/fop.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/fop.xml	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/chapter45/fop.xml	2005-06-30 00:08:54 UTC (rev 1923)
@@ -14,7 +14,7 @@
 <package name="fop" version="&fop-version;">
   <packageinfo>
     <requires>
-      <name>&j2sdk;</name>
+      <name>&jdk;</name>
     </requires>
     <utilizes>
       <name>libxslt</name>
@@ -39,9 +39,9 @@
   <stage name="Installing JAI.">
     <stageinfo>
       <environment>
-	<variable name="JAVA_HOME">/opt/j2sdk/j2sdk</variable>
+	<variable name="JAVA_HOME">/opt/jdk/jdk</variable>
       </environment>
-      <base>/opt/j2sdk/j2sdk</base>
+      <base>/opt/jdk/jdk</base>
     </stageinfo>
     <permissions mode="755">
       <name>&packages_dir;/&fop-jai-binary;</name>
@@ -51,7 +51,7 @@
   <stage name="Installing FOP.">
     <stageinfo>
       <environment>
-	<variable name="JAVA_HOME">/opt/j2sdk/j2sdk</variable>
+	<variable name="JAVA_HOME">/opt/jdk/jdk</variable>
       </environment>
       <base>&build_dir;/&fop-directory;</base>
     </stageinfo>

Modified: profiles/BLFS/trunk/config_standard/config.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/config.ent	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/config_standard/config.ent	2005-06-30 00:08:54 UTC (rev 1923)
@@ -72,8 +72,8 @@
 <!ENTITY krb-impl "heimdal">
 
 <!-- Java implementation -->
-<!-- binary (j2sdk-binary) or source (j2sdk-source) -->
-<!ENTITY j2sdk "j2sdk-source">
+<!-- binary (jdk-binary) or source (jdk-source) -->
+<!ENTITY jdk "jdk-source">
 
 <!-- X implementation -->
 <!-- XFree86 (xfree86) or X.org (xorg) -->

Added: profiles/BLFS/trunk/config_standard/etc/profile.d/jdk.sh
===================================================================
--- profiles/BLFS/trunk/config_standard/etc/profile.d/jdk.sh	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/config_standard/etc/profile.d/jdk.sh	2005-06-30 00:08:54 UTC (rev 1923)
@@ -0,0 +1,26 @@
+# Begin /etc/profile.d/jdk.sh
+
+# Set JAVA_HOME directory
+JAVA_HOME=/opt/jdk/jdk
+export JAVA_HOME
+
+# Adjust PATH
+pathappend ${JAVA_HOME}/bin PATH
+
+# Auto Java Classpath Updating
+# Create symlinks to this directory for auto classpath setting
+AUTO_CLASSPATH_DIR=/usr/lib/classpath
+if [ -z ${CLASSPATH} ]; then
+        CLASSPATH=.:${AUTO_CLASSPATH_DIR}
+else
+        CLASSPATH="${CLASSPATH}:.:${AUTO_CLASSPATH_DIR}"
+fi
+
+# Check for empty AUTO_CLASSPATH_DIR
+ls ${AUTO_CLASSPATH_DIR}/*.jar &> /dev/null &&
+for i in ${AUTO_CLASSPATH_DIR}/*.jar
+        do CLASSPATH=${CLASSPATH}:"${i}"
+done
+export CLASSPATH
+
+# End /etc/profile.d/jdk.sh

Modified: profiles/BLFS/trunk/config_standard/packages/ch12.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch12.ent	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/config_standard/packages/ch12.ent	2005-06-30 00:08:54 UTC (rev 1923)
@@ -187,43 +187,30 @@
 <!ENTITY librep-directory "librep-&librep-version;">
 
 <!-- Begin java packages -->
-<!ENTITY j2sdk-version   "1.4.2">
-<!ENTITY j2sdk-_-version "1_4_2">
-<!ENTITY j2sdk-suffix    "08">
+<!ENTITY jdk-version   "1.5.0">
+<!ENTITY jdk-_-version "1_5_0">
+<!ENTITY jdk-suffix    "03">
 
-<!ENTITY j2sdk-bin-package   "j2sdk-&j2sdk-_-version;_&j2sdk-suffix;-linux-i586.bin">
-<!ENTITY j2sdk-bin-md5       "a55a9150977de7d5c7f78d29593a8b8c">
-<!ENTITY j2sdk-bin-directory "j2sdk&j2sdk-version;_&j2sdk-suffix;">
+<!ENTITY jdk-bin-package   "jdk-&jdk-_-version;_&jdk-suffix;-linux-i586.bin">
+<!ENTITY jdk-bin-md5       "bc221641fcfdc9268499001326fc8ebb">
+<!ENTITY jdk-bin-directory "jdk&jdk-version;_&jdk-suffix;">
 
-<!ENTITY j2sdk-src-package "j2sdk-&j2sdk-_-version;-src-scsl.zip">
-<!ENTITY j2sdk-src-md5     "387ae674dcd686f3a7a477c191aa8b65">
+<!ENTITY jdk-src-package "jdk-&jdk-_-version;-src-jrl.zip">
+<!ENTITY jdk-src-md5     "ae036d6b771f89aff0b19bdd0b289591">
 
-<!ENTITY j2sdk-src-bin-package "j2sdk-&j2sdk-_-version;-bin-scsl.zip">
-<!ENTITY j2sdk-src-bin-md5     "24877ff50ae66744090c3723968bb7dc">
+<!ENTITY jdk-src-bin-package "jdk-&jdk-_-version;-bin-jrl.zip">
+<!ENTITY jdk-src-bin-md5     "3c3b2c079628141fa28f5f0f1cde5bf0">
 
-<!ENTITY j2sdk-src-mozilla-headers-package "j2sdk-&j2sdk-_-version;-mozilla_headers-unix.zip">
-<!ENTITY j2sdk-src-mozilla-headers-md5     "57d10879fa2c2738f859f0b0f902f69c">
+<!ENTITY jdk-src-mozilla-headers-package "jdk-&jdk-_-version;-mozilla_headers-unix.zip">
+<!ENTITY jdk-src-mozilla-headers-md5     "a832e5a668967a1dfa27912dfc717dcc">
 
-<!ENTITY j2sdk-asm-patch     "j2sdk-&j2sdk-version;-fix_inline_asm-1.patch">
-<!ENTITY j2sdk-asm-patch-md5 "b7d9235640add59432683fa4e32be8d9">
-
-<!ENTITY j2sdk-gcc33-patch     "j2sdk-&j2sdk-version;-gcc33-1.patch">
-<!ENTITY j2sdk-gcc33-patch-md5 "9be656687de3b45131cb2a72c3fef76a">
-
-<!ENTITY j2sdk-motif-patch     "j2sdk-&j2sdk-version;-motif_mkmsgcat-1.patch">
-<!ENTITY j2sdk-motif-patch-md5 "c625f49a52ff7dbacfa11b4272dd303c">
-
-<!ENTITY j2sdk-nptl-patch     "j2sdk-&j2sdk-version;-nptl-1.patch">
-<!ENTITY j2sdk-nptl-patch-md5 "b99f1f8c53e34334d88189a189df8651">
-
-<!ENTITY j2sdk-remove-debug-patch     "j2sdk-&j2sdk-version;-remove_debug_image-1.patch">
-<!ENTITY j2sdk-remove-debug-patch-md5 "5fa9b211519555f34057d1791c58cc1d">
-
-<!ENTITY j2sdk-fixed-paths-patch     "j2sdk-&j2sdk-version;-remove_fixed_paths-1.patch">
-<!ENTITY j2sdk-fixed-paths-patch-md5 "53487994a83eec881a7beb3ceb6cb98c">
-
-<!ENTITY j2sdk-static-cxx-patch     "j2sdk-&j2sdk-version;-static_cxx-1.patch">
-<!ENTITY j2sdk-static-cxx-patch-md5 "3b9fc7189f8e1f710e6959e4d83887a">
+<!ENTITY jdk-gcc34-patch     "jdk-&jdk-version;-gcc342+-3.patch">
+<!ENTITY jdk-motif-patch     "jdk-&jdk-version;-motif_mkmsgcat-1.patch">
+<!ENTITY jdk-nptl-patch     "jdk-&jdk-version;-nptl-1.patch">
+<!ENTITY jdk-remove-broken-demo-patch "jdk-&jdk-version;-remove_broken_demo-1.patch">
+<!ENTITY jdk-fixed-paths-patch     "jdk-&jdk-version;-remove_fixed_paths-1.patch">
+<!ENTITY jdk-remove-debug-patch     "jdk-&jdk-version;-remove_debug_image-1.patch">
+<!ENTITY jdk-static-cxx-patch     "jdk-&jdk-version;-static_cxx-1.patch">
 <!-- End java packages -->
 
 <!ENTITY ruby-version   "1.8.2">

Modified: profiles/BLFS/trunk/wget/chapter12.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter12.urls	2005-06-29 23:16:37 UTC (rev 1922)
+++ profiles/BLFS/trunk/wget/chapter12.urls	2005-06-30 00:08:54 UTC (rev 1923)
@@ -16,14 +16,13 @@
 
 ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/F-H/guile-1.6.7.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/I-K/j2sdk-1.4.2-fix_inline_asm-1.patch
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/I-K/j2sdk-1.4.2-gcc33-1.patch
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/I-K/j2sdk-1.4.2-motif_mkmsgcat-1.patch
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/I-K/j2sdk-1.4.2-nptl-1.patch
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/I-K/j2sdk-1.4.2-remove_debug_image-1.patch
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/I-K/j2sdk-1.4.2-remove_fixed_paths-1.patch
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/I-K/j2sdk-1.4.2-static_cxx-1.patch
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/I-K/j2sdk-1.4.2-ash-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/I-K/jdk-1.5.0-gcc_3.4.2+-3.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/I-K/jdk-1.5.0-motif_mkmsgcat-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/I-K/jdk-1.5.0-nptl-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/I-K/jdk-1.5.0-remove_broken_demo-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/I-K/jdk-1.5.0-remove_debug_image-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/I-K/jdk-1.5.0-remove_fixed_paths-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/I-K/jdk-1.5.0-static_cxx-1.patch
 
 ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/L/librep-0.17.tar.bz2
 




More information about the alfs-log mailing list