- Update to bsd.java.mk 2.0

- Enforce a specific version (1.4+) in the launcher shell script
- Use SUB_FILES to patch the launche shell script

3 files changed, 11 insertions, 7 deletions

diff --git a/graphics/jpatch/Makefile b/graphics/jpatch/Makefile
index 9fddb68575b1..69900270057c 100644
--- a/graphics/jpatch/Makefile
+++ b/graphics/jpatch/Makefile
@@ -16,17 +16,19 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/.b/beta/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A spline based 3D modeling tool
 
-USE_JAVA=	1.4+
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
 NO_BUILD=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar \
 		bin/jpatch
 
-post-patch:
-	@${SED} 's,%%JAVAJARDIR%%,${JAVAJARDIR},' ${FILESDIR}/jpatch > ${WRKSRC}/jpatch
+SUB_FILES=	jpatch.sh
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/jpatch.jar ${JAVAJARDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/jpatch ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/jpatch.sh ${PREFIX}/bin/jpatch
 
 .include <bsd.port.mk>
diff --git a/graphics/jpatch/files/jpatch b/graphics/jpatch/files/jpatch
deleted file mode 100644
index 03697eee8700..000000000000
--- a/graphics/jpatch/files/jpatch
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-java -jar %%JAVAJARDIR%%/jpatch.jar
diff --git a/graphics/jpatch/files/jpatch.sh.in b/graphics/jpatch/files/jpatch.sh.in
new file mode 100644
index 000000000000..f06241d0a36a
--- /dev/null
+++ b/graphics/jpatch/files/jpatch.sh.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+JAVA_VERSION="1.4+" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jpatch.jar" "$@"