graphics/openjump: Update to 1.15

PR:	246665
Submitted by:	rhurlin@gwdg.de (maintainer)

3 files changed, 20 insertions, 26 deletions

diff --git a/graphics/openjump/Makefile b/graphics/openjump/Makefile
index baa8eb60e804..8bf89c2c1691 100644
--- a/graphics/openjump/Makefile
+++ b/graphics/openjump/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	OpenJUMP
-PORTVERSION=	1.14.1
+PORTVERSION=	1.15
 CATEGORIES=	graphics java geography
 MASTER_SITES=	SF/jump-pilot/OpenJUMP/${PORTVERSION}
 DISTNAME=	${PORTNAME}-Portable-${PORTVERSION}-r${PLUS_REV}-PLUS
@@ -12,29 +12,23 @@ COMMENT=	Open source GIS software written in Java
 
 LICENSE=	BSD3CLAUSE CLEARTHOUGHT CPL ECW GPLv2 GPLv3 JAIDL JDOM JYTHON LGPL21 LGPL3
 LICENSE_COMB=	multi
-
 LICENSE_NAME_CLEARTHOUGHT=	Clearthought Software License
-LICENSE_FILE_CLEARTHOUGHT=	${WRKSRC}/licenses/clearthought-2.0.txt
-LICENSE_PERMS_CLEARTHOUGHT=	auto-accept
-
 LICENSE_NAME_CPL=	Common Public License v1.0
-LICENSE_FILE_CPL=	${WRKSRC}/licenses/cpl-1.0.txt
-LICENSE_PERMS_CPL=	auto-accept
-
 LICENSE_NAME_ECW=	EARTH RESOURCE MAPPING
-LICENSE_FILE_ECW=	${WRKSRC}/licenses/ecw\ license.txt
-LICENSE_PERMS_ECW=	auto-accept
-
 LICENSE_NAME_JAIDL=	Java Advanced Imaging Distribution License
-LICENSE_FILE_JAIDL=	${WRKSRC}/licenses/jdl-jai.pdf
-LICENSE_PERMS_JAIDL=	auto-accept
-
 LICENSE_NAME_JDOM=	JDOM Project License
-LICENSE_FILE_JDOM=	${WRKSRC}/licenses/jdom_license.txt
-LICENSE_PERMS_JDOM=	auto-accept
-
 LICENSE_NAME_JYTHON=	The Jython License
+LICENSE_FILE_CLEARTHOUGHT=	${WRKSRC}/licenses/clearthought-2.0.txt
+LICENSE_FILE_CPL=	${WRKSRC}/licenses/cpl-1.0.txt
+LICENSE_FILE_ECW=	${WRKSRC}/licenses/ecw\ license.txt
+LICENSE_FILE_JAIDL=	${WRKSRC}/licenses/jdl-jai.pdf
+LICENSE_FILE_JDOM=	${WRKSRC}/licenses/jdom_license.txt
 LICENSE_FILE_JYTHON=	${WRKSRC}/licenses/jython_license.txt
+LICENSE_PERMS_CLEARTHOUGHT=	auto-accept
+LICENSE_PERMS_CPL=	auto-accept
+LICENSE_PERMS_ECW=	auto-accept
+LICENSE_PERMS_JAIDL=	auto-accept
+LICENSE_PERMS_JDOM=	auto-accept
 LICENSE_PERMS_JYTHON=	auto-accept
 
 USES=		zip
@@ -44,7 +38,7 @@ NO_BUILD=	yes
 NO_ARCH=	yes
 TARGET_DIR=	${STAGEDIR}${PREFIX}/${PORTNAME}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-r${PLUS_REV}-PLUS
-PLUS_REV=	6147
+PLUS_REV=	6241
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/graphics/openjump/distinfo b/graphics/openjump/distinfo
index 9d258d211b4e..f8262af8b3e0 100644
--- a/graphics/openjump/distinfo
+++ b/graphics/openjump/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552659342
-SHA256 (OpenJUMP-Portable-1.14.1-r6147-PLUS.zip) = 7cf75baceda69079098da20f3365da499d8b99d5ca562bd79034263b42630455
-SIZE (OpenJUMP-Portable-1.14.1-r6147-PLUS.zip) = 58896870
+TIMESTAMP = 1589832307
+SHA256 (OpenJUMP-Portable-1.15-r6241-PLUS.zip) = e6926890078790dd24428ee4360699c8ab53a211879ac0c3bfab5d2bec1ac20a
+SIZE (OpenJUMP-Portable-1.15-r6241-PLUS.zip) = 58988379
diff --git a/graphics/openjump/pkg-plist b/graphics/openjump/pkg-plist
index 79da79bd264f..221cc511136f 100644
--- a/graphics/openjump/pkg-plist
+++ b/graphics/openjump/pkg-plist
@@ -2,7 +2,7 @@ OpenJUMP/bin/default-plugins.xml
 OpenJUMP/bin/log4j.xml
 OpenJUMP/bin/openjump
 OpenJUMP/bin/readme.txt
