diff -ruN munin-node-port/Makefile munin-node-1.2.6/Makefile --- munin-node-port/Makefile 2008-07-20 15:06:43.000000000 +0200 +++ munin-node-1.2.6/Makefile 2008-08-09 18:06:26.000000000 +0200 @@ -6,8 +6,7 @@ # PORTNAME= munin -PORTVERSION= 1.2.5 -PORTREVISION= 3 +PORTVERSION= 1.2.6 CATEGORIES= sysutils perl5 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= munin @@ -31,8 +30,8 @@ USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/} PKGMESSAGE= ${WRKDIR}/pkg-message -ALL_TARGET= DATADIR=${DATADIR} PERL=${PERL} build build-man -INSTALL_TARGET= DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-node install-node-plugins +ALL_TARGET= WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} build build-man +INSTALL_TARGET= WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-node install-node-plugins MAKE_ENV= LANG=C MAN5= munin-node.conf.5 diff -ruN munin-node-port/distinfo munin-node-1.2.6/distinfo --- munin-node-port/distinfo 2006-11-06 23:50:50.000000000 +0100 +++ munin-node-1.2.6/distinfo 2008-08-09 14:55:21.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (munin_1.2.5.tar.gz) = e863d11693c02bde1c593a6c701e64fd -SHA256 (munin_1.2.5.tar.gz) = 2d1ea4aa3f0eaf11a5beb0b90f9bbee63e184249e06274fcc9d4c17b70b47a5e -SIZE (munin_1.2.5.tar.gz) = 353005 +MD5 (munin_1.2.6.tar.gz) = 45f84d58f80642ce914f147232f0d396 +SHA256 (munin_1.2.6.tar.gz) = 3b04d72810317a91225c78652277079ec3cc5791ef8991326da219a05d2477d8 +SIZE (munin_1.2.6.tar.gz) = 360694 diff -ruN munin-node-port/files/patch-Makefile.config munin-node-1.2.6/files/patch-Makefile.config --- munin-node-port/files/patch-Makefile.config 2007-10-22 14:32:25.000000000 +0200 +++ munin-node-1.2.6/files/patch-Makefile.config 2008-08-10 11:20:49.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile.config.orig 2005-01-10 11:38:32.000000000 +0100 -+++ Makefile.config 2005-02-03 11:55:51.000000000 +0100 -@@ -7,52 +7,56 @@ +--- Makefile.config.orig 2008-01-20 20:32:46.000000000 +0100 ++++ Makefile.config 2008-08-09 15:44:06.000000000 +0200 +@@ -7,46 +7,50 @@ # # the base of the Munin installation. # @@ -38,12 +38,12 @@ # Server only - Output directory -HTMLDIR = $(PREFIX)/var/www -CGIDIR = $(HTMLDIR)/cgi -+HTMLDIR = $(PREFIX)/www/munin ++HTMLDIR = $(WWWDIR) +CGIDIR = $(PREFIX)/www/cgi-bin # Client only - Where to put RRD files and other intenal data -DBDIR = $(DESTDIR)/var/opt/munin -+DBDIR = $(PREFIX)/var/munin ++DBDIR = /var/db/munin # Client only - Where plugins should put their states. Must be writable by # group "munin", and should be preserved between reboots @@ -64,14 +64,20 @@ # The python interpreter to use (used by some plugins) PYTHON = /usr/bin/env python +@@ -62,10 +66,10 @@ + GOODSH = $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"') + + # Path of bash for bash specific plugins +-BASH = /bin/bash ++BASH = /usr/local/bin/bash # Server only - Where to install the perl libraries --PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g") +-PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2) +PERLLIB = $(PREFIX)/$(SITE_PERL_REL) # Client only - Install plugins for this architecture OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]') -@@ -72,9 +76,8 @@ +@@ -90,9 +94,8 @@ PLUGINUSER = nobody # Which command to use to check if the USER and GROUP to run Munin as, exists. @@ -81,5 +87,5 @@ +CHECKUSER:= $(shell /usr/sbin/pw user show $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) +CHECKGROUP:= $(shell /usr/sbin/pw group show $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) - CHOWN = chown - CHMOD = chmod + # 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")) diff -ruN munin-node-port/files/patch-hddtemp_smartctl.in munin-node-1.2.6/files/patch-hddtemp_smartctl.in --- munin-node-port/files/patch-hddtemp_smartctl.in 2007-10-22 14:32:25.000000000 +0200 +++ munin-node-1.2.6/files/patch-hddtemp_smartctl.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ ---- node/node.d/hddtemp_smartctl.in.orig 2006-10-17 14:27:35.000000000 +0200 -+++ node/node.d/hddtemp_smartctl.in 2007-10-04 09:29:43.931425624 +0200 -@@ -109,6 +109,10 @@ - @drives = grep /hd[a-z]/, readdir IDE; - closedir(IDE); - } -+} elsif ($^O eq 'freebsd') { -+ opendir(DEV, '/dev'); -+ @drives = grep /^ad[0-9]+$/, readdir DEV; -+ closedir(DEV); - } elsif ($^O eq 'solaris') { - @drives = map { s@.*/@@ ; $_ } glob '/dev/rdsk/c*t*d*s2'; - } diff -ruN munin-node-port/files/patch-if_.in munin-node-1.2.6/files/patch-if_.in --- munin-node-port/files/patch-if_.in 2008-02-06 22:34:23.000000000 +0100 +++ munin-node-1.2.6/files/patch-if_.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ ---- node/node.d.freebsd/if_.in.orig 2006-10-17 14:27:35.000000000 +0200 -+++ node/node.d.freebsd/if_.in 2007-10-26 10:52:46.000000000 +0200 -@@ -63,7 +63,7 @@ - - if [ "$1" = "suggest" ]; then - if [ -x /usr/bin/netstat ]; then -- netstat -i -b | sed -n -e '/^faith/d' -e '/^lo0/d' -e '/<Link#[0-9]*>/s/\** .*//p' -+ netstat -i -b | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link#[0-9]*>/s/\** .*//p' - exit 0 - else - exit 1 ---- node/node.d.freebsd/if_errcoll_.in.orig 2006-10-17 14:27:35.000000000 +0200 -+++ node/node.d.freebsd/if_errcoll_.in 2007-10-26 10:53:08.000000000 +0200 -@@ -57,7 +57,7 @@ - - if [ "$1" = "suggest" ]; then - if [ -x /usr/bin/netstat ]; then -- netstat -i -b | sed -n -e '/^faith/d' -e '/^lo0/d' -e '/<Link#[0-9]*>/s/\** .*//p' -+ netstat -i -b | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link#[0-9]*>/s/\** .*//p' - exit 0 - else - exit 1 diff -ruN munin-node-port/pkg-plist munin-node-1.2.6/pkg-plist --- munin-node-port/pkg-plist 2008-07-20 15:06:43.000000000 +0200 +++ munin-node-1.2.6/pkg-plist 2008-08-09 17:55:30.000000000 +0200 @@ -7,7 +7,9 @@ etc/munin/munin-node.conf.sample @unexec if cmp -s %D/etc/munin/plugin-conf.d/plugins.conf %D/etc/munin/plugin-conf.d/plugins.conf.sample; then rm -f %D/etc/munin/plugin-conf.d/plugins.conf; fi etc/munin/plugin-conf.d/plugins.conf.sample +bin/munindoc etc/rc.d/munin-node.sh +%%SITE_PERL%%/Munin/Plugin.pm sbin/munin-node sbin/munin-node-configure sbin/munin-node-configure-snmp @@ -62,12 +64,14 @@ %%DATADIR%%/plugins/named %%DATADIR%%/plugins/netstat %%DATADIR%%/plugins/ntp_ +%%DATADIR%%/plugins/ntp_offset %%DATADIR%%/plugins/ntp_states %%DATADIR%%/plugins/nut_misc %%DATADIR%%/plugins/nut_volts %%DATADIR%%/plugins/open_files %%DATADIR%%/plugins/perdition %%DATADIR%%/plugins/ping_ +%%DATADIR%%/plugins/plugin.sh %%DATADIR%%/plugins/plugins.history %%DATADIR%%/plugins/pm3users_ %%DATADIR%%/plugins/pop_stats @@ -112,6 +116,8 @@ @dirrmtry var/munin @dirrmtry %%DATADIR%%/plugins @dirrmtry %%DATADIR%% +@dirrmtry %%SITE_PERL%%/Munin/Plugin +@dirrmtry %%SITE_PERL%%/Munin @dirrmtry etc/munin/plugin-conf.d @dirrmtry etc/munin/plugins @dirrmtry etc/munin