8 files changed, 98 insertions, 70 deletions

diff --git a/devel/astah-community/Makefile b/devel/astah-community/Makefile
index e0e83d0b8702..651962c7041a 100644
--- a/devel/astah-community/Makefile
+++ b/devel/astah-community/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jude-community
-PORTVERSION=	2.5.1
+PORTVERSION=	3.0
 CATEGORIES=	devel java
 MASTER_SITES=	# you have to register yourself as a member to download
 DISTNAME=	${PORTNAME}-${PORTVERSION:S!.!_!g}
@@ -23,17 +23,25 @@ JAVA_VERSION=	1.4+
 JAVA_OS=	native
 NO_BUILD=	yes
 
-RESTRICTED=	"See http://jude.change-vision.com/jude-web/notes/ProductLicenseAgreement.html"
+RESTRICTED=	See http://jude.change-vision.com/jude-web/notes/ProductLicenseAgreement.html
 NO_CDROM=	${RESTRICTED}
 
-PLIST_SUB+=	PORTNAME=${PORTNAME}
-
 WRKSRC=		${WRKDIR}/${PORTNAME:S!-!_!}
 
 DOWNLOAD_URL=	http://jude.change-vision.com/jude-web/download/index.html
 
+PLIST_FILES=	bin/jude share/${PORTNAME}/mozilla
+DATA_FILES=	${PORTNAME}.jar jude-api.jar JudeDefaultModel.jude \
+		jude.ico jude-doc.ico Welcome.jude
+.for file in ${DATA_FILES}
+PLIST_FILES+=	share/${PORTNAME}/${file}
+.endfor
+PLIST_FILES+=	share/${PORTNAME}/tools.jar
+PLIST_DIRS=	share/${PORTNAME}
+
 .if !defined(NOPORTDOCS)
-PORTDOCS=	README-e.txt README.txt ReleaseNote-e.html ReleaseNote.html
+PORTDOCS+=	README-e.txt README.txt ReleaseNote-e.html ReleaseNote.html \
+		ProductInformation.txt
 .endif
 
 .include <bsd.port.pre.mk>
@@ -47,22 +55,32 @@ IGNORE=		needs you to fetch manually the distribution file\
 post-patch:
 	${REINPLACE_CMD} -e "s!%%JAVA_HOME%%!${JAVA_HOME}!; \
 	                     s!%%DATADIR%%!${DATADIR}!" ${WRKSRC}/jude
