<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e5654b81d898ab3f2eeee14e354cd50186e3417a">https://github.com/macports/macports-ports/commit/e5654b81d898ab3f2eeee14e354cd50186e3417a</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 e5654b81d89 prometheus: fix build, via use of gnutar Fixes: https://trac.macports.org/ticket/65254
</span>e5654b81d89 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e5654b81d898ab3f2eeee14e354cd50186e3417a
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon May 30 14:21:11 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> prometheus: fix build, via use of gnutar
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/65254
</span>---
sysutils/prometheus/Portfile | 8 ++++++--
sysutils/prometheus/files/patch-build-use-gnutar.diff | 15 +++++++++++++++
2 files changed, 21 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/prometheus/Portfile b/sysutils/prometheus/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 89de7c79fc6..d090b817c07 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/prometheus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/prometheus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,12 +23,16 @@ license Apache-2
</span> maintainers {gmail.com:herby.gillot @herbygillot} \
openmaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-build-use-gnutar.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:golangci-lint \
path:bin/node:nodejs16 \
path:bin/npm:npm8 \
port:promu \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:yarn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:yarn \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gnutar
</span>
platform darwin {
if {${os.major} < 13} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +81,7 @@ post-extract {
</span> ${workpath}/org.macports.prometheus.plist
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-patch {
</span> reinplace "s|@NAME@|${name}|g" \
${workpath}/org.macports.prometheus.plist
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/prometheus/files/patch-build-use-gnutar.diff b/sysutils/prometheus/files/patch-build-use-gnutar.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b4333375f94
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/prometheus/files/patch-build-use-gnutar.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2022-05-30 14:04:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2022-05-30 14:04:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,11 +83,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PHONY: npm_licenses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ npm_licenses: ui-install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo ">> bundling npm licenses"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f $(REACT_APP_NPM_LICENSES_TARBALL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find $(UI_NODE_MODULES_PATH) -iname "license*" | tar cfj $(REACT_APP_NPM_LICENSES_TARBALL) --transform 's/^/npm_licenses\//' --files-from=-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find $(UI_NODE_MODULES_PATH) -iname "license*" | gnutar cfj $(REACT_APP_NPM_LICENSES_TARBALL) --transform 's/^/npm_licenses\//' --files-from=-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PHONY: tarball
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tarball: npm_licenses common-tarball
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PHONY: docker
</span></pre><pre style='margin:0'>
</pre>