4 files changed, 21 insertions, 18 deletions

diff --git a/devel/argouml/Makefile b/devel/argouml/Makefile
index b3d3469128e1..c5b899dfc054 100644
--- a/devel/argouml/Makefile
+++ b/devel/argouml/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	argouml
-PORTVERSION=	0.24
-PORTREVISION=	2
+PORTVERSION=	0.26
 CATEGORIES=	devel java
 MASTER_SITES=	http://argouml-downloads.tigris.org/nonav/argouml-${PORTVERSION}/
 DISTNAME=	ArgoUML-${PORTVERSION}
@@ -23,10 +22,10 @@ COMMENT=	A UML design tool with cognitive support
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 
 SUB_FILES=	argouml.sh
 .if !defined(NOPORTDOCS)
@@ -39,6 +38,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.jar ${DATADIR}
 	@${MKDIR} ${DATADIR}/ext
 	${INSTALL_DATA} ${WRKSRC}/ext/*.jar ${DATADIR}/ext/
+	${INSTALL_DATA} ${WRKSRC}/ext/*.xml ${DATADIR}/ext/
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/argomanual-${PORTVERSION}.pdf ${DOCSDIR}
diff --git a/devel/argouml/distinfo b/devel/argouml/distinfo
index 4aaa122a5696..ebd6ca246e65 100644
--- a/devel/argouml/distinfo
+++ b/devel/argouml/distinfo
@@ -1,6 +1,6 @@
-MD5 (ArgoUML-0.24.tar.gz) = 7f27c601e6b38674850b53e3e1055f29
-SHA256 (ArgoUML-0.24.tar.gz) = b99af974c644a299b89dff7e0de9adad11770b5ed09693fea40b28e5942f0f57
-SIZE (ArgoUML-0.24.tar.gz) = 7096917
-MD5 (argomanual-0.24.pdf) = 6f19a4434c797e036729d6f43b5545c3
-SHA256 (argomanual-0.24.pdf) = ad14736aeba4ce71fd7523ca12cad55d601b5abe7b0e524045aab10ccc5a396e
-SIZE (argomanual-0.24.pdf) = 3088192
+MD5 (ArgoUML-0.26.tar.gz) = 213a037e009bd0c8c6d3014bc0ecb48d
+SHA256 (ArgoUML-0.26.tar.gz) = ed87cee85d436425d7b85e5714f469bfc3b719e626392d5b052328f58c5dbfa8
+SIZE (ArgoUML-0.26.tar.gz) = 7494621
+MD5 (argomanual-0.26.pdf) = 9bab4bb6c83ca1bfce348609caa66a95
+SHA256 (argomanual-0.26.pdf) = 8da444cf14ed7e4b0fd6dbf76315efc470352bb4cab9e73f81cc9a72079481da
+SIZE (argomanual-0.26.pdf) = 3389902
diff --git a/devel/argouml/files/argouml.sh.in b/devel/argouml/files/argouml.sh.in
index beeb7d05e504..811f8e168348 100644
--- a/devel/argouml/files/argouml.sh.in
+++ b/devel/argouml/files/argouml.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="1.4+"  "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/argouml.jar" "$@"
+JAVA_VERSION="1.5+"  "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/argouml.jar" "$@"
diff --git a/devel/argouml/pkg-plist b/devel/argouml/pkg-plist
index 4d0e8cd3079b..dfeace32f3d3 100644
--- a/devel/argouml/pkg-plist
+++ b/devel/argouml/pkg-plist
@@ -1,21 +1,22 @@
 bin/argouml
-%%DATADIR%%/antlrall.jar
+%%DATADIR%%/antlr-2.7.7.jar
 %%DATADIR%%/argouml-mdr.jar
 %%DATADIR%%/argouml-model.jar
 %%DATADIR%%/argouml.jar
-%%DATADIR%%/commons-logging.jar
-%%DATADIR%%/gef.jar
+%%DATADIR%%/commons-logging-1.0.2.jar
+%%DATADIR%%/gef-0.12.4.jar
 %%DATADIR%%/java-interfaces.jar
 %%DATADIR%%/jmi.jar
 %%DATADIR%%/jmiutils.jar
-%%DATADIR%%/log4j.jar
+%%DATADIR%%/log4j-1.2.6.jar
 %%DATADIR%%/mdrapi.jar
 %%DATADIR%%/mof.jar
 %%DATADIR%%/nbmdr.jar
-%%DATADIR%%/ocl-argo.jar
+%%DATADIR%%/ocl-argo-1.1.jar
 %%DATADIR%%/openide-util.jar
-%%DATADIR%%/swidgets.jar
-%%DATADIR%%/toolbar.jar
+%%DATADIR%%/swidgets-0.1.4.jar
+%%DATADIR%%/toolbar-1.4.1-20071227.jar
+%%DATADIR%%/ext/anarres-cpp-no-dependencies-1.2.3.jar
 %%DATADIR%%/ext/argo_classfile.jar
 %%DATADIR%%/ext/argo_cpp.jar
 %%DATADIR%%/ext/argo_idl.jar
@@ -31,5 +32,7 @@ bin/argouml
 %%DATADIR%%/ext/argouml-i18n-pt_BR.jar
 %%DATADIR%%/ext/argouml-i18n-ru.jar
 %%DATADIR%%/ext/argouml-i18n-zh.jar
+%%DATADIR%%/ext/argouml-sql.jar
+%%DATADIR%%/ext/domainmapping.xml
 @dirrm %%DATADIR%%/ext
 @dirrm %%DATADIR%%