Date: Mon, 24 Sep 2012 16:25:59 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r304784 - in head/astro/osmosis: . files Message-ID: <201209241625.q8OGPxwp053127@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Sep 24 16:25:58 2012 New Revision: 304784 URL: http://svn.freebsd.org/changeset/ports/304784 Log: - Update to 0.41 - Switch to upstream wrapper script - Simplify the port (greately) Deleted: head/astro/osmosis/files/ Modified: head/astro/osmosis/Makefile head/astro/osmosis/distinfo head/astro/osmosis/pkg-plist Modified: head/astro/osmosis/Makefile ============================================================================== --- head/astro/osmosis/Makefile Mon Sep 24 15:19:10 2012 (r304783) +++ head/astro/osmosis/Makefile Mon Sep 24 16:25:58 2012 (r304784) @@ -6,9 +6,10 @@ # PORTNAME= osmosis -PORTVERSION= 0.40.1 +PORTVERSION= 0.41 CATEGORIES= astro java -MASTER_SITES= http://bretth.dev.openstreetmap.org/osmosis-build/ +MASTER_SITES= http://bretth.dev.openstreetmap.org/osmosis-build/ \ + http://mirror.amdmi3.ru/distfiles/ EXTRACT_SUFX= .tgz MAINTAINER= amdmi3@FreeBSD.org @@ -16,59 +17,15 @@ COMMENT= Command line Java app for proce NO_BUILD= yes -USE_JAVA= YES +USE_JAVA= yes JAVA_VERSION= 1.6+ -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -SUB_FILES= osmosis - -JAVAJARDIR_REL= ${JAVAJARDIR:C,${PREFIX}/?,,} -JARFILES= aopalliance-1.0.jar \ - commons-codec-1.5.jar \ - commons-compress-1.2.jar \ - commons-dbcp-1.4.jar \ - commons-logging-1.1.1.jar \ - commons-pool-1.5.4.jar \ - jpf-1.5.jar \ - mysql-connector-java-5.1.18.jar \ - osmosis-apidb-${PORTVERSION}.jar \ - osmosis-areafilter-${PORTVERSION}.jar \ - osmosis-core-${PORTVERSION}.jar \ - osmosis-dataset-${PORTVERSION}.jar \ - osmosis-extract-${PORTVERSION}.jar \ - osmosis-hstore-${PORTVERSION}.jar \ - osmosis-pbf-${PORTVERSION}.jar \ - osmosis-pgsimple-${PORTVERSION}.jar \ - osmosis-pgsnapshot-${PORTVERSION}.jar \ - osmosis-replication-${PORTVERSION}.jar \ - osmosis-set-${PORTVERSION}.jar \ - osmosis-tagfilter-${PORTVERSION}.jar \ - osmosis-xml-${PORTVERSION}.jar \ - osmpbf-1.1.1-754a33af.jar \ - plexus-classworlds-2.4.jar \ - postgis-jdbc-1.3.3.jar \ - postgresql-9.0-801.jdbc4.jar \ - protobuf-java-2.4.1.jar \ - spring-aop-3.0.6.RELEASE.jar \ - spring-asm-3.0.6.RELEASE.jar \ - spring-beans-3.0.6.RELEASE.jar \ - spring-context-3.0.6.RELEASE.jar \ - spring-core-3.0.6.RELEASE.jar \ - spring-expression-3.0.6.RELEASE.jar \ - spring-jdbc-3.0.6.RELEASE.jar \ - spring-tx-3.0.6.RELEASE.jar \ - stax2-api-3.1.1.jar \ - woodstox-core-lgpl-4.1.2.jar \ - xercesImpl-2.9.1.jar - -CONFFILES= plexus.conf +post-patch: + @${REINPLACE_CMD} -e 's|^\(MYAPP_HOME=\).*|\1${DATADIR}|' ${WRKSRC}/bin/osmosis do-install: - @${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 - cd ${WRKSRC} && ${COPYTREE_SHARE} script ${DATADIR}/ + ${MKDIR} ${DATADIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} "script config lib" ${DATADIR}/ + ${INSTALL_SCRIPT} ${WRKSRC}/bin/osmosis ${PREFIX}/bin/ .include <bsd.port.mk> Modified: head/astro/osmosis/distinfo ============================================================================== --- head/astro/osmosis/distinfo Mon Sep 24 15:19:10 2012 (r304783) +++ head/astro/osmosis/distinfo Mon Sep 24 16:25:58 2012 (r304784) @@ -1,2 +1,2 @@ -SHA256 (osmosis-0.40.1.tgz) = 3f4e29184341fbe8996f6dcd70d5c8104cab2a3c643ae4ca6d5389fc232a2d00 -SIZE (osmosis-0.40.1.tgz) = 7683042 +SHA256 (osmosis-0.41.tgz) = e88a382883a4c1252243e4e96b7fa274e2c2564572ba22c23a3506f81fee244c +SIZE (osmosis-0.41.tgz) = 8602122 Modified: head/astro/osmosis/pkg-plist ============================================================================== --- head/astro/osmosis/pkg-plist Mon Sep 24 15:19:10 2012 (r304783) +++ head/astro/osmosis/pkg-plist Mon Sep 24 16:25:58 2012 (r304784) @@ -8,19 +8,23 @@ bin/osmosis %%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/osmosis-apidb-0.40.1.jar -%%DATADIR%%/lib/default/osmosis-areafilter-0.40.1.jar -%%DATADIR%%/lib/default/osmosis-core-0.40.1.jar -%%DATADIR%%/lib/default/osmosis-dataset-0.40.1.jar -%%DATADIR%%/lib/default/osmosis-extract-0.40.1.jar -%%DATADIR%%/lib/default/osmosis-hstore-0.40.1.jar -%%DATADIR%%/lib/default/osmosis-pbf-0.40.1.jar -%%DATADIR%%/lib/default/osmosis-pgsimple-0.40.1.jar -%%DATADIR%%/lib/default/osmosis-pgsnapshot-0.40.1.jar -%%DATADIR%%/lib/default/osmosis-replication-0.40.1.jar -%%DATADIR%%/lib/default/osmosis-set-0.40.1.jar -%%DATADIR%%/lib/default/osmosis-tagfilter-0.40.1.jar -%%DATADIR%%/lib/default/osmosis-xml-0.40.1.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/plexus-classworlds-2.4.jar %%DATADIR%%/lib/default/postgis-jdbc-1.3.3.jar
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209241625.q8OGPxwp053127>