From owner-svn-ports-head@freebsd.org Wed Mar 20 08:55:04 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 43BEA154CA97; Wed, 20 Mar 2019 08:55:04 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D9F5F8C151; Wed, 20 Mar 2019 08:55:03 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B0A6B1E760; Wed, 20 Mar 2019 08:55:03 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2K8t3Ul045981; Wed, 20 Mar 2019 08:55:03 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2K8t22t045975; Wed, 20 Mar 2019 08:55:02 GMT (envelope-from meta@FreeBSD.org) Message-Id: <201903200855.x2K8t22t045975@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Wed, 20 Mar 2019 08:55:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496320 - in head/graphics/openjump: . files X-SVN-Group: ports-head X-SVN-Commit-Author: meta X-SVN-Commit-Paths: in head/graphics/openjump: . files X-SVN-Commit-Revision: 496320 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D9F5F8C151 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Mar 2019 08:55:04 -0000 Author: meta Date: Wed Mar 20 08:55:02 2019 New Revision: 496320 URL: https://svnweb.freebsd.org/changeset/ports/496320 Log: graphics/openjump: Update to 1.14.1 The update of graphics/openjump from version 1.13 to 1.14.1 release rev. 6147 brings important bugfixes and new features[1]: Some of the many new features and improvements * CORE source is now java 8 * general java 11 runtime compatibility * Add an option to connect to a WMS with invalid certificate * Improve LayerView naming and saving, allow views based on view * Added LegendPlugin to display a legend of symbols adopted into the view * PLUS: Added OpenKLEM extension for topographic and Hydrological analysis * Added histogram plugin for raster which calculates also statistic indices, relative and cumulative frequancies [1] https://sourceforge.net/projects/jump-pilot/files/OpenJUMP/1.14.1/ PR: 236555 Submitted by: Rainer Hurling (maintainer) Modified: head/graphics/openjump/Makefile head/graphics/openjump/distinfo head/graphics/openjump/files/patch-bin_oj__linux.sh head/graphics/openjump/pkg-plist Modified: head/graphics/openjump/Makefile ============================================================================== --- head/graphics/openjump/Makefile Wed Mar 20 08:52:34 2019 (r496319) +++ head/graphics/openjump/Makefile Wed Mar 20 08:55:02 2019 (r496320) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= OpenJUMP -PORTVERSION= 1.13 +PORTVERSION= 1.14.1 CATEGORIES= graphics java geography MASTER_SITES= SF/jump-pilot/OpenJUMP/${PORTVERSION} DISTNAME= ${PORTNAME}-Portable-${PORTVERSION}-r${PLUS_REV}-PLUS @@ -37,16 +37,14 @@ LICENSE_NAME_JYTHON= The Jython License LICENSE_FILE_JYTHON= ${WRKSRC}/licenses/jython_license.txt LICENSE_PERMS_JYTHON= auto-accept -### Desktop Entries ??? - USES= zip USE_JAVA= yes -JAVA_VERSION= 1.7+ +JAVA_VERSION= 1.8+ NO_BUILD= yes NO_ARCH= yes TARGET_DIR= ${STAGEDIR}${PREFIX}/${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-r${PLUS_REV}-PLUS -PLUS_REV= 5792 +PLUS_REV= 6147 OPTIONS_DEFINE= DOCS Modified: head/graphics/openjump/distinfo ============================================================================== --- head/graphics/openjump/distinfo Wed Mar 20 08:52:34 2019 (r496319) +++ head/graphics/openjump/distinfo Wed Mar 20 08:55:02 2019 (r496320) @@ -1,3 +1,3 @@ -TIMESTAMP = 1530951799 -SHA256 (OpenJUMP-Portable-1.13-r5792-PLUS.zip) = 803514da3ed17d5eb0d0d8f5944d219b6a0a6bb8015a4ba8d43cc442e99342d3 -SIZE (OpenJUMP-Portable-1.13-r5792-PLUS.zip) = 56754602 +TIMESTAMP = 1552659342 +SHA256 (OpenJUMP-Portable-1.14.1-r6147-PLUS.zip) = 7cf75baceda69079098da20f3365da499d8b99d5ca562bd79034263b42630455 +SIZE (OpenJUMP-Portable-1.14.1-r6147-PLUS.zip) = 58896870 Modified: head/graphics/openjump/files/patch-bin_oj__linux.sh ============================================================================== --- head/graphics/openjump/files/patch-bin_oj__linux.sh Wed Mar 20 08:52:34 2019 (r496319) +++ head/graphics/openjump/files/patch-bin_oj__linux.sh Wed Mar 20 08:55:02 2019 (r496320) @@ -1,4 +1,4 @@ ---- bin/oj_linux.sh.orig 2017-12-14 23:17:50 UTC +--- bin/oj_linux.sh.orig 2018-08-27 15:30:38 UTC +++ bin/oj_linux.sh @@ -4,9 +4,11 @@ ## if unset defaults to @@ -69,7 +69,7 @@ fi # java available -@@ -150,24 +165,27 @@ fi +@@ -150,24 +165,28 @@ fi add the location of java to your PATH environment variable." && ERROR=1 && end # resolve recursive links to java binary @@ -85,7 +85,7 @@ - JAVA="$JAVA_CANDIDATE" - relPath "$JAVA" && JAVA="${JDIR}/${JAVA}" -done -+echo "##### awk script survived after \$1 test" +++echo "##### awk script survived after \$1 test" +#while [ -L "${JAVA}" ]; do +# JDIR=$(dirname "$JAVA") +# JAVA_CANDIDATE=$(readlink -n "${JAVA}") @@ -102,13 +102,14 @@ # java version check JAVA_VERSIONSTRING="$("$JAVA" -version 2>&1)" --JAVA_VERSION=$(echo $JAVA_VERSIONSTRING | awk -F'[ \056]' '{gsub(/["\047]+/,"")}/version [0-9]+\.[0-9]+/{print $3"."$4; exit}' ) +-JAVA_VERSION=$( echo $JAVA_VERSIONSTRING | awk 'BEGIN{done=0}{gsub(/["\047]+/,"")}/[a-zA-Z]+ version [0-9]+/{split($3,a,"[^0-9]"); if(match(a[2],/^[0-9]+$/)){print a[1]"."a[2]}else{print a[1]".0"}; done=1}END{if(!done)exit 1}' ) ++#JAVA_VERSION=$( echo $JAVA_VERSIONSTRING | awk 'BEGIN{done=0}{gsub(/["\047]+/,"")}/[a-zA-Z]+ version [0-9]+/{split($3,a,"[^0-9]"); if(match(a[2],/^[0-9]+$/)){print a[1]"."a[2]}else{print a[1]".0"}; done=1}END{if(!done)exit 1}' ) +JAVA_VERSION=$(echo $JAVA_VERSIONSTRING | awk -F'"' '/^java version/ || /^openjdk version/{print $2}' | awk -F'.' '{print $1"."$2}') +echo "##### JAVA_VERSION = '$JAVA_VERSION'" JAVA_ARCH=$(echo $JAVA_VERSIONSTRING | grep -q -i 64-bit && echo x64 || echo x86) JAVA_NEEDED="1.6" if ! is_decimal "$JAVA_VERSION"; then -@@ -189,7 +207,7 @@ echo ---JAVA--- +@@ -189,7 +208,7 @@ echo ---JAVA--- echo "Using '$(basename "${JAVA}")' found in '$(dirname "${JAVA}")'" "$JAVA" -version 2>&1|awk 'BEGIN{ORS=""}{print $0"; "}END{print "\n"}' @@ -117,7 +118,7 @@ if [ -f "$JUMP_PROFILE" ]; then source $JUMP_PROFILE fi -@@ -198,8 +216,13 @@ fi +@@ -198,8 +217,13 @@ fi if [ -z "$JUMP_LIB" ]; then JUMP_LIB="./lib" fi @@ -131,7 +132,7 @@ JUMP_PLUGINS=./bin/default-plugins.xml if [ -z "$JUMP_PLUGINS" ] || [ ! -f "$JUMP_PLUGINS" ]; then -@@ -208,6 +231,7 @@ if [ -z "$JUMP_PLUGINS" ] || [ ! -f "$JUMP_PLUGINS" ]; +@@ -208,6 +232,7 @@ if [ -z "$JUMP_PLUGINS" ] || [ ! -f "$JUMP_PLUGINS" ]; JUMP_PLUGINS="./scripts/default-plugins.xml" fi fi @@ -139,7 +140,7 @@ # include every jar/zip in lib and native dir for libfile in "$JUMP_LIB/"*.zip "$JUMP_LIB/"*.jar "$JUMP_NATIVE_DIR/$JAVA_ARCH/"*.jar "$JUMP_NATIVE_DIR/"*.jar -@@ -216,26 +240,35 @@ do +@@ -216,26 +241,35 @@ do done CLASSPATH=.:./bin:./conf:$CLASSPATH export CLASSPATH; @@ -175,7 +176,7 @@ # java9 needs some packages explicitly added/exported if awk "BEGIN{if($JAVA_VERSION >= 9)exit 0;else exit 1}"; then -@@ -247,7 +280,8 @@ $JAVA_OPTS" +@@ -251,7 +285,8 @@ if awk "BEGIN{if( $JAVA_VERSION >= 9 && $JAVA_VERSION fi # in case some additional archives were placed in native dir inbetween @@ -185,7 +186,7 @@ # allow jre to find native libraries in native dir, lib/ext (backwards compatibility) NATIVE_PATH="$JUMP_NATIVE_DIR/$JAVA_ARCH:$JUMP_NATIVE_DIR:$JUMP_PLUGIN_DIR" -@@ -283,7 +317,11 @@ echo "$JUMP_SETTINGS/" +@@ -287,7 +322,11 @@ echo "$JUMP_SETTINGS/" echo ---Detect maximum memory limit--- # use previously set or detect RAM size in bytes @@ -198,12 +199,13 @@ if [ -n "$JAVA_MAXMEM" ]; then echo "max. memory limit defined via JAVA_MAXMEM=$JAVA_MAXMEM" elif ! is_number "$RAM_SIZE"; then -@@ -301,14 +339,18 @@ else +@@ -305,14 +344,18 @@ else else MEM_MAX="$MEM_MINUS1GB" fi +- + echo "##### MEM_MAX = '$MEM_MAX'" - ++ # limit 32bit jre to 2GiB = 2147483648 bytes + echo "##### JAVA_ARCH = '$JAVA_ARCH'" if [ "$JAVA_ARCH" != "x64" ] && [ "$MEM_MAX" -gt "2147483648" ]; then Modified: head/graphics/openjump/pkg-plist ============================================================================== --- head/graphics/openjump/pkg-plist Wed Mar 20 08:52:34 2019 (r496319) +++ head/graphics/openjump/pkg-plist Wed Mar 20 08:55:02 2019 (r496320) @@ -2,7 +2,7 @@ OpenJUMP/bin/default-plugins.xml OpenJUMP/bin/log4j.xml OpenJUMP/bin/openjump OpenJUMP/bin/readme.txt -OpenJUMP/lib/OpenJUMP-1.13-r5792-nosrc.jar +OpenJUMP/lib/OpenJUMP-1.14.1-r6147-nosrc.jar OpenJUMP/lib/batik-awt-util-1.6.jar OpenJUMP/lib/batik-bridge-1.6.jar OpenJUMP/lib/batik-css-1.6.jar @@ -21,11 +21,11 @@ OpenJUMP/lib/batik-util-1.6.jar OpenJUMP/lib/batik-xml-1.6.jar OpenJUMP/lib/bsh-2.0b4.jar OpenJUMP/lib/buoy-1.8.jar -OpenJUMP/lib/commons-codec-1.10.jar -OpenJUMP/lib/commons-compress-1.12.jar -OpenJUMP/lib/commons-imaging-1.0-20130811.122228-3.jar -OpenJUMP/lib/commons-io-2.5.jar -OpenJUMP/lib/commons-lang3-3.5.jar +OpenJUMP/lib/commons-codec-1.11.jar +OpenJUMP/lib/commons-compress-1.18.jar +OpenJUMP/lib/commons-imaging-1.0-20180908.110935-119.jar +OpenJUMP/lib/commons-io-2.6.jar +OpenJUMP/lib/commons-lang3-3.8.1.jar OpenJUMP/lib/commons-logging-1.2.jar OpenJUMP/lib/cts-1.5.1.jar OpenJUMP/lib/ext/BeanTools/0-Help.bsh @@ -42,7 +42,7 @@ OpenJUMP/lib/ext/BeanTools/9-Display_WMS_URL.bsh OpenJUMP/lib/ext/BeanTools/RefreshScriptsMenu.bsh OpenJUMP/lib/ext/BeanTools/SaveViewAsBeanTool.bsh OpenJUMP/lib/ext/CadTools-0.7.jar -OpenJUMP/lib/ext/ColorChooser-1.1.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 @@ -203,6 +203,8 @@ OpenJUMP/lib/ext/JumpFillPattern-0.3.jar OpenJUMP/lib/ext/JumpPrinter-1.88.jar OpenJUMP/lib/ext/MeasureToolbox_12.jar 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/SkyPrinterPlugIn-1.0.1.jar @@ -282,8 +284,8 @@ OpenJUMP/lib/ext/dbdatastore/mysql-connector-java-5.1. 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.8.1.jar -OpenJUMP/lib/ext/graph-toolbox-0.5.6.jar +OpenJUMP/lib/ext/driver-dxf-0.9.0.jar +OpenJUMP/lib/ext/graph-toolbox-0.6.1.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 @@ -321,7 +323,10 @@ OpenJUMP/lib/ext/imageio-ext/nitf-bindings-2.7-r1269.j OpenJUMP/lib/ext/imageio-ext/pngj-2.0.1.jar OpenJUMP/lib/ext/imageio-ext/turbojpeg-wrapper-1.2.1.1.jar OpenJUMP/lib/ext/itext-2.1.7.jar -OpenJUMP/lib/ext/jaxb-api-2.3.0.jar +OpenJUMP/lib/ext/jaxb/javax.activation-api-1.2.0.jar +OpenJUMP/lib/ext/jaxb/jaxb-api-2.2.12.jar +OpenJUMP/lib/ext/jaxb/jaxb-core-2.2.11.jar +OpenJUMP/lib/ext/jaxb/jaxb-impl-2.2.11.jar OpenJUMP/lib/ext/jumpdbquery-1.1.1/CONTRIBUTORS.txt OpenJUMP/lib/ext/jumpdbquery-1.1.1/COPYING OpenJUMP/lib/ext/jumpdbquery-1.1.1/LICENSE.txt @@ -332,23 +337,15 @@ OpenJUMP/lib/ext/jumpdbquery-1.1.1/gt2-oracle-spatial- OpenJUMP/lib/ext/jumpdbquery-1.1.1/jsyntaxpane-1.0.0.jar OpenJUMP/lib/ext/jumpdbquery-1.1.1/postgis-jdbc-1.3.3.jar OpenJUMP/lib/ext/jumpdbquery.jar -OpenJUMP/lib/ext/jython/AlignSelected$py.class OpenJUMP/lib/ext/jython/AlignSelected.py -OpenJUMP/lib/ext/jython/ArcTool$py.class OpenJUMP/lib/ext/jython/ArcTool.py -OpenJUMP/lib/ext/jython/CircleTool$py.class OpenJUMP/lib/ext/jython/CircleTool.py -OpenJUMP/lib/ext/jython/DistributeSelected$py.class OpenJUMP/lib/ext/jython/DistributeSelected.py -OpenJUMP/lib/ext/jython/OvalTool$py.class OpenJUMP/lib/ext/jython/OvalTool.py OpenJUMP/lib/ext/jython/RightAngleTool.py -OpenJUMP/lib/ext/jython/RoadTool$py.class OpenJUMP/lib/ext/jython/RoadTool.py -OpenJUMP/lib/ext/jython/RotatedRectangleTool$py.class OpenJUMP/lib/ext/jython/RotatedRectangleTool.py OpenJUMP/lib/ext/jython/SetASHSLabel.py -OpenJUMP/lib/ext/jython/UnionSelected$py.class OpenJUMP/lib/ext/jython/UnionSelected.py OpenJUMP/lib/ext/jython/images/DrawArc.gif OpenJUMP/lib/ext/jython/images/DrawCircle.gif @@ -369,11 +366,11 @@ OpenJUMP/lib/ext/jython/images/shape_center_vertical.p OpenJUMP/lib/ext/jython/images/shape_distribute_horizontal.png OpenJUMP/lib/ext/jython/images/shape_distribute_vertical.png OpenJUMP/lib/ext/jython/startup.py -OpenJUMP/lib/ext/kml-driver-0.2.4.jar +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.7.5.jar +OpenJUMP/lib/ext/matching-0.8.1.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 @@ -1091,7 +1088,7 @@ OpenJUMP/lib/ext/sextante/sextante_algorithms.jar OpenJUMP/lib/ext/sextante/sextante_gui.jar OpenJUMP/lib/ext/sextante/sextante_new_algorithms.jar OpenJUMP/lib/ext/sextante/trove-0.1.8.jar -OpenJUMP/lib/ext/topology-0.9.2.jar +OpenJUMP/lib/ext/topology-0.9.3.jar OpenJUMP/lib/ext/utils-0.1-20111127.jar OpenJUMP/lib/ext/wfs/commons-httpclient-3.1.jar OpenJUMP/lib/ext/wfs/deegree2-core-2.6-pre2-20140511.220246-596.jar @@ -1123,8 +1120,7 @@ OpenJUMP/lib/slf4j-log4j12-1.7.25.jar OpenJUMP/lib/xercesImpl-2.11.0.jar OpenJUMP/lib/xml-apis-1.4.01.jar OpenJUMP/lib/xmlParserAPIs-2.0.2.jar -OpenJUMP/lib/xz-1.5.jar +OpenJUMP/lib/xz-1.8.jar bin/openjump %%PORTDOCS%%%%DOCSDIR%%/Changes.txt -@dir OpenJUMP/lib/ext/macro @dir OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.createHyetogram