- Update to 0.37

Submitted by:	glebius (maintainer, via private email)

4 files changed, 132 insertions, 80 deletions

diff --git a/astro/osmosis/Makefile b/astro/osmosis/Makefile
index 5934eb725b19..119c5220139b 100644
--- a/astro/osmosis/Makefile
+++ b/astro/osmosis/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	osmosis
-PORTVERSION=	0.31.2
+PORTVERSION=	0.37
 CATEGORIES=	astro java
-MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
+MASTER_SITES=	http://bretth.dev.openstreetmap.org/osmosis-build/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	glebius@FreeBSD.org
 COMMENT=	A command line java app for processing OpenStreetMap data
@@ -22,30 +22,52 @@ JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 SUB_FILES=	osmosis
 
-#FETCH_ARGS=	-pRr
 JAVAJARDIR_REL=	 ${JAVAJARDIR:C,${PREFIX}/?,,}
 JARFILES=	aopalliance-1.0.jar \
-		bzip2-20090327.jar \
-		commons-dbcp-1.2.2.jar \
+		commons-codec-1.4.jar \
+		commons-compress-1.0.jar \
+		commons-dbcp-1.4.jar \
 		commons-logging-1.1.1.jar \
-		commons-pool-1.3.jar \
+		commons-pool-1.5.4.jar \
 		jpf-1.5.jar \
-		mysql-connector-java-5.1.6.jar \
-		postgis-1.3.2.jar \
-		postgresql-8.3-603.jdbc4.jar \
-		spring-beans-2.5.6.SEC01.jar \
-		spring-context-2.5.6.SEC01.jar \
-		spring-core-2.5.6.SEC01.jar \
-		spring-jdbc-2.5.6.SEC01.jar \
-		spring-tx-2.5.6.SEC01.jar \
-		stax2-api-3.0.1.jar \
-		woodstox-core-lgpl-4.0.3.jar
+		mysql-connector-java-5.1.10.jar \
+		osmbin-1.0-6d760534.jar \
+		osmosis-apidb-0.37.jar \
+		osmosis-areafilter-0.37.jar \
+		osmosis-binary-0.37.jar \
+		osmosis-core-0.37.jar \
+		osmosis-dataset-0.37.jar \
+		osmosis-extract-0.37.jar \
+		osmosis-hstore-0.2.jar \
+		osmosis-pgsnapshot-0.37.jar \
+		osmosis-replication-0.37.jar \
+		osmosis-set-0.37.jar \
+		osmosis-tagfilter-0.37.jar \
+		osmosis-xml-0.37.jar \
+		plexus-classworlds-2.2.2.jar \
+		postgis-jdbc-1.3.3.jar \
+		postgresql-8.4-701.jdbc4.jar \
+		protobuf-java-2.3.0.jar \
+		spring-aop-3.0.3.RELEASE.jar \
+		spring-asm-3.0.3.RELEASE.jar \
+		spring-beans-3.0.3.RELEASE.jar \
+		spring-context-3.0.3.RELEASE.jar \
+		spring-core-3.0.3.RELEASE.jar \
+		spring-expression-3.0.3.RELEASE.jar \
+		spring-jdbc-3.0.3.RELEASE.jar \
+		spring-tx-3.0.3.RELEASE.jar \
+		stax2-api-3.0.2.jar \
+		woodstox-core-lgpl-4.0.3.jar \
+		xercesImpl-2.9.1.jar
+
+CONFFILES=	plexus.conf \
+		osmosis-plugins.conf
 
 do-install:
