<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/134cf284647e1afeacc88f4d2a36ee6061561c74">https://github.com/macports/macports-ports/commit/134cf284647e1afeacc88f4d2a36ee6061561c74</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 134cf284647 osmosis: update to 0.49.2
</span>134cf284647 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 134cf284647e1afeacc88f4d2a36ee6061561c74
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Thu Dec 12 20:09:15 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> osmosis: update to 0.49.2
</span>---
java/osmosis/Portfile | 60 ++++++++++-------------------
java/osmosis/files/package-bin-osmosis.diff | 14 -------
2 files changed, 21 insertions(+), 53 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/osmosis/Portfile b/java/osmosis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bcef1601ff5..78bc62b289f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/osmosis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/osmosis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup java 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup openstreetmap osmosis 0.48.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup openstreetmap osmosis 0.49.2
</span> github.tarball_from archive
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,50 +28,44 @@ long_description The tool consists of a series of pluggable \
</span> new features without re-writing common tasks such \
as file or database handling.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a1920323b49aaabe15357630191aa364cc2fb9b2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3bf84e32ed4ff9525b1901b71ac4ddf63fc60892ce522ca1926a82eeafc107cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 638032
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6e96abddad8137b2bef8c694a7e90c82f086e589 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b355771c35f326ee45431916c2ebe3f81a09ba571c03c3302f5268103f7b7e3c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 529169
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set confdir ${prefix}/etc/${name}
</span> set appdir ${prefix}/share/${name}
set docdir ${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-java.version 1.8+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-java.fallback openjdk11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.version 17+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.fallback openjdk17
</span>
depends_build port:gradle
use_configure no
build.env-append GRADLE_USER_HOME=${worksrcpath}/.gradle
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ${worksrcpath}/gradlew
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ${prefix}/bin/gradle
</span> build.target assemble
test.run yes
test.env-append GRADLE_USER_HOME=${worksrcpath}/.gradle
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.cmd ${worksrcpath}/gradlew
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.cmd ${prefix}/bin/gradle
</span> test.target build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles package-bin-osmosis.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build-gradle.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles build-gradle.diff
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/etc/osmosis|${confdir}/${name}.conf|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/package/bin/osmosis
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/package/bin/osmosis
</span> reinplace "s|@VERSION@|${version}|g" \
${worksrcpath}/build.gradle
reinplace "s|/usr/share|${prefix}/share|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/package/script/munin/README
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/osmosis/src/dist/script/munin/README
</span> reinplace "s|/etc|${prefix}/etc|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/package/script/munin/README
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/osmosis/src/dist/script/munin/README
</span> reinplace "s|#user osm|#user nobody|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/package/script/munin/osm_replication.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/osmosis/src/dist/script/munin/osm_replication.conf
</span> reinplace "s|#env.osmosis /opt/osmosis/bin|env.osmosis ${appdir}/bin|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/package/script/munin/osm_replication.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/osmosis/src/dist/script/munin/osm_replication.conf
</span> reinplace "s|#env.workingDirectory /path/to/state.txt|#env.workingDirectory ${prefix}/var/lib/mod_tile/.osmosis/state.txt|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/package/script/munin/osm_replication.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/osmosis/src/dist/script/munin/osm_replication.conf
</span> }
pre-test {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,25 +79,13 @@ pre-test {
</span> }
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -d ${destroot}/${appdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -d ${destroot}/${confdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -d ${destroot}/${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/README.md \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach d [glob -nocomplain ${worksrcpath}/package/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${d} ${destroot}${appdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/osmosis/build/distributions "tar -xf osmosis-${version}.tar"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/osmosis/build/distributions/osmosis-${version} ${destroot}${appdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move {*}[glob ${destroot}${appdir}/*.txt] ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${appdir}/bin/osmosis.bat
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}[glob ${destroot}${appdir}/*.txt] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${appdir}/build.gradle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${appdir}/bin/osmosis-extract-apidb-0.6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${appdir}/bin/osmosis-extract-mysql-0.6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${appdir}/bin/osmosis.bat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${appdir}/build
</span> ln -s ${appdir}/bin/${name} ${destroot}${prefix}/bin/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.keepdirs ${destroot}${confdir}
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ad4ce5e000c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/osmosis/files/package-bin-osmosis.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- package/bin/osmosis.orig 2021-08-27 15:57:04.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ package/bin/osmosis 2021-08-27 15:58:59.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -80,10 +80,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # make it fully qualified
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--saveddir=`pwd`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MYAPP_HOME=`dirname "$PRG"`/..
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MYAPP_HOME=`cd "$MYAPP_HOME" && pwd`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cd "$saveddir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MYAPP_HOME="@PREFIX@/share/osmosis"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build up the classpath of required jar files via classworlds launcher.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MYAPP_CLASSPATH=$MYAPP_HOME/lib/default/plexus-classworlds-*.jar
</span></pre><pre style='margin:0'>
</pre>