. Apply similar patches to those applied to the linux-sun-jdk13 port so

  that this port works out of the box:
  . Use the linux version of expr in the .java_wrapper scripts.
  . Use the Classic VM by default, not HotSpot (which is unhappy with
    the emulation layer).
. Bump PORT_REVISION.

Approved by:	znerd

4 files changed, 37 insertions, 1 deletions

diff --git a/java/linux-blackdown-jdk13/Makefile b/java/linux-blackdown-jdk13/Makefile
index cef676e68430..ead75c8433a0 100644
--- a/java/linux-blackdown-jdk13/Makefile
+++ b/java/linux-blackdown-jdk13/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/os/Linux/java/jdk/${DOWNLOAD_DIR}/ \
 		ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/${DOWNLOAD_DIR}/ \
diff --git a/java/linux-blackdown-jdk13/files/patch-bin::.java_wrapper b/java/linux-blackdown-jdk13/files/patch-bin::.java_wrapper
new file mode 100644
index 000000000000..2a9abb7ef2e1
--- /dev/null
+++ b/java/linux-blackdown-jdk13/files/patch-bin::.java_wrapper
@@ -0,0 +1,13 @@
+--- bin/.java_wrapper.orig	Mon Jan 27 13:47:44 2003
++++ bin/.java_wrapper	Mon Jan 27 13:48:36 2003
+@@ -39,8 +39,8 @@
+ # Resolve symlinks. See 4152645.
+ while [ -L "${PRG}" ]; do
+     ls=`ls -ld "${PRG}"`
+-    link=`expr "${ls}" : '.*-> \(.*\)$'`
+-    if expr "${link}" : '/' > /dev/null; then
++    link=`/compat/linux/usr/bin/expr "${ls}" : '.*-> \(.*\)$'`
++    if /compat/linux/usr/bin/expr "${link}" : '/' > /dev/null; then
+ 	PRG="${link}"
+     else
+ 	PRG="`dirname ${PRG}`/${link}"
diff --git a/java/linux-blackdown-jdk13/files/patch-jre::bin::.java_wrapper b/java/linux-blackdown-jdk13/files/patch-jre::bin::.java_wrapper
new file mode 100644
index 000000000000..f69142ae4de4
--- /dev/null
+++ b/java/linux-blackdown-jdk13/files/patch-jre::bin::.java_wrapper
@@ -0,0 +1,13 @@
+--- jre/bin/.java_wrapper.orig	Mon Jan 27 13:48:43 2003
++++ jre/bin/.java_wrapper	Mon Jan 27 13:48:54 2003
+@@ -39,8 +39,8 @@
+ # Resolve symlinks. See 4152645.
+ while [ -L "${PRG}" ]; do
+     ls=`ls -ld "${PRG}"`
+-    link=`expr "${ls}" : '.*-> \(.*\)$'`
+-    if expr "${link}" : '/' > /dev/null; then
++    link=`/compat/linux/usr/bin/expr "${ls}" : '.*-> \(.*\)$'`
++    if /compat/linux/usr/bin/expr "${link}" : '/' > /dev/null; then
+ 	PRG="${link}"
+     else
+ 	PRG="`dirname ${PRG}`/${link}"
diff --git a/java/linux-blackdown-jdk13/files/patch-jvm.cfg b/java/linux-blackdown-jdk13/files/patch-jvm.cfg
new file mode 100644
index 000000000000..8a2e63c248dd
--- /dev/null
+++ b/java/linux-blackdown-jdk13/files/patch-jvm.cfg
@@ -0,0 +1,10 @@
+--- jre/lib/jvm.cfg.orig	Mon Jan 27 13:52:19 2003
++++ jre/lib/jvm.cfg	Mon Jan 27 13:52:29 2003
+@@ -10,6 +10,6 @@
+ # List of JVMs that can be used as the first option to java, javac, etc.
+ # Order is important -- first in this list is the default JVM.
+ #
++-classic
+ -client
+ -server
+--classic