- Update to bsd.java.mk 2.0

- Enforce a specific version (1.3+) in the launcher shell script
- Use SUB_FILES/SUB_LIST to patch the launcher shell script

3 files changed, 12 insertions, 8 deletions

diff --git a/graphics/tintfu/Makefile b/graphics/tintfu/Makefile
index e025711aac8f..0118f96a18d9 100644
--- a/graphics/tintfu/Makefile
+++ b/graphics/tintfu/Makefile
@@ -17,22 +17,24 @@ EXTRACT_SUFX=	.jar
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GraphViz .dot file editor
 
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	.
 NO_BUILD=	yes
-USE_JAVA=	1.3+
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
 
 PLIST_FILES=	%%JAVAJARDIR%%/${DISTNAME}.jar \
 		bin/tintfu
 
-post-patch:
-	@${SED} -e 's,%%JAVAJARDIR%%,${JAVAJARDIR},' \
-		-e 's,%%DISTNAME%%,${DISTNAME},' ${FILESDIR}/tintfu > ${WRKSRC}/tintfu
+SUB_FILES=	tintfu.sh
+SUB_LIST=	DISTNAME=${DISTNAME}
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar ${JAVAJARDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/tintfu.sh ${PREFIX}/bin/tintfu
 
 .include <bsd.port.mk>
diff --git a/graphics/tintfu/files/tintfu b/graphics/tintfu/files/tintfu
deleted file mode 100644
index 0ecf470deb9b..000000000000
--- a/graphics/tintfu/files/tintfu
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-java -jar %%JAVAJARDIR%%/%%DISTNAME%%.jar
diff --git a/graphics/tintfu/files/tintfu.sh.in b/graphics/tintfu/files/tintfu.sh.in
new file mode 100644
index 000000000000..4a44d0645a0a
--- /dev/null
+++ b/graphics/tintfu/files/tintfu.sh.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+JAVA_VERSION="1.3+" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar"