- Update to bsd.java.mk 2.0

- Install in DATADIR=${JAVASHAREDIR}/${PORTNAME}
- Improve launcher shell script (switch to javavmwrapper 2.0)
- Improve the dynamic plist
- CP -> INSTALL_DATA
- Bump PORTREVISION

3 files changed, 25 insertions, 19 deletions

diff --git a/net/danamics/Makefile b/net/danamics/Makefile
index 1c5794d83ae3..a88c2bd49047 100644
--- a/net/danamics/Makefile
+++ b/net/danamics/Makefile
@@ -7,35 +7,38 @@
 
 PORTNAME=	danamics
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	ftp://ftp.cs.uct.ac.za/pub/FreeBSD/distfiles-local/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Petri Net editor for correctness and performance analysis
 
-USE_JAVA=	1.1+
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+
+USE_JAVA=	yes
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/DaNAMiCS
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+DATAFILES=	DaNAMiCS DaNAMiCS.jar INSTALL dnamaca.opt
 
-.include <bsd.port.pre.mk>
+SUB_FILES=	danamics.sh
+PLIST_FILES=	bin/danamics
 
-PLIST=		${WRKDIR}/plist
+.include <bsd.port.pre.mk>
 
-pre-install:
-	cd ${WRKSRC}; ${FIND} . -type f \
-		| ${SORT} | ${SED} -e 's|^\.|danamics|' >${PLIST}
-	cd ${WRKSRC};  ${FIND} . -type d \
-		| ${SORT} -r | ${SED} -e 's|^\.|@dirrm danamics|' >>${PLIST}
-	${ECHO} bin/danamics >>${PLIST}
+post-install:
+	@cd ${WRKSRC}; ${FIND} -s ${DATAFILES} -type f \
+	  | ${SED} -e 's|^|${DATADIR:S,^${PREFIX}/,,}/|' >>${TMPPLIST}
+	@cd ${WRKSRC};  ${FIND} -s -d ${DATAFILES} -type d \
+	  | ${SED} -e 's|^|@dirrm ${DATADIR:S,^${PREFIX}/,,}/|' >>${TMPPLIST}
+	@${ECHO_CMD} '@dirrm ${DATADIR:S,^${PREFIX}/,,}' >>${TMPPLIST}
 
 do-install:
-	${MKDIR} ${PREFIX}/danamics
-	${CP} -R ${WRKSRC}/* ${PREFIX}/danamics
-
-	${SED} \
-		-e s,%%PREFIX%%,${PREFIX},g \
-		< ${FILESDIR}/danamics.sh > ${PREFIX}/bin/danamics; \
-	${CHMOD} a+x ${PREFIX}/bin/danamics
+	cd ${WRKSRC} \
+	  && ${FIND} -s ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \; \
+	  && ${FIND} -s ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
+	${INSTALL_SCRIPT} ${WRKDIR}/danamics.sh ${PREFIX}/bin/danamics
 
 .include <bsd.port.post.mk>
diff --git a/net/danamics/files/danamics.sh b/net/danamics/files/danamics.sh
deleted file mode 100644
index f41814de6428..000000000000
--- a/net/danamics/files/danamics.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd %%PREFIX%%/danamics
-exec javavm -classpath DaNAMiCS.jar:swing.jar:$CLASSPATH DaNAMiCS.DFrame
diff --git a/net/danamics/files/danamics.sh.in b/net/danamics/files/danamics.sh.in
new file mode 100644
index 000000000000..f3d6d9f018d2
--- /dev/null
+++ b/net/danamics/files/danamics.sh.in
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+(cd "%%DATADIR%%" && \
+	"%%LOCALBASE%%/bin/java" -classpath "DaNAMiCS.jar:${CLASSPATH}" DaNAMiCS.DFrame)