From e3393701b14de121813aeda69d1920a3a097a052 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Mon, 1 Feb 2016 13:30:00 +0000
Subject: - Update to 1.9.0 - While here, add NO_ARCH

PR:		206518
Submitted by:	rhurlin@gwdg.de (maintainer)
---
 graphics/openjump/Makefile                     |   5 +-
 graphics/openjump/distinfo                     |   4 +-
 graphics/openjump/files/patch-bin__oj_linux.sh | 230 -----------------------
 graphics/openjump/files/patch-bin_oj__linux.sh | 219 ++++++++++++++++++++++
 graphics/openjump/pkg-plist                    | 250 ++++++++++++++++++++-----
 5 files changed, 423 insertions(+), 285 deletions(-)
 delete mode 100644 graphics/openjump/files/patch-bin__oj_linux.sh
 create mode 100644 graphics/openjump/files/patch-bin_oj__linux.sh

diff --git a/graphics/openjump/Makefile b/graphics/openjump/Makefile
index db053b3f67d3..dd2eb9d0a125 100644
--- a/graphics/openjump/Makefile
+++ b/graphics/openjump/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	OpenJUMP
-PORTVERSION=	1.8.0
+PORTVERSION=	1.9.0
 CATEGORIES=	graphics java geography
 MASTER_SITES=	SF/jump-pilot/OpenJUMP/${PORTVERSION}
 DISTNAME=	${PORTNAME}-Portable-${PORTVERSION}-r${PLUS_REV}-PLUS
@@ -44,8 +44,9 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USES=		zip
 NO_BUILD=	yes
+NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-r${PLUS_REV}-PLUS
-PLUS_REV=	4164
+PLUS_REV=	4795
 
 do-install:
 	@${ECHO_CMD} "--->  Installing JAR files"
