4 files changed, 62 insertions, 42 deletions

diff --git a/devel/astah-community/Makefile b/devel/astah-community/Makefile
index 83ec07251f1c..df1cde9692be 100644
--- a/devel/astah-community/Makefile
+++ b/devel/astah-community/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jude-community
-PORTVERSION=	5.1.1
+PORTVERSION=	5.2
 CATEGORIES=	devel java
 MASTER_SITES=	# you have to register yourself as a member to download
 DISTNAME=	${PORTNAME}-${PORTVERSION:S!.!_!g}
@@ -16,12 +16,19 @@ COMMENT=	A Java/UML Object-Oriented Design Tool
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-# HTML export doesn't work with JDK 5.0.
-# Expect that, Jude Community 3.1 works fine with JDK 5.0
-# work around to use JDK 5.0: symlink or copy tools.jar from JDK 1.4.
+
+# Export HTML function can be used with JDK 1.4 only.
+# (But it can work with JDK 1.5 + copying JDK 1.4 tools.jar to ${DATADIR})
+# In case you are going to use JDK1.5+ in Japanese environment, make sure
+# you have prepared following command to avoid from font problem:
+# ln -s /usr/local/lib/X11/fonts/TrueType \
+#     /usr/local/diablo-jdk1.5.0/jre/lib/fonts/fallback
+.if !defined(WITHOUT_EXPORT_HTML)
 JAVA_VERSION=	1.4
-# It doesn't work well with linux-sun-jdk14
-# I haven't tested with the jdks of blackdown or ibm
+.else
+JAVA_VERSION=	1.4+
+.endif
+
 JAVA_OS=	native
 NO_BUILD=	yes
 
@@ -32,14 +39,19 @@ 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 \
-		JudeDefaultModel_ja.jude jude-gui_en.properties_org \
-		jude.ico jude-doc.ico Welcome.jude Welcome_ja.jude
+DATA_FILES=	${PORTNAME}.jar jude-api.jar jude-gui_en.properties_org \
+		jude.ico jude-doc.ico Welcome.jude Welcome_ja.jude \
+		template/project/Java1.4.jude template/project/Java5.jude
+
 .for file in ${DATA_FILES}
 PLIST_FILES+=	share/${PORTNAME}/${file}
 .endfor
+.if !defined(WITHOUT_EXPORT_HTML)
 PLIST_FILES+=	share/${PORTNAME}/tools.jar
-PLIST_DIRS=	share/${PORTNAME}
+.endif
+PLIST_DIRS=	share/${PORTNAME}/template/project \
+		share/${PORTNAME}/template \
+		share/${PORTNAME}
 
 .if !defined(NOPORTDOCS)
 PORTDOCS+=	README-e.txt README.txt ReleaseNote-e.html ReleaseNote.html \