-	@${MKDIR} ${JAVAJARDIR}/
-	${INSTALL_DATA} ${WRKSRC}/osmosis.jar ${JAVAJARDIR}/
-	@${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${JARFILES:S,^,${WRKSRC}/lib/default/,} ${DATADIR}/
+	@${MKDIR} ${DATADIR}/lib/default
+	${INSTALL_DATA} ${JARFILES:S,^,${WRKSRC}/lib/default/,} ${DATADIR}/lib/default
+	@${MKDIR} ${DATADIR}/config
+	${INSTALL_DATA} ${CONFFILES:S,^,${WRKSRC}/config/,} ${DATADIR}/config
 	${INSTALL_SCRIPT} ${WRKDIR}/osmosis ${PREFIX}/bin/osmosis
 
 .include <bsd.port.mk>
diff --git a/astro/osmosis/distinfo b/astro/osmosis/distinfo
index 1a7f46b92006..a8edb090f131 100644
--- a/astro/osmosis/distinfo
+++ b/astro/osmosis/distinfo
@@ -1,3 +1,3 @@
-MD5 (osmosis-0.31.2-bin.tar.gz) = 3c8a5d8109add0395208c38543034962
-SHA256 (osmosis-0.31.2-bin.tar.gz) = 3252ba62271c6b74a7c13960ecf68b703c47764371be4dfa04577c6e01a99c8c
-SIZE (osmosis-0.31.2-bin.tar.gz) = 6837385
+MD5 (osmosis-0.37.tgz) = ba60b953c93e43e18a7205c1a3fe0ff7
+SHA256 (osmosis-0.37.tgz) = 431eb49439fc6fa69fe52e794311bb3167554280c2441c9b0450373b1d6fd05c
+SIZE (osmosis-0.37.tgz) = 7241414
diff --git a/astro/osmosis/files/osmosis.in b/astro/osmosis/files/osmosis.in
index e025d0834dec..27db1946c6d6 100644
--- a/astro/osmosis/files/osmosis.in
+++ b/astro/osmosis/files/osmosis.in
@@ -2,10 +2,8 @@
 
 # Config files can define several variables used throughout this script.
 # JAVACMD - The java command to launch osmosis.
-# JAVACMD_OPTIONS - The options to append to the java command, typically used
-#                   to modify jvm settings such as max memory.
-# OSMOSIS_OPTIONS - The options to apply to all osmosis invocations, typically
-#                   used to add plugins or make quiet operation the default.
+# JAVACMD_OPTIONS - The options to append to the java command, typically used to modify jvm settings such as max memory.
+# OSMOSIS_OPTIONS - The options to apply to all osmosis invocations, typically used to add plugins or make quiet operation the default.
 
 if [ -f /etc/osmosis ] ; then
   . /etc/osmosis
@@ -24,63 +22,71 @@ JAVACMD_OPTIONS="-Xmx1024m ${JAVACMD_OPTIONS}"
 JAVA_VERSION="%%JAVA_VERSION%%"
 export JAVA_VERSION
 
+## resolve links - $0 may be a link to application
+PRG="$0"
+
+# if started without absolute path, but from PATH environment
+if [ ! -s "$PRG" ] ; then
+    PRG=`which $PRG`
+fi
+
+# need this for relative symlinks
+while [ -h "$PRG" ] ; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG="`dirname "$PRG"`/$link"
+  fi
+done
+
 if [ "x$1x" = "xx" ] || echo "$@" | grep -q -e '--help' ; then
-  cat <<EOF
+cat <<EOF
 osmosis
 
 Example Usage
 
-Import a planet file into a local MySQL database.
-% osmosis --read-xml file=~/osm/planbet/planet.osm --write-mysql host="x" \\
-	database="x" user="x" password="x"
+Import a planet file into a local PostgreSQL database.
+
+osmosis --read-xml file=~/osm/planbet/planet.osm --write-apidb host="x" database="x" user="x" password="x"
 
-Export a planet file from a local MySQL database.
-% osmosis --read-mysql host="x" database="x" user="x" password="x" --write-xml \\
-	file="planet.osm"
+Export a planet file from a local PostgreSQL database.
+
+osmosis --read-apidb host="x" database="x" user="x" password="x" --write-xml file="planet.osm"
 
 Derive a change set between two planet files.
-% osmosis --read-xml file="planet1.osm" --read-xml file="planet2.osm" \\
-	--derive-change --write-xml-change file="planetdiff-1-2.osc"
+
+osmosis --read-xml file="planet2.osm" --read-xml file="planet1.osm" --derive-change --write-xml-change file="planetdiff-1-2.osc"
 
 Derive a change set between a planet file and a database.
-% osmosis --read-xml file="planet1.osm" --read-mysql host="x" database="x" \\
-	user="x" password="x" --derive-change --write-xml-change \\
-	file="planetdiff-1-2.osc"
+
+osmosis --read-mysql host="x" database="x" user="x" password="x" --read-xml file="planet1.osm" --derive-change --write-xml-change file="planetdiff-1-2.osc"
 
 Apply a change set to a planet file.
-% osmosis --read-xml file="planet1.osm" --read-xml-change \\
-	file="planetdiff-1-2.osc" --apply-change --write-xml file="planet2.osm"
+
+osmosis --read-xml-change file="planetdiff-1-2.osc" --read-xml file="planet1.osm" --apply-change --write-xml file="planet2.osm"
 
 Sort the contents of a planet file.
-% osmosis --read-xml file="data.osm" --sort type="TypeThenId" --write-xml \\
-	file="data-sorted.osm"
 
-The above examples make use of the default pipe connection feature, however
-a simple read and write planet file command line could be written in two ways.
-The first example uses default pipe connection, the second explicitly connects
-the two components using a pipe named "mypipe". The default pipe connection
-will always work so long as each task is specified in the correct order.
+osmosis --read-xml file="data.osm" --sort type="TypeThenId" --write-xml file="data-sorted.osm"
+
+The above examples make use of the default pipe connection feature, however a simple read and write planet file command line could be written in two ways. The first example uses default pipe connection, the second explicitly connects the two components using a pipe named "mypipe". The default pipe connection will always work so long as each task is specified in the correct order.
 
-% osmosis --read-xml file="planetin.osm" --write-xml file="planetout.osm"
+osmosis --read-xml file="planetin.osm" --write-xml file="planetout.osm"
 
-% osmosis --read-xml file="planetin.osm" outPipe.0="mypipe" --write-xml \\
-	file="planetout.osm" inPipe.0="mypipe"
+osmosis --read-xml file="planetin.osm" outPipe.0="mypipe" --write-xml file="planetout.osm" inPipe.0="mypipe"
 
-Full usage details are available at:
-http://www.bretth.com/wiki/Wiki.jsp?page=OpenStreetMap 
+Full usage details are available at: http://wiki.openstreetmap.org/wiki/Osmosis/DetailedUsage 
 
 EOF
-  exit 1
+exit 1
 fi
 
-# Build up the classpath of required jar files.
-CLASSPATH=%%JAVALIBDIR%%/osmosis.jar:${OSMOSIS_CLASSPATH}
-for FILE in `ls %%DATADIR%%`; do
-  CLASSPATH=${CLASSPATH}:%%DATADIR%%/${FILE}
-done
+# Build up the classpath of required jar files via classworlds launcher.
+CLASSPATH=%%DATADIR%%/lib/default/plexus-classworlds-*.jar
 
-MAINCLASS=org.openstreetmap.osmosis.core.Osmosis
-EXEC="${JAVACMD} ${JAVACMD_OPTIONS} -cp ${CLASSPATH} ${MAINCLASS} \
-	${OSMOSIS_OPTIONS} $@"
+MAINCLASS=org.codehaus.classworlds.Launcher
+EXEC="$JAVACMD $JAVACMD_OPTIONS -cp $CLASSPATH -Dapp.home=%%DATADIR%% -Dclassworlds.conf=%%DATADIR%%/config/plexus.conf $MAINCLASS $OSMOSIS_OPTIONS $@"
 
 exec $EXEC
diff --git a/astro/osmosis/pkg-plist b/astro/osmosis/pkg-plist
index 95cabf2b77b7..147ad740a5e3 100644
--- a/astro/osmosis/pkg-plist
+++ b/astro/osmosis/pkg-plist
@@ -1,19 +1,43 @@
 bin/osmosis
-%%JAVASHAREDIR%%/classes/osmosis.jar
-%%DATADIR%%/aopalliance-1.0.jar
-%%DATADIR%%/bzip2-20090327.jar
-%%DATADIR%%/commons-dbcp-1.2.2.jar
-%%DATADIR%%/commons-logging-1.1.1.jar
-%%DATADIR%%/commons-pool-1.3.jar
-%%DATADIR%%/jpf-1.5.jar
-%%DATADIR%%/mysql-connector-java-5.1.6.jar
-%%DATADIR%%/postgis-1.3.2.jar
-%%DATADIR%%/postgresql-8.3-603.jdbc4.jar
-%%DATADIR%%/spring-beans-2.5.6.SEC01.jar
-%%DATADIR%%/spring-context-2.5.6.SEC01.jar
-%%DATADIR%%/spring-core-2.5.6.SEC01.jar
-%%DATADIR%%/spring-jdbc-2.5.6.SEC01.jar
-%%DATADIR%%/spring-tx-2.5.6.SEC01.jar
-%%DATADIR%%/stax2-api-3.0.1.jar
-%%DATADIR%%/woodstox-core-lgpl-4.0.3.jar
+%%DATADIR%%/config/plexus.conf
+%%DATADIR%%/config/osmosis-plugins.conf
+%%DATADIR%%/lib/default/aopalliance-1.0.jar
+%%DATADIR%%/lib/default/commons-codec-1.4.jar
+%%DATADIR%%/lib/default/commons-compress-1.0.jar
+%%DATADIR%%/lib/default/commons-dbcp-1.4.jar
+%%DATADIR%%/lib/default/commons-logging-1.1.1.jar
+%%DATADIR%%/lib/default/commons-pool-1.5.4.jar
+%%DATADIR%%/lib/default/jpf-1.5.jar
+%%DATADIR%%/lib/default/mysql-connector-java-5.1.10.jar
+%%DATADIR%%/lib/default/osmbin-1.0-6d760534.jar
+%%DATADIR%%/lib/default/osmosis-apidb-0.37.jar
+%%DATADIR%%/lib/default/osmosis-areafilter-0.37.jar
+%%DATADIR%%/lib/default/osmosis-binary-0.37.jar
+%%DATADIR%%/lib/default/osmosis-core-0.37.jar
+%%DATADIR%%/lib/default/osmosis-dataset-0.37.jar
+%%DATADIR%%/lib/default/osmosis-extract-0.37.jar
+%%DATADIR%%/lib/default/osmosis-hstore-0.2.jar
+%%DATADIR%%/lib/default/osmosis-pgsnapshot-0.37.jar
+%%DATADIR%%/lib/default/osmosis-replication-0.37.jar
+%%DATADIR%%/lib/default/osmosis-set-0.37.jar
+%%DATADIR%%/lib/default/osmosis-tagfilter-0.37.jar
+%%DATADIR%%/lib/default/osmosis-xml-0.37.jar
+%%DATADIR%%/lib/default/plexus-classworlds-2.2.2.jar
+%%DATADIR%%/lib/default/postgis-jdbc-1.3.3.jar
+%%DATADIR%%/lib/default/postgresql-8.4-701.jdbc4.jar
+%%DATADIR%%/lib/default/protobuf-java-2.3.0.jar
+%%DATADIR%%/lib/default/spring-aop-3.0.3.RELEASE.jar
+%%DATADIR%%/lib/default/spring-asm-3.0.3.RELEASE.jar
+%%DATADIR%%/lib/default/spring-beans-3.0.3.RELEASE.jar
+%%DATADIR%%/lib/default/spring-context-3.0.3.RELEASE.jar
+%%DATADIR%%/lib/default/spring-core-3.0.3.RELEASE.jar
+%%DATADIR%%/lib/default/spring-expression-3.0.3.RELEASE.jar
+%%DATADIR%%/lib/default/spring-jdbc-3.0.3.RELEASE.jar
+%%DATADIR%%/lib/default/spring-tx-3.0.3.RELEASE.jar
+%%DATADIR%%/lib/default/stax2-api-3.0.2.jar
+%%DATADIR%%/lib/default/woodstox-core-lgpl-4.0.3.jar
+%%DATADIR%%/lib/default/xercesImpl-2.9.1.jar
+@dirrm %%DATADIR%%/lib/default
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%