+.if !defined(NOPORTDOCS)
+	${REINPLACE_CMD} 's/png\\/png\//' ${WRKSRC}/api/*/doc/index.html
+.endif
 
 do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/jude ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${FILESDIR}/mozilla ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.jar ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/JudeDefaultModel.jude ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/jude.ico ${DATADIR}
+.for datafile in ${DATA_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${datafile} ${DATADIR}
+.endfor
 	# ExportHTML needs lib/tools.jar to be copied
 	${LN} -s ${JAVA_HOME}/lib/tools.jar ${DATADIR}
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.for docfile in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
 .endfor
+	@ ${MKDIR} ${DOCSDIR}/api
+	@ cd ${WRKSRC}/api && ${FIND} . | \
+		${CPIO} --quiet -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}/api
+	@ cd ${PREFIX} && ${FIND} share/doc/${PORTNAME}/api -type f -print | \
+		${SORT} -r >> ${TMPPLIST}
+	@ cd ${PREFIX} && ${FIND} share/doc/${PORTNAME}/api -type d -print | \
+		${SORT} -r |  ${SED} -e 's#^#@dirrm #' >> ${TMPPLIST}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/astah-community/distinfo b/devel/astah-community/distinfo
index a991be9f4ef0..02bdf853a09d 100644
--- a/devel/astah-community/distinfo
+++ b/devel/astah-community/distinfo
@@ -1,3 +1,3 @@
-MD5 (jude-community-2_5_1.zip) = f0f387ca6ac26e366c29e6b3396ee4f5
-SHA256 (jude-community-2_5_1.zip) = 398bf74a569a5ad2f76e1fff92f08d9797c9481e7fa86c0143063dda78d58a3d
-SIZE (jude-community-2_5_1.zip) = 3865957
+MD5 (jude-community-3_0.zip) = 5ab57d91b1af58e080ce0345aadd74ff
+SHA256 (jude-community-3_0.zip) = 392a8d4111fe6398f8ee0ec94cb40f76ee60616770cce43f8b3e87e8660c2f9c
+SIZE (jude-community-3_0.zip) = 4880565
diff --git a/devel/astah-community/pkg-descr b/devel/astah-community/pkg-descr
index fc812cfb7611..bbc51762f0a1 100644
--- a/devel/astah-community/pkg-descr
+++ b/devel/astah-community/pkg-descr
@@ -1,18 +1,21 @@
-Jude/Community is a new tool which supports your object-oriented software 
-designing in Java(TM) and UML1.4(Unified Modeling Language). 
+JUDE/Community is the free edition with basic features.
+It is rich in functionality, offering features, such as editing and printing
+UML1.4 diagrams, import/export of Java source code, graphics output, and
+auto layout. (A restriction is that the JUDE logo always appears in the header
+of printed documents.)
 
-Basic Functions
-- Support of UML1.4
-- Class Diagram
-  (Object, Package, Subsystem and Robustness Diagrams are included.)
-- Usecase Diagram
-- Sequence Diagram
-- Collaboration Diagram
-- Statechart Diagram
-- Activity Diagram
-- Deployment Diagram
-- Component Diagram
-- Generate Java source code from model.
-- Import Java source files to create model.
+Basic Features
+JUDE supports the following basic UML 1.4 diagrams:
+- Class (Object, Package, Robustness)
+- Usecase
+- Sequence
+- Collaboration
+- Statechart
+- Activity
+- Component
+- Deployment
+- Template Generation of Java Source Files
+- Import of Java Source Files
+- Automatic Generation of Class Diagrams with Model Information
 
 WWW: http://jude.change-vision.com/jude-web/index.html
diff --git a/devel/astah-community/pkg-plist b/devel/astah-community/pkg-plist
deleted file mode 100644
index d51f1be13ba1..000000000000
--- a/devel/astah-community/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/jude
-%%DATADIR%%/mozilla
-%%DATADIR%%/%%PORTNAME%%.jar
-%%DATADIR%%/JudeDefaultModel.jude
-%%DATADIR%%/jude.ico
-%%DATADIR%%/tools.jar
-@dirrm %%DATADIR%%
diff --git a/devel/jude-community/Makefile b/devel/jude-community/Makefile
index e0e83d0b8702..651962c7041a 100644
--- a/devel/jude-community/Makefile
+++ b/devel/jude-community/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jude-community
-PORTVERSION=	2.5.1
+PORTVERSION=	3.0
 CATEGORIES=	devel java
 MASTER_SITES=	# you have to register yourself as a member to download
 DISTNAME=	${PORTNAME}-${PORTVERSION:S!.!_!g}
@@ -23,17 +23,25 @@ JAVA_VERSION=	1.4+
 JAVA_OS=	native
 NO_BUILD=	yes
 
-RESTRICTED=	"See http://jude.change-vision.com/jude-web/notes/ProductLicenseAgreement.html"
+RESTRICTED=	See http://jude.change-vision.com/jude-web/notes/ProductLicenseAgreement.html
 NO_CDROM=	${RESTRICTED}
 
-PLIST_SUB+=	PORTNAME=${PORTNAME}
-
 WRKSRC=		${WRKDIR}/${PORTNAME:S!-!_!}
 
 DOWNLOAD_URL=	http://jude.change-vision.com/jude-web/download/index.html
 
+PLIST_FILES=	bin/jude share/${PORTNAME}/mozilla
+DATA_FILES=	${PORTNAME}.jar jude-api.jar JudeDefaultModel.jude \
+		jude.ico jude-doc.ico Welcome.jude
+.for file in ${DATA_FILES}
+PLIST_FILES+=	share/${PORTNAME}/${file}
+.endfor
+PLIST_FILES+=	share/${PORTNAME}/tools.jar
+PLIST_DIRS=	share/${PORTNAME}
+
 .if !defined(NOPORTDOCS)
-PORTDOCS=	README-e.txt README.txt ReleaseNote-e.html ReleaseNote.html
+PORTDOCS+=	README-e.txt README.txt ReleaseNote-e.html ReleaseNote.html \
+		ProductInformation.txt
 .endif
 
 .include <bsd.port.pre.mk>
@@ -47,22 +55,32 @@ IGNORE=		needs you to fetch manually the distribution file\
 post-patch:
 	${REINPLACE_CMD} -e "s!%%JAVA_HOME%%!${JAVA_HOME}!; \
 	                     s!%%DATADIR%%!${DATADIR}!" ${WRKSRC}/jude
+.if !defined(NOPORTDOCS)
+	${REINPLACE_CMD} 's/png\\/png\//' ${WRKSRC}/api/*/doc/index.html
+.endif
 
 do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/jude ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${FILESDIR}/mozilla ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.jar ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/JudeDefaultModel.jude ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/jude.ico ${DATADIR}
