From owner-svn-ports-head@freebsd.org Sat Jul 7 15:04:42 2018 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 57A8710298AF; Sat, 7 Jul 2018 15:04:42 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0C72D7B8FE; Sat, 7 Jul 2018 15:04:42 +0000 (UTC) (envelope-from swills@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 E195218F97; Sat, 7 Jul 2018 15:04:41 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w67F4fHn078724; Sat, 7 Jul 2018 15:04:41 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w67F4fBn078721; Sat, 7 Jul 2018 15:04:41 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201807071504.w67F4fBn078721@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sat, 7 Jul 2018 15:04:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474099 - in head/graphics/openjump: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/graphics/openjump: . files X-SVN-Commit-Revision: 474099 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 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: Sat, 07 Jul 2018 15:04:42 -0000 Author: swills Date: Sat Jul 7 15:04:40 2018 New Revision: 474099 URL: https://svnweb.freebsd.org/changeset/ports/474099 Log: graphics/openjump: Update to 1.13 PR: 229579 Submitted by: Rainer Hurling (maintainer) Modified: head/graphics/openjump/Makefile (contents, props changed) head/graphics/openjump/distinfo (contents, props changed) head/graphics/openjump/files/patch-bin_oj__linux.sh (contents, props changed) head/graphics/openjump/pkg-plist (contents, props changed) Modified: head/graphics/openjump/Makefile ============================================================================== --- head/graphics/openjump/Makefile Sat Jul 7 14:52:51 2018 (r474098) +++ head/graphics/openjump/Makefile Sat Jul 7 15:04:40 2018 (r474099) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= OpenJUMP -PORTVERSION= 1.11 +PORTVERSION= 1.13 CATEGORIES= graphics java geography MASTER_SITES= SF/jump-pilot/OpenJUMP/${PORTVERSION} DISTNAME= ${PORTNAME}-Portable-${PORTVERSION}-r${PLUS_REV}-PLUS @@ -46,7 +46,7 @@ NO_BUILD= yes NO_ARCH= yes TARGET_DIR= ${STAGEDIR}${PREFIX}/${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-r${PLUS_REV}-PLUS -PLUS_REV= 5434 +PLUS_REV= 5792 do-install: @${ECHO_CMD} "---> Installing JAR files" Modified: head/graphics/openjump/distinfo ============================================================================== --- head/graphics/openjump/distinfo Sat Jul 7 14:52:51 2018 (r474098) +++ head/graphics/openjump/distinfo Sat Jul 7 15:04:40 2018 (r474099) @@ -1,3 +1,3 @@ -TIMESTAMP = 1500014254 -SHA256 (OpenJUMP-Portable-1.11-r5434-PLUS.zip) = a29a48776fddd3eedfd2ee1699e6ddb54030f8a7e715279e8366e81dff98396c -SIZE (OpenJUMP-Portable-1.11-r5434-PLUS.zip) = 56024751 +TIMESTAMP = 1530951799 +SHA256 (OpenJUMP-Portable-1.13-r5792-PLUS.zip) = 803514da3ed17d5eb0d0d8f5944d219b6a0a6bb8015a4ba8d43cc442e99342d3 +SIZE (OpenJUMP-Portable-1.13-r5792-PLUS.zip) = 56754602 Modified: head/graphics/openjump/files/patch-bin_oj__linux.sh ============================================================================== --- head/graphics/openjump/files/patch-bin_oj__linux.sh Sat Jul 7 14:52:51 2018 (r474098) +++ head/graphics/openjump/files/patch-bin_oj__linux.sh Sat Jul 7 15:04:40 2018 (r474099) @@ -1,4 +1,4 @@ ---- bin/oj_linux.sh.orig 2016-05-29 14:45:28 UTC +--- bin/oj_linux.sh.orig 2017-12-14 23:17:50 UTC +++ bin/oj_linux.sh @@ -4,9 +4,11 @@ ## if unset defaults to @@ -131,7 +131,7 @@ JUMP_PLUGINS=./bin/default-plugins.xml if [ -z "$JUMP_PLUGINS" ] || [ ! -f "$JUMP_PLUGINS" ]; then -@@ -208,6 +231,7 @@ if [ -z "$JUMP_PLUGINS" ] || [ ! -f "$JU +@@ -208,6 +231,7 @@ if [ -z "$JUMP_PLUGINS" ] || [ ! -f "$JUMP_PLUGINS" ]; JUMP_PLUGINS="./scripts/default-plugins.xml" fi fi @@ -139,7 +139,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,29 +240,39 @@ do +@@ -216,26 +240,35 @@ do done CLASSPATH=.:./bin:./conf:$CLASSPATH export CLASSPATH; @@ -173,6 +173,11 @@ JAVA_OPTS="$JAVA_OPTS $JAVA_OPTS_OVERRIDE" +echo "##### JAVA_OPTS = '$JAVA_OPTS'" + # 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" + fi + # in case some additional archives were placed in native dir inbetween -extract_libs "$JUMP_NATIVE_DIR" +echo "##### -----------------------------------------------------------" @@ -180,7 +185,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" -@@ -274,7 +308,11 @@ echo "$JUMP_SETTINGS/" +@@ -283,7 +317,11 @@ echo "$JUMP_SETTINGS/" echo ---Detect maximum memory limit--- # use previously set or detect RAM size in bytes @@ -193,7 +198,7 @@ if [ -n "$JAVA_MAXMEM" ]; then echo "max. memory limit defined via JAVA_MAXMEM=$JAVA_MAXMEM" elif ! is_number "$RAM_SIZE"; then -@@ -292,14 +330,18 @@ else +@@ -301,14 +339,18 @@ else else MEM_MAX="$MEM_MINUS1GB" fi Modified: head/graphics/openjump/pkg-plist ============================================================================== --- head/graphics/openjump/pkg-plist Sat Jul 7 14:52:51 2018 (r474098) +++ head/graphics/openjump/pkg-plist Sat Jul 7 15:04:40 2018 (r474099) @@ -2,7 +2,7 @@ OpenJUMP/bin/default-plugins.xml OpenJUMP/bin/log4j.xml OpenJUMP/bin/openjump OpenJUMP/bin/readme.txt -OpenJUMP/lib/OpenJUMP-1.11-r5434-nosrc.jar +OpenJUMP/lib/OpenJUMP-1.13-r5792-nosrc.jar OpenJUMP/lib/batik-awt-util-1.6.jar OpenJUMP/lib/batik-bridge-1.6.jar OpenJUMP/lib/batik-css-1.6.jar @@ -27,6 +27,7 @@ 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-logging-1.2.jar +OpenJUMP/lib/cts-1.5.1.jar OpenJUMP/lib/ext/BeanTools/0-Help.bsh OpenJUMP/lib/ext/BeanTools/1-HelloWorld.bsh OpenJUMP/lib/ext/BeanTools/10-Flatten3DGeometries.bsh @@ -40,9 +41,8 @@ OpenJUMP/lib/ext/BeanTools/8-GetInvalidShapefileRings. OpenJUMP/lib/ext/BeanTools/9-Display_WMS_URL.bsh OpenJUMP/lib/ext/BeanTools/RefreshScriptsMenu.bsh OpenJUMP/lib/ext/BeanTools/SaveViewAsBeanTool.bsh -OpenJUMP/lib/ext/CTSPlugIn-0.1.3.jar -OpenJUMP/lib/ext/CadTools-0.2.jar -OpenJUMP/lib/ext/ColorChooser-0.8.jar +OpenJUMP/lib/ext/CadTools-0.7.jar +OpenJUMP/lib/ext/ColorChooser-1.1.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 @@ -198,10 +198,11 @@ OpenJUMP/lib/ext/FillPatterns/WORM-CASTS_E3_064_A_RGB. OpenJUMP/lib/ext/FillPatterns/WORM-CASTS_E3_064_B_RGB.JPG OpenJUMP/lib/ext/FillPatterns/warp-&-weft_C1_064_A_RGB.JPG OpenJUMP/lib/ext/FillPatterns/warp-&-weft_C1_064_B_RGB.JPG -OpenJUMP/lib/ext/JumpChart.jar -OpenJUMP/lib/ext/JumpFillPattern.jar -OpenJUMP/lib/ext/JumpPrinter.jar +OpenJUMP/lib/ext/JumpChart-1.00.jar +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/PirolCsv.jar OpenJUMP/lib/ext/SetAttributes-0.7.1.jar OpenJUMP/lib/ext/SkyPrinterPlugIn-1.0.1.jar @@ -271,18 +272,18 @@ OpenJUMP/lib/ext/VertexImages/vector_17.wkt OpenJUMP/lib/ext/VertexImages/vector_18.wkt OpenJUMP/lib/ext/VertexImages/vector_19.wkt OpenJUMP/lib/ext/VertexImages/vector_20.wkt -OpenJUMP/lib/ext/VertexSymbols.jar +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/csv-driver-1.0.0.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 OpenJUMP/lib/ext/dbdatastore/readme.txt -OpenJUMP/lib/ext/dbdatastore/sqlite-jdbc-3.8.11.2.jar +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.4.1.jar +OpenJUMP/lib/ext/graph-toolbox-0.5.6.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 @@ -320,6 +321,7 @@ 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/jumpdbquery-1.1.1/CONTRIBUTORS.txt OpenJUMP/lib/ext/jumpdbquery-1.1.1/COPYING OpenJUMP/lib/ext/jumpdbquery-1.1.1/LICENSE.txt @@ -330,15 +332,23 @@ 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 @@ -361,15 +371,12 @@ OpenJUMP/lib/ext/jython/images/shape_distribute_vertic OpenJUMP/lib/ext/jython/startup.py OpenJUMP/lib/ext/kml-driver-0.2.4.jar OpenJUMP/lib/ext/kml/ProjectStringsList.pjl -OpenJUMP/lib/ext/lib/cts-1.4.0-SNAPSHOT.jar OpenJUMP/lib/ext/lib/jgrapht-core-0.9.2.jar OpenJUMP/lib/ext/lib/jump-jgrapht-0.7.1.jar -OpenJUMP/lib/ext/lib/slf4j-api-1.7.7.jar -OpenJUMP/lib/ext/lib/slf4j-simple-1.7.7.jar OpenJUMP/lib/ext/matching-0.7.5.jar OpenJUMP/lib/ext/oj_osm_reader_v1-0-4.jar OpenJUMP/lib/ext/ojmapcoloring-0.5.jar -OpenJUMP/lib/ext/ojsextante_binding_dec2016c.jar +OpenJUMP/lib/ext/ojsextante_binding_apr2018c.jar OpenJUMP/lib/ext/pbaseClasses.jar OpenJUMP/lib/ext/readme.txt OpenJUMP/lib/ext/set_attributes/DocumentedSample.xml @@ -1084,7 +1091,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.1.jar +OpenJUMP/lib/ext/topology-0.9.2.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 @@ -1111,10 +1118,13 @@ OpenJUMP/lib/log4j-1.2.17.jar OpenJUMP/lib/native/jecw-0.0.7.jar OpenJUMP/lib/org-netbeans-swing-outline-7.2.jar OpenJUMP/lib/postgresql-9.4.1208.jre6.jar +OpenJUMP/lib/slf4j-api-1.7.25.jar +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 bin/openjump %%PORTDOCS%%%%DOCSDIR%%/Changes.txt +@dir OpenJUMP/lib/ext/macro @dir OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.createHyetogram