1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-13 07:34:50 +00:00

Either linimon@ in 2011 or hq@ in 2006 broke the wrapper-script -- the

%%JAVA_VERSION%% inserted into it was never expanded...

Now that we aren't using JDK-1.{3,4} anyway, the setting of JAVA_VERSION
is, probably, redundant. Remove it and bump PORTREVISION.

While here, declare the port as unsafe for parallel building. Unfortunately.
This commit is contained in:
Mikhail Teterin 2012-06-12 20:00:27 +00:00
parent a96f657509
commit 9851c6325c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=299148
2 changed files with 4 additions and 4 deletions

View File

@ -6,7 +6,7 @@
PORTNAME= jode
PORTVERSION= 1.1.1.1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= java devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.1.2-pre1
DISTNAME= ${PORTNAME}-${VENDOR_VERSION}
@ -23,6 +23,7 @@ JAVA_VERSION= 1.5+
NEED_JAVAC= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
MAKE_JOBS_UNSAFE= yes
GETOPT_JAR= ${JAVALIBDIR}/getopt.jar
CLASSLIB= ${JAVA_CLASSES}:${GETOPT_JAR}

View File

@ -5,7 +5,7 @@
-prefix=@prefix@
case $1 in
@@ -9,6 +8,7 @@
@@ -9,6 +8,6 @@
esac
+# This will only set CP if CLASSPATH is non-empty:
@ -14,5 +14,4 @@
-CP=`echo $CLASSPATH | sed s/:/,/`
-CLASSPATH=@datadir@/jode-@VERSION@.jar:@CLASSPATH@ \
-@JAVA@ $CLAZZ --classpath $CP $*
+JAVA_VERSION="%%JAVA_VERSION%%" exec @prefix@/bin/java -cp @datadir@/jode-@VERSION@.jar:@datadir@/getopt.jar \
+ $CLAZZ $CP "$@"
+exec @prefix@/bin/java -cp @datadir@/jode-@VERSION@.jar:@datadir@/getopt.jar $CLAZZ $CP "$@"