@@ -65,20 +77,18 @@ do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/jude ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${FILESDIR}/mozilla ${DATADIR}
-.for datafile in ${DATA_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${datafile} ${DATADIR}
-.endfor
-	# ExportHTML needs lib/tools.jar to be copied
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${DATA_FILES}" ${DATADIR})
+.if !defined(WITHOUT_EXPORT_HTML)
+	# ExportHTML needs lib/tools.jar of JDK1.4
 	${LN} -s ${JAVA_HOME}/lib/tools.jar ${DATADIR}
-
+.endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${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
+	${MKDIR} ${DOCSDIR}/api
+	(cd ${WRKSRC}/api && ${COPYTREE_SHARE} \* ${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 | \
diff --git a/devel/astah-community/distinfo b/devel/astah-community/distinfo
index 6b6a22ea97c8..0e644de5a142 100644
--- a/devel/astah-community/distinfo
+++ b/devel/astah-community/distinfo
@@ -1,3 +1,3 @@
-MD5 (jude-community-5_1_1.zip) = ce46e0f9ca720ead60d52c052da228a3
-SHA256 (jude-community-5_1_1.zip) = c03ad1be77e1c7a06d17133bbf73a1a62bc27cb77e97492edda67e62e75f2b8d
-SIZE (jude-community-5_1_1.zip) = 7671961
+MD5 (jude-community-5_2.zip) = a2d9727288616f74e266d39d13bbbbe4
+SHA256 (jude-community-5_2.zip) = 65a60116d4a006c754d6ffc2169caba5a224b22a16150f1a353547da111b4602
+SIZE (jude-community-5_2.zip) = 8229940
diff --git a/devel/jude-community/Makefile b/devel/jude-community/Makefile
index 83ec07251f1c..df1cde9692be 100644
--- a/devel/jude-community/Makefile
+++ b/devel/jude-community/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jude-community
-PORTVERSION=	5.1.1
+PORTVERSION=	5.2
 CATEGORIES=	devel java
 MASTER_SITES=	# you have to register yourself as a member to download
 DISTNAME=	${PORTNAME}-${PORTVERSION:S!.!_!g}
@@ -16,12 +16,19 @@ COMMENT=	A Java/UML Object-Oriented Design Tool
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-# HTML export doesn't work with JDK 5.0.
-# Expect that, Jude Community 3.1 works fine with JDK 5.0
-# work around to use JDK 5.0: symlink or copy tools.jar from JDK 1.4.
+
+# Export HTML function can be used with JDK 1.4 only.
+# (But it can work with JDK 1.5 + copying JDK 1.4 tools.jar to ${DATADIR})
+# In case you are going to use JDK1.5+ in Japanese environment, make sure
+# you have prepared following command to avoid from font problem:
+# ln -s /usr/local/lib/X11/fonts/TrueType \
+#     /usr/local/diablo-jdk1.5.0/jre/lib/fonts/fallback
+.if !defined(WITHOUT_EXPORT_HTML)
 JAVA_VERSION=	1.4
-# It doesn't work well with linux-sun-jdk14
-# I haven't tested with the jdks of blackdown or ibm
+.else
+JAVA_VERSION=	1.4+
+.endif
+
 JAVA_OS=	native
 NO_BUILD=	yes
 
@@ -32,14 +39,19 @@ 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 \
-		JudeDefaultModel_ja.jude jude-gui_en.properties_org \
-		jude.ico jude-doc.ico Welcome.jude Welcome_ja.jude
+DATA_FILES=	${PORTNAME}.jar jude-api.jar jude-gui_en.properties_org \
+		jude.ico jude-doc.ico Welcome.jude Welcome_ja.jude \
+		template/project/Java1.4.jude template/project/Java5.jude
+
 .for file in ${DATA_FILES}
 PLIST_FILES+=	share/${PORTNAME}/${file}
 .endfor
+.if !defined(WITHOUT_EXPORT_HTML)
 PLIST_FILES+=	share/${PORTNAME}/tools.jar
-PLIST_DIRS=	share/${PORTNAME}
+.endif
+PLIST_DIRS=	share/${PORTNAME}/template/project \
+		share/${PORTNAME}/template \
+		share/${PORTNAME}
 
 .if !defined(NOPORTDOCS)
 PORTDOCS+=	README-e.txt README.txt ReleaseNote-e.html ReleaseNote.html \
@@ -65,20 +77,18 @@ do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/jude ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${FILESDIR}/mozilla ${DATADIR}
-.for datafile in ${DATA_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${datafile} ${DATADIR}
-.endfor
-	# ExportHTML needs lib/tools.jar to be copied
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${DATA_FILES}" ${DATADIR})
+.if !defined(WITHOUT_EXPORT_HTML)
+	# ExportHTML needs lib/tools.jar of JDK1.4
 	${LN} -s ${JAVA_HOME}/lib/tools.jar ${DATADIR}
-
+.endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${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
+	${MKDIR} ${DOCSDIR}/api
+	(cd ${WRKSRC}/api && ${COPYTREE_SHARE} \* ${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 | \
diff --git a/devel/jude-community/distinfo b/devel/jude-community/distinfo
index 6b6a22ea97c8..0e644de5a142 100644
--- a/devel/jude-community/distinfo
+++ b/devel/jude-community/distinfo
@@ -1,3 +1,3 @@
-MD5 (jude-community-5_1_1.zip) = ce46e0f9ca720ead60d52c052da228a3
-SHA256 (jude-community-5_1_1.zip) = c03ad1be77e1c7a06d17133bbf73a1a62bc27cb77e97492edda67e62e75f2b8d
-SIZE (jude-community-5_1_1.zip) = 7671961
+MD5 (jude-community-5_2.zip) = a2d9727288616f74e266d39d13bbbbe4
+SHA256 (jude-community-5_2.zip) = 65a60116d4a006c754d6ffc2169caba5a224b22a16150f1a353547da111b4602
+SIZE (jude-community-5_2.zip) = 8229940