- Support staging

2 files changed, 6 insertions, 77 deletions

diff --git a/astro/osmosis/Makefile b/astro/osmosis/Makefile
index 750e3355b01c..b7d692f805ef 100644
--- a/astro/osmosis/Makefile
+++ b/astro/osmosis/Makefile
@@ -11,19 +11,21 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Command line Java app for processing OpenStreetMap data
 
-NO_STAGE=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 
+PLIST_FILES=	bin/${PORTNAME}
+PORTDATA=	*
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|^\(MYAPP_HOME=\).*|\1${DATADIR}|' ${WRKSRC}/bin/osmosis
 
 do-install:
-	${MKDIR} ${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} "script config lib" ${DATADIR}/
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/osmosis ${PREFIX}/bin/
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "script config lib" ${STAGEDIR}${DATADIR}/
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/osmosis ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/astro/osmosis/pkg-plist b/astro/osmosis/pkg-plist
deleted file mode 100644
index b332ed247a78..000000000000
--- a/astro/osmosis/pkg-plist
+++ /dev/null
@@ -1,73 +0,0 @@
-bin/osmosis
-%%DATADIR%%/config/plexus.conf
-%%DATADIR%%/lib/default/aopalliance-1.0.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.21.jar
-%%DATADIR%%/lib/default/netty-3.2.7.Final.jar
-%%DATADIR%%/lib/default/osmosis-apidb-0.43.1.jar
-%%DATADIR%%/lib/default/osmosis-areafilter-0.43.1.jar
-%%DATADIR%%/lib/default/osmosis-core-0.43.1.jar
-%%DATADIR%%/lib/default/osmosis-dataset-0.43.1.jar
-%%DATADIR%%/lib/default/osmosis-extract-0.43.1.jar
-%%DATADIR%%/lib/default/osmosis-hstore-jdbc-0.43.1.jar
-%%DATADIR%%/lib/default/osmosis-osm-binary-0.43.1.jar
-%%DATADIR%%/lib/default/osmosis-pbf-0.43.1.jar
-%%DATADIR%%/lib/default/osmosis-pbf2-0.43.1.jar
-%%DATADIR%%/lib/default/osmosis-pgsimple-0.43.1.jar
-%%DATADIR%%/lib/default/osmosis-pgsnapshot-0.43.1.jar
-%%DATADIR%%/lib/default/osmosis-replication-0.43.1.jar
-%%DATADIR%%/lib/default/osmosis-replication-http-0.43.1.jar
-%%DATADIR%%/lib/default/osmosis-set-0.43.1.jar
-%%DATADIR%%/lib/default/osmosis-tagfilter-0.43.1.jar
-%%DATADIR%%/lib/default/osmosis-tagtransform-0.43.1.jar
-%%DATADIR%%/lib/default/osmosis-xml-0.43.1.jar
-%%DATADIR%%/lib/default/plexus-classworlds-2.4.jar
-%%DATADIR%%/lib/default/postgis-jdbc-1.3.3.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.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.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
-%%DATADIR%%/script/contrib/dump_apidb.sh
-%%DATADIR%%/script/contrib/replicate_osm_file.sh
-%%DATADIR%%/script/fix_line_endings.sh
-%%DATADIR%%/script/munin/README
-%%DATADIR%%/script/munin/osm_replication.conf
-%%DATADIR%%/script/munin/osm_replication_lag
-%%DATADIR%%/script/pgsimple_load_0.6.sql
-%%DATADIR%%/script/pgsimple_schema_0.6.sql
-%%DATADIR%%/script/pgsimple_schema_0.6_action.sql
-%%DATADIR%%/script/pgsimple_schema_0.6_bbox.sql
-%%DATADIR%%/script/pgsimple_schema_0.6_linestring.sql
-%%DATADIR%%/script/pgsnapshot_and_pgsimple.txt
-%%DATADIR%%/script/pgsnapshot_load_0.6.sql
-%%DATADIR%%/script/pgsnapshot_schema_0.6.sql
-%%DATADIR%%/script/pgsnapshot_schema_0.6_action.sql
-%%DATADIR%%/script/pgsnapshot_schema_0.6_bbox.sql
-%%DATADIR%%/script/pgsnapshot_schema_0.6_linestring.sql
-%%DATADIR%%/script/pgsnapshot_schema_0.6_upgrade_4-5.sql
-%%DATADIR%%/script/pgsnapshot_schema_0.6_upgrade_5-6.sql
-@dirrm %%DATADIR%%/script/munin
-@dirrm %%DATADIR%%/script/contrib
-@dirrm %%DATADIR%%/script
-@dirrm %%DATADIR%%/lib/default
-@dirrm %%DATADIR%%/lib
-@dirrm %%DATADIR%%/config
-@dirrm %%DATADIR%%