-OpenJUMP/lib/OpenJUMP-1.14.1-r6147-nosrc.jar
+OpenJUMP/lib/OpenJUMP-1.15-r6241-nosrc.jar
 OpenJUMP/lib/batik-awt-util-1.6.jar
 OpenJUMP/lib/batik-bridge-1.6.jar
 OpenJUMP/lib/batik-css-1.6.jar
@@ -43,7 +43,6 @@ OpenJUMP/lib/ext/BeanTools/RefreshScriptsMenu.bsh
 OpenJUMP/lib/ext/BeanTools/SaveViewAsBeanTool.bsh
 OpenJUMP/lib/ext/CadTools-0.7.jar
 OpenJUMP/lib/ext/ColorChooser-1.3.jar
-OpenJUMP/lib/ext/ConcaveHull-0.2.jar
 OpenJUMP/lib/ext/ConcaveHull-Readme.txt
 OpenJUMP/lib/ext/FillPatterns/40S-TWEED_C1_064_A_RGB.JPG
 OpenJUMP/lib/ext/FillPatterns/40S-TWEED_C1_064_B_RGB.JPG
@@ -206,7 +205,7 @@ OpenJUMP/lib/ext/OnlineDoc-0.1.jar
 OpenJUMP/lib/ext/OpenKLEM-20190224.jar
 OpenJUMP/lib/ext/OpenKLEMOJ-20190224.jar
 OpenJUMP/lib/ext/PirolCsv.jar
-OpenJUMP/lib/ext/SetAttributes-0.7.1.jar
+OpenJUMP/lib/ext/SetAttributes-0.8.0.jar
 OpenJUMP/lib/ext/SkyPrinterPlugIn-1.0.1.jar
 OpenJUMP/lib/ext/TableLayout-bin-jdk1.5-2007-04-21.jar
 OpenJUMP/lib/ext/VertexImages/bore_01.wkt
@@ -278,6 +277,7 @@ OpenJUMP/lib/ext/VertexSymbols-0.19.jar
 OpenJUMP/lib/ext/ViewManager-0.3.4.jar
 OpenJUMP/lib/ext/aggregation-0.2.10.jar
 OpenJUMP/lib/ext/bsheditor4jump-0.2.4.jar
+OpenJUMP/lib/ext/concave-hull-0.3.jar
 OpenJUMP/lib/ext/csv-driver-1.0.2.jar
 OpenJUMP/lib/ext/dbdatastore/mariadb-java-client-1.3.4.jar
 OpenJUMP/lib/ext/dbdatastore/mysql-connector-java-5.1.38-bin.jar
@@ -285,7 +285,7 @@ OpenJUMP/lib/ext/dbdatastore/readme.txt
 OpenJUMP/lib/ext/dbdatastore/sqlite-jdbc-3.20.0.jar
 OpenJUMP/lib/ext/dbquery.properties
 OpenJUMP/lib/ext/driver-dxf-0.9.0.jar
-OpenJUMP/lib/ext/graph-toolbox-0.6.1.jar
+OpenJUMP/lib/ext/graph-toolbox-0.6.3.jar
 OpenJUMP/lib/ext/imageio-ext/commons-lang-2.4.jar
 OpenJUMP/lib/ext/imageio-ext/gdal-2.1.0.jar
 OpenJUMP/lib/ext/imageio-ext/imageio-ext-arcgrid-1.1.16.jar
@@ -370,7 +370,7 @@ OpenJUMP/lib/ext/kml-driver-0.2.5.jar
 OpenJUMP/lib/ext/kml/ProjectStringsList.pjl
 OpenJUMP/lib/ext/lib/jgrapht-core-0.9.2.jar
 OpenJUMP/lib/ext/lib/jump-jgrapht-0.7.1.jar
-OpenJUMP/lib/ext/matching-0.8.1.jar
+OpenJUMP/lib/ext/matching-0.8.2.jar
 OpenJUMP/lib/ext/oj_osm_reader_v1-0-4.jar
 OpenJUMP/lib/ext/ojmapcoloring-0.5.jar
 OpenJUMP/lib/ext/ojsextante_binding_apr2018c.jar