3 files changed, 23 insertions, 16 deletions

diff --git a/devel/argouml/Makefile b/devel/argouml/Makefile
index 0325320e63b7..c4afd3e1a7f6 100644
--- a/devel/argouml/Makefile
+++ b/devel/argouml/Makefile
@@ -1,13 +1,8 @@
-# ex:ts=8
-# Ports collection makefile for:	ArgoUML
-# Date created:			June 14, 2003
-# Whom:				ijliao
-#
+# Created by:	ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	argouml
-PORTVERSION=	0.32.2
+PORTVERSION=	0.34
 CATEGORIES=	devel java
 MASTER_SITES=	http://argouml-downloads.tigris.org/nonav/argouml-${PORTVERSION}/
 DISTNAME=	ArgoUML-${PORTVERSION}
@@ -18,7 +13,7 @@ DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A UML design tool with cognitive support
+COMMENT=	UML design tool with cognitive support
 
 LICENSE=	EPL
 
@@ -36,6 +31,10 @@ SUB_FILES=	argouml.sh
 SUB_LIST=	JAVA_VERSION=${JAVA_VERSION}
 PORTDOCS=	manual-${PORTVERSION}.pdf quickguide-${PORTVERSION}.pdf
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 DESKTOP_ENTRIES=	"ArgoUML" \
 			"Create advanced UML diagrams" \
 			"${DATADIR}/icon/ArgoIcon128x128.png" \
@@ -53,7 +52,7 @@ do-install:
 	@${MKDIR} ${DATADIR}/icon
 	${INSTALL_DATA} ${WRKSRC}/icon/*.png ${DATADIR}/icon
 	${INSTALL_DATA} ${WRKSRC}/icon/*.svg ${DATADIR}/icon
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/manual-${PORTVERSION}.pdf ${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/quickguide-${PORTVERSION}.pdf ${DOCSDIR}
diff --git a/devel/argouml/distinfo b/devel/argouml/distinfo
index 4807bc3806db..056f5d8c5168 100644
--- a/devel/argouml/distinfo
+++ b/devel/argouml/distinfo
@@ -1,6 +1,6 @@
-SHA256 (argouml/ArgoUML-0.32.2.tar.gz) = 6140031b06db5b9af045b360e12b829ba373a77d54e9f83a74f2dfc4e1558906
-SIZE (argouml/ArgoUML-0.32.2.tar.gz) = 15819963
-SHA256 (argouml/manual-0.32.2.pdf) = aad5d006772ee6bd62f16078a5d105c0a8eb8136dbaa226664a6d321ea054ec7
-SIZE (argouml/manual-0.32.2.pdf) = 3405772
-SHA256 (argouml/quickguide-0.32.2.pdf) = e5be421fdd1ef865c6dd7defe598070c605bcb71ca36bf6cd5c87195c8403799
-SIZE (argouml/quickguide-0.32.2.pdf) = 58284
+SHA256 (argouml/ArgoUML-0.34.tar.gz) = 818fdbbbaf48f70f3a7386cd4dab5313cdba3293b3d8df49a3045911a5372dc3
+SIZE (argouml/ArgoUML-0.34.tar.gz) = 16504818
+SHA256 (argouml/manual-0.34.pdf) = 13c91e8b7802fe3a4d4462b9608f06755981549865a710dccc2372021b270c49
+SIZE (argouml/manual-0.34.pdf) = 3405949
+SHA256 (argouml/quickguide-0.34.pdf) = 6972651140234aad7c1c93948f1d788b1c0a64dc09d8a5342d712904d181e458
+SIZE (argouml/quickguide-0.34.pdf) = 58334
diff --git a/devel/argouml/pkg-plist b/devel/argouml/pkg-plist
index 590dc6c73947..db51f8010f15 100644
--- a/devel/argouml/pkg-plist
+++ b/devel/argouml/pkg-plist
@@ -4,6 +4,12 @@ bin/argouml
 %%DATADIR%%/argouml-mdr.jar
 %%DATADIR%%/argouml-model.jar
 %%DATADIR%%/argouml.jar
+%%DATADIR%%/batik-awt-util-1.7.jar
+%%DATADIR%%/batik-dom-1.7.jar
+%%DATADIR%%/batik-ext-1.7.jar
+%%DATADIR%%/batik-svggen-1.7.jar
+%%DATADIR%%/batik-util-1.7.jar
+%%DATADIR%%/batik-xml-1.7.jar
 %%DATADIR%%/commons-logging-1.0.2.jar
 %%DATADIR%%/ext/anarres-cpp-no-dependencies-1.2.3.jar
 %%DATADIR%%/ext/antlr-2.7.7.jar
@@ -14,6 +20,7 @@ bin/argouml
 %%DATADIR%%/ext/argo_php.jar
 %%DATADIR%%/ext/argouml-csharp.jar
 %%DATADIR%%/ext/argouml-diagrams-activity.jar
+%%DATADIR%%/ext/argouml-diagrams-deployment.jar
 %%DATADIR%%/ext/argouml-diagrams-sequence.jar
 %%DATADIR%%/ext/argouml-diagrams-state.jar
 %%DATADIR%%/ext/argouml-i18n-de.jar
@@ -26,11 +33,12 @@ bin/argouml
 %%DATADIR%%/ext/argouml-i18n-pt_BR.jar
 %%DATADIR%%/ext/argouml-i18n-ru.jar
 %%DATADIR%%/ext/argouml-i18n-zh.jar
+%%DATADIR%%/ext/argouml-notation.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%%/gef-0.13.8.jar
 %%DATADIR%%/icon/ArgoIcon128x128.png
 %%DATADIR%%/icon/ArgoIcon256x256.png
 %%DATADIR%%/icon/ArgoIcon512x512.png