- Update to bsd.java.mk 2.0

- Set JAVA_VERSION (for javavmwrapper) in the launcher script
- Use an absolute path to launch javavmwrapper
- JAVAJARDIR -> JAVALIBDIR (for JAR dependencies)
- Use %%JAVAJARDIR%% in pkg-plist

PR:		97856
Submitted by:	hq
Approved by:	maintainer

java/jode/Makefile

@@ -7,9 +7,9 @@
 PORTNAME=	jode
 PORTVERSION=	1.1.1.1
 CATEGORIES=	java devel
-DISTNAME=	${PORTNAME}-${VENDOR_VERSION}
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
+DISTNAME=	${PORTNAME}-${VENDOR_VERSION}
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	A java package containing a decompiler and an optimizer for java
@@ -18,16 +18,17 @@ BUILD_DEPENDS=	${GETOPT_JAR}:${PORTSDIR}/java/java-getopt
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 VENDOR_VERSION=	1.1.2-pre1
-USE_JAVA=	1.2+
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
 NEED_JAVAC=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-GETOPT_JAR=	${JAVAJARDIR}/getopt.jar
+GETOPT_JAR=	${JAVALIBDIR}/getopt.jar
 CLASSLIB=	${JAVA_CLASSES}:${GETOPT_JAR}
 CONFIGURE_ENV+=	CLASSLIB=${CLASSLIB} JAR="${JAR}" \
 		JAVA="${JAVA}" JAVAC="${JAVAC}"
-CONFIGURE_ARGS+=--datadir="${JAVAJARDIR}"
+CONFIGURE_ARGS+=--datadir="${JAVALIBDIR}"
 # Don't create the dependencies:
 MAKE_ARGS+=	JAVADEP=:
 PLIST_SUB+=	VERSION=${VENDOR_VERSION}

java/jode/files/patch-bin-jode

@@ -14,5 +14,5 @@
 -CP=`echo $CLASSPATH | sed s/:/,/`
 -CLASSPATH=@datadir@/jode-@VERSION@.jar:@CLASSPATH@ \
 -@JAVA@ $CLAZZ --classpath $CP $*
-+exec java -cp @datadir@/jode-@VERSION@.jar:@datadir@/getopt.jar \
++JAVA_VERSION="1.2+" exec @prefix@/bin/java -cp @datadir@/jode-@VERSION@.jar:@datadir@/getopt.jar \
 +	$CLAZZ $CP "$@"

java/jode/pkg-plist

@@ -1,2 +1,2 @@
 bin/jode
-share/java/classes/jode-%%VERSION%%.jar
+%%JAVAJARDIR%%/jode-%%VERSION%%.jar