diff options
| author | Ernst de Haan <znerd@FreeBSD.org> | 2002-06-13 17:30:53 +0000 |
|---|---|---|
| committer | Ernst de Haan <znerd@FreeBSD.org> | 2002-06-13 17:30:53 +0000 |
| commit | ddf8667538667c664400982bd19b5f2f05888b73 (patch) | |
| tree | 418eb9bd53b11170c5f438dd6f418c4a065ab097 /java/linux-sun-jdk12 | |
| parent | Reenable IPv6 support. (diff) | |
Patches that solve the problem that expr and libjava.so
cannot be found.
Bumped PORTREVISION.
Submitted by: glewis
Notes
Notes:
svn path=/head/; revision=61231
Diffstat (limited to 'java/linux-sun-jdk12')
| -rw-r--r-- | java/linux-sun-jdk12/Makefile | 1 | ||||
| -rw-r--r-- | java/linux-sun-jdk12/files/patch-aa | 15 | ||||
| -rw-r--r-- | java/linux-sun-jdk12/files/patch-ab | 15 |
3 files changed, 31 insertions, 0 deletions
diff --git a/java/linux-sun-jdk12/Makefile b/java/linux-sun-jdk12/Makefile index ff7d894b29b0..50824f06d350 100644 --- a/java/linux-sun-jdk12/Makefile +++ b/java/linux-sun-jdk12/Makefile @@ -7,6 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION} +PORTREVISION= 1 CATEGORIES= java MASTER_SITES= # PKGNAMEPREFIX= linux-sun- diff --git a/java/linux-sun-jdk12/files/patch-aa b/java/linux-sun-jdk12/files/patch-aa new file mode 100644 index 000000000000..2923412b5348 --- /dev/null +++ b/java/linux-sun-jdk12/files/patch-aa @@ -0,0 +1,15 @@ +$FreeBSD$ + +--- bin/.java_wrapper.orig Wed Mar 20 19:36:13 2002 ++++ bin/.java_wrapper Thu Jun 13 11:10:56 2002 +@@ -25,8 +25,8 @@ + # Resolve symlinks. See 4152645. + while [ -L "$PRG" ]; do + ls=`/bin/ls -ld "$PRG"` +- link=`/usr/bin/expr "$ls" : '.*-> \(.*\)$'` +- if /usr/bin/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="`/usr/bin/dirname $PRG`/$link" diff --git a/java/linux-sun-jdk12/files/patch-ab b/java/linux-sun-jdk12/files/patch-ab new file mode 100644 index 000000000000..11549792f159 --- /dev/null +++ b/java/linux-sun-jdk12/files/patch-ab @@ -0,0 +1,15 @@ +$FreeBSD$ + +--- jre/bin/.java_wrapper.orig Wed Mar 20 19:36:13 2002 ++++ jre/bin/.java_wrapper Thu Jun 13 11:10:56 2002 +@@ -25,8 +25,8 @@ + # Resolve symlinks. See 4152645. + while [ -L "$PRG" ]; do + ls=`/bin/ls -ld "$PRG"` +- link=`/usr/bin/expr "$ls" : '.*-> \(.*\)$'` +- if /usr/bin/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="`/usr/bin/dirname $PRG`/$link" |