- Update to bsd.java.mk 2.0

- Improve launcher shell script (hardcode path to javavmwrapper)
- Fix build with jikes

3 files changed, 11 insertions, 6 deletions

diff --git a/ftp/dmachine/Makefile b/ftp/dmachine/Makefile
index c42b0719f188..1e32bea5d812 100644
--- a/ftp/dmachine/Makefile
+++ b/ftp/dmachine/Makefile
@@ -16,15 +16,16 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A non interactive, non graphical, batch download manager
 
-USE_JAVA=	1.1+
-NEED_JAVAC=	yes
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+
+USE_JAVA=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 ALL_TARGET=	dmachine
-MAKE_ARGS=	JAVAC=${JAVAC}
+MAKE_ARGS=	JAVAC="${JAVAC}"
+SUB_FILES=	dmachine.sh
 
 do-install:
-	@${SED} 's|%%DATADIR%%|${DATADIR}|' ${FILESDIR}/dmachine > ${WRKSRC}/dmachine
-	${INSTALL_SCRIPT} ${WRKSRC}/dmachine ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/dmachine.sh ${PREFIX}/bin/dmachine
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.class ${DATADIR}
 .if !defined(NOPORTDOCS)
diff --git a/ftp/dmachine/files/dmachine b/ftp/dmachine/files/dmachine
deleted file mode 100644
index e0caf2eab2e4..000000000000
--- a/ftp/dmachine/files/dmachine
+++ /dev/null
@@ -1 +0,0 @@
-java -cp %%DATADIR%% dmachine
diff --git a/ftp/dmachine/files/dmachine.sh.in b/ftp/dmachine/files/dmachine.sh.in
new file mode 100644
index 000000000000..add5c9385ec8
--- /dev/null
+++ b/ftp/dmachine/files/dmachine.sh.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+"%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%" dmachine