Index: head/astro/Makefile
===================================================================
--- head/astro/Makefile	(revision 242069)
+++ head/astro/Makefile	(revision 242070)
@@ -1,113 +1,114 @@
 # $FreeBSD$
 #
 
     COMMENT = Astronomical ports
 
     SUBDIR += aa
     SUBDIR += accrete
     SUBDIR += astrometry
     SUBDIR += boinc-einsteinathome
     SUBDIR += boinc-milkyway
     SUBDIR += boinc-setiathome-enhanced
     SUBDIR += celestia
     SUBDIR += celestia-gnome
     SUBDIR += celestia-gtk
     SUBDIR += celestia-kde
     SUBDIR += cfitsio
     SUBDIR += dgpsip
     SUBDIR += ephem
     SUBDIR += gaia
     SUBDIR += gkrellmoon
     SUBDIR += gkrellmoon2
     SUBDIR += gkrellsun
     SUBDIR += glunarclock
     SUBDIR += google-earth
     SUBDIR += gpsbabel
     SUBDIR += gpscorrelate
     SUBDIR += gpsd
     SUBDIR += gpsdrive
     SUBDIR += gpsman
     SUBDIR += gpstk
     SUBDIR += jday
     SUBDIR += josm
     SUBDIR += libgal
     SUBDIR += libnova
     SUBDIR += libroadnav
     SUBDIR += luna
     SUBDIR += match
     SUBDIR += merkaartor
     SUBDIR += mymoon
     SUBDIR += nightfall
     SUBDIR += nova
     SUBDIR += openmap
     SUBDIR += openuniverse
     SUBDIR += orsa
+    SUBDIR += osmosis
     SUBDIR += p5-Astro
     SUBDIR += p5-Astro-ADS
     SUBDIR += p5-Astro-Catalog
     SUBDIR += p5-Astro-DSS
     SUBDIR += p5-Astro-FITS-Header
     SUBDIR += p5-Astro-MoonPhase
     SUBDIR += p5-Astro-SIMBAD
     SUBDIR += p5-Astro-SIMBAD-Client
     SUBDIR += p5-Astro-SpaceTrack
     SUBDIR += p5-Astro-SunTime
     SUBDIR += p5-Astro-Sunrise
     SUBDIR += p5-Astro-satpass
     SUBDIR += p5-GPS
     SUBDIR += p5-GPS-Babel
     SUBDIR += p5-Geo-METAR
     SUBDIR += p5-Weather-Underground
     SUBDIR += phoon
     SUBDIR += planets
     SUBDIR += position
     SUBDIR += pp3
     SUBDIR += prune
     SUBDIR += ptiger
     SUBDIR += py-aipy
     SUBDIR += py-astLib
     SUBDIR += py-metar
     SUBDIR += py-pyfits
     SUBDIR += pyephem
     SUBDIR += pyweather
     SUBDIR += qlandkartegt
     SUBDIR += rmap
     SUBDIR += roadmap
     SUBDIR += roadnav
     SUBDIR += saoimage
     SUBDIR += sattrack
     SUBDIR += sextractor
     SUBDIR += sky2000
     SUBDIR += spacechart
     SUBDIR += sscalc
     SUBDIR += stardates
     SUBDIR += starplot
     SUBDIR += stars
     SUBDIR += stellarium
     SUBDIR += sunclock
     SUBDIR += swe
     SUBDIR += tangogps
     SUBDIR += tclgeomap
     SUBDIR += tkgeomap
     SUBDIR += viking
     SUBDIR += wcslib
     SUBDIR += weatherget
     SUBDIR += weatherspect
     SUBDIR += wmglobe
     SUBDIR += wmjupiter
     SUBDIR += wmmoonclock
     SUBDIR += wmsolar
     SUBDIR += wmspaceweather
     SUBDIR += wmsun
     SUBDIR += xearth
     SUBDIR += xeartk
     SUBDIR += xephem
     SUBDIR += xglobe
     SUBDIR += xmoontool
     SUBDIR += xphoon
     SUBDIR += xplanet
     SUBDIR += xrmap
     SUBDIR += xtide
     SUBDIR += xworld
 
 .include <bsd.port.subdir.mk>

Property changes on: head/astro/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.140
\ No newline at end of property
+1.141
\ No newline at end of property
Index: head/astro/osmosis/Makefile
===================================================================
--- head/astro/osmosis/Makefile	(nonexistent)
+++ head/astro/osmosis/Makefile	(revision 242070)
@@ -0,0 +1,54 @@
+# New ports collection makefile for:	osmosis
+# Date created:		2009/09/21
+# Whom:			Gleb Smirnoff <glebius@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	osmosis
+PORTVERSION=	0.31.2
+CATEGORIES=	astro java
+MASTER_SITES=	http://dev.openstreetmap.org/~bretth/osmosis-build/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
+
+MAINTAINER=	glebius@FreeBSD.org
+COMMENT=	A command line java app for processing OpenStreetMap data
+
+NO_BUILD=	yes
+
+USE_JAVA=	YES
+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-logging-1.1.1.jar \
+		commons-pool-1.3.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
+
+PLIST_FILES=	bin/osmosis ${JAVAJARDIR_REL}/osmosis.jar \
+		${JARFILES:S,^,${DATADIR_REL}/,}
+
+do-install:
+	@${MKDIR} ${JAVAJARDIR}/
+	${INSTALL_DATA} ${WRKSRC}/osmosis.jar ${JAVAJARDIR}/
+	@${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${JARFILES:S,^,${WRKSRC}/lib/default/,} ${DATADIR}/
+	${INSTALL_SCRIPT} ${WRKDIR}/osmosis ${PREFIX}/bin/osmosis
+
+.include <bsd.port.mk>

Property changes on: head/astro/osmosis/Makefile
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/astro/osmosis/distinfo
===================================================================
--- head/astro/osmosis/distinfo	(nonexistent)
+++ head/astro/osmosis/distinfo	(revision 242070)
@@ -0,0 +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

Property changes on: head/astro/osmosis/distinfo
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/astro/osmosis/files/osmosis.in
===================================================================
--- head/astro/osmosis/files/osmosis.in	(nonexistent)
+++ head/astro/osmosis/files/osmosis.in	(revision 242070)
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# 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.
+
+if [ -f /etc/osmosis ] ; then
+  . /etc/osmosis
+fi
+
+if [ -f "$HOME/.osmosis" ] ; then
+  . "$HOME/.osmosis"
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  # No JAVACMD provided in osmosis config files, therefore default to java
+  JAVACMD="%%LOCALBASE%%/bin/java"
+fi
+
+JAVACMD_OPTIONS="-Xmx1024m ${JAVACMD_OPTIONS}"
+JAVA_VERSION="%%JAVA_VERSION%%"
+export JAVA_VERSION
+
+if [ "x$1x" = "xx" ] || echo "$@" | grep -q -e '--help' ; then
+  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"
+
+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"
+
+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"
+
+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"
+
+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"
+
+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="planetin.osm" --write-xml file="planetout.osm"
+
+% 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 
+
+EOF
+  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
+
+MAINCLASS=org.openstreetmap.osmosis.core.Osmosis
+EXEC="${JAVACMD} ${JAVACMD_OPTIONS} -cp ${CLASSPATH} ${MAINCLASS} \
+	${OSMOSIS_OPTIONS} $@"
+
+exec $EXEC

Property changes on: head/astro/osmosis/files/osmosis.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/astro/osmosis/pkg-descr
===================================================================
--- head/astro/osmosis/pkg-descr	(nonexistent)
+++ head/astro/osmosis/pkg-descr	(revision 242070)
@@ -0,0 +1,9 @@
+Osmosis is a command line java app for processing OSM data.  The tool consists
+of a series of pluggable components that can be chained together to perform a
+larger operation.  For example, it has components for reading from database and
+from file, components for writing to database and to file, components for
+deriving and applying change sets to data sources, components for sorting data,
+etc. It has been written so that it is easy to add new features without
+re-writing common tasks such as file or database handling. 
+
+WWW: http://wiki.openstreetmap.org/wiki/Osmosis

Property changes on: head/astro/osmosis/pkg-descr
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property