- Update to 1.4.0.3

Submitted by:	Rainer Hurling <rhurlin@gwdg.de> (via email)

3 files changed, 28 insertions, 16 deletions

diff --git a/graphics/openjump/Makefile b/graphics/openjump/Makefile
index 0e3b9ae4a325..cf19a75bf86e 100644
--- a/graphics/openjump/Makefile
+++ b/graphics/openjump/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	openjump
-PORTVERSION=	1.3
+PORTVERSION=	1.4.0.3
 CATEGORIES=	graphics java geography
-MASTER_SITES=	SF/jump-pilot/OldFiles
+MASTER_SITES=	SF/jump-pilot/OpenJUMP/${PORTVERSION}
+DISTNAME=	${PORTNAME}-bin-${PORTVERSION}
 
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	An open source GIS software written in Java
@@ -18,8 +19,7 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 USE_ZIP=	yes
 NO_BUILD=	yes
-PORTDOCS=	OJ_improvements_from_v1.2_to_v1.3.txt gpl2_license.txt \
-		Using_MrSIDPlugIn.txt apache_license.txt readme.txt
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
@@ -31,7 +31,7 @@ do-install:
 	@cd ${WRKSRC}/lib/ext && ${COPYTREE_SHARE} . ${TARGET_DIR}/lib/ext
 	@${ECHO_MSG} "Installing startup script"
 	${MKDIR} ${TARGET_DIR}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/openjump.sh ${TARGET_DIR}/bin/openjump
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/oj_linux.sh ${TARGET_DIR}/bin/openjump
 	${INSTALL_DATA} ${WRKSRC}/bin/workbench-properties.xml ${TARGET_DIR}/bin/
 	${INSTALL_DATA} ${WRKSRC}/bin/default-plugins.xml ${TARGET_DIR}/bin/
 	${INSTALL_DATA} ${WRKSRC}/bin/log4j.xml ${TARGET_DIR}/bin/
@@ -39,9 +39,12 @@ do-install:
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} "---> Installing documentation"
 	${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/Changes.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/licenses/apache_license.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/licenses/gpl2_license.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/licenses/jmath_license.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/licenses/jython_license.txt ${DOCSDIR}
 .else
 	@${ECHO_MSG} "---> Skipping documentation"
 .endif
diff --git a/graphics/openjump/distinfo b/graphics/openjump/distinfo
index 8ab0968e53ec..5cdc316d808c 100644
--- a/graphics/openjump/distinfo
+++ b/graphics/openjump/distinfo
@@ -1,3 +1,2 @@
-MD5 (openjump-1.3.zip) = 71eafced5e08b641566f475b96996013
-SHA256 (openjump-1.3.zip) = 7e403e09be83329938b5a8a0f26f0977147cdce3829c58e5ca7e471a49874f1f
-SIZE (openjump-1.3.zip) = 12427236
+SHA256 (openjump-bin-1.4.0.3.zip) = 5dfd394e72cdda128e9d964840cd57a8e9515857b6e073d2156c33aaf85d2437
+SIZE (openjump-bin-1.4.0.3.zip) = 13515561
diff --git a/graphics/openjump/pkg-plist b/graphics/openjump/pkg-plist
index c36f093ad5fc..f9745b5267e6 100644
--- a/graphics/openjump/pkg-plist
+++ b/graphics/openjump/pkg-plist
@@ -5,7 +5,7 @@ openjump/bin/log4j.xml
 openjump/lib/bsh-2.0b4.jar
 openjump/lib/Jama-1.0.1.jar
 openjump/lib/jdom.jar
-openjump/lib/jts-1.10.jar
+openjump/lib/jts-1.11.jar
 openjump/lib/xercesImpl.jar
 openjump/lib/xml-apis.jar
 openjump/lib/Buoy.jar
@@ -14,12 +14,13 @@ openjump/lib/ermapper.jar
 openjump/lib/jai_codec.jar
 openjump/lib/jai_core.jar
 openjump/lib/jmatharray-20070905.jar
+openjump/lib/jmathplot-20070905.jar
 openjump/lib/jython.jar
-openjump/lib/log4j-1.2.8.jar
-openjump/lib/openjump-api-1.3.jar
-openjump/lib/openjump-workbench-1.3.jar
+openjump/lib/log4j-1.2.16.jar
+openjump/lib/openjump-api-1.4.0.3.jar
+openjump/lib/openjump-workbench-1.4.0.3.jar
 openjump/lib/postgis_1_0_0.jar
-openjump/lib/postgresql-8.3-603.jdbc3.jar
+openjump/lib/postgresql-9.0-801.jdbc3.jar
 openjump/lib/xml-apis-ext.jar
 openjump/lib/ext/BeanTools/0-Help.bsh
 openjump/lib/ext/BeanTools/1-HelloWorld.bsh
@@ -29,7 +30,9 @@ openjump/lib/ext/BeanTools/4-AddAttribute.bsh
 openjump/lib/ext/BeanTools/5-ChangeAttributeValue.bsh
 openjump/lib/ext/BeanTools/6-PushPinPoints.bsh
 openjump/lib/ext/BeanTools/7-AddXYAsAttributes.bsh
+openjump/lib/ext/BeanTools/8-GetInvalidShapefileRings.bsh
 openjump/lib/ext/BeanTools/RefreshScriptsMenu.bsh
+openjump/lib/ext/BeanTools/SaveViewAsBeanTool.bsh
 openjump/lib/ext/jython/AlignSelected.py
 openjump/lib/ext/jython/ArcTool.py
 openjump/lib/ext/jython/CircleTool.py
@@ -49,6 +52,13 @@ openjump/lib/ext/jython/images/DrawRoad.gif
 openjump/lib/ext/jython/images/DrawRotRect.gif
 openjump/lib/ext/jython/startup.py
 openjump/lib/ext/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/Changes.txt
+%%PORTDOCS%%%%DOCSDIR%%/apache_license.txt
+%%PORTDOCS%%%%DOCSDIR%%/gpl2_license.txt
+%%PORTDOCS%%%%DOCSDIR%%/jmath_license.txt
+%%PORTDOCS%%%%DOCSDIR%%/jython_license.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm openjump/lib/ext/jython/images
 @dirrm openjump/lib/ext/jython
 @dirrm openjump/lib/ext/BeanTools