From nobody Mon Nov 20 18:26:19 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SYwtz370Bz51gH6; Mon, 20 Nov 2023 18:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SYwtz2TFvz3KjF; Mon, 20 Nov 2023 18:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700504779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WtNKh4G2+/NpH6YrVLM8Pdzc9mrdrAYxR4IrGbe70lE=; b=D6l8MbnVkOd35y9W0hOpSMiyghwB3HpDMAWOIMGOotL7rzRW5s2bwOqeLvgB26VcFO9na3 lHnGLU/HqOI4aQZ3wnRn+dbR/jWSaNYFwGyRbMPhCtcVLlntoYF2w+9kWHF1s9Z+ubJOMX OVTSWkn0CqbemuWwSTZR9FDpt8UQWCln+s3W36YaEceOogELp3IhctaO7CvuOGB84QsSgl EP6Mtmwx5tJk5jV62wA2UVI/WW//ttmNYaXH0XLd8tQ8DW55RxUpp+dYZPf4JnH5/WSV4Y jG9nH8QYl2XK+oz4adks/x020pZAjuZK3HRw2o3wf3NSQaP//GFRJx+9nDaUHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700504779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WtNKh4G2+/NpH6YrVLM8Pdzc9mrdrAYxR4IrGbe70lE=; b=ccdRJyc1paepYmoJvmYt5pxz0zMYhXqmH9kDTsmNR52fPoVP/f/BiHkaJdkn8S4iIDsyb6 hvz63Fp5pDmGoG2amqfZNbP/nVdT1KJFWU4AWU7IiQ8sifEoiG8yOyhrX29I41i0tWR47N Hv2Re67/6EvEPeUBIsbE4Jfg5XeNdiW6GZ/CYA5eMpprmkN36ghwJOJG2dKQhm6D/MjRpc zKuS3KOM9nFsQ7TX9sPBc8Jhn8Du7sb1BCbB1ODML/EJM24ok86VKj04vS3qI7ye2BsiPE /v0k0idAiQMfDV9CoC9emhzUlJLDcKKQiwbR+jKIQuXZr43b4Q10Ka7GJRkrNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700504779; a=rsa-sha256; cv=none; b=oSQ9lBQ5SwtGCZxR+OB0EtApub9Fe9aEJ9YnxQ/NdYE9wL/gdL4tMMuHnsLFiTavu70ocp TAgHtNOjMoIcpL9RojZzYRxNRerhRkz03I+NvJ2ayMIWy4F9nsHfFkGDJKhJdnjVf6Fu76 sN+d0lh/0ZLlJk6laiBy+uH7xBSwFnwWRv1HTHaSmm21EO1Sv3PTvfz+h4bvAR4eLVWrse uG5zaIxNx3bSmFbPf/h3TMT0B8kicWVHeOAEaxsdLYC+esqK9o6hRFv8b8JCfLj2l0+WLf WenpzF51n5y0C+IoscFUFH2bE89fRGs7w56nrR7+8FmR0EwF4JpbIWrFKEH6ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SYwtz1Dq6z12hK; Mon, 20 Nov 2023 18:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AKIQJqw024805; Mon, 20 Nov 2023 18:26:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AKIQJ4v024802; Mon, 20 Nov 2023 18:26:19 GMT (envelope-from git) Date: Mon, 20 Nov 2023 18:26:19 GMT Message-Id: <202311201826.3AKIQJ4v024802@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 13c8c4f94774 - main - astro/osmosis: update 0.48.3 =?utf-8?Q?=E2=86=92?= 0.49.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13c8c4f947740904f45b0f7c2a16fbae7464a919 Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=13c8c4f947740904f45b0f7c2a16fbae7464a919 commit 13c8c4f947740904f45b0f7c2a16fbae7464a919 Author: Dmitry Marakasov AuthorDate: 2023-11-14 12:33:39 +0000 Commit: Dmitry Marakasov CommitDate: 2023-11-20 18:26:08 +0000 astro/osmosis: update 0.48.3 → 0.49.0 --- astro/osmosis/Makefile | 22 ++++++++------ astro/osmosis/distinfo | 6 ++-- astro/osmosis/files/patch-bin_osmosis | 57 +++++++++++++++++++++++++++++++++++ astro/osmosis/files/test.osm | 17 +++++++++++ 4 files changed, 89 insertions(+), 13 deletions(-) diff --git a/astro/osmosis/Makefile b/astro/osmosis/Makefile index 60474290c716..bfd42e293229 100644 --- a/astro/osmosis/Makefile +++ b/astro/osmosis/Makefile @@ -1,5 +1,5 @@ PORTNAME= osmosis -PORTVERSION= 0.48.3 +PORTVERSION= 0.49.0 CATEGORIES= astro java MASTER_SITES= https://github.com/openstreetmap/osmosis/releases/download/${PORTVERSION}/ @@ -10,11 +10,11 @@ WWW= https://wiki.openstreetmap.org/wiki/Osmosis LICENSE= PD LICENSE_FILE= ${WRKSRC}/copying.txt -USES= tar:tgz +USES= tar USE_JAVA= yes +JAVA_VERSION= 17+ NO_BUILD= yes NO_ARCH= yes -NO_WRKSUBDIR= yes PLIST_FILES= bin/${PORTNAME} PORTDATA= * @@ -23,11 +23,12 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e 's|^\(MYAPP_HOME=\).*|\1${DATADIR}|' ${WRKSRC}/bin/osmosis + @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|; s|%%JAVA%%|${JAVA}|' \ + ${WRKSRC}/bin/osmosis do-install: @${MKDIR} ${STAGEDIR}${DATADIR} - @cd ${WRKSRC} && ${COPYTREE_SHARE} "script config lib" ${STAGEDIR}${DATADIR}/ + @cd ${WRKSRC} && ${COPYTREE_SHARE} "script lib" ${STAGEDIR}${DATADIR}/ ${INSTALL_SCRIPT} ${WRKSRC}/bin/osmosis ${STAGEDIR}${PREFIX}/bin/ do-install-DOCS-on: @@ -35,10 +36,11 @@ do-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/changes.txt ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR} do-test: - ${JAVA} \ - -cp ${STAGEDIR}${DATADIR}/lib/default/plexus-classworlds-*.jar \ - -Dapp.home=${STAGEDIR}${DATADIR} \ - -Dclassworlds.conf=${STAGEDIR}${DATADIR}/config/plexus.conf \ - org.codehaus.classworlds.Launcher + @${STAGEDIR}${PREFIX}/bin/osmosis \ + --read-xml ${FILESDIR}/test.osm \ + --tf accept-ways highway='*' \ + --used-node \ + --write-xml ${WRKDIR}/test-out.osm + ${TEST} -s ${WRKDIR}/test-out.osm .include diff --git a/astro/osmosis/distinfo b/astro/osmosis/distinfo index 1ce85b100903..4883d2151202 100644 --- a/astro/osmosis/distinfo +++ b/astro/osmosis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1599859191 -SHA256 (osmosis-0.48.3.tgz) = b24c601578ea4cb0ca88302be6768fd0602bde86c254a0e0b90513581dba67ff -SIZE (osmosis-0.48.3.tgz) = 15169299 +TIMESTAMP = 1699954417 +SHA256 (osmosis-0.49.0.tar) = d2a35bdbff190ffa66a6304ea1f73db9e7048c55340306e569086730518675ae +SIZE (osmosis-0.49.0.tar) = 15555072 diff --git a/astro/osmosis/files/patch-bin_osmosis b/astro/osmosis/files/patch-bin_osmosis new file mode 100644 index 000000000000..54d8fe0b065a --- /dev/null +++ b/astro/osmosis/files/patch-bin_osmosis @@ -0,0 +1,57 @@ +--- bin/osmosis.orig 2023-11-03 11:05:00 UTC ++++ bin/osmosis +@@ -67,23 +67,10 @@ + # Resolve links: $0 may be a link + app_path=$0 + +-# Need this for daisy-chained symlinks. +-while +- APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path +- [ -h "$app_path" ] +-do +- ls=$( ls -ld "$app_path" ) +- link=${ls#*' -> '} +- case $link in #( +- /*) app_path=$link ;; #( +- *) app_path=$APP_HOME$link ;; +- esac +-done +- + # This is normally unused + # shellcheck disable=SC2034 + APP_BASE_NAME=${0##*/} +-APP_HOME=$( cd "${APP_HOME:-./}.." && pwd -P ) || exit ++APP_HOME=%%DATADIR%% + + # Use the maximum available, or set MAX_FD != -1 to use that value. + MAX_FD=maximum +@@ -113,28 +100,7 @@ esac + + CLASSPATH=$APP_HOME/lib/osmosis-0.49.0.jar:$APP_HOME/lib/osmosis-extract-0.49.0.jar:$APP_HOME/lib/osmosis-apidb-0.49.0.jar:$APP_HOME/lib/osmosis-areafilter-0.49.0.jar:$APP_HOME/lib/osmosis-dataset-0.49.0.jar:$APP_HOME/lib/osmosis-pbf-0.49.0.jar:$APP_HOME/lib/osmosis-pbf2-0.49.0.jar:$APP_HOME/lib/osmosis-pgsimple-0.49.0.jar:$APP_HOME/lib/osmosis-pgsnapshot-0.49.0.jar:$APP_HOME/lib/osmosis-replication-0.49.0.jar:$APP_HOME/lib/osmosis-set-0.49.0.jar:$APP_HOME/lib/osmosis-tagfilter-0.49.0.jar:$APP_HOME/lib/osmosis-tagtransform-0.49.0.jar:$APP_HOME/lib/osmosis-xml-0.49.0.jar:$APP_HOME/lib/osmosis-core-0.49.0.jar:$APP_HOME/lib/commons-dbcp-1.4.jar:$APP_HOME/lib/spring-jdbc-5.3.30.jar:$APP_HOME/lib/postgis-jdbc-2021.1.0.jar:$APP_HOME/lib/osmosis-hstore-jdbc-0.49.0.jar:$APP_HOME/lib/postgresql-42.6.0.jar:$APP_HOME/lib/osmpbf-1.5.0.jar:$APP_HOME/lib/mysql-connector-j-8.0.33.jar:$APP_HOME/lib/protobuf-java-3.25.0.jar:$APP_HOME/lib/guava-32.1.3-jre.jar:$APP_HOME/lib/commons-io-2.15.0.jar:$APP _HOME/lib/commons-csv-1.10.0.jar:$APP_HOME/lib/commons-codec-1.16.0.jar:$APP_HOME/lib/commons-compress-1.24.0.jar:$APP_HOME/lib/commons-pool-1.5.4.jar:$APP_HOME/lib/spring-tx-5.3.30.jar:$APP_HOME/lib/spring-beans-5.3.30.jar:$APP_HOME/lib/spring-core-5.3.30.jar:$APP_HOME/lib/checker-qual-3.37.0.jar:$APP_HOME/lib/failureaccess-1.0.1.jar:$APP_HOME/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:$APP_HOME/lib/jsr305-3.0.2.jar:$APP_HOME/lib/error_prone_annotations-2.21.1.jar:$APP_HOME/lib/postgis-geometry-2021.1.0.jar:$APP_HOME/lib/slf4j-api-1.7.32.jar:$APP_HOME/lib/spring-jcl-5.3.30.jar + +- +-# Determine the Java command to use to start the JVM. +-if [ -n "$JAVA_HOME" ] ; then +- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +- # IBM's JDK on AIX uses strange locations for the executables +- JAVACMD=$JAVA_HOME/jre/sh/java +- else +- JAVACMD=$JAVA_HOME/bin/java +- fi +- if [ ! -x "$JAVACMD" ] ; then +- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME +- +-Please set the JAVA_HOME variable in your environment to match the +-location of your Java installation." +- fi +-else +- JAVACMD=java +- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +- +-Please set the JAVA_HOME variable in your environment to match the +-location of your Java installation." +-fi ++JAVACMD=%%JAVA%% + + # Increase the maximum file descriptors if we can. + if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then diff --git a/astro/osmosis/files/test.osm b/astro/osmosis/files/test.osm new file mode 100644 index 000000000000..d02b02f0d4ee --- /dev/null +++ b/astro/osmosis/files/test.osm @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + +