<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4d32a098a78878b0dacf8d2159be3e915f8c836f">https://github.com/macports/macports-ports/commit/4d32a098a78878b0dacf8d2159be3e915f8c836f</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 4d32a09 munin: upgrade to 2.0.56, remove obsolete patches
</span>4d32a09 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4d32a098a78878b0dacf8d2159be3e915f8c836f
</span>Author: Michael Klein <michael.klein@fossekall.de>
AuthorDate: Fri Mar 6 11:51:15 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> munin: upgrade to 2.0.56, remove obsolete patches
</span>---
net/munin/Portfile | 40 ++++++++++++++--------
net/munin/files/patch-Makefile-javaplugin | 11 -------
net/munin/files/patch-Makefile.config | 26 ---------------
net/munin/files/patch-encodings.diff | 55 -------------------------------
4 files changed, 26 insertions(+), 106 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/munin/Portfile b/net/munin/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d4d3019..5ebdbfb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/munin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/munin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup perl5 1.0
name munin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0.56
</span> license GPL-2
categories net
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,10 +25,11 @@ long_description Munin the monitoring tool surveys all your computers \
</span> server variant.
homepage http://munin-monitoring.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/munin/munin%20stable/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/munin/stable/${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b25c0a4d7d7613592757132290b7158228ea2a67 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 36ff9fa559d0b0e45612a2f8ad1ddcacaf7b05b8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 62e1d9ed9b7fac0ff92edda84a5367f28cb95a2e3582122e2fa874069559d7f2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2264291
</span>
perl5.branches 5.28
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,22 +45,34 @@ depends_run port:groff
</span>
use_configure no
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile-javaplugin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Makefile.config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-munin-node.conf.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-encodings.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-munin-node.conf.in \
</span> patch-perl5.26.diff
post-patch {
reinplace "s|/usr/bin/perl|${perl5.bin}|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/master/_bin/munin-update.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node/extras/munin-node-sched \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node/extras/munin-node-simple.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node/bin/munindoc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/contrib/dump_db \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/contrib/dump_storable \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/contrib/epoch2localtime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/contrib/import_db \
</span> ${worksrcpath}/contrib/munin-every-services-all-boxes-build-html.in \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/contrib/munin-mergedb.pl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/contrib/munin-node-debug \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/contrib/perf/db_files.pl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/contrib/perf/rrd_perf.pl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/contrib/perf/test_weak.pl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/contrib/rrdcopy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/contrib/rtbtrace.pl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/node/bin/munindoc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/node/extras/munin-node-simple.in \
</span> ${worksrcpath}/node/sbin/munin-node \
${worksrcpath}/node/sbin/munin-node-configure \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node/sbin/munin-run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/node/sbin/munin-run \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/plugins/node.d.debug/sincos \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/plugins/node.d.debug/testplugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/env python|${prefix}/bin/python|" ${worksrcpath}/Makefile.config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|root:root|root:wheel|" ${worksrcpath}/Makefile
</span> }
# sed fails in Mountain Lion, see #36527
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/munin/files/patch-Makefile-javaplugin b/net/munin/files/patch-Makefile-javaplugin
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c31394b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/munin/files/patch-Makefile-javaplugin
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig-1.4.4 2010-04-25 10:01:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2010-04-25 10:04:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .SUFFIXES: .java .class
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .java.class:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cd plugins/javalib && $(JC) $(JFLAGS) $(subst plugins/javalib/,,$*.java)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd plugins/javalib && $(JC) $(JFLAGS) $(subst plugins/javalib/,.,$*.java)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default: build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/munin/files/patch-Makefile.config b/net/munin/files/patch-Makefile.config
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bc3dd5f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/munin/files/patch-Makefile.config
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.config.1.4.4.orig 2010-04-25 09:38:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.config 2010-04-25 09:38:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,9 +126,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Which command to use to check if the USER and GROUP to run Munin as, exists.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # These will work on most modern OSes:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GETENT := $(shell which getent || which true 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#GETENT := $(shell which getent || which true 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For OSX, comment out the previous two lines and comment in these
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,8 +137,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For OSX 10.5 (Leopard), use the following two lines instead of what's above
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#CHECKUSER := $(shell dscl . -read /Users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#CHECKGROUP := $(shell dscl . -read /Groups/$(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CHECKUSER := $(shell dscl . -read /Users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CHECKGROUP := $(shell dscl . -read /Groups/$(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
</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:#ffe0e0;'>- # For HP-UX, use these instead:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/munin/files/patch-encodings.diff b/net/munin/files/patch-encodings.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d683a80..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/munin/files/patch-encodings.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,55 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- master/_bin/munin-gather.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ master/_bin/munin-gather.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -980,7 +980,7 @@ Please report other bugs in the bug tracker at L<http://munin.sf.net/>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- =head1 COPYRIGHT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Copyright © 2002-2008 Audun Ytterdal, Jimmy Olsen, Tore Anderson,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Copyright (C) 2002-2008 Audun Ytterdal, Jimmy Olsen, Tore Anderson,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Nicolai Langfeldt / Linpro AS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This is free software; see the source for copying conditions. There is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- master/_bin/munin-graph.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ master/_bin/munin-graph.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- =begin comment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Copyright (C) 2002-2009 Jimmy Olsen, Audun Ytterdal, Kjell Magne Øierud,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Copyright (C) 2002-2009 Jimmy Olsen, Audun Ytterdal, Kjell Magne Oeierud,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Nicolai Langfeldt, Linpro AS, Redpill Linpro AS and others.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This program is free software; you can redistribute it and/or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- master/_bin/munin-html.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ master/_bin/munin-html.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- =begin comment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Copyright (C) 2002-2009 Jimmy Olsen, Audun Ytterdal, Kjell Magne
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Øierud, Nicolai Langfeldt, Linpro AS, Redpill Linpro AS and others.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Oeierud, Nicolai Langfeldt, Linpro AS, Redpill Linpro AS and others.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This program is free software; you can redistribute it and/or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- modify it under the terms of the GNU General Public License
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- master/_bin/munin-update.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ master/_bin/munin-update.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -210,7 +210,7 @@ The Munin Team. FIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- =head1 COPYRIGHT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Copyright © 2002-2009 Jimmy Olsen, Audun Ytterdal, Tore Andersson, Kjell-Magne Øierud, Linpro AS, Redpill Linpro AS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Copyright (C) 2002-2009 Jimmy Olsen, Audun Ytterdal, Tore Andersson, Kjell-Magne Oeierud, Linpro AS, Redpill Linpro AS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This is free software; see the source for copying conditions. There is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- node/doc/munin-node.conf.pod
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ node/doc/munin-node.conf.pod
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,7 +171,7 @@ Jimmy Olsen.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- =head1 COPYRIGHT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Copyright (C) 2002-2006 Audun Ytterdal, Jimmy Olsen, Dagfin Ilmari
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Mans�ker, Nicolai Langfeldt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Mansaaker, Nicolai Langfeldt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This is free software; see the source for copying conditions. There is NO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
</span></pre><pre style='margin:0'>
</pre>