- Update to 1.6.1 [1]

- Use DATADIR=${JAVASHAREDIR}/${PORTNAME} [1]
- Add 'java' category
- Use INSTALL_DATA rather than CP
- Use %%DATADIR%% in launcher scripts (already included in SUB_LIST by
  bsd.port.mk)
- Pass JAVA_VERSION to javavmwrapper in launcher scripts

PR:		83979 [1]
Submitted by:	Pedro F. Giffuni <giffunip@asme.org> [1]

4 files changed, 13 insertions, 13 deletions

diff --git a/cad/impact/Makefile b/cad/impact/Makefile
index 2cccfd95b64e..ef459fe491de 100644
--- a/cad/impact/Makefile
+++ b/cad/impact/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	impact
-PORTVERSION=	0.5.3
-CATEGORIES=	cad
+PORTVERSION=	0.6.1
+CATEGORIES=	cad java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	Impact-${PORTVERSION}
@@ -22,20 +22,20 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 NO_BUILD=	yes
 
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 SUB_FILES=	impact impactgui
-SUB_LIST=	DIR=${PREFIX}/impact
 
 PLIST_FILES=	bin/impact bin/impactgui
 
 do-install:
-	@${MKDIR} ${PREFIX}/impact
-	${CP} -R ${WRKSRC}/ ${PREFIX}/impact
+	cd ${WRKSRC} && ${FIND} . -type d -exec ${MKDIR} ${DATADIR}/{} \;
+	cd ${WRKSRC} && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
 	${INSTALL_SCRIPT} ${WRKDIR}/impact ${WRKDIR}/impactgui ${PREFIX}/bin
 
 post-install:
-	@${FIND} ${PREFIX}/impact ! -type d | \
+	@${FIND} ${DATADIR} ! -type d | \
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${PREFIX}/impact -type d | ${SORT} -r | \
+	@${FIND} ${DATADIR} -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/cad/impact/distinfo b/cad/impact/distinfo
index a39bce47db36..5cd521597a80 100644
--- a/cad/impact/distinfo
+++ b/cad/impact/distinfo
@@ -1,2 +1,2 @@
-MD5 (Impact-0.5.3.zip) = 45fbc9e4e17daeb7ff06d0118eb11298
-SIZE (Impact-0.5.3.zip) = 5150450
+MD5 (Impact-0.6.1.zip) = c06f34619bfe878fc8aa24f5f5c19d0a
+SIZE (Impact-0.6.1.zip) = 3670738
diff --git a/cad/impact/files/impact.in b/cad/impact/files/impact.in
index 41e8fe5dc9f4..acb9a1d6a169 100644
--- a/cad/impact/files/impact.in
+++ b/cad/impact/files/impact.in
@@ -2,6 +2,6 @@
 #
 # $FreeBSD$
 
-cd %%DIR%%/bin
-"%%LOCALBASE%%/bin/java" -Xmx500m run.Impact $1
+cd %%DATADIR%%/bin
+JAVA_VERSION="%%JAVA_VERSION" "%%LOCALBASE%%/bin/java" -Xmx500m run.Impact "$@"
 cd -
diff --git a/cad/impact/files/impactgui.in b/cad/impact/files/impactgui.in
index 13c99f61b004..289fc62a36da 100644
--- a/cad/impact/files/impactgui.in
+++ b/cad/impact/files/impactgui.in
@@ -2,6 +2,6 @@
 #
 # $FreeBSD$
 
-cd %%DIR%%/bin
-"%%LOCALBASE%%/bin/java" -Xmx500m gui.ImpactGUI
+cd %%DATADIR%%/bin
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -Xmx500m gui.ImpactGUI
 cd -