+.for datafile in ${DATA_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${datafile} ${DATADIR}
+.endfor
 	# ExportHTML needs lib/tools.jar to be copied
 	${LN} -s ${JAVA_HOME}/lib/tools.jar ${DATADIR}
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.for docfile in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
 .endfor
+	@ ${MKDIR} ${DOCSDIR}/api
+	@ cd ${WRKSRC}/api && ${FIND} . | \
+		${CPIO} --quiet -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}/api
+	@ cd ${PREFIX} && ${FIND} share/doc/${PORTNAME}/api -type f -print | \
+		${SORT} -r >> ${TMPPLIST}
+	@ cd ${PREFIX} && ${FIND} share/doc/${PORTNAME}/api -type d -print | \
+		${SORT} -r |  ${SED} -e 's#^#@dirrm #' >> ${TMPPLIST}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/jude-community/distinfo b/devel/jude-community/distinfo
index a991be9f4ef0..02bdf853a09d 100644
--- a/devel/jude-community/distinfo
+++ b/devel/jude-community/distinfo
@@ -1,3 +1,3 @@
-MD5 (jude-community-2_5_1.zip) = f0f387ca6ac26e366c29e6b3396ee4f5
-SHA256 (jude-community-2_5_1.zip) = 398bf74a569a5ad2f76e1fff92f08d9797c9481e7fa86c0143063dda78d58a3d
-SIZE (jude-community-2_5_1.zip) = 3865957
+MD5 (jude-community-3_0.zip) = 5ab57d91b1af58e080ce0345aadd74ff
+SHA256 (jude-community-3_0.zip) = 392a8d4111fe6398f8ee0ec94cb40f76ee60616770cce43f8b3e87e8660c2f9c
+SIZE (jude-community-3_0.zip) = 4880565
diff --git a/devel/jude-community/pkg-descr b/devel/jude-community/pkg-descr
index fc812cfb7611..bbc51762f0a1 100644
--- a/devel/jude-community/pkg-descr
+++ b/devel/jude-community/pkg-descr
@@ -1,18 +1,21 @@
-Jude/Community is a new tool which supports your object-oriented software 
-designing in Java(TM) and UML1.4(Unified Modeling Language). 
+JUDE/Community is the free edition with basic features.
+It is rich in functionality, offering features, such as editing and printing
+UML1.4 diagrams, import/export of Java source code, graphics output, and
+auto layout. (A restriction is that the JUDE logo always appears in the header
+of printed documents.)
 
-Basic Functions
-- Support of UML1.4
-- Class Diagram
-  (Object, Package, Subsystem and Robustness Diagrams are included.)
-- Usecase Diagram
-- Sequence Diagram
-- Collaboration Diagram
-- Statechart Diagram
-- Activity Diagram
-- Deployment Diagram
-- Component Diagram
-- Generate Java source code from model.
-- Import Java source files to create model.
+Basic Features
+JUDE supports the following basic UML 1.4 diagrams:
+- Class (Object, Package, Robustness)
+- Usecase
+- Sequence
+- Collaboration
+- Statechart
+- Activity
+- Component
+- Deployment
+- Template Generation of Java Source Files
+- Import of Java Source Files
+- Automatic Generation of Class Diagrams with Model Information
 
 WWW: http://jude.change-vision.com/jude-web/index.html
diff --git a/devel/jude-community/pkg-plist b/devel/jude-community/pkg-plist
deleted file mode 100644
index d51f1be13ba1..000000000000
--- a/devel/jude-community/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/jude
-%%DATADIR%%/mozilla
-%%DATADIR%%/%%PORTNAME%%.jar
-%%DATADIR%%/JudeDefaultModel.jude
-%%DATADIR%%/jude.ico
-%%DATADIR%%/tools.jar
-@dirrm %%DATADIR%%