Re-adding patches to make scripts use the linux expr

and to use green iso linux threads by default.
These patches were removed by me when I upgraded the
port to FCS, but they should have been ported to this
version of the port.
Bumped PORTREVISION.

Submitted by:	glewis
This commit is contained in:
Ernst de Haan 2002-04-15 21:18:18 +00:00
parent ede6fd9dae
commit 1d2f329fe2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=57734
6 changed files with 90 additions and 2 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= jdk PORTNAME= jdk
PORTVERSION= 1.2.2 PORTVERSION= 1.2.2
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= java devel CATEGORIES= java devel
MASTER_SITES= ftp://ftp.tux.org/pub/java/JDK-${PORTVERSION}/${ARCH}/FCS/ \ MASTER_SITES= ftp://ftp.tux.org/pub/java/JDK-${PORTVERSION}/${ARCH}/FCS/ \
http://www.metaverse.nl/~ernst/ \ http://www.metaverse.nl/~ernst/ \

View file

@ -0,0 +1,22 @@
--- bin/.java_wrapper.orig Fri Apr 12 17:03:39 2002
+++ bin/.java_wrapper Fri Apr 12 17:04:00 2002
@@ -32,8 +32,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"
@@ -65,7 +65,7 @@
# Select vm type (if classic vm, also select thread type).
unset vmtype
unset ttype
-DEFAULT_THREADS_FLAG=native
+DEFAULT_THREADS_FLAG=green
if [ "x$1" = "x-hotspot" ]; then
vmtype=hotspot
ttype=native_threads

View file

@ -0,0 +1,22 @@
--- jre/bin/.java_wrapper.orig Fri Apr 12 17:03:39 2002
+++ jre/bin/.java_wrapper Fri Apr 12 17:04:00 2002
@@ -32,8 +32,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"
@@ -65,7 +65,7 @@
# Select vm type (if classic vm, also select thread type).
unset vmtype
unset ttype
-DEFAULT_THREADS_FLAG=native
+DEFAULT_THREADS_FLAG=green
if [ "x$1" = "x-hotspot" ]; then
vmtype=hotspot
ttype=native_threads

View file

@ -7,7 +7,7 @@
PORTNAME= jdk PORTNAME= jdk
PORTVERSION= 1.2.2 PORTVERSION= 1.2.2
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= java devel CATEGORIES= java devel
MASTER_SITES= ftp://ftp.tux.org/pub/java/JDK-${PORTVERSION}/${ARCH}/FCS/ \ MASTER_SITES= ftp://ftp.tux.org/pub/java/JDK-${PORTVERSION}/${ARCH}/FCS/ \
http://www.metaverse.nl/~ernst/ \ http://www.metaverse.nl/~ernst/ \

View file

@ -0,0 +1,22 @@
--- bin/.java_wrapper.orig Fri Apr 12 17:03:39 2002
+++ bin/.java_wrapper Fri Apr 12 17:04:00 2002
@@ -32,8 +32,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"
@@ -65,7 +65,7 @@
# Select vm type (if classic vm, also select thread type).
unset vmtype
unset ttype
-DEFAULT_THREADS_FLAG=native
+DEFAULT_THREADS_FLAG=green
if [ "x$1" = "x-hotspot" ]; then
vmtype=hotspot
ttype=native_threads

View file

@ -0,0 +1,22 @@
--- jre/bin/.java_wrapper.orig Fri Apr 12 17:03:39 2002
+++ jre/bin/.java_wrapper Fri Apr 12 17:04:00 2002
@@ -32,8 +32,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"
@@ -65,7 +65,7 @@
# Select vm type (if classic vm, also select thread type).
unset vmtype
unset ttype
-DEFAULT_THREADS_FLAG=native
+DEFAULT_THREADS_FLAG=green
if [ "x$1" = "x-hotspot" ]; then
vmtype=hotspot
ttype=native_threads