<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ae39446cb58632564af85d7d5452a171c8ba1241">https://github.com/macports/macports-ports/commit/ae39446cb58632564af85d7d5452a171c8ba1241</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ae39446cb58 osmosis: new port
</span>ae39446cb58 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ae39446cb58632564af85d7d5452a171c8ba1241
</span>Author: Frank Dean <frankdean@users.noreply.github.com>
AuthorDate: Thu Sep 16 18:57:57 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> osmosis: new port
</span>---
java/osmosis/Portfile | 109 ++++++++++++++++++++++++++++
java/osmosis/files/build-gradle.diff | 11 +++
java/osmosis/files/package-bin-osmosis.diff | 14 ++++
3 files changed, 134 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/osmosis/Portfile b/java/osmosis/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8a2638fc0ad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/osmosis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,109 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup java 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup openstreetmap osmosis 0.48.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories java gis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@frankdean fdsd.co.uk:frank.dean} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license public-domain LGPL-3+ ODbL Permissive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description A command line Java application for processing OSM data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description The tool consists of a series of pluggable \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ components that can be chained together to perform \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a larger operation. For example, it has components \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for reading from database and from file, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ components for writing to database and to file, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ components for deriving and applying change sets \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to data sources, components for sorting data, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ etc. It has been written so that it is easy to add \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ new features without re-writing common tasks such \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as file or database handling.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a1920323b49aaabe15357630191aa364cc2fb9b2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3bf84e32ed4ff9525b1901b71ac4ddf63fc60892ce522ca1926a82eeafc107cc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 638032
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set confdir ${prefix}/etc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set appdir ${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.version 1.8*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.fallback openjdk11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:gradle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append GRADLE_USER_HOME=${worksrcpath}/.gradle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ${worksrcpath}/gradlew
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target assemble
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.env-append GRADLE_USER_HOME=${worksrcpath}/.gradle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.cmd ${worksrcpath}/gradlew
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles package-bin-osmosis.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build-gradle.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/etc/osmosis|${confdir}/${name}.conf|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/package/bin/osmosis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/package/bin/osmosis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@VERSION@|${version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/build.gradle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/share|${prefix}/share|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/package/script/munin/README
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/etc|${prefix}/etc|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/package/script/munin/README
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|#user osm|#user nobody|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/package/script/munin/osm_replication.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|#env.osmosis /opt/osmosis/bin|env.osmosis ${appdir}/bin|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/package/script/munin/osm_replication.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|#env.workingDirectory /path/to/state.txt|#env.workingDirectory ${prefix}/var/lib/mod_tile/.osmosis/state.txt|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/package/script/munin/osm_replication.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-test {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Tests that fail, which are effectively integration tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # requiring databases that have been created and configured for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # testing.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${worksrcpath}/osmosis-apidb/src/test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${worksrcpath}/osmosis-extract/src/test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${worksrcpath}/osmosis-pgsimple/src/test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${worksrcpath}/osmosis-pgsnapshot/src/test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}/${appdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}/${confdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}/${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/README.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach d [glob -nocomplain ${worksrcpath}/package/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${d} ${destroot}${appdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}[glob ${destroot}${appdir}/*.txt] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete ${destroot}${appdir}/build.gradle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${appdir}/bin/osmosis-extract-apidb-0.6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${appdir}/bin/osmosis-extract-mysql-0.6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${appdir}/bin/osmosis.bat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${appdir}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${appdir}/bin/${name} ${destroot}${prefix}/bin/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.keepdirs ${destroot}${confdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/osmosis/files/build-gradle.diff b/java/osmosis/files/build-gradle.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..62a400cc707
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/osmosis/files/build-gradle.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build.gradle.orig 2021-08-18 12:52:48.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build.gradle 2021-08-18 12:54:57.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Load the project version dynamically from Git. For release builds, don't add a suffix.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def versionSuffix = "RELEASE".equals(osmosisBuildType) ? '' : '-' + osmosisBuildType
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- version = 'git describe --always --dirty'.execute().in.text.trim() + versionSuffix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ version = '@VERSION@'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Enable access to artefact dependency repositories.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ repositories {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/osmosis/files/package-bin-osmosis.diff b/java/osmosis/files/package-bin-osmosis.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ad4ce5e000c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/osmosis/files/package-bin-osmosis.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- package/bin/osmosis.orig 2021-08-27 15:57:04.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ package/bin/osmosis 2021-08-27 15:58:59.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,10 +80,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make it fully qualified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-saveddir=`pwd`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MYAPP_HOME=`dirname "$PRG"`/..
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MYAPP_HOME=`cd "$MYAPP_HOME" && pwd`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-cd "$saveddir"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MYAPP_HOME="@PREFIX@/share/osmosis"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Build up the classpath of required jar files via classworlds launcher.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MYAPP_CLASSPATH=$MYAPP_HOME/lib/default/plexus-classworlds-*.jar
</span></pre><pre style='margin:0'>
</pre>