diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2012-06-12 20:00:27 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2012-06-12 20:00:27 +0000 |
| commit | 9851c6325c546cb63ddfad2dff6db7fce88ee0b3 (patch) | |
| tree | a689687cdfc8f3d55cd23269bacf87be528e2fbb /java | |
| parent | - Use appropriate variables instead of hard coding a path (diff) | |
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.
Notes
Notes:
svn path=/head/; revision=299148
Diffstat (limited to 'java')
| -rw-r--r-- | java/jode/Makefile | 3 | ||||
| -rw-r--r-- | java/jode/files/patch-bin-jode | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/jode/Makefile b/java/jode/Makefile index 27c764e57661..dec89cc0fbac 100644 --- a/java/jode/Makefile +++ b/java/jode/Makefile @@ -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} diff --git a/java/jode/files/patch-bin-jode b/java/jode/files/patch-bin-jode index a5e07eca4f32..4f5f689cf777 100644 --- a/java/jode/files/patch-bin-jode +++ b/java/jode/files/patch-bin-jode @@ -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 "$@" |