Date: Sun, 23 Oct 2011 08:12:33 GMT From: Rainer Hurling <rhurlin@gwdg.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/161920: [PATCH] graphics/openjump: update to 1.4.2 Message-ID: <201110230812.p9N8CXBt077596@red.freebsd.org> Resent-Message-ID: <201110230820.p9N8KA9L029958@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 161920 >Category: ports >Synopsis: [PATCH] graphics/openjump: update to 1.4.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Oct 23 08:20:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Rainer Hurling >Release: FreeBSD 9.0-BETA2 (amd64) >Organization: >Environment: FreeBSD xxx.xxx.xxx 9.0-BETA2 FreeBSD 9.0-BETA2 #0: Tue Sep 27 10:18:08 CEST 2011 xxx@xxx.xxx.xxx:/usr/obj/usr/src/sys/XXX amd64 >Description: This patch updates graphics/openjump from 1.4.0.3 to 1.4.2. While I was here I did some more issues: - Creating a link from ${PREFIX}/openjump/bin/openjump to ${PREFIX}/bin/openjump - Adding a hint for reloadable extensions and plugins in pkg_descr - Patching bin/oj_linux.sh to get this script work with java/openjdk6 ==> PLEASE proof, if this breaks other java versions, thanks. - A little cleanup for .dll's and some licence texts (should them be copied into ${DOCSDIR} at all?) >How-To-Repeat: >Fix: Patch attached with submission follows: diff -Naur openjump.orig/Makefile openjump/Makefile --- openjump.orig/Makefile 2011-06-09 09:08:24.000000000 +0200 +++ openjump/Makefile 2011-10-23 10:00:20.000000000 +0200 @@ -6,7 +6,7 @@ # PORTNAME= openjump -PORTVERSION= 1.4.0.3 +PORTVERSION= 1.4.2 CATEGORIES= graphics java geography MASTER_SITES= SF/jump-pilot/OpenJUMP/${PORTVERSION} DISTNAME= ${PORTNAME}-bin-${PORTVERSION} @@ -29,9 +29,11 @@ ${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${TARGET_DIR}/lib ${MKDIR} ${TARGET_DIR}/lib/ext @cd ${WRKSRC}/lib/ext && ${COPYTREE_SHARE} . ${TARGET_DIR}/lib/ext + @${RM} ${PREFIX}/openjump/lib/ext/*.dll @${ECHO_MSG} "Installing startup script" ${MKDIR} ${TARGET_DIR}/bin ${INSTALL_SCRIPT} ${WRKSRC}/bin/oj_linux.sh ${TARGET_DIR}/bin/openjump + ${LN} -sf ${PREFIX}/openjump/bin/openjump ${PREFIX}/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/ @@ -42,7 +44,8 @@ ${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/cpl-1.0.txt ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/licenses/jdom_license.txt ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/licenses/jmath_license.txt ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/licenses/jython_license.txt ${DOCSDIR} .else diff -Naur openjump.orig/distinfo openjump/distinfo --- openjump.orig/distinfo 2011-06-09 09:08:24.000000000 +0200 +++ openjump/distinfo 2011-10-23 08:04:54.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (openjump-bin-1.4.0.3.zip) = 5dfd394e72cdda128e9d964840cd57a8e9515857b6e073d2156c33aaf85d2437 -SIZE (openjump-bin-1.4.0.3.zip) = 13515561 +SHA256 (openjump-bin-1.4.2.zip) = 46a7b71a743db661ace672af9673842e878806fa5f89382c5f6dab0f57072298 +SIZE (openjump-bin-1.4.2.zip) = 17730191 diff -Naur openjump.orig/files/patch-bin__oj_linux.sh openjump/files/patch-bin__oj_linux.sh --- openjump.orig/files/patch-bin__oj_linux.sh 1970-01-01 01:00:00.000000000 +0100 +++ openjump/files/patch-bin__oj_linux.sh 2011-10-23 09:48:13.000000000 +0200 @@ -0,0 +1,32 @@ +--- bin/oj_linux.sh.orig 2011-09-11 12:55:32.000000000 +0200 ++++ bin/oj_linux.sh 2011-10-23 09:46:55.000000000 +0200 +@@ -1,7 +1,7 @@ + #!/bin/sh + + ## uncomment and put the path to your jre here +-#JAVA_HOME="/home/ed/jre1.6.0_21" ++JAVA_HOME="/usr/local/" + + ## uncomment and change your memory configuration here + ## Xms is initial size, Xmx is maximum size +@@ -75,13 +75,13 @@ + echo "The found java binary '$JAVA' is no executable file." && ERROR=1 && end + + # java version check +-JAVA_VERSION=$("$JAVA" -version 2>&1 | awk -F'"' '/^java version/{print $2}' | awk -F'.' '{print $1"."$2}') +-JAVA_NEEDED="1.5" +-if ! awk "BEGIN{if($JAVA_VERSION < $JAVA_NEEDED)exit 1}"; then +- echo "Your java version '$JAVA_VERSION' is insufficient to run openjump. +-Please provide an at least version '$JAVA_NEEDED' java runtime." +- ERROR=1 +-fi ++#JAVA_VERSION=$("$JAVA" -version 2>&1 | awk -F'"' '/^java version/{print $2}' | awk -F'.' '{print $1"."$2}') ++#JAVA_NEEDED="1.5" ++#if ! awk "BEGIN{if($JAVA_VERSION < $JAVA_NEEDED)exit 1}"; then ++# echo "Your java version '$JAVA_VERSION' is insufficient to run openjump. ++#Please provide an at least version '$JAVA_NEEDED' java runtime." ++# ERROR=1 ++#fi + + # always print java infos + echo "Running -> '${JAVA}'; " $("$JAVA" -version 2>&1|awk 'BEGIN{ORS=""}{print $0"; "}') diff -Naur openjump.orig/pkg-descr openjump/pkg-descr --- openjump.orig/pkg-descr 2009-05-10 20:22:25.000000000 +0200 +++ openjump/pkg-descr 2011-10-23 09:25:01.000000000 +0200 @@ -1,18 +1,22 @@ OpenJUMP is an open source GIS software written in Java. It is based on JUMP GIS by Vivid Solutions. It's features include: + * It is a Vector GIS that can read rasters as well. * OpenJUMP is known to work on Windows, Linux and Mac platforms, but -should work on any operating system that runs Java 1.5 or later. + should work on any operating system that runs Java 1.5 or later. * It is not just another free demo viewer, but you can edit, save, -analyze etc. with JUMP / OpenJUMP. + analyze etc. with JUMP / OpenJUMP. * It works, even with medium size datasets, and with professional -touch. + touch. * It provides a GIS API with a flexible plugin structure, so that -new features are relatively easy to develope around the sound mapping -platform. + new features are relatively easy to develope around the sound + mapping platform. * It utilises standards like GML, WMS and WFS. * It is already translated in English, Finnish, French, German, -Italian, Portugese and Spanish. The translation in other languages is in -progress. + Italian, Portugese and Spanish. The translation in other languages + is in progress. + +Extensions and plugins can be found at +WWW: http://sourceforge.net/projects/jump-pilot/files/OpenJUMP_plugins/ WWW: http://www.openjump.org/ diff -Naur openjump.orig/pkg-plist openjump/pkg-plist --- openjump.orig/pkg-plist 2011-06-09 09:08:24.000000000 +0200 +++ openjump/pkg-plist 2011-10-23 09:08:24.000000000 +0200 @@ -1,27 +1,26 @@ -openjump/bin/openjump -openjump/bin/workbench-properties.xml openjump/bin/default-plugins.xml 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.11.jar -openjump/lib/xercesImpl.jar -openjump/lib/xml-apis.jar +openjump/bin/openjump +bin/openjump +openjump/bin/workbench-properties.xml openjump/lib/Buoy.jar +openjump/lib/Jama-1.0.1.jar openjump/lib/batik-all.jar +openjump/lib/bsh-2.0b4.jar openjump/lib/ermapper.jar openjump/lib/jai_codec.jar openjump/lib/jai_core.jar +openjump/lib/jdom.jar openjump/lib/jmatharray-20070905.jar openjump/lib/jmathplot-20070905.jar +openjump/lib/jts-1.12.jar openjump/lib/jython.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/openjump-1.4.2.jar openjump/lib/postgresql-9.0-801.jdbc3.jar +openjump/lib/xercesImpl.jar openjump/lib/xml-apis-ext.jar +openjump/lib/xml-apis.jar openjump/lib/ext/BeanTools/0-Help.bsh openjump/lib/ext/BeanTools/1-HelloWorld.bsh openjump/lib/ext/BeanTools/2-NewLayer.bsh @@ -31,6 +30,7 @@ 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/9-Display_WMS_URL.bsh openjump/lib/ext/BeanTools/RefreshScriptsMenu.bsh openjump/lib/ext/BeanTools/SaveViewAsBeanTool.bsh openjump/lib/ext/jython/AlignSelected.py @@ -55,7 +55,8 @@ %%PORTDOCS%%%%DOCSDIR%%/readme.txt %%PORTDOCS%%%%DOCSDIR%%/Changes.txt %%PORTDOCS%%%%DOCSDIR%%/apache_license.txt -%%PORTDOCS%%%%DOCSDIR%%/gpl2_license.txt +%%PORTDOCS%%%%DOCSDIR%%/cpl-1.0.txt +%%PORTDOCS%%%%DOCSDIR%%/jdom_license.txt %%PORTDOCS%%%%DOCSDIR%%/jmath_license.txt %%PORTDOCS%%%%DOCSDIR%%/jython_license.txt %%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110230812.p9N8CXBt077596>