Revision: 69144 http://trac.macports.org/changeset/69144 Author: jmr@macports.org Date: 2010-06-24 18:17:12 -0700 (Thu, 24 Jun 2010) Log Message: ----------- munin: update to 1.4.4 (#24653, maintainer timeout) Modified Paths: -------------- trunk/dports/net/munin/Portfile trunk/dports/net/munin/files/patch-Makefile.config trunk/dports/net/munin/files/patch-munin-node.conf.in Added Paths: ----------- trunk/dports/net/munin/files/patch-Makefile-javaplugin Modified: trunk/dports/net/munin/Portfile =================================================================== --- trunk/dports/net/munin/Portfile 2010-06-25 01:10:12 UTC (rev 69143) +++ trunk/dports/net/munin/Portfile 2010-06-25 01:17:12 UTC (rev 69144) @@ -4,7 +4,7 @@ PortSystem 1.0 name munin -version 1.2.6 +version 1.4.4 categories net maintainers alpha platforms darwin @@ -23,17 +23,20 @@ existing nodes and generates graphs please enable the \ server variant. -homepage http://munin.projects.linpro.no/ +homepage http://munin-monitoring.org/ master_sites sourceforge -distname ${name}_${version} -worksrcdir ${name}-${version} -checksums md5 45f84d58f80642ce914f147232f0d396 \ - sha1 bdc6d1767df1ea618071d76f0c4525dda2ea33d9 \ - rmd160 1fe38f8da3b2c88b38d56eb86f7b584c7fded962 -depends_lib port:perl5 port:p5-net-server +checksums md5 18d864fa04134ce67042a99dd3ec23ae \ + sha1 b771065081c699ceb34d28b185c42f42d83cec90 \ + rmd160 45a84ebc5e58379da7526c5909bb260ef7a4b444 +depends_lib port:perl5 port:p5-net-server \ + path:bin/config_data:p5-module-build \ + port:p5-net-snmp port:p5-net-ssleay use_configure no -patchfiles patch-Makefile.config patch-munin-node.conf.in +use_parallel_build no +patchfiles patch-Makefile-javaplugin \ + patch-Makefile.config \ + patch-munin-node.conf.in build.target build build.args PREFIX=${prefix} \ CONFDIR=${prefix}/etc/munin \ @@ -62,7 +65,8 @@ ${destroot}${prefix}/etc/munin/plugins \ ${destroot}${prefix}/var/munin \ ${destroot}${prefix}/www/munin -destroot.target install-node install-node-plugins install-doc install-man +destroot.target install-common-prime install-node-prime \ + install-plugins-prime install-plugins-java install-man startupitem.create yes startupitem.name munin-node @@ -70,8 +74,13 @@ startupitem.stop "kill `cat ${prefix}/var/run/munin/munin-node.pid`" variant server description {Install Munin server} { - depends_lib-append port:rrdtool port:p5-html-template - destroot.target-append install-main + depends_lib-append port:rrdtool \ + port:p5-html-template \ + port:p5-time-hires \ + port:p5-digest-md5 \ + port:p5-text-balanced \ + port:p5-log-log4perl + destroot.target-append install-master-prime } pre-destroot { @@ -104,7 +113,6 @@ ui_msg "###########################################################" } } -post-install { - ui_msg "To detect supported Munin plugins please use the following command" - ui_msg "$ sudo munin-node-configure --suggest --shell | sh" -} +notes \ +"To detect supported Munin plugins please use the following command +$ sudo munin-node-configure --suggest --shell | sh" Added: trunk/dports/net/munin/files/patch-Makefile-javaplugin =================================================================== --- trunk/dports/net/munin/files/patch-Makefile-javaplugin (rev 0) +++ trunk/dports/net/munin/files/patch-Makefile-javaplugin 2010-06-25 01:17:12 UTC (rev 69144) @@ -0,0 +1,11 @@ +--- Makefile.orig-1.4.4 2010-04-25 10:01:15.000000000 -0500 ++++ Makefile 2010-04-25 10:04:38.000000000 -0500 +@@ -39,7 +39,7 @@ + .SUFFIXES: .java .class + + .java.class: +- cd plugins/javalib && $(JC) $(JFLAGS) $(subst plugins/javalib/,,$*.java) ++ cd plugins/javalib && $(JC) $(JFLAGS) $(subst plugins/javalib/,.,$*.java) + + default: build + Modified: trunk/dports/net/munin/files/patch-Makefile.config =================================================================== --- trunk/dports/net/munin/files/patch-Makefile.config 2010-06-25 01:10:12 UTC (rev 69143) +++ trunk/dports/net/munin/files/patch-Makefile.config 2010-06-25 01:17:12 UTC (rev 69144) @@ -1,26 +1,26 @@ -diff -r 0e0f9e28d8e6 Makefile.config ---- Makefile.config Sat Mar 07 22:18:01 2009 +0100 -+++ Makefile.config Mon Mar 09 09:41:58 2009 +0100 -@@ -87,16 +87,17 @@ - GROUP = munin +--- Makefile.config.1.4.4.orig 2010-04-25 09:38:13.000000000 -0500 ++++ Makefile.config 2010-04-25 09:38:56.000000000 -0500 +@@ -126,9 +126,9 @@ + # Which command to use to check if the USER and GROUP to run Munin as, exists. + # These will work on most modern OSes: + # +-GETENT := $(shell which getent || which true 2>/dev/null) +-CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) +-CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) ++#GETENT := $(shell which getent || which true 2>/dev/null) ++#CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) ++#CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) - # Default user to run the plugins as --PLUGINUSER = nobody -+#PLUGINUSER = nobody -+PLUGINUSER = munin + # For OSX, comment out the previous two lines and comment in these + # +@@ -137,8 +137,8 @@ - # Which command to use to check if the USER and GROUP to run Munin as, exists. - GETENT = $(shell which getent || which true 2>/dev/null) --CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) --CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) -+#CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) -+#CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) + # For OSX 10.5 (Leopard), use the following two lines instead of what's above + # +-#CHECKUSER := $(shell dscl . -read /Users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) +-#CHECKGROUP := $(shell dscl . -read /Groups/$(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) ++CHECKUSER := $(shell dscl . -read /Users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) ++CHECKGROUP := $(shell dscl . -read /Groups/$(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) - # For OSX, comment out the previous two lines and comment in these --#CHECKUSER = $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) --#CHECKGROUP = $(shell nicl . -read /groups/$(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) -+CHECKUSER = $(shell dscl . -read /users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) -+CHECKGROUP = $(shell dscl . -read /groups/$(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) - CHOWN = chown - CHMOD = chmod + # For HP-UX, use these instead: Modified: trunk/dports/net/munin/files/patch-munin-node.conf.in =================================================================== --- trunk/dports/net/munin/files/patch-munin-node.conf.in 2010-06-25 01:10:12 UTC (rev 69143) +++ trunk/dports/net/munin/files/patch-munin-node.conf.in 2010-06-25 01:17:12 UTC (rev 69144) @@ -7,6 +7,6 @@ user root -group root +group wheel - setsid yes + # Regexps for files to ignore