Attachment #89434 for bug #126371




#

PORTNAME=	munin
PORTVERSION=	1.2.6
PORTREVISION=	3
CATEGORIES=	sysutils perl5
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	munin

USE_GMAKE=	yes
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
PKGMESSAGE=	${WRKDIR}/pkg-message
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

Lines 1-3 Link Here

(-)munin-node-1.2.6/distinfo (-3 / +3 lines)
1	MD5 (munin_1.2.5.tar.gz) = e863d11693c02bde1c593a6c701e64fd	1	MD5 (munin_1.2.6.tar.gz) = 45f84d58f80642ce914f147232f0d396
2	SHA256 (munin_1.2.5.tar.gz) = 2d1ea4aa3f0eaf11a5beb0b90f9bbee63e184249e06274fcc9d4c17b70b47a5e	2	SHA256 (munin_1.2.6.tar.gz) = 3b04d72810317a91225c78652277079ec3cc5791ef8991326da219a05d2477d8
3	SIZE (munin_1.2.5.tar.gz) = 353005	3	SIZE (munin_1.2.6.tar.gz) = 360694

Lines 1-6 Link Here

(-)munin-node-1.2.6/files/patch-Makefile.config (-8 / +14 lines)
1	--- Makefile.config.orig 2005-01-10 11:38:32.000000000 +0100	1	--- Makefile.config.orig 2008-01-20 20:32:46.000000000 +0100
2	+++ Makefile.config 2005-02-03 11:55:51.000000000 +0100	2	+++ Makefile.config 2008-08-09 15:44:06.000000000 +0200
3	@@ -7,52 +7,56 @@	3	@@ -7,46 +7,50 @@
4	#	4	#
5	# the base of the Munin installation.	5	# the base of the Munin installation.
6	#	6	#
Lines 38-44 Link Here
38	# Server only - Output directory	38	# Server only - Output directory
39	-HTMLDIR = $(PREFIX)/var/www	39	-HTMLDIR = $(PREFIX)/var/www
40	-CGIDIR = $(HTMLDIR)/cgi	40	-CGIDIR = $(HTMLDIR)/cgi
41	+HTMLDIR = $(PREFIX)/www/munin	41	+HTMLDIR = $(WWWDIR)
42	+CGIDIR = $(PREFIX)/www/cgi-bin	42	+CGIDIR = $(PREFIX)/www/cgi-bin
43		43
44	# Client only - Where to put RRD files and other intenal data	44	# Client only - Where to put RRD files and other intenal data
Lines 64-77 Link Here
64		64
65	# The python interpreter to use (used by some plugins)	65	# The python interpreter to use (used by some plugins)
66	PYTHON = /usr/bin/env python	66	PYTHON = /usr/bin/env python
		67	@@ -62,10 +66,10 @@
		68	GOODSH = $(shell PATH=`getconf PATH` sh -c 'type sh \| sed "s/.* //"')
		69
		70	# Path of bash for bash specific plugins
		71	-BASH = /bin/bash
		72	+BASH = /usr/local/bin/bash
67		73
68	# Server only - Where to install the perl libraries	74	# Server only - Where to install the perl libraries
69	-PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib \| cut -d= -f2 \| sed "s/[\';]//g")	75	-PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib \| cut -d"'" -f2)
70	+PERLLIB = $(PREFIX)/$(SITE_PERL_REL)	76	+PERLLIB = $(PREFIX)/$(SITE_PERL_REL)
71		77
72	# Client only - Install plugins for this architecture	78	# Client only - Install plugins for this architecture
73	OSTYPE = $(shell uname \| tr '[A-Z]' '[a-z]')	79	OSTYPE = $(shell uname \| tr '[A-Z]' '[a-z]')
74	@@ -72,9 +76,8 @@	80	@@ -90,9 +94,8 @@
75	PLUGINUSER = nobody	81	PLUGINUSER = nobody
76		82
77	# Which command to use to check if the USER and GROUP to run Munin as, exists.	83	# Which command to use to check if the USER and GROUP to run Munin as, exists.
Lines 81-85 Link Here
81	+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"))	87	+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"))
82	+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"))	88	+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"))
83		89
84	CHOWN = chown	90	# For OSX, comment out the previous two lines and comment in these
85	CHMOD = chmod	91	#CHECKUSER = $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))

Lines 1-13 Link Here

(-)munin-node-1.2.6/files/patch-hddtemp_smartctl.in (-13 lines)
1	--- node/node.d/hddtemp_smartctl.in.orig 2006-10-17 14:27:35.000000000 +0200
2	+++ node/node.d/hddtemp_smartctl.in 2007-10-04 09:29:43.931425624 +0200
3	@@ -109,6 +109,10 @@
4	@drives = grep /hd[a-z]/, readdir IDE;
5	closedir(IDE);
6	}
7	+} elsif ($^O eq 'freebsd') {
8	+ opendir(DEV, '/dev');
9	+ @drives = grep /^ad[0-9]+$/, readdir DEV;
10	+ closedir(DEV);
11	} elsif ($^O eq 'solaris') {
12	@drives = map { s@./@@ ; $_ } glob '/dev/rdsk/ctds2';
13	}

Lines 1-22 Link Here

