OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 13-Jan-2008 11:19:15 Branch: HEAD Handle: 2008011310191400 Modified files: openpkg-src/java java-toolkit.sh java.spec Log: flush a long-pending change Summary: Revision Changes Path 1.3 +10 -1 openpkg-src/java/java-toolkit.sh 1.4 +1 -1 openpkg-src/java/java.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/java/java-toolkit.sh ============================================================================ $ cvs diff -u -r1.2 -r1.3 java-toolkit.sh --- openpkg-src/java/java-toolkit.sh 27 Aug 2007 09:47:46 -0000 1.2 +++ openpkg-src/java/java-toolkit.sh 13 Jan 2008 10:19:14 -0000 1.3 @@ -60,7 +60,8 @@ echo "JAVA_HOME=\"$JAVA_HOME\"; export JAVA_HOME" ;; -l | --list ) - awk '{ printf("%s %-15s %s\n", $1, $2, $3); }' <@l_prefix@/etc/java/toolkits + sort <@l_prefix@/etc/java/toolkits |\ + awk '{ printf("%s %-15s %s\n", $1, $2, $3); }' ;; --register=* ) eval `echo "$1" | sed -e 's%^--register=\(.*\):\(.*\)$%_platform="\1"; _home="\2"%'` @@ -160,6 +161,14 @@ exit 1 fi + # determine Java class path + if [ ".$CLASSPATH" = . ]; then + CLASSPATH="@l_prefix@/lib/java" + else + CLASSPATH="$CLASSPATH:@l_prefix@/lib/java" + fi + export CLASSPATH + # pass-through execution to requested tool of particular platform if [ -x $JAVA_HOME/bin/$tool ]; then exec $JAVA_HOME/bin/$tool ${1+"$@"} @@ . patch -p0 <<'@@ .' Index: openpkg-src/java/java.spec ============================================================================ $ cvs diff -u -r1.3 -r1.4 java.spec --- openpkg-src/java/java.spec 1 Jan 2008 14:56:04 -0000 1.3 +++ openpkg-src/java/java.spec 13 Jan 2008 10:19:14 -0000 1.4 @@ -32,7 +32,7 @@ Group: Language License: OpenPKG Version: 0 -Release: 20080101 +Release: 20080113 # list of sources Source0: java-toolkit.sh @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org