diff --git a/graphics/openjump/distinfo b/graphics/openjump/distinfo
index 35edcd54a4ed..529426676878 100644
--- a/graphics/openjump/distinfo
+++ b/graphics/openjump/distinfo
@@ -1,2 +1,2 @@
-SHA256 (OpenJUMP-Portable-1.8.0-r4164-PLUS.zip) = 663b19562dd2429492f2f28aa0f4b79a368db33f388f83be5ba5f128a79f5065
-SIZE (OpenJUMP-Portable-1.8.0-r4164-PLUS.zip) = 43584306
+SHA256 (OpenJUMP-Portable-1.9.0-r4795-PLUS.zip) = f106b1b20f5e599c692be583efa1b88c2bdcb12f78e71a4d21fef0f4eda763ff
+SIZE (OpenJUMP-Portable-1.9.0-r4795-PLUS.zip) = 53337243
diff --git a/graphics/openjump/files/patch-bin__oj_linux.sh b/graphics/openjump/files/patch-bin__oj_linux.sh
deleted file mode 100644
index 3532da90cfb9..000000000000
--- a/graphics/openjump/files/patch-bin__oj_linux.sh
+++ /dev/null
@@ -1,230 +0,0 @@
---- bin/oj_linux.sh.orig	2014-11-26 00:15:22.000000000 +0100
-+++ bin/oj_linux.sh	2014-12-21 22:31:45.000000000 +0100
-@@ -4,9 +4,11 @@
- ## if unset defaults to
- ##   JUMP_HOME (oj app folder) if writable or $HOME/.openjump (user home)
- #JUMP_SETTINGS="/tmp/foobar"
-+JUMP_SETTINGS="$HOME/.openjump"
- 
- ## uncomment and put the path to your jre here
- #JAVA_HOME="/home/ed/jre1.6.0_21"
-+JAVA_HOME=${JAVA_HOME}
- 
- ## uncomment and change your memory configuration here 
- ## Xms is initial size, Xmx is maximum size
-@@ -48,6 +50,7 @@
-   # extract zipped files in native dir (our way to ship symlinks to desktops)
-   for filepath in $(find "$1/" -name '*.tgz' -o -name '*.tar.gz')
-   do
-+    echo "#####  filepath = '$filepath'"
-     file=$(basename "$filepath")
-     folder=$(dirname "$filepath")
-     done=".$file.unzipped"
-@@ -71,6 +74,7 @@
- 
- macinstall(){
-   # create app package
-+  echo "#####  MACINSTALL"
-   cp -R -a "$1"/bin/OpenJUMP.app/Contents "$1" &&\
-   awk '{sub(/..\/oj_/,"bin/oj_",$0)}1' "$1"/bin/OpenJUMP.app/Contents/Resources/script > "$1"/Contents/Resources/script &&\
-   echo patched oj.app
-@@ -79,12 +83,14 @@
- }
- 
- ## detect home folder
-+echo "#####  \$0 = '$0'"
- if(test -L "$0") then
-   auxlink=`ls -l "$0" | sed 's/^[^>]*-> //g'`
-   JUMP_HOME=`dirname "$auxlink"`/..
- else 
-   JUMP_HOME=`dirname "$0"`/..
- fi
-+echo "#####  JUMP_HOME = '$JUMP_HOME'"
- 
- ## run postinstalls only, if requested
- case "$1" in
-@@ -100,13 +106,19 @@
- 
- ## cd into jump home
- OLD_DIR=`pwd`
-+echo "#####  pwd = '$OLD_DIR'"
- cd "$JUMP_HOME"
-+PWD_DIR=`pwd`
-+echo "#####  cd '$JUMP_HOME', pwd = '$PWD_DIR'"
- 
- ## determine where to place settings, if no path given
-+echo "#####  ===== JUMP_SETTINGS = '$JUMP_SETTINGS'"
- [ -z "$JUMP_SETTINGS" ] && \
- JUMP_SETTINGS="$JUMP_HOME"; \
- if [ -d "$JUMP_SETTINGS" ]; then
-+  echo "#####  within -d \$JUMP_SETTINGS"
-   if [ ! -w "$JUMP_SETTINGS" ]; then
-+    echo "#####  within ! -w \$JUMP_SETTINGS"
-     # try users home dir
-     JUMP_SETTINGS="$HOME/.openjump"
-     # create if missing
-@@ -123,14 +135,19 @@
- # 1. first in oj_home/jre
- # 2. in configured java_home
- # 3. in path
-+echo "#####  -----------------------------------------------------------"
-+echo "#####  SEARCH JAVA:"
- if [ -f "$JUMP_HOME/jre/bin/java" ]; then
-   JAVA="$JUMP_HOME/jre/bin/java"
-+  echo "#####  JAVA = '$JAVA'"
- # is there a jre defined by env var?
- elif [ -n "$JAVA_HOME" ]; then
-   JAVA=$JAVA_HOME/bin/java
-+  echo "#####  JAVA = '$JAVA'"
- # well, let's look what we've got in the path
- else
-   JAVA=`which java`
-+  echo "#####  JAVA = '$JAVA'"
- fi
- 
- # java available
-@@ -139,20 +156,26 @@
- add the location of java to your PATH environment variable." && ERROR=1 && end
- 
- # resolve recursive links to java binary
-+echo "#####  ===== Resolve recursive links to java binary: \$1 = '$1'"
- relPath(){ echo $1 | awk '/^\//{exit 1}'; }
-+echo "#####  awk script survived after \$1 test"
- relPath "$JAVA" && JAVA="$(pwd)/$JAVA"
--while [ -L "${JAVA}" ]; do
--  JDIR=$(dirname "$JAVA")
--  JAVA=$(readlink -n "${JAVA}")
--  relPath "$JAVA" && JAVA="${JDIR}/${JAVA}"
--done
-+#while [ -L "${JAVA}" ]; do
-+#  JDIR=$(dirname "$JAVA")
-+#  echo "#####    JDIR = '$JDIR'"
-+#  JAVA=$(readlink -n "${JAVA}")
-+#  echo "#####    JAVA = '$JAVA'"
-+#  relPath "$JAVA" && JAVA="${JDIR}/${JAVA}"
-+#done
- # java executable file?
- [ ! -x "$JAVA" ] && \
-  echo "The found java binary '$JAVA' is no executable file." && ERROR=1 && end
- 
- # java version check
- JAVA_VERSIONSTRING="$("$JAVA" -version 2>&1)"
--JAVA_VERSION=$(echo $JAVA_VERSIONSTRING | awk -F'"' '/^java version/{print $2}' | awk -F'.' '{print $1"."$2}')
-+echo "#####  JAVA_VERSIONSTRING = '$JAVA_VERSIONSTRING'"
-+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" || ! awk "BEGIN{if($JAVA_VERSION < $JAVA_NEEDED)exit 1}"; then
-@@ -166,7 +189,7 @@
- echo "Using '$(basename "${JAVA}")' found in '$(dirname "${JAVA}")"
- echo $("$JAVA" -version 2>&1|awk 'BEGIN{ORS=""}{print $0"; "}')
- 
--JUMP_PROFILE=~/.jump/openjump.profile
-+JUMP_PROFILE="$HOME/.openjump/openjump.profile"
- if [ -f "$JUMP_PROFILE" ]; then
-   source $JUMP_PROFILE
- fi
-@@ -175,8 +198,13 @@
- if [ -z "$JUMP_LIB" ]; then
-   JUMP_LIB="./lib"
- fi
-+echo "#####  JUMP_LIB = '$JUMP_LIB'"
-+
- JUMP_NATIVE_DIR="$JUMP_LIB/native"
- JUMP_PLUGIN_DIR="${JUMP_PLUGIN_DIR:=$JUMP_LIB/ext}"
-+echo "#####  -----------------------------------------------------------"
-+echo "#####  JUMP_NATIVE_DIR = '$JUMP_NATIVE_DIR'"
-+echo "#####  JUMP_PLUGIN_DIR = '$JUMP_PLUGIN_DIR'"
- 
- JUMP_PLUGINS=./bin/default-plugins.xml
- if [ -z "$JUMP_PLUGINS" ] || [ ! -f "$JUMP_PLUGINS" ]; then
-@@ -185,6 +213,7 @@
-     JUMP_PLUGINS="./scripts/default-plugins.xml"
-   fi
- fi
-+echo "#####  JUMP_PLUGINS = '$JUMP_PLUGINS'"
- 
- # 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
-@@ -193,29 +222,39 @@
- done
- CLASSPATH=.:./bin:./conf:$CLASSPATH
- export CLASSPATH;
-+echo "#####  CLASSPATH = '$CLASSPATH'"
- 
- ## compile jump opts
- #
- JUMP_OPTS="-plug-in-directory $JUMP_PLUGIN_DIR"
-+echo "#####  JUMP_OPTS = '$JUMP_OPTS'"
- if [ -f "$JUMP_PLUGINS" ]; then
-   JUMP_OPTS="$JUMP_OPTS -default-plugins $JUMP_PLUGINS"
-+  echo "#####  JUMP_OPTS = '$JUMP_OPTS'"
- fi
-+
- # workbench-properties.xml is used to manually load plugins (ISA uses this)
- JUMP_PROPERTIES=./bin/workbench-properties.xml
- if [ -n "$JUMP_PROPERTIES" ] && [ -f "$JUMP_PROPERTIES" ]; then
-   JUMP_OPTS="$JUMP_OPTS -properties $JUMP_PROPERTIES"
-+  echo "#####  JUMP_OPTS = '$JUMP_OPTS'"
- fi
- 
- # compile jre opts, respect already set ones from e.g. mac
- JAVA_OPTS=""
-+echo "#####  JAVA_OPTS = '$JAVA_OPTS'"
- JAVA_OPTS="$JAVA_OPTS $JAVA_MAXMEM $JAVA_LANG"
-+echo "#####  JAVA_OPTS = '$JAVA_OPTS'"
- JAVA_OPTS="$JAVA_OPTS -Djump.home=."
-+echo "#####  JAVA_OPTS = '$JAVA_OPTS'"
- [ -n "JAVA_SAXDRIVER"    ] && JAVA_OPTS="$JAVA_OPTS -Dorg.xml.sax.driver=$JAVA_SAXDRIVER"
- [ -n "$JAVA_LOOKANDFEEL" ] && JAVA_OPTS="$JAVA_OPTS -Dswing.defaultlaf=$JAVA_LOOKANDFEEL"
- JAVA_OPTS="$JAVA_OPTS $JAVA_OPTS_OVERRIDE"
-+echo "#####  JAVA_OPTS = '$JAVA_OPTS'"
- 
- # in case some additional archives were placed in native dir inbetween
--extract_libs "$JUMP_NATIVE_DIR"
-+echo "#####  -----------------------------------------------------------"
-+#extract_libs "$JUMP_NATIVE_DIR"
- 
- # 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"
-@@ -251,7 +290,11 @@
- 
- echo ---Detect maximum memory limit---
- # use previously set or detect RAM size in bytes
--RAM_SIZE=${RAM_SIZE-$(expr "$(awk '/MemTotal/{print $2}' /proc/meminfo)" \* 1024)}
-+#RAM_SIZE=${RAM_SIZE-$(expr "$(awk '/MemTotal/{print $2}' /proc/meminfo)" \* 1024)}
-+RAM_SIZE=${RAM_SIZE-$(expr "$(sysctl hw.realmem | awk '/hw.realmem:/{print $2}')" / 1024)}
-+echo "#####  -----------------------------------------------------------"
-+echo "#####  RAM_SIZE = '$RAM_SIZE'"
-+
- if [ -n "$JAVA_MAXMEM" ]; then
-   echo "max. memory limit defined via JAVA_MAXMEM=$JAVA_MAXMEM"
- elif ! is_number "$RAM_SIZE"; then
-@@ -269,14 +312,18 @@
-   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
-     MEM_MAX=2147483648
-   fi
- 
--  MEM_MAX_MB=`expr $MEM_MAX / 1024 / 1024`
-+  MEM_MAX_MB=`expr $MEM_MAX / 1024`
-   JAVA_MAXMEM="-Xmx${MEM_MAX_MB}M"
-+  echo "#####  JAVA_MAXMEM = '$JAVA_MAXMEM'"
-+
-   # output info
-   echo set max. memory limit to $MEM_MAX_MB MiB
- fi
-@@ -294,4 +341,4 @@
- cd "$OLD_DIR"
- 
- ## run end function
--end
-\ No newline at end of file
-+end
diff --git a/graphics/openjump/files/patch-bin_oj__linux.sh b/graphics/openjump/files/patch-bin_oj__linux.sh
new file mode 100644
index 000000000000..59e7e79f71cf
--- /dev/null
+++ b/graphics/openjump/files/patch-bin_oj__linux.sh
@@ -0,0 +1,219 @@
+--- bin/oj_linux.sh.orig	2016-01-08 09:30:28 UTC
++++ bin/oj_linux.sh
+@@ -4,9 +4,11 @@
+ ## if unset defaults to
+ ##   JUMP_HOME (oj app folder) if writable or $HOME/.openjump (user home)
+ #JUMP_SETTINGS="/tmp/foobar"
++JUMP_SETTINGS="$HOME/.openjump"
+ 
+ ## uncomment and put the path to your jre here
+ #JAVA_HOME="/home/ed/jre1.6.0_21"
++JAVA_HOME=${JAVA_HOME}
+ 
+ ## uncomment and change your memory configuration here 
+ ## Xms is initial size, Xmx is maximum size
+@@ -51,6 +53,7 @@ extract_libs(){
+   # extract zipped files in native dir (our way to ship symlinks to desktops)
+   for filepath in $(find "$1/" -name '*.tgz' -o -name '*.tar.gz')
+   do
++    echo "#####  filepath = '$filepath'"
+     file=$(basename "$filepath")
+     folder=$(dirname "$filepath")
+     done=".$file.unzipped"
+@@ -74,6 +77,7 @@ postinstall(){
+ 
+ macinstall(){
+   # create app package
++  echo "#####  MACINSTALL"
+   cp -R -a "$1"/bin/OpenJUMP.app/Contents "$1" &&\
+   awk '{sub(/..\/oj_/,"bin/oj_",$0)}1' "$1"/bin/OpenJUMP.app/Contents/Resources/script > "$1"/Contents/Resources/script &&\
+   echo patched oj.app
+@@ -110,13 +114,19 @@ esac
+ 
+ ## cd into jump home
+ OLD_DIR=`pwd`
++echo "#####  pwd = '$OLD_DIR'"
+ cd "$JUMP_HOME"
++PWD_DIR=`pwd`
++echo "##### cd '$JUMP_HOME', pwd = '$PWD_DIR'"
+ 
+ ## determine where to place settings, if no path given
++echo "#####  ===== JUMP_SETTINGS = '$JUMP_SETTINGS'"
+ [ -z "$JUMP_SETTINGS" ] && \
+ JUMP_SETTINGS="$JUMP_HOME"; \
+ if [ -d "$JUMP_SETTINGS" ]; then
++  echo "#####  within -d \$JUMP_SETTINGS"
+   if [ ! -w "$JUMP_SETTINGS" ]; then
++    echo "#####  within ! -w \$JUMP_SETTINGS"
+     # try users home dir
+     JUMP_SETTINGS="$HOME/.openjump"
+     # create if missing
+@@ -134,14 +144,19 @@ fi
+ # 1. first in oj_home/jre
+ # 2. in configured java_home
+ # 3. in path
++echo "#####  -----------------------------------------------------------"
++echo "#####  SEARCH JAVA:"
+ if [ -f "$JUMP_HOME/jre/bin/java" ]; then
+   JAVA="$JUMP_HOME/jre/bin/java"
++  echo "#####  JAVA = '$JAVA'"
+ # is there a jre defined by env var?
+ elif [ -n "$JAVA_HOME" ]; then
+   JAVA=$JAVA_HOME/bin/java
++  echo "#####  JAVA = '$JAVA'"
+ # well, let's look what we've got in the path
+ else
+   JAVA=`which java`
++  echo "#####  JAVA = '$JAVA'"
+ fi
+ 
+ # java available
+@@ -150,24 +165,27 @@ fi
+ add the location of java to your PATH environment variable." && ERROR=1 && end
+ 
+ # resolve recursive links to java binary
++echo "#####  ===== Resolve recursive links to java binary: \$1 = '$1'"
+ relPath "$JAVA" && JAVA="$(pwd)/$JAVA"
+-while [ -L "${JAVA}" ]; do
+-  JDIR=$(dirname "$JAVA")
+-  JAVA_CANDIDATE=$(readlink -n "${JAVA}")
+-  # protect against Gentoo's run-java-tool.bash wrapper
+-  if [ $(basename "$JAVA") != $(basename "$JAVA_CANDIDATE") ]; then
+-    break
+-  fi
+-  JAVA="$JAVA_CANDIDATE"
+-  relPath "$JAVA" && JAVA="${JDIR}/${JAVA}"
+-done
++echo "#####  awk script survived after \$1 test"
++#while [ -L "${JAVA}" ]; do
++#  JDIR=$(dirname "$JAVA")
++#  JAVA_CANDIDATE=$(readlink -n "${JAVA}")
++#  # protect against Gentoo's run-java-tool.bash wrapper
++#  if [ $(basename "$JAVA") != $(basename "$JAVA_CANDIDATE") ]; then
++#    break
++#  fi
++#  JAVA="$JAVA_CANDIDATE"
++#  relPath "$JAVA" && JAVA="${JDIR}/${JAVA}"
++#done
+ # java executable file?
+ [ ! -x "$JAVA" ] && \
+  echo "The found java binary '$JAVA' is no executable file." && ERROR=1 && end
+ 
+ # 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 -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---
+ echo "Using '$(basename "${JAVA}")' found in '$(dirname "${JAVA}")'"
+ "$JAVA" -version 2>&1|awk 'BEGIN{ORS=""}{print $0"; "}END{print "\n"}'
+ 
+-JUMP_PROFILE=~/.jump/openjump.profile
++JUMP_PROFILE="$HOME/.openjump/openjump.profile"
+ if [ -f "$JUMP_PROFILE" ]; then
+   source $JUMP_PROFILE
+ fi
+@@ -198,8 +216,13 @@ fi
+ if [ -z "$JUMP_LIB" ]; then
+   JUMP_LIB="./lib"
+ fi
++echo "#####  JUMP_LIB = '$JUMP_LIB'"
++
+ JUMP_NATIVE_DIR="$JUMP_LIB/native"
+ JUMP_PLUGIN_DIR="${JUMP_PLUGIN_DIR:=$JUMP_LIB/ext}"
++echo "#####  -----------------------------------------------------------"
++echo "#####  JUMP_NATIVE_DIR = '$JUMP_NATIVE_DIR'"
++echo "#####  JUMP_PLUGIN_DIR = '$JUMP_PLUGIN_DIR'"
+ 
+ JUMP_PLUGINS=./bin/default-plugins.xml
+ if [ -z "$JUMP_PLUGINS" ] || [ ! -f "$JUMP_PLUGINS" ]; then
+@@ -208,6 +231,7 @@ if [ -z "$JUMP_PLUGINS" ] || [ ! -f "$JU
+     JUMP_PLUGINS="./scripts/default-plugins.xml"
+   fi
+ fi
++echo "#####  JUMP_PLUGINS = '$JUMP_PLUGINS'"
+ 
+ # 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
+ done
+ CLASSPATH=.:./bin:./conf:$CLASSPATH
+ export CLASSPATH;
++echo "#####  CLASSPATH = '$CLASSPATH'"
+ 
+ ## compile jump opts
+ #
+ JUMP_OPTS="-plug-in-directory $JUMP_PLUGIN_DIR"
++echo "#####  JUMP_OPTS = '$JUMP_OPTS'"
+ if [ -f "$JUMP_PLUGINS" ]; then
+   JUMP_OPTS="$JUMP_OPTS -default-plugins $JUMP_PLUGINS"
++  echo "#####  JUMP_OPTS = '$JUMP_OPTS'"
+ fi
++
+ # workbench-properties.xml is used to manually load plugins (ISA uses this)
+ JUMP_PROPERTIES=./bin/workbench-properties.xml
+ if [ -n "$JUMP_PROPERTIES" ] && [ -f "$JUMP_PROPERTIES" ]; then
+   JUMP_OPTS="$JUMP_OPTS -properties $JUMP_PROPERTIES"
++  echo "#####  JUMP_OPTS = '$JUMP_OPTS'"
+ fi
+ 
+ # compile jre opts, respect already set ones from e.g. mac
+ JAVA_OPTS=""
++echo "#####  JAVA_OPTS = '$JAVA_OPTS'"
+ JAVA_OPTS="$JAVA_OPTS $JAVA_MAXMEM $JAVA_LANG"
++echo "#####  JAVA_OPTS = '$JAVA_OPTS'"
+ JAVA_OPTS="$JAVA_OPTS -Djump.home=."
++echo "#####  JAVA_OPTS = '$JAVA_OPTS'"
+ [ -n "JAVA_SAXDRIVER"    ] && JAVA_OPTS="$JAVA_OPTS -Dorg.xml.sax.driver=$JAVA_SAXDRIVER"
+ [ -n "$JAVA_LOOKANDFEEL" ] && JAVA_OPTS="$JAVA_OPTS -Dswing.defaultlaf=$JAVA_LOOKANDFEEL"
+ JAVA_OPTS="$JAVA_OPTS $JAVA_OPTS_OVERRIDE"
++echo "#####  JAVA_OPTS = '$JAVA_OPTS'"
+ 
+ # in case some additional archives were placed in native dir inbetween
+-extract_libs "$JUMP_NATIVE_DIR"
++echo "#####  -----------------------------------------------------------"
++#extract_libs "$JUMP_NATIVE_DIR"
+ 
+ # 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/"
+ 
+ echo ---Detect maximum memory limit---
+ # use previously set or detect RAM size in bytes
+-RAM_SIZE=${RAM_SIZE-$(expr "$(awk '/MemTotal/{print $2}' /proc/meminfo)" \* 1024)}
++#RAM_SIZE=${RAM_SIZE-$(expr "$(awk '/MemTotal/{print $2}' /proc/meminfo)" \* 1024)}
++RAM_SIZE=${RAM_SIZE-$(expr "$(sysctl hw.realmem | awk '/hw.realmem:/{print $2}')" / 1024)}
++echo "#####  -----------------------------------------------------------"
++echo "#####  RAM_SIZE = '$RAM_SIZE'"
++
+ 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
+   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
+     MEM_MAX=2147483648
+   fi
+ 
+-  MEM_MAX_MB=`expr $MEM_MAX / 1024 / 1024`
++  MEM_MAX_MB=`expr $MEM_MAX / 1024`
+   JAVA_MAXMEM="-Xmx${MEM_MAX_MB}M"
++  echo "#####  JAVA_MAXMEM = '$JAVA_MAXMEM'"
++
+   # output info
+   echo set max. memory limit to $MEM_MAX_MB MiB
+ fi
+@@ -318,3 +360,4 @@ cd "$OLD_DIR"
+ 
+ ## run end function
+ end
++
diff --git a/graphics/openjump/pkg-plist b/graphics/openjump/pkg-plist
index 74fbb0a49252..162b3511fdf7 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.8.0-r4164-nosrc.jar
+OpenJUMP/lib/OpenJUMP-1.9.0-r4795-nosrc.jar
 OpenJUMP/lib/batik-awt-util-1.6.jar
 OpenJUMP/lib/batik-bridge-1.6.jar
 OpenJUMP/lib/batik-css-1.6.jar
@@ -22,11 +22,11 @@ OpenJUMP/lib/batik-xml-1.6.jar
 OpenJUMP/lib/bsh-2.0b4.jar
 OpenJUMP/lib/buoy-1.8.jar
 OpenJUMP/lib/commons-codec-1.2.jar
-OpenJUMP/lib/commons-compress-1.6-20130810.172126-39.jar
+OpenJUMP/lib/commons-compress-1.9.jar
 OpenJUMP/lib/commons-imaging-1.0-20130811.122228-3.jar
-OpenJUMP/lib/commons-io-1.4.jar
+OpenJUMP/lib/commons-io-2.4.jar
 OpenJUMP/lib/commons-lang-2.4.jar
-OpenJUMP/lib/commons-logging-1.0.4.jar
+OpenJUMP/lib/commons-logging-1.2.jar
 OpenJUMP/lib/ext/BeanTools/0-Help.bsh
 OpenJUMP/lib/ext/BeanTools/1-HelloWorld.bsh
 OpenJUMP/lib/ext/BeanTools/10-Flatten3DGeometries.bsh
@@ -40,6 +40,7 @@ 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/CTSPlugIn-0.1.1.jar
 OpenJUMP/lib/ext/ColorChooser-0.6.jar
 OpenJUMP/lib/ext/ConcaveHull-0.2.jar
 OpenJUMP/lib/ext/ConcaveHull-Readme.txt
@@ -199,7 +200,9 @@ 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/MeasureToolbox_11.jar
 OpenJUMP/lib/ext/PirolCsv.jar
+OpenJUMP/lib/ext/SetAttributes-0.7.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
@@ -271,24 +274,52 @@ OpenJUMP/lib/ext/VertexSymbols.jar
 OpenJUMP/lib/ext/aggregation-0.2.8.jar
 OpenJUMP/lib/ext/bsheditor4jump-0.2.4.jar
 OpenJUMP/lib/ext/csv-driver-0.9.2.jar
+OpenJUMP/lib/ext/cts-1.3.2-SNAPSHOT.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/dbquery.properties
 OpenJUMP/lib/ext/driver-dxf-0.8.0.jar
 OpenJUMP/lib/ext/graph-toolbox-0.2.0.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalarcbinarygrid-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalarcgrid-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalbsb-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaldoq1-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaldoq2-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaldted-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalecw-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalecwjp2-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalehdr-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalenvihdr-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalenvisat-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalerdasimg-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalgeotiff-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalidrisi-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaljpeg-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalkakadujp2-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalmrsid-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalmrsidjp2-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalnitf-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-imagereadmt-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-kakadu-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-kakadujni-5.2.6.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-nitf-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-turbojpeg-1.1.7.jar
+OpenJUMP/lib/ext/imageio-ext/nitf-bindings-2.7-dev-r1130.jar
+OpenJUMP/lib/ext/imageio-ext/turbojpeg-wrapper-1.2.1.1.jar
 OpenJUMP/lib/ext/itext-2.1.7.jar
 OpenJUMP/lib/ext/jgrapht-jdk1.5.jar
 OpenJUMP/lib/ext/jump-jgrapht-0.5.jar
-OpenJUMP/lib/ext/jumpdbquery-1.1.0/CONTRIBUTORS.txt
-OpenJUMP/lib/ext/jumpdbquery-1.1.0/COPYING
-OpenJUMP/lib/ext/jumpdbquery-1.1.0/LICENSE.txt
-OpenJUMP/lib/ext/jumpdbquery-1.1.0/NOTICE.txt
-OpenJUMP/lib/ext/jumpdbquery-1.1.0/README_jumpdbquery.txt
-OpenJUMP/lib/ext/jumpdbquery-1.1.0/README_releases.txt
-OpenJUMP/lib/ext/jumpdbquery-1.1.0/dbquery.properties
-OpenJUMP/lib/ext/jumpdbquery-1.1.0/gt2-oracle-spatial-2.3.2.jar
-OpenJUMP/lib/ext/jumpdbquery-1.1.0/jgrapht-jdk1.6.jar
-OpenJUMP/lib/ext/jumpdbquery-1.1.0/jsyntaxpane-1.0.0.jar
-OpenJUMP/lib/ext/jumpdbquery-1.1.0/mysql-connector-java-5.1.27.jar
-OpenJUMP/lib/ext/jumpdbquery-1.1.0/sqlite-jdbc-3.8.6.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
+OpenJUMP/lib/ext/jumpdbquery-1.1.1/NOTICE.txt
+OpenJUMP/lib/ext/jumpdbquery-1.1.1/README_jumpdbquery.txt
+OpenJUMP/lib/ext/jumpdbquery-1.1.1/README_releases.txt
+OpenJUMP/lib/ext/jumpdbquery-1.1.1/gt2-oracle-spatial-2.3.2.jar
+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
 OpenJUMP/lib/ext/jython/ArcTool.py
@@ -319,14 +350,148 @@ OpenJUMP/lib/ext/jython/images/shape_center_vertical.png
 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.jar
+OpenJUMP/lib/ext/kml-driver-0.2.4.jar
 OpenJUMP/lib/ext/kml/ProjectStringsList.pjl
 OpenJUMP/lib/ext/oj_osm_reader_v1-0-4.jar
-OpenJUMP/lib/ext/ojsextante_binding_apr2013.jar
+OpenJUMP/lib/ext/ojsextante_binding_mar2015.jar
 OpenJUMP/lib/ext/pbaseClasses.jar
-OpenJUMP/lib/ext/postgis-jdbc-1.3.3.jar
-OpenJUMP/lib/ext/postgis-stubs-1.3.3.jar
 OpenJUMP/lib/ext/readme.txt
+OpenJUMP/lib/ext/set_attributes/DocumentedSample.xml
+OpenJUMP/lib/ext/set_attributes/img/331.png
+OpenJUMP/lib/ext/set_attributes/img/361[100].png
+OpenJUMP/lib/ext/set_attributes/img/361[10].png
+OpenJUMP/lib/ext/set_attributes/img/361[120].png
+OpenJUMP/lib/ext/set_attributes/img/361[15].png
+OpenJUMP/lib/ext/set_attributes/img/361[20].png
+OpenJUMP/lib/ext/set_attributes/img/361[25].png
+OpenJUMP/lib/ext/set_attributes/img/361[30].png
+OpenJUMP/lib/ext/set_attributes/img/361[40].png
+OpenJUMP/lib/ext/set_attributes/img/361[50].png
+OpenJUMP/lib/ext/set_attributes/img/361[5].png
+OpenJUMP/lib/ext/set_attributes/img/361[60].png
+OpenJUMP/lib/ext/set_attributes/img/361[70].png
+OpenJUMP/lib/ext/set_attributes/img/361[80].png
+OpenJUMP/lib/ext/set_attributes/img/361[90].png
+OpenJUMP/lib/ext/set_attributes/img/412.png
+OpenJUMP/lib/ext/set_attributes/img/551[right].png
+OpenJUMP/lib/ext/set_attributes/img/airfield-24.png
+OpenJUMP/lib/ext/set_attributes/img/airport-24.png
+OpenJUMP/lib/ext/set_attributes/img/alcohol-shop-24.png
+OpenJUMP/lib/ext/set_attributes/img/america-football-24.png
+OpenJUMP/lib/ext/set_attributes/img/art-gallery-24.png
+OpenJUMP/lib/ext/set_attributes/img/bakery-24.png
+OpenJUMP/lib/ext/set_attributes/img/bank-24.png
+OpenJUMP/lib/ext/set_attributes/img/bar-24.png
+OpenJUMP/lib/ext/set_attributes/img/baseball-24.png
+OpenJUMP/lib/ext/set_attributes/img/basketball-24.png
+OpenJUMP/lib/ext/set_attributes/img/beer-24.png
+OpenJUMP/lib/ext/set_attributes/img/bicycle-24.png
+OpenJUMP/lib/ext/set_attributes/img/building-24.png
+OpenJUMP/lib/ext/set_attributes/img/bus-24.png
+OpenJUMP/lib/ext/set_attributes/img/cafe-24.png
+OpenJUMP/lib/ext/set_attributes/img/camera-24.png
+OpenJUMP/lib/ext/set_attributes/img/campsite-24.png
+OpenJUMP/lib/ext/set_attributes/img/car-24.png
+OpenJUMP/lib/ext/set_attributes/img/cemetery-24.png
+OpenJUMP/lib/ext/set_attributes/img/chemist-24.png
+OpenJUMP/lib/ext/set_attributes/img/cinema-24.png
+OpenJUMP/lib/ext/set_attributes/img/circle-24.png
+OpenJUMP/lib/ext/set_attributes/img/circle-stroked-24.png
+OpenJUMP/lib/ext/set_attributes/img/city-24.png
+OpenJUMP/lib/ext/set_attributes/img/clothing-store-24.png
+OpenJUMP/lib/ext/set_attributes/img/college-24.png
+OpenJUMP/lib/ext/set_attributes/img/commercial-24.png
+OpenJUMP/lib/ext/set_attributes/img/cricket-24.png
+OpenJUMP/lib/ext/set_attributes/img/cross-24.png
+OpenJUMP/lib/ext/set_attributes/img/dam-24.png
+OpenJUMP/lib/ext/set_attributes/img/danger-24.png
+OpenJUMP/lib/ext/set_attributes/img/dentist-24.png
+OpenJUMP/lib/ext/set_attributes/img/disability-24.png
+OpenJUMP/lib/ext/set_attributes/img/dog-park-24.png
+OpenJUMP/lib/ext/set_attributes/img/embassy-24.png
+OpenJUMP/lib/ext/set_attributes/img/emergency-telephone-24.png
+OpenJUMP/lib/ext/set_attributes/img/entrance-24.png
+OpenJUMP/lib/ext/set_attributes/img/farm-24.png
+OpenJUMP/lib/ext/set_attributes/img/fast-food-24.png
+OpenJUMP/lib/ext/set_attributes/img/ferry-24.png
+OpenJUMP/lib/ext/set_attributes/img/fire-station-24.png
+OpenJUMP/lib/ext/set_attributes/img/fuel-24.png
+OpenJUMP/lib/ext/set_attributes/img/garden-24.png
+OpenJUMP/lib/ext/set_attributes/img/gift-24.png
+OpenJUMP/lib/ext/set_attributes/img/golf-24.png
+OpenJUMP/lib/ext/set_attributes/img/grocery-24.png
+OpenJUMP/lib/ext/set_attributes/img/hairdresser-24.png
+OpenJUMP/lib/ext/set_attributes/img/harbor-24.png
+OpenJUMP/lib/ext/set_attributes/img/heart-24.png
+OpenJUMP/lib/ext/set_attributes/img/heliport-24.png
+OpenJUMP/lib/ext/set_attributes/img/hospital-24.png
+OpenJUMP/lib/ext/set_attributes/img/ice-cream-24.png
+OpenJUMP/lib/ext/set_attributes/img/industrial-24.png
+OpenJUMP/lib/ext/set_attributes/img/land-use-24.png
+OpenJUMP/lib/ext/set_attributes/img/laundry-24.png
+OpenJUMP/lib/ext/set_attributes/img/library-24.png
+OpenJUMP/lib/ext/set_attributes/img/lighthouse-24.png
+OpenJUMP/lib/ext/set_attributes/img/lodging-24.png
+OpenJUMP/lib/ext/set_attributes/img/logging-24.png
+OpenJUMP/lib/ext/set_attributes/img/london-underground-24.png
+OpenJUMP/lib/ext/set_attributes/img/marker-24.png
+OpenJUMP/lib/ext/set_attributes/img/marker-stroked-24.png
+OpenJUMP/lib/ext/set_attributes/img/minefield-24.png
+OpenJUMP/lib/ext/set_attributes/img/mobilephone-24.png
+OpenJUMP/lib/ext/set_attributes/img/monument-24.png
+OpenJUMP/lib/ext/set_attributes/img/museum-24.png
+OpenJUMP/lib/ext/set_attributes/img/music-24.png
+OpenJUMP/lib/ext/set_attributes/img/oil-well-24.png
+OpenJUMP/lib/ext/set_attributes/img/park-24.png
+OpenJUMP/lib/ext/set_attributes/img/park2-24.png
+OpenJUMP/lib/ext/set_attributes/img/parking-24.png
+OpenJUMP/lib/ext/set_attributes/img/parking-garage-24.png
+OpenJUMP/lib/ext/set_attributes/img/pharmacy-24.png
+OpenJUMP/lib/ext/set_attributes/img/pitch-24.png
+OpenJUMP/lib/ext/set_attributes/img/place-of-worship-24.png
+OpenJUMP/lib/ext/set_attributes/img/playground-24.png
+OpenJUMP/lib/ext/set_attributes/img/police-24.png
+OpenJUMP/lib/ext/set_attributes/img/polling-place-24.png
+OpenJUMP/lib/ext/set_attributes/img/post-24.png
+OpenJUMP/lib/ext/set_attributes/img/prison-24.png
+OpenJUMP/lib/ext/set_attributes/img/rail-24.png
+OpenJUMP/lib/ext/set_attributes/img/rail-above-24.png
+OpenJUMP/lib/ext/set_attributes/img/rail-light-24.png
+OpenJUMP/lib/ext/set_attributes/img/rail-metro-24.png
+OpenJUMP/lib/ext/set_attributes/img/rail-underground-24.png
+OpenJUMP/lib/ext/set_attributes/img/religious-christian-24.png
+OpenJUMP/lib/ext/set_attributes/img/religious-jewish-24.png
+OpenJUMP/lib/ext/set_attributes/img/religious-muslim-24.png
+OpenJUMP/lib/ext/set_attributes/img/restaurant-24.png
+OpenJUMP/lib/ext/set_attributes/img/roadblock-24.png
+OpenJUMP/lib/ext/set_attributes/img/rocket-24.png
+OpenJUMP/lib/ext/set_attributes/img/school-24.png
+OpenJUMP/lib/ext/set_attributes/img/scooter-24.png
+OpenJUMP/lib/ext/set_attributes/img/shop-24.png
+OpenJUMP/lib/ext/set_attributes/img/skiing-24.png
+OpenJUMP/lib/ext/set_attributes/img/slaughterhouse-24.png
+OpenJUMP/lib/ext/set_attributes/img/soccer-24.png
+OpenJUMP/lib/ext/set_attributes/img/square-24.png
+OpenJUMP/lib/ext/set_attributes/img/square-stroked-24.png
+OpenJUMP/lib/ext/set_attributes/img/star-24.png
+OpenJUMP/lib/ext/set_attributes/img/star-stroked-24.png
+OpenJUMP/lib/ext/set_attributes/img/suitcase-24.png
+OpenJUMP/lib/ext/set_attributes/img/swimming-24.png
+OpenJUMP/lib/ext/set_attributes/img/telephone-24.png
+OpenJUMP/lib/ext/set_attributes/img/tennis-24.png
+OpenJUMP/lib/ext/set_attributes/img/theatre-24.png
+OpenJUMP/lib/ext/set_attributes/img/toilets-24.png
+OpenJUMP/lib/ext/set_attributes/img/town-24.png
+OpenJUMP/lib/ext/set_attributes/img/town-hall-24.png
+OpenJUMP/lib/ext/set_attributes/img/triangle-24.png
+OpenJUMP/lib/ext/set_attributes/img/triangle-stroked-24.png
+OpenJUMP/lib/ext/set_attributes/img/village-24.png
+OpenJUMP/lib/ext/set_attributes/img/warehouse-24.png
+OpenJUMP/lib/ext/set_attributes/img/waste-basket-24.png
+OpenJUMP/lib/ext/set_attributes/img/water-24.png
+OpenJUMP/lib/ext/set_attributes/img/wetland-24.png
+OpenJUMP/lib/ext/set_attributes/img/zoo-24.png
+OpenJUMP/lib/ext/set_attributes/maxspeed.xml
 OpenJUMP/lib/ext/sextante/gishur_core.jar
 OpenJUMP/lib/ext/sextante/gishur_x.jar
 OpenJUMP/lib/ext/sextante/japura-1.14.0.jar
@@ -866,6 +1031,7 @@ OpenJUMP/lib/ext/sextante_help/en/general/multiple_selection.png
 OpenJUMP/lib/ext/sextante_help/en/general/numerical_table.png
 OpenJUMP/lib/ext/sextante_help/en/general/previous_parameters.png
 OpenJUMP/lib/ext/sextante_help/en/general/providers.html
+OpenJUMP/lib/ext/sextante_help/en/general/sextante_algo.html
 OpenJUMP/lib/ext/sextante_help/en/general/sextante_objects.png
 OpenJUMP/lib/ext/sextante_help/en/general/slope.png
 OpenJUMP/lib/ext/sextante_help/en/general/toolbox.html
@@ -884,40 +1050,23 @@ OpenJUMP/lib/ext/sextante_help/slope.model
 OpenJUMP/lib/ext/sextante_help/slopemean.bsh
 OpenJUMP/lib/ext/sextante_help/watershed.model
 OpenJUMP/lib/ext/sextante_help/watershed.model.xml
+OpenJUMP/lib/ext/slf4j-api-1.7.7.jar
+OpenJUMP/lib/ext/slf4j-simple-1.7.7.jar
 OpenJUMP/lib/ext/topology-0.8.1.jar
+OpenJUMP/lib/ext/wfs/commons-httpclient-3.1.jar
+OpenJUMP/lib/ext/wfs/deegree2-core-2.6-pre2-20140511.220246-596.jar
+OpenJUMP/lib/ext/wfs/jaxen-1.1.1.jar
+OpenJUMP/lib/ext/wfs/vecmath-1.5.2.jar
+OpenJUMP/lib/ext/workbench-properties.xml
 OpenJUMP/lib/ext/xbean-2.2.0.jar
 OpenJUMP/lib/icons/oj.ico
 OpenJUMP/lib/icons/oj.png
 OpenJUMP/lib/imageio-ext-arcgrid-1.1.7.jar
 OpenJUMP/lib/imageio-ext-gdal-bindings-1.9.2.jar
-OpenJUMP/lib/imageio-ext-gdalarcbinarygrid-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdalarcgrid-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdalbsb-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdaldoq1-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdaldoq2-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdaldted-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdalecw-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdalecwjp2-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdalehdr-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdalenvihdr-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdalenvisat-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdalerdasimg-1.1.7.jar
 OpenJUMP/lib/imageio-ext-gdalframework-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdalgeotiff-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdalidrisi-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdaljpeg-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdalkakadujp2-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdalmrsid-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdalmrsidjp2-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdalnitf-1.1.7.jar
 OpenJUMP/lib/imageio-ext-geocore-1.1.7.jar
-OpenJUMP/lib/imageio-ext-imagereadmt-1.1.7.jar
-OpenJUMP/lib/imageio-ext-kakadu-1.1.7.jar
-OpenJUMP/lib/imageio-ext-kakadujni-5.2.6.jar
-OpenJUMP/lib/imageio-ext-nitf-1.1.7.jar
 OpenJUMP/lib/imageio-ext-streams-1.1.7.jar
 OpenJUMP/lib/imageio-ext-tiff-1.1.7.jar
-OpenJUMP/lib/imageio-ext-turbojpeg-1.1.7.jar
 OpenJUMP/lib/imageio-ext-utilities-1.1.7.jar
 OpenJUMP/lib/jai_codec-1.1.3.jar
 OpenJUMP/lib/jai_core-1.1.3.jar
@@ -927,17 +1076,16 @@ OpenJUMP/lib/jdom-1.1.3.jar
 OpenJUMP/lib/jmatharray-20070905.jar
 OpenJUMP/lib/jmathplot-20070905.jar
 OpenJUMP/lib/js-1.5R4.1.jar
-OpenJUMP/lib/jts-1.14-20140423.jar
+OpenJUMP/lib/jts-core-1.14.0.jar
 OpenJUMP/lib/jython-2.2.jar
-OpenJUMP/lib/log4j-1.2.16.jar
+OpenJUMP/lib/log4j-1.2.17.jar
 OpenJUMP/lib/native/jecw-0.0.7.jar
-OpenJUMP/lib/nitf-bindings-2.7-dev-r1130.jar
-OpenJUMP/lib/postgresql-9.3-1101-jdbc4.jar
-OpenJUMP/lib/turbojpeg-wrapper-1.2.1.1.jar
+OpenJUMP/lib/org-netbeans-swing-outline-7.2.jar
+OpenJUMP/lib/postgresql-9.4-1206-jdbc4.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.3.jar
+OpenJUMP/lib/xz-1.5.jar
 bin/openjump
-%%DOCSDIR%%/Changes.txt
+%%PORTDOCS%%%%DOCSDIR%%/Changes.txt
 @dir OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.createHyetogram
-- 
cgit v1.2.3