3 files changed, 37 insertions, 38 deletions

diff --git a/astro/osmosis/Makefile b/astro/osmosis/Makefile
index 6d3125e58c76..6025ee9f42e7 100644
--- a/astro/osmosis/Makefile
+++ b/astro/osmosis/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	osmosis
-# Date created:		2009/09/21
-# Whom:			Gleb Smirnoff <glebius@FreeBSD.org>
-#
+# Created by: Gleb Smirnoff <glebius@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	osmosis
-PORTVERSION=	0.41
+PORTVERSION=	0.42
 CATEGORIES=	astro java
 MASTER_SITES=	http://bretth.dev.openstreetmap.org/osmosis-build/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -16,6 +12,7 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Command line Java app for processing OpenStreetMap data
 
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/astro/osmosis/distinfo b/astro/osmosis/distinfo
index 331132345e6e..ea08d7cecfd8 100644
--- a/astro/osmosis/distinfo
+++ b/astro/osmosis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (osmosis-0.41.tgz) = e88a382883a4c1252243e4e96b7fa274e2c2564572ba22c23a3506f81fee244c
-SIZE (osmosis-0.41.tgz) = 8602122
+SHA256 (osmosis-0.42.tgz) = 725ee5cfdacfd64f79435f6a860c3af7b7fdecd654570fa2f317c25e7126c1bf
+SIZE (osmosis-0.42.tgz) = 9244523
diff --git a/astro/osmosis/pkg-plist b/astro/osmosis/pkg-plist
index cecf4323b07d..610742472e7c 100644
--- a/astro/osmosis/pkg-plist
+++ b/astro/osmosis/pkg-plist
@@ -1,46 +1,48 @@
 bin/osmosis
 %%DATADIR%%/config/plexus.conf
 %%DATADIR%%/lib/default/aopalliance-1.0.jar
-%%DATADIR%%/lib/default/commons-codec-1.5.jar
-%%DATADIR%%/lib/default/commons-compress-1.2.jar
+%%DATADIR%%/lib/default/commons-codec-1.7.jar
+%%DATADIR%%/lib/default/commons-compress-1.4.1.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.18.jar
+%%DATADIR%%/lib/default/mysql-connector-java-5.1.21.jar
 %%DATADIR%%/lib/default/netty-3.2.7.Final.jar
-%%DATADIR%%/lib/default/osmosis-apidb-0.41.jar
-%%DATADIR%%/lib/default/osmosis-areafilter-0.41.jar
-%%DATADIR%%/lib/default/osmosis-core-0.41.jar
-%%DATADIR%%/lib/default/osmosis-dataset-0.41.jar
-%%DATADIR%%/lib/default/osmosis-extract-0.41.jar
-%%DATADIR%%/lib/default/osmosis-hstore-0.41.jar
-%%DATADIR%%/lib/default/osmosis-pbf-0.41.jar
-%%DATADIR%%/lib/default/osmosis-pbf2-0.41.jar
-%%DATADIR%%/lib/default/osmosis-pbfmarshall-0.41.jar
-%%DATADIR%%/lib/default/osmosis-pgsimple-0.41.jar
-%%DATADIR%%/lib/default/osmosis-pgsnapshot-0.41.jar
-%%DATADIR%%/lib/default/osmosis-replication-0.41.jar
-%%DATADIR%%/lib/default/osmosis-replication-http-0.41.jar
-%%DATADIR%%/lib/default/osmosis-set-0.41.jar
-%%DATADIR%%/lib/default/osmosis-tagfilter-0.41.jar
-%%DATADIR%%/lib/default/osmosis-xml-0.41.jar
-%%DATADIR%%/lib/default/osmpbf-1.1.1-754a33af.jar
+%%DATADIR%%/lib/default/osmosis-apidb-0.42.jar
+%%DATADIR%%/lib/default/osmosis-areafilter-0.42.jar
+%%DATADIR%%/lib/default/osmosis-core-0.42.jar
+%%DATADIR%%/lib/default/osmosis-dataset-0.42.jar
+%%DATADIR%%/lib/default/osmosis-extract-0.42.jar
+%%DATADIR%%/lib/default/osmosis-hstore-jdbc-0.42.jar
+%%DATADIR%%/lib/default/osmosis-pbf-0.42.jar
+%%DATADIR%%/lib/default/osmosis-pbf2-0.42.jar
+%%DATADIR%%/lib/default/osmosis-pbfmarshall-0.42.jar
+%%DATADIR%%/lib/default/osmosis-pgsimple-0.42.jar
+%%DATADIR%%/lib/default/osmosis-pgsnapshot-0.42.jar
+%%DATADIR%%/lib/default/osmosis-replication-0.42.jar
+%%DATADIR%%/lib/default/osmosis-replication-http-0.42.jar
+%%DATADIR%%/lib/default/osmosis-set-0.42.jar
+%%DATADIR%%/lib/default/osmosis-tagfilter-0.42.jar
+%%DATADIR%%/lib/default/osmosis-tagtransform-0.42.jar
+%%DATADIR%%/lib/default/osmosis-xml-0.42.jar
+%%DATADIR%%/lib/default/osmpbf.jar
 %%DATADIR%%/lib/default/plexus-classworlds-2.4.jar
 %%DATADIR%%/lib/default/postgis-jdbc-1.3.3.jar