(-)munin-node-1.2.6/files/patch-if_.in (-22 lines)
1	--- node/node.d.freebsd/if_.in.orig 2006-10-17 14:27:35.000000000 +0200
2	+++ node/node.d.freebsd/if_.in 2007-10-26 10:52:46.000000000 +0200
3	@@ -63,7 +63,7 @@
4
5	if [ "$1" = "suggest" ]; then
6	if [ -x /usr/bin/netstat ]; then
7	- netstat -i -b \| sed -n -e '/^faith/d' -e '/^lo0/d' -e '/<Link#[0-9]>/s/\* .*//p'
8	+ netstat -i -b \| sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link#[0-9]>/s/\* .*//p'
9	exit 0
10	else
11	exit 1
12	--- node/node.d.freebsd/if_errcoll_.in.orig 2006-10-17 14:27:35.000000000 +0200
13	+++ node/node.d.freebsd/if_errcoll_.in 2007-10-26 10:53:08.000000000 +0200
14	@@ -57,7 +57,7 @@
15
16	if [ "$1" = "suggest" ]; then
17	if [ -x /usr/bin/netstat ]; then
18	- netstat -i -b \| sed -n -e '/^faith/d' -e '/^lo0/d' -e '/<Link#[0-9]>/s/\* .*//p'
19	+ netstat -i -b \| sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link#[0-9]>/s/\* .*//p'
20	exit 0
21	else
22	exit 1




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

%%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

@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

Return to bug 126371

Lines 6-13 Link Here

(-)munin-node-1.2.6/Makefile (-4 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= munin	8	PORTNAME= munin
9	PORTVERSION= 1.2.5	9	PORTVERSION= 1.2.6
10	PORTREVISION= 3
11	CATEGORIES= sysutils perl5	10	CATEGORIES= sysutils perl5
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= munin	12	MASTER_SITE_SUBDIR= munin
Lines 31-38 Link Here
31	USE_GMAKE= yes	30	USE_GMAKE= yes
32	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}	31	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
33	PKGMESSAGE= ${WRKDIR}/pkg-message	32	PKGMESSAGE= ${WRKDIR}/pkg-message
34	ALL_TARGET= DATADIR=${DATADIR} PERL=${PERL} build build-man	33	ALL_TARGET= WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} build build-man
35	INSTALL_TARGET= DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-node install-node-plugins	34	INSTALL_TARGET= WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-node install-node-plugins
36	MAKE_ENV= LANG=C	35	MAKE_ENV= LANG=C
37		36
38	MAN5= munin-node.conf.5	37	MAN5= munin-node.conf.5

Lines 7-13 Link Here

(-)munin-node-1.2.6/pkg-plist (+6 lines)
7	etc/munin/munin-node.conf.sample	7	etc/munin/munin-node.conf.sample
8	@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	8	@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
9	etc/munin/plugin-conf.d/plugins.conf.sample	9	etc/munin/plugin-conf.d/plugins.conf.sample
		10	bin/munindoc
10	etc/rc.d/munin-node.sh	11	etc/rc.d/munin-node.sh
		12	%%SITE_PERL%%/Munin/Plugin.pm
11	sbin/munin-node	13	sbin/munin-node
12	sbin/munin-node-configure	14	sbin/munin-node-configure
13	sbin/munin-node-configure-snmp	15	sbin/munin-node-configure-snmp
Lines 62-73 Link Here
62	%%DATADIR%%/plugins/named	64	%%DATADIR%%/plugins/named
63	%%DATADIR%%/plugins/netstat	65	%%DATADIR%%/plugins/netstat
64	%%DATADIR%%/plugins/ntp_	66	%%DATADIR%%/plugins/ntp_
		67	%%DATADIR%%/plugins/ntp_offset
65	%%DATADIR%%/plugins/ntp_states	68	%%DATADIR%%/plugins/ntp_states
66	%%DATADIR%%/plugins/nut_misc	69	%%DATADIR%%/plugins/nut_misc
67	%%DATADIR%%/plugins/nut_volts	70	%%DATADIR%%/plugins/nut_volts
68	%%DATADIR%%/plugins/open_files	71	%%DATADIR%%/plugins/open_files
69	%%DATADIR%%/plugins/perdition	72	%%DATADIR%%/plugins/perdition
70	%%DATADIR%%/plugins/ping_	73	%%DATADIR%%/plugins/ping_
		74	%%DATADIR%%/plugins/plugin.sh
71	%%DATADIR%%/plugins/plugins.history	75	%%DATADIR%%/plugins/plugins.history
72	%%DATADIR%%/plugins/pm3users_	76	%%DATADIR%%/plugins/pm3users_
73	%%DATADIR%%/plugins/pop_stats	77	%%DATADIR%%/plugins/pop_stats
Lines 112-117 Link Here
112	@dirrmtry var/munin	116	@dirrmtry var/munin
113	@dirrmtry %%DATADIR%%/plugins	117	@dirrmtry %%DATADIR%%/plugins
114	@dirrmtry %%DATADIR%%	118	@dirrmtry %%DATADIR%%
		119	@dirrmtry %%SITE_PERL%%/Munin/Plugin
		120	@dirrmtry %%SITE_PERL%%/Munin
115	@dirrmtry etc/munin/plugin-conf.d	121	@dirrmtry etc/munin/plugin-conf.d
116	@dirrmtry etc/munin/plugins	122	@dirrmtry etc/munin/plugins
117	@dirrmtry etc/munin	123	@dirrmtry etc/munin