- update to 0.32

- add icons for desktop menu
- tiny Makefile cleanup

Feature safe:	yes

3 files changed, 51 insertions, 44 deletions

diff --git a/devel/argouml/Makefile b/devel/argouml/Makefile
index 737469b48e6f..efd45a8c7279 100644
--- a/devel/argouml/Makefile
+++ b/devel/argouml/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	argouml
-PORTVERSION=	0.30.2
-PORTREVISION=	1
+PORTVERSION=	0.32
 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
 
 LICENSE=	EPL
 
-RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
-
 PORTSCOUT=	limitw:1,even
 
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 USE_JAVA=	yes
@@ -37,7 +36,7 @@ PORTDOCS=	manual-${PORTVERSION}.pdf quickguide-${PORTVERSION}.pdf
 
 DESKTOP_ENTRIES=	"ArgoUML" \
 			"Create advanced UML diagrams" \
-			"" \
+			"${DATADIR}/icon/ArgoIcon128x128.png" \
 			"argouml" \
 			"Application;Development;Building;Java;" \
 			false
@@ -47,8 +46,11 @@ do-install:
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.jar ${DATADIR}
 	@${MKDIR} ${DATADIR}/ext
-	${INSTALL_DATA} ${WRKSRC}/ext/*.jar ${DATADIR}/ext/
-	${INSTALL_DATA} ${WRKSRC}/ext/*.xml ${DATADIR}/ext/
+	${INSTALL_DATA} ${WRKSRC}/ext/*.jar ${DATADIR}/ext
+	${INSTALL_DATA} ${WRKSRC}/ext/*.xml ${DATADIR}/ext
+	@${MKDIR} ${DATADIR}/icon
+	${INSTALL_DATA} ${WRKSRC}/icon/*.png ${DATADIR}/icon
+	${INSTALL_DATA} ${WRKSRC}/icon/*.svg ${DATADIR}/icon
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/manual-${PORTVERSION}.pdf ${DOCSDIR}
diff --git a/devel/argouml/distinfo b/devel/argouml/distinfo
index ed89d0a991c8..e080f595c901 100644
--- a/devel/argouml/distinfo
+++ b/devel/argouml/distinfo
@@ -1,9 +1,6 @@
-MD5 (argouml/ArgoUML-0.30.2.tar.gz) = 87061dd062d689df7a1d6db85fdb2641
-SHA256 (argouml/ArgoUML-0.30.2.tar.gz) = 3e6c664cdfaac4d44573d33cab26e4d36005e1e9da9a416e3c8b132975c746cd
-SIZE (argouml/ArgoUML-0.30.2.tar.gz) = 14822325
-MD5 (argouml/manual-0.30.2.pdf) = 1e48488b95255c34d5e3d50727c4ba59
-SHA256 (argouml/manual-0.30.2.pdf) = d628f9eb5fc995667dad1811510cf591c1f44c4490b843970447f32edb56e8dc
-SIZE (argouml/manual-0.30.2.pdf) = 3406131
-MD5 (argouml/quickguide-0.30.2.pdf) = 4552289cc7b76bae5cc2f764227359de
-SHA256 (argouml/quickguide-0.30.2.pdf) = ebaef7c7e12078236bf5f419fbb849d6c2c0245d5d80b198c4897769e1ebdf89
-SIZE (argouml/quickguide-0.30.2.pdf) = 58299
+SHA256 (argouml/ArgoUML-0.32.tar.gz) = 37c2cd52e97ae01d324684440b0ea5e8af0b98102088b05759dda89f27b68ee9
+SIZE (argouml/ArgoUML-0.32.tar.gz) = 15819728
+SHA256 (argouml/manual-0.32.pdf) = 925a4332f4beb13a0f2c48155763248d73472eba04196b93e8ed4e7503f15920
+SIZE (argouml/manual-0.32.pdf) = 3405767
+SHA256 (argouml/quickguide-0.32.pdf) = 7d0f5c1f15e99d2d252b5fc74ab53ccb2b3c726695b56449fac2182224390ecc
+SIZE (argouml/quickguide-0.32.pdf) = 58281
diff --git a/devel/argouml/pkg-plist b/devel/argouml/pkg-plist
index 3dba6a8183d5..590dc6c73947 100644
--- a/devel/argouml/pkg-plist
+++ b/devel/argouml/pkg-plist
@@ -5,42 +5,17 @@ bin/argouml
 %%DATADIR%%/argouml-model.jar
 %%DATADIR%%/argouml.jar
 %%DATADIR%%/commons-logging-1.0.2.jar
-%%DATADIR%%/gef-0.13.1.jar
-%%DATADIR%%/java-interfaces.jar
-%%DATADIR%%/jmi.jar
-%%DATADIR%%/jmiutils.jar
-%%DATADIR%%/log4j-1.2.6.jar
-%%DATADIR%%/mdrapi.jar
-%%DATADIR%%/mof.jar
-%%DATADIR%%/nbmdr.jar
-%%DATADIR%%/ocl-argo-1.1.jar
-%%DATADIR%%/openide-util.jar
-%%DATADIR%%/org.eclipse.emf.common_2.5.0.v200906151043.jar
-%%DATADIR%%/org.eclipse.emf.ecore.change.edit_2.5.0.v200906151043.jar
-%%DATADIR%%/org.eclipse.emf.ecore.change_2.5.0.v200906151043.jar
-%%DATADIR%%/org.eclipse.emf.ecore.edit_2.5.0.v200906151043.jar
-%%DATADIR%%/org.eclipse.emf.ecore.xmi_2.5.0.v200906151043.jar
-%%DATADIR%%/org.eclipse.emf.ecore_2.5.0.v200906151043.jar
-%%DATADIR%%/org.eclipse.emf.edit_2.5.0.v200906151043.jar
-%%DATADIR%%/org.eclipse.emf.mapping.ecore2xml_2.5.0.v200906151043.jar
-%%DATADIR%%/org.eclipse.emf.mapping.ecore_2.5.0.v200906151043.jar
-%%DATADIR%%/org.eclipse.emf.mapping_2.5.0.v200906151043.jar
-%%DATADIR%%/org.eclipse.uml2.common.edit_1.5.0.v200905041045.jar
-%%DATADIR%%/org.eclipse.uml2.common_1.5.0.v200905041045.jar
-%%DATADIR%%/org.eclipse.uml2.uml.edit_3.0.0.v200905041045.jar
-%%DATADIR%%/org.eclipse.uml2.uml.resources_3.0.0.v200906011111.jar
-%%DATADIR%%/org.eclipse.uml2.uml_3.0.1.v200908281330.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/antlr-2.7.7.jar
 %%DATADIR%%/ext/antlr-runtime-3.1.1.jar
 %%DATADIR%%/ext/argo_cpp.jar
 %%DATADIR%%/ext/argo_idl.jar
-%%DATADIR%%/ext/argo_php.jar
 %%DATADIR%%/ext/argo_java.jar
+%%DATADIR%%/ext/argo_php.jar
 %%DATADIR%%/ext/argouml-csharp.jar
+%%DATADIR%%/ext/argouml-diagrams-activity.jar
 %%DATADIR%%/ext/argouml-diagrams-sequence.jar
+%%DATADIR%%/ext/argouml-diagrams-state.jar
 %%DATADIR%%/ext/argouml-i18n-de.jar
 %%DATADIR%%/ext/argouml-i18n-en_GB.jar
 %%DATADIR%%/ext/argouml-i18n-es.jar
@@ -52,7 +27,40 @@ bin/argouml
 %%DATADIR%%/ext/argouml-i18n-ru.jar
 %%DATADIR%%/ext/argouml-i18n-zh.jar
 %%DATADIR%%/ext/argouml-sql.jar
+%%DATADIR%%/ext/argouml-transformer.jar
 %%DATADIR%%/ext/argouml-umlpropertypanels.jar
 %%DATADIR%%/ext/domainmapping.xml
+%%DATADIR%%/gef-0.13.3.jar
+%%DATADIR%%/icon/ArgoIcon128x128.png
+%%DATADIR%%/icon/ArgoIcon256x256.png
+%%DATADIR%%/icon/ArgoIcon512x512.png
+%%DATADIR%%/icon/argouml2.svg
+%%DATADIR%%/java-interfaces.jar
+%%DATADIR%%/jmi.jar
+%%DATADIR%%/jmiutils.jar
+%%DATADIR%%/log4j-1.2.6.jar
+%%DATADIR%%/mdrapi.jar
+%%DATADIR%%/mof.jar
+%%DATADIR%%/nbmdr.jar
+%%DATADIR%%/ocl-argo-1.1.jar
+%%DATADIR%%/openide-util.jar
+%%DATADIR%%/org.eclipse.emf.common_2.6.0.v20100914-1218.jar
+%%DATADIR%%/org.eclipse.emf.ecore.change.edit_2.5.0.v20100521-1846.jar
+%%DATADIR%%/org.eclipse.emf.ecore.change_2.5.1.v20100907-1643.jar
+%%DATADIR%%/org.eclipse.emf.ecore.edit_2.6.0.v20100914-1218.jar
+%%DATADIR%%/org.eclipse.emf.ecore.xmi_2.5.0.v20100521-1846.jar
+%%DATADIR%%/org.eclipse.emf.ecore_2.6.1.v20100914-1218.jar
+%%DATADIR%%/org.eclipse.emf.edit_2.6.0.v20100914-1218.jar
+%%DATADIR%%/org.eclipse.emf.mapping.ecore2xml_2.5.0.v20100521-1847.jar
+%%DATADIR%%/org.eclipse.emf.mapping.ecore_2.6.0.v20100914-1218.jar
+%%DATADIR%%/org.eclipse.emf.mapping_2.6.0.v20100914-1218.jar
+%%DATADIR%%/org.eclipse.uml2.common.edit_1.5.0.v201005031530.jar
+%%DATADIR%%/org.eclipse.uml2.common_1.5.0.v201005031530.jar
+%%DATADIR%%/org.eclipse.uml2.uml.edit_3.1.0.v201005031530.jar
+%%DATADIR%%/org.eclipse.uml2.uml.resources_3.1.1.v201008191505.jar
+%%DATADIR%%/org.eclipse.uml2.uml_3.1.1.v201008191505.jar
+%%DATADIR%%/swidgets-0.1.4.jar
+%%DATADIR%%/toolbar-1.4.1-20071227.jar
+@dirrm %%DATADIR%%/icon
 @dirrm %%DATADIR%%/ext
 @dirrm %%DATADIR%%