-%%DATADIR%%/lib/default/postgresql-9.0-801.jdbc4.jar
+%%DATADIR%%/lib/default/postgresql-9.1-901-1.jdbc4.jar
 %%DATADIR%%/lib/default/protobuf-java-2.4.1.jar
-%%DATADIR%%/lib/default/spring-aop-3.0.6.RELEASE.jar
-%%DATADIR%%/lib/default/spring-asm-3.0.6.RELEASE.jar
-%%DATADIR%%/lib/default/spring-beans-3.0.6.RELEASE.jar
-%%DATADIR%%/lib/default/spring-context-3.0.6.RELEASE.jar
-%%DATADIR%%/lib/default/spring-core-3.0.6.RELEASE.jar
-%%DATADIR%%/lib/default/spring-expression-3.0.6.RELEASE.jar
-%%DATADIR%%/lib/default/spring-jdbc-3.0.6.RELEASE.jar
-%%DATADIR%%/lib/default/spring-tx-3.0.6.RELEASE.jar
+%%DATADIR%%/lib/default/spring-aop-3.1.2.RELEASE.jar
+%%DATADIR%%/lib/default/spring-asm-3.1.2.RELEASE.jar
+%%DATADIR%%/lib/default/spring-beans-3.1.2.RELEASE.jar
+%%DATADIR%%/lib/default/spring-context-3.1.2.RELEASE.jar
+%%DATADIR%%/lib/default/spring-core-3.1.2.RELEASE.jar
+%%DATADIR%%/lib/default/spring-expression-3.1.2.RELEASE.jar
+%%DATADIR%%/lib/default/spring-jdbc-3.1.2.RELEASE.jar
+%%DATADIR%%/lib/default/spring-tx-3.1.2.RELEASE.jar
 %%DATADIR%%/lib/default/stax2-api-3.1.1.jar
-%%DATADIR%%/lib/default/woodstox-core-lgpl-4.1.2.jar
+%%DATADIR%%/lib/default/woodstox-core-lgpl-4.1.4.jar
 %%DATADIR%%/lib/default/xercesImpl-2.9.1.jar
+%%DATADIR%%/lib/default/xz-1.0.jar
 %%DATADIR%%/script/contrib/CreateGeometryForWays.sql
 %%DATADIR%%/script/contrib/apidb_0.6.sql
 %%DATADIR%%/script/contrib/apidb_0.6_osmosis_xid_indexing.sql