4 files changed, 13 insertions, 11 deletions

diff --git a/devel/argouml/Makefile b/devel/argouml/Makefile
index ba2bd6bf441c..75de9e13cbf2 100644
--- a/devel/argouml/Makefile
+++ b/devel/argouml/Makefile
@@ -8,25 +8,24 @@
 
 PORTNAME=	argouml
 PORTVERSION=	0.16.1
-PORTREVISION=	0
-CATEGORIES=	devel
+CATEGORIES=	devel java
 MASTER_SITES=	http://argouml.tigris.org/files/documents/4/0/argouml-${PORTVERSION}/
 DISTNAME=	ArgoUML-${PORTVERSION}
 
 MAINTAINER=	philip.reynolds@rfc-networks.ie
 COMMENT=	A UML design tool with cognitive support
 
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-USE_JAVE=	yes
+USE_JAVA=	yes
 JAVA_VERSION=	1.3+
 
-post-patch:
-	@${SED} 's,%%DATADIR%%,${DATADIR},' ${FILESDIR}/argouml > \
-		${WRKSRC}/argouml
+SUB_FILES=	argouml.sh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/argouml ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/argouml.sh ${PREFIX}/bin/argouml
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.jar ${DATADIR}
 
diff --git a/devel/argouml/files/argouml b/devel/argouml/files/argouml
deleted file mode 100644
index 79a043e67e2e..000000000000
--- a/devel/argouml/files/argouml
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-java -jar %%DATADIR%%/argouml.jar
diff --git a/devel/argouml/files/argouml.sh.in b/devel/argouml/files/argouml.sh.in
new file mode 100644
index 000000000000..e5ad1bc6e18c
--- /dev/null
+++ b/devel/argouml/files/argouml.sh.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+JAVA_VERSION="1.3+"  "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/argouml.jar" "$@"
diff --git a/devel/argouml/pkg-plist b/devel/argouml/pkg-plist
index 9a815220ea6f..0521cd423e65 100644
--- a/devel/argouml/pkg-plist
+++ b/devel/argouml/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/argouml
 %%DATADIR%%/antlrall.jar
 %%DATADIR%%/argouml.jar
@@ -8,6 +9,6 @@ bin/argouml
 %%DATADIR%%/log4j.jar
 %%DATADIR%%/nsuml.jar
 %%DATADIR%%/ocl-argo.jar
-%%DATADIR%%/toolbar.jar          
+%%DATADIR%%/toolbar.jar
 %%DATADIR%%/xerces.jar
 @dirrm %%DATADIR%%