Attachment #127308 for bug #171116

View | Details | Raw Unified | Return to bug 171116
Collapse All | Expand All

Lines 1-2 Link Here

(-)munin-master/distinfo (-2 lines)
1	SHA256 (munin-1.4.7.tar.gz) = 9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af
2	SIZE (munin-1.4.7.tar.gz) = 1236273




--- master/_bin/munin-check.in.orig	2009-12-29 17:03:49.000000000 +0100
+++ master/_bin/munin-check.in	2010-12-02 23:48:25.854543201 +0100
@@ -78,7 +78,7 @@
     object=$1; shift || exit 1
     correctowner=$1; shift || exit 1
 
-    owner=$(stat -c%U $object)
+    owner=$(stat -f%Su $object)
     if [ "$owner" != "$correctowner" ]; then
 	echo "# $object : Wrong owner ($owner != $correctowner)";
 	if [ "$PLEASE_FIXME" = "true" ]; then
@@ -108,7 +108,7 @@
     object=$1; shift || exit 1
     correctperm=$1; shift || exit 1
 
-    perm=$(stat -c%a $object)
+    perm=$(stat -f%OLp $object)
     if [ "$perm" != "$correctperm" ]; then
 	echo "# $object : Wrong permissions ($perm != $correctperm)";
 	if [ "$PLEASE_FIXME" = "true" ]; then

Lines 1-11 Link Here

(-)munin-master/files/patch-Makefile (-11 lines)
1	--- Makefile.orig 2010-01-30 10:49:44.000000000 -0700
2	+++ Makefile 2010-01-30 10:49:53.000000000 -0700
3	@@ -69,7 +69,7 @@
4	mkdir -p $(LOGDIR)
5	mkdir -p $(STATEDIR)
6	mkdir -p $(CONFDIR)
7	- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)
8	+ $(CHOWN) $(USER) $(STATEDIR)
9
10	install-master-prime: $(INFILES_MASTER) install-pre install-master
11	mkdir -p $(CONFDIR)/templates




--- Makefile.config.orig	2009-12-30 05:55:56.000000000 -0700
+++ Makefile.config	2010-01-30 11:17:34.000000000 -0700
@@ -126,9 +129,8 @@
 # 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"))
+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"))
 
 # For OSX, comment out the previous two lines and comment in these
 #

Lines 3-33 Link Here

(-)munin-master/pkg-plist (-7 / +22 lines)
3	@unexec if cmp -s %D/%%ETCDIR%%/munin.conf.sample %D/%%ETCDIR%%/munin.conf ; then rm -f %D/%%ETCDIR%%/munin.conf ; fi	3	@unexec if cmp -s %D/%%ETCDIR%%/munin.conf.sample %D/%%ETCDIR%%/munin.conf ; then rm -f %D/%%ETCDIR%%/munin.conf ; fi
4	%%ETCDIR%%/munin.conf.sample	4	%%ETCDIR%%/munin.conf.sample
5	@exec if [ ! -f %D/%%ETCDIR%%/munin.conf ] ; then cp -p %D/%%ETCDIR%%/munin.conf.sample %D/%%ETCDIR%%/munin.conf ; fi	5	@exec if [ ! -f %D/%%ETCDIR%%/munin.conf ] ; then cp -p %D/%%ETCDIR%%/munin.conf.sample %D/%%ETCDIR%%/munin.conf ; fi
6	%%ETCDIR%%/templates/definitions.html	6	%%ETCDIR%%/static/definitions.html
7	%%ETCDIR%%/templates/favicon.ico	7	%%ETCDIR%%/static/dynazoom.html
8	%%ETCDIR%%/templates/logo-h.png	8	%%ETCDIR%%/static/favicon.ico
9	%%ETCDIR%%/templates/logo.png	9	%%ETCDIR%%/static/formatdate.js
		10	%%ETCDIR%%/static/logo-h.png
		11	%%ETCDIR%%/static/logo.png
		12	%%ETCDIR%%/static/querystring.js
		13	%%ETCDIR%%/static/style-1.2.css
		14	%%ETCDIR%%/static/style-new.css
		15	%%ETCDIR%%/static/style.css
		16	%%ETCDIR%%/static/zoom.js
10	%%ETCDIR%%/templates/munin-comparison-day.tmpl	17	%%ETCDIR%%/templates/munin-comparison-day.tmpl
11	%%ETCDIR%%/templates/munin-comparison-month.tmpl	18	%%ETCDIR%%/templates/munin-comparison-month.tmpl
12	%%ETCDIR%%/templates/munin-comparison-week.tmpl	19	%%ETCDIR%%/templates/munin-comparison-week.tmpl
13	%%ETCDIR%%/templates/munin-comparison-year.tmpl	20	%%ETCDIR%%/templates/munin-comparison-year.tmpl
		21	%%ETCDIR%%/templates/munin-categoryview.tmpl
		22	%%ETCDIR%%/templates/munin-dynazoom.tmpl
14	%%ETCDIR%%/templates/munin-domainview.tmpl	23	%%ETCDIR%%/templates/munin-domainview.tmpl
15	%%ETCDIR%%/templates/munin-nodeview.tmpl	24	%%ETCDIR%%/templates/munin-nodeview.tmpl
16	%%ETCDIR%%/templates/munin-overview.tmpl	25	%%ETCDIR%%/templates/munin-overview.tmpl
		26	%%ETCDIR%%/templates/munin-problemview.tmpl
17	%%ETCDIR%%/templates/munin-serviceview.tmpl	27	%%ETCDIR%%/templates/munin-serviceview.tmpl
18	%%ETCDIR%%/templates/partial/bottom_navigation.tmpl	28	%%ETCDIR%%/templates/partial/bottom_navigation.tmpl
		29	%%ETCDIR%%/templates/partial/footer.tmpl
19	%%ETCDIR%%/templates/partial/generated_by.tmpl	30	%%ETCDIR%%/templates/partial/generated_by.tmpl
20	%%ETCDIR%%/templates/partial/head.tmpl	31	%%ETCDIR%%/templates/partial/head.tmpl
21	%%ETCDIR%%/templates/partial/logo_navigation.tmpl	32	%%ETCDIR%%/templates/partial/logo_navigation.tmpl
22	%%ETCDIR%%/templates/partial/logo_navigation_comparison.tmpl	33	%%ETCDIR%%/templates/partial/logo_navigation_comparison.tmpl
		34	%%ETCDIR%%/templates/partial/logo_navigation_problem.tmpl
23	%%ETCDIR%%/templates/partial/logo_path.tmpl	35	%%ETCDIR%%/templates/partial/logo_path.tmpl
		36	%%ETCDIR%%/templates/partial/navigation.tmpl
24	%%ETCDIR%%/templates/partial/path.tmpl	37	%%ETCDIR%%/templates/partial/path.tmpl
25	%%ETCDIR%%/templates/style-1.2.css
26	%%ETCDIR%%/templates/style.css
27	%%SITE_PERL%%/Munin/Master/Config.pm	38	%%SITE_PERL%%/Munin/Master/Config.pm
28	%%SITE_PERL%%/Munin/Master/GraphOld.pm	39	%%SITE_PERL%%/Munin/Master/GraphOld.pm
29	%%SITE_PERL%%/Munin/Master/Group.pm	40	%%SITE_PERL%%/Munin/Master/Group.pm
30	%%SITE_PERL%%/Munin/Master/GroupRepository.pm	41	%%SITE_PERL%%/Munin/Master/GroupRepository.pm
		42	%%SITE_PERL%%/Munin/Master/HTMLConfig.pm
31	%%SITE_PERL%%/Munin/Master/HTMLOld.pm	43	%%SITE_PERL%%/Munin/Master/HTMLOld.pm
32	%%SITE_PERL%%/Munin/Master/Host.pm	44	%%SITE_PERL%%/Munin/Master/Host.pm
33	%%SITE_PERL%%/Munin/Master/LimitsOld.pm	45	%%SITE_PERL%%/Munin/Master/LimitsOld.pm
Lines 40-58 Link Here
40	%%SITE_PERL%%/Munin/Master/Worker.pm	52	%%SITE_PERL%%/Munin/Master/Worker.pm
41	%%DATADIR%%/DejaVuSans.ttf	53	%%DATADIR%%/DejaVuSans.ttf
42	%%DATADIR%%/DejaVuSansMono.ttf	54	%%DATADIR%%/DejaVuSansMono.ttf
		55	%%DATADIR%%/munin-datafile2storable
43	%%DATADIR%%/munin-graph	56	%%DATADIR%%/munin-graph
44	%%DATADIR%%/munin-html	57	%%DATADIR%%/munin-html
45	%%DATADIR%%/munin-limits	58	%%DATADIR%%/munin-limits
		59	%%DATADIR%%/munin-storable2datafile
46	%%DATADIR%%/munin-update	60	%%DATADIR%%/munin-update
47	%%WWWDIR%%/.htaccess	61	%%WWWDIR%%/.htaccess
48	www/cgi-bin/munin-cgi-graph	62	www/cgi-bin/munin-cgi-graph
49	www/cgi-bin/munin-fastcgi-graph	63	www/cgi-bin/munin-cgi-html
50	@dirrmtry www/cgi-bin	64	@dirrmtry www/cgi-bin
51	@dirrmtry %%WWWDIR%%	65	@dirrmtry %%WWWDIR%%
52	@dirrmtry %%DATADIR%%	66	@dirrmtry %%DATADIR%%
53	@dirrmtry %%DBDIR%%	67	@dirrmtry %%DBDIR%%
54	@dirrm %%SITE_PERL%%/Munin/Master	68	@dirrm %%SITE_PERL%%/Munin/Master
55	@dirrmtry %%SITE_PERL%%/Munin	69	@dirrmtry %%SITE_PERL%%/Munin
		70	@dirrmtry %%ETCDIR%%/static
56	@dirrmtry %%ETCDIR%%/templates/partial	71	@dirrmtry %%ETCDIR%%/templates/partial
57	@dirrmtry %%ETCDIR%%/templates	72	@dirrmtry %%ETCDIR%%/templates
58	@exec mkdir -p %D/%%ETCDIR%%/munin-conf.d	73	@exec mkdir -p %D/%%ETCDIR%%/munin-conf.d




#

PORTNAME=	munin
PORTVERSION=	${MUNIN_VERSION}
PORTREVISION=	3
CATEGORIES=	sysutils perl5
MASTER_SITES=	${MUNIN_SITES}
PKGNAMESUFFIX=	-master

MAINTAINER=	flo@FreeBSD.org


BUILD_DEPENDS=	p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build \
		munin-common>=0:${PORTSDIR}/sysutils/munin-common \
		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
		rrdtool>=0:${PORTSDIR}/databases/rrdtool \
		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
		p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \
		p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \
		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
		p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced
RUN_DEPENDS=	munin-common>=0:${PORTSDIR}/sysutils/munin-common \
		rrdtool>=0:${PORTSDIR}/databases/rrdtool \
		p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \
		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
		p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \
		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
		p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced

USE_PERL5=	yes


.include "${.CURDIR}/../munin-common/munin.mk"

EXTRA_PATCHES=	${MUNIN_PATCHES}
DISTINFO_FILE=	${MUNIN_DISTINFO}
ALL_TARGET=	infiles build-master build-man
INSTALL_TARGET=	install-master-prime

MAN3=		Munin::Master::Config.3 \

Lines 1-2 Link Here

(-)munin-node/distinfo (-2 lines)
1	SHA256 (munin-1.4.7.tar.gz) = 9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af
2	SIZE (munin-1.4.7.tar.gz) = 1236273




#!/bin/sh
#

# PROVIDE: munin-sched
# REQUIRE: DAEMON
# BEFORE:  cron

#
# Add the following lines to /etc/rc.conf to enable munin-sched:
# munin_sched_enable (bool):      Set to "NO" by default.
#                                Set it to "YES" to enable munin-sched
# munin_sched_config (path):      Set to "%%PREFIX%%/etc/munin/munin-node.conf" by default.
#

. /etc/rc.subr

name="munin_sched"
rcvar=munin_sched_enable

[ -z "$munin_sched_enable" ] && munin_sched_enable="NO"
[ -z "$munin_sched_config" ] && munin_sched_config="%%PREFIX%%/etc/munin/munin-node.conf"

command="%%PREFIX%%/sbin/munin-sched"
pidfile=`awk '$1 == "pid_file" { print $2 }' $munin_sched_config`

load_rc_config $name
run_rc_command "$1"

Lines 1-24 Link Here

(-)munin-node/files/patch-plugins__node.d__squeezebox_.in (-10 / +10 lines)
1	--- ./plugins/node.d/squeezebox_.in.orig 2010-03-09 22:23:57.000000000 +0100	1	--- ./plugins/node.d/squeezebox_.in.orig 2012-08-14 17:19:40.000000000 +0200
2	+++ ./plugins/node.d/squeezebox_.in 2010-03-09 22:24:16.000000000 +0100	2	+++ ./plugins/node.d/squeezebox_.in 2012-08-27 13:55:40.573530762 +0200
3	@@ -157,7 +157,7 @@ if [ "$CMD" = "years" ]; then	3	@@ -156,7 +156,7 @@
4	# echo "graph_order y0"	4	printf "graph_order y"
5	echo -n "graph_order y"; echo $years_array \| sed 's/ / y/g'	5	echo $years_array \| sed 's/ / y/g'
6		6
7	- for i in `seq 0 $no_of_years`; do	7	- for i in `seq 0 $no_of_years`; do
8	+ for i in `jot - 0 $no_of_years`; do	8	+ for i in `jot - 0 $no_of_years`; do
9	year=$(echo ${arr1[$i]})	9	year=$(echo ${arr1[$i]})
10	if [ $year = 0 ]; then	10	if [ $year = 0 ]; then
11	echo y0.label No year	11	echo y0.label No year
12	@@ -172,7 +172,7 @@ if [ "$CMD" = "years" ]; then	12	@@ -171,7 +171,7 @@
13	done	13	done
14	exit 0	14	exit 0
15	fi	15	fi
16	- for i in `seq 0 $no_of_years`; do	16	- for i in `seq 0 $no_of_years`; do
17	+ for i in `jot - 0 $no_of_years`; do	17	+ for i in `jot - 0 $no_of_years`; do
18	year=$(echo ${arr1[$i]})	18	year=$(echo ${arr1[$i]})
19	echo -n "y${year}.value "	19	printf "y%s.value " ${year}
20	printf "%b" "albums 0 0 year:${year}\nexit\n" \| $NC $HOST $PORT \| sed 's/%3A/:/g' \| cut -d ':' -f 3	20	printf "%b" "albums 0 0 year:${year}\nexit\n" \| $NC $HOST $PORT \| sed 's/%3A/:/g' \| cut -d ':' -f 3
21	@@ -183,7 +183,7 @@ elif [ "$CMD" = "signalstrength" -o "$CM	21	@@ -182,7 +182,7 @@
22	echo "graph_category Squeezebox"	22	echo "graph_category Squeezebox"
23	COUNT=$(printf "%b" "player count ?\nexit\n" \| $NC $HOST $PORT \| cut -d " " -f 3)	23	COUNT=$(printf "%b" "player count ?\nexit\n" \| $NC $HOST $PORT \| cut -d " " -f 3)
24	(( COUNT-- ))	24	(( COUNT-- ))
Lines 27-33 Link Here
27	MAC=$(printf "%b" "player id $ID ?\nexit\n" \| $NC $HOST $PORT \| cut -d " " -f 4 \| sed 's/%3A/:/g')	27	MAC=$(printf "%b" "player id $ID ?\nexit\n" \| $NC $HOST $PORT \| cut -d " " -f 4 \| sed 's/%3A/:/g')
28	NAME=$(printf "%b" "player name $MAC ?\nexit\n" \| $NC $HOST $PORT \| cut -d " " -f 4 \| sed 's/%20/ /g')	28	NAME=$(printf "%b" "player name $MAC ?\nexit\n" \| $NC $HOST $PORT \| cut -d " " -f 4 \| sed 's/%20/ /g')
29	MAC2=$(echo $MAC \| sed 's/://g; s/\./_/g')	29	MAC2=$(echo $MAC \| sed 's/://g; s/\./_/g')
30	@@ -193,7 +193,7 @@ elif [ "$CMD" = "signalstrength" -o "$CM	30	@@ -192,7 +192,7 @@
31	fi	31	fi
32	COUNT=$(printf "%b" "player count ?\nexit\n" \| $NC $HOST $PORT \| cut -d " " -f 3)	32	COUNT=$(printf "%b" "player count ?\nexit\n" \| $NC $HOST $PORT \| cut -d " " -f 3)
33	(( COUNT-- ))	33	(( COUNT-- ))




--- Makefile.orig	2009-12-30 05:55:56.000000000 -0700
+++ Makefile	2010-01-30 12:57:44.000000000 -0700
@@ -65,11 +65,8 @@
 endif
 
 install-pre: Makefile Makefile.config
-	@$(CHECKUSER)
-	mkdir -p $(LOGDIR)
 	mkdir -p $(STATEDIR)
 	mkdir -p $(CONFDIR)
-	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)
 
 install-master-prime: $(INFILES_MASTER) install-pre install-master
 	mkdir -p $(CONFDIR)/templates




--- Makefile.config.orig	2009-12-30 05:55:56.000000000 -0700
+++ Makefile.config	2010-01-30 11:17:34.000000000 -0700
@@ -126,9 +129,8 @@
 # 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"))
+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"))
 
 # For OSX, comment out the previous two lines and comment in these
 #

Lines 1-5 Link Here

(-)munin-node/files/patch-plugins__node.d__colour_tester.in (-2 / +2 lines)
1	--- ./plugins/node.d/colour_tester.in.orig 2010-03-09 22:23:28.000000000 +0100	1	--- ./plugins/node.d.debug/colour_tester.in.orig 2010-03-09 22:23:28.000000000 +0100
2	+++ ./plugins/node.d/colour_tester.in 2010-03-09 22:23:46.000000000 +0100	2	+++ ./plugins/node.d.debug/colour_tester.in 2010-03-09 22:23:46.000000000 +0100
3	@@ -29,7 +29,7 @@ NUMCOL=$(($I - 1))	3	@@ -29,7 +29,7 @@ NUMCOL=$(($I - 1))
4		4
5		5

Lines 1-11 Link Here

(-)munin-node/files/patch-node-node.d.freebsd-dev_cpu_.diff (-11 lines)
1	--- ./plugins/node.d.freebsd/dev_cpu_.in.orig 2011-02-15 00:02:38.000000000 +0100
2	+++ ./plugins/node.d.freebsd/dev_cpu_.in 2011-02-15 00:03:19.000000000 +0100
3	@@ -109,7 +109,7 @@
4	reqcpus
5	for cpu in $cpus ; do
6	echo -n "CPU$cpu.value "
7	- sysctl -n "dev.cpu.$cpu.$func"
8	+ sysctl -n "dev.cpu.$cpu.$func" \| tr -d 'C'
9	done
10	}
11

Lines 15-24 Link Here

(-)munin-node/pkg-plist (-7 / +13 lines)
15	%%SITE_PERL%%/Munin/Node/Configure/PluginList.pm	15	%%SITE_PERL%%/Munin/Node/Configure/PluginList.pm
16	%%SITE_PERL%%/Munin/Node/Logger.pm	16	%%SITE_PERL%%/Munin/Node/Logger.pm
17	%%SITE_PERL%%/Munin/Node/OS.pm	17	%%SITE_PERL%%/Munin/Node/OS.pm
		18	%%SITE_PERL%%/Munin/Node/ProxySpooler.pm
18	%%SITE_PERL%%/Munin/Node/SNMPConfig.pm	19	%%SITE_PERL%%/Munin/Node/SNMPConfig.pm
19	%%SITE_PERL%%/Munin/Node/Server.pm	20	%%SITE_PERL%%/Munin/Node/Server.pm
20	%%SITE_PERL%%/Munin/Node/Service.pm	21	%%SITE_PERL%%/Munin/Node/Service.pm
21	%%SITE_PERL%%/Munin/Node/Session.pm	22	%%SITE_PERL%%/Munin/Node/Session.pm
		23	%%SITE_PERL%%/Munin/Node/SpoolReader.pm
		24	%%SITE_PERL%%/Munin/Node/SpoolWriter.pm
22	%%SITE_PERL%%/Munin/Node/Utils.pm	25	%%SITE_PERL%%/Munin/Node/Utils.pm
23	%%SITE_PERL%%/Munin/Plugin.pm	26	%%SITE_PERL%%/Munin/Plugin.pm
24	%%SITE_PERL%%/Munin/Plugin/Pgsql.pm	27	%%SITE_PERL%%/Munin/Plugin/Pgsql.pm
Lines 26-31 Link Here
26	sbin/munin-node	29	sbin/munin-node
27	sbin/munin-node-configure	30	sbin/munin-node-configure
28	sbin/munin-run	31	sbin/munin-run
		32	sbin/munin-sched
29	%%DATADIR%%/plugins/amavis	33	%%DATADIR%%/plugins/amavis
30	%%DATADIR%%/plugins/apache_accesses	34	%%DATADIR%%/plugins/apache_accesses
31	%%DATADIR%%/plugins/apache_processes	35	%%DATADIR%%/plugins/apache_processes
Lines 43-49 Link Here
43	%%DATADIR%%/plugins/bind9	47	%%DATADIR%%/plugins/bind9
44	%%DATADIR%%/plugins/bind9_rndc	48	%%DATADIR%%/plugins/bind9_rndc
45	%%DATADIR%%/plugins/cmc_tc_sensor_	49	%%DATADIR%%/plugins/cmc_tc_sensor_
46	%%DATADIR%%/plugins/colour_tester
47	%%DATADIR%%/plugins/coretemp	50	%%DATADIR%%/plugins/coretemp
48	%%DATADIR%%/plugins/courier_	51	%%DATADIR%%/plugins/courier_
49	%%DATADIR%%/plugins/courier_mta_mailqueue	52	%%DATADIR%%/plugins/courier_mta_mailqueue
Lines 57-67 Link Here
57	%%DATADIR%%/plugins/dhcpd3	60	%%DATADIR%%/plugins/dhcpd3
58	%%DATADIR%%/plugins/digitemp_	61	%%DATADIR%%/plugins/digitemp_
59	%%DATADIR%%/plugins/ejabberd_	62	%%DATADIR%%/plugins/ejabberd_
60	%%DATADIR%%/plugins/env
61	%%DATADIR%%/plugins/exim_mailqueue	63	%%DATADIR%%/plugins/exim_mailqueue
62	%%DATADIR%%/plugins/exim_mailqueue_alt	64	%%DATADIR%%/plugins/exim_mailqueue_alt
63	%%DATADIR%%/plugins/exim_mailstats	65	%%DATADIR%%/plugins/exim_mailstats
64	%%DATADIR%%/plugins/extinfo_tester
65	%%DATADIR%%/plugins/fail2ban	66	%%DATADIR%%/plugins/fail2ban
66	%%DATADIR%%/plugins/foldingathome	67	%%DATADIR%%/plugins/foldingathome
67	%%DATADIR%%/plugins/foldingathome_rank	68	%%DATADIR%%/plugins/foldingathome_rank
Lines 71-90 Link Here
71	%%DATADIR%%/plugins/freeradius_proxy_acct	72	%%DATADIR%%/plugins/freeradius_proxy_acct
72	%%DATADIR%%/plugins/freeradius_proxy_auth	73	%%DATADIR%%/plugins/freeradius_proxy_auth
73	%%DATADIR%%/plugins/haproxy_	74	%%DATADIR%%/plugins/haproxy_
		75	%%DATADIR%%/plugins/haproxy_ng
74	%%DATADIR%%/plugins/hddtemp	76	%%DATADIR%%/plugins/hddtemp
75	%%DATADIR%%/plugins/hddtemp2	77	%%DATADIR%%/plugins/hddtemp2
76	%%DATADIR%%/plugins/hddtemp_smartctl	78	%%DATADIR%%/plugins/hddtemp_smartctl
77	%%DATADIR%%/plugins/hddtempd	79	%%DATADIR%%/plugins/hddtempd
		80	%%DATADIR%%/plugins/hp2000_
78	%%DATADIR%%/plugins/http_loadtime	81	%%DATADIR%%/plugins/http_loadtime
79	%%DATADIR%%/plugins/id
80	%%DATADIR%%/plugins/if_	82	%%DATADIR%%/plugins/if_
81	%%DATADIR%%/plugins/if_errcoll_	83	%%DATADIR%%/plugins/if_errcoll_
82	%%DATADIR%%/plugins/ifx_concurrent_sessions_	84	%%DATADIR%%/plugins/ifx_concurrent_sessions_
83	%%DATADIR%%/plugins/iostat	85	%%DATADIR%%/plugins/iostat
84	%%DATADIR%%/plugins/ipac-ng	86	%%DATADIR%%/plugins/ipac-ng
		87	%%DATADIR%%/plugins/ipmi_
85	%%DATADIR%%/plugins/ipmi_sensor_	88	%%DATADIR%%/plugins/ipmi_sensor_
86	%%DATADIR%%/plugins/ircu	89	%%DATADIR%%/plugins/ircu
87	%%DATADIR%%/plugins/jmx_
88	%%DATADIR%%/plugins/load	90	%%DATADIR%%/plugins/load
89	%%DATADIR%%/plugins/loggrep	91	%%DATADIR%%/plugins/loggrep
90	%%DATADIR%%/plugins/lpstat	92	%%DATADIR%%/plugins/lpstat
Lines 94-100 Link Here
94	%%DATADIR%%/plugins/memcached_	96	%%DATADIR%%/plugins/memcached_
95	%%DATADIR%%/plugins/memory	97	%%DATADIR%%/plugins/memory
96	%%DATADIR%%/plugins/mhttping	98	%%DATADIR%%/plugins/mhttping
97	%%DATADIR%%/plugins/multigraph_tester
98	%%DATADIR%%/plugins/multiping	99	%%DATADIR%%/plugins/multiping
99	%%DATADIR%%/plugins/multips	100	%%DATADIR%%/plugins/multips
100	%%DATADIR%%/plugins/multips_memory	101	%%DATADIR%%/plugins/multips_memory
Lines 126-131 Link Here
126	%%DATADIR%%/plugins/open_files	127	%%DATADIR%%/plugins/open_files
127	%%DATADIR%%/plugins/openvpn	128	%%DATADIR%%/plugins/openvpn
128	%%DATADIR%%/plugins/perdition	129	%%DATADIR%%/plugins/perdition
		130	%%DATADIR%%/plugins/pgbouncer_connections
		131	%%DATADIR%%/plugins/pgbouncer_requests
129	%%DATADIR%%/plugins/ping_	132	%%DATADIR%%/plugins/ping_
130	%%DATADIR%%/plugins/plugin.sh	133	%%DATADIR%%/plugins/plugin.sh
131	%%DATADIR%%/plugins/plugins.history	134	%%DATADIR%%/plugins/plugins.history
Lines 134-148 Link Here
134	%%DATADIR%%/plugins/postfix_mailqueue	137	%%DATADIR%%/plugins/postfix_mailqueue
135	%%DATADIR%%/plugins/postfix_mailstats	138	%%DATADIR%%/plugins/postfix_mailstats
136	%%DATADIR%%/plugins/postfix_mailvolume	139	%%DATADIR%%/plugins/postfix_mailvolume
		140	%%DATADIR%%/plugins/postgres_autovacuum
137	%%DATADIR%%/plugins/postgres_bgwriter	141	%%DATADIR%%/plugins/postgres_bgwriter
138	%%DATADIR%%/plugins/postgres_cache_	142	%%DATADIR%%/plugins/postgres_cache_
139	%%DATADIR%%/plugins/postgres_checkpoints	143	%%DATADIR%%/plugins/postgres_checkpoints
140	%%DATADIR%%/plugins/postgres_connections_	144	%%DATADIR%%/plugins/postgres_connections_
141	%%DATADIR%%/plugins/postgres_connections_db	145	%%DATADIR%%/plugins/postgres_connections_db
142	%%DATADIR%%/plugins/postgres_locks_	146	%%DATADIR%%/plugins/postgres_locks_
		147	%%DATADIR%%/plugins/postgres_oldest_prepared_xact_
		148	%%DATADIR%%/plugins/postgres_prepared_xacts_
143	%%DATADIR%%/plugins/postgres_querylength_	149	%%DATADIR%%/plugins/postgres_querylength_
144	%%DATADIR%%/plugins/postgres_scans_	150	%%DATADIR%%/plugins/postgres_scans_
145	%%DATADIR%%/plugins/postgres_size_	151	%%DATADIR%%/plugins/postgres_size_
		152	%%DATADIR%%/plugins/postgres_streaming_
146	%%DATADIR%%/plugins/postgres_transactions_	153	%%DATADIR%%/plugins/postgres_transactions_
147	%%DATADIR%%/plugins/postgres_tuples_	154	%%DATADIR%%/plugins/postgres_tuples_
148	%%DATADIR%%/plugins/postgres_users	155	%%DATADIR%%/plugins/postgres_users
Lines 217-223 Link Here
217	%%DATADIR%%/plugins/users	224	%%DATADIR%%/plugins/users
218	%%DATADIR%%/plugins/varnish_	225	%%DATADIR%%/plugins/varnish_
219	%%DATADIR%%/plugins/vmstat	226	%%DATADIR%%/plugins/vmstat
220	%%DATADIR%%/plugins/warning_tester
221	%%DATADIR%%/plugins/zimbra_	227	%%DATADIR%%/plugins/zimbra_
222	@dirrmtry %%DBDIR%%/plugin-state	228	@dirrmtry %%DBDIR%%/plugin-state
223	@dirrmtry %%DBDIR%%	229	@dirrmtry %%DBDIR%%

Lines 6-14 Link Here

(-)munin-node/Makefile (-3 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= munin	8	PORTNAME= munin
9	PORTVERSION= 1.4.7	9	PORTVERSION= ${MUNIN_VERSION}
10	CATEGORIES= sysutils perl5	10	CATEGORIES= sysutils perl5
11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION}	11	MASTER_SITES= ${MUNIN_SITES}
12	PKGNAMESUFFIX= -node	12	PKGNAMESUFFIX= -node
13		13
14	MAINTAINER= flo@FreeBSD.org	14	MAINTAINER= flo@FreeBSD.org
Lines 27-32 Link Here
27	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \	27	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
28	bash:${PORTSDIR}/shells/bash	28	bash:${PORTSDIR}/shells/bash
29		29
		30	DISTINFO_FILE= ${MUNIN_DISTINFO}
		31	EXTRA_PATCHES+= ${MUNIN_PATCHES}
30	USE_PERL5= yes	32	USE_PERL5= yes
31	USE_GMAKE= yes	33	USE_GMAKE= yes
32	PKGMESSAGE= ${WRKDIR}/pkg-message	34	PKGMESSAGE= ${WRKDIR}/pkg-message
Lines 40-45 Link Here
40	MAN1= munin-node-configure.1 \	42	MAN1= munin-node-configure.1 \
41	munin-node.1 \	43	munin-node.1 \
42	munin-run.1 \	44	munin-run.1 \
		45	munin-sched.1 \
43	munindoc.1	46	munindoc.1
44	MAN3_NODE= Munin::Node::Config.3 \	47	MAN3_NODE= Munin::Node::Config.3 \
45	Munin::Node::Configure::Debug.3 \	48	Munin::Node::Configure::Debug.3 \
Lines 49-58 Link Here
49	Munin::Node::Configure::PluginList.3 \	52	Munin::Node::Configure::PluginList.3 \
50	Munin::Node::Logger.3 \	53	Munin::Node::Logger.3 \
51	Munin::Node::OS.3 \	54	Munin::Node::OS.3 \
		55	Munin::Node::ProxySpooler.3 \
52	Munin::Node::SNMPConfig.3 \	56	Munin::Node::SNMPConfig.3 \
53	Munin::Node::Server.3 \	57	Munin::Node::Server.3 \
54	Munin::Node::Service.3 \	58	Munin::Node::Service.3 \
55	Munin::Node::Session.3 \	59	Munin::Node::Session.3 \
		60	Munin::Node::SpoolReader.3 \
		61	Munin::Node::SpoolWriter.3 \
56	Munin::Node::Utils.3	62	Munin::Node::Utils.3
57	MAN3_PLUGIN= Munin::Plugin.3 \	63	MAN3_PLUGIN= Munin::Plugin.3 \
58	Munin::Plugin::Pgsql.3 \	64	Munin::Plugin::Pgsql.3 \
Lines 62-68 Link Here
62	MAN8= munin.8	68	MAN8= munin.8
63		69
64	SUB_FILES= pkg-message munin-node-revive.sh	70	SUB_FILES= pkg-message munin-node-revive.sh
65	USE_RC_SUBR= munin-node	71	USE_RC_SUBR= munin-node munin-sched
66		72
67	post-patch:	73	post-patch:
68	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' \	74	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' \

Lines 1-2 Link Here

(-)munin-common/distinfo (-2 / +2 lines)
1	SHA256 (munin-1.4.7.tar.gz) = 9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af	1	SHA256 (munin-2.0.5.tar.gz) = 927b9b557343ad031b55b401eb1542db03d78a48a64797f5fed6ad58fc2c8785
2	SIZE (munin-1.4.7.tar.gz) = 1236273	2	SIZE (munin-2.0.5.tar.gz) = 1319398




--- Makefile.orig	2012-08-14 17:19:40.000000000 +0200
+++ Makefile	2012-08-27 13:30:39.664510751 +0200
@@ -68,11 +68,11 @@
 
 install-pre: Makefile Makefile.config
 	@$(CHECKUSER)
-	mkdir -p $(LOGDIR)
-	mkdir -p $(STATEDIR)
-	mkdir -p $(SPOOLDIR)
+#	mkdir -p $(LOGDIR)
+#	mkdir -p $(STATEDIR)
+#	mkdir -p $(SPOOLDIR)
 	mkdir -p $(CONFDIR)
-	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
+#	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
 
 install-master-prime: $(INFILES_MASTER) install-pre install-master
 	mkdir -p $(CONFDIR)/templates

Lines 1-12 Link Here

(-)munin-common/pkg-plist (-4 / +5 lines)
1	%%SITE_PERL%%/Munin/Common/Config.pm	1	%%SITE_PERL%%/Munin/Common/Config.pm
2	%%SITE_PERL%%/Munin/Common/Defaults.pm	2	%%SITE_PERL%%/Munin/Common/Defaults.pm
		3	%%SITE_PERL%%/Munin/Common/DictFile.pm
		4	%%SITE_PERL%%/Munin/Common/SyncDictFile.pm
3	%%SITE_PERL%%/Munin/Common/TLS.pm	5	%%SITE_PERL%%/Munin/Common/TLS.pm
4	%%SITE_PERL%%/Munin/Common/TLSClient.pm	6	%%SITE_PERL%%/Munin/Common/TLSClient.pm
5	%%SITE_PERL%%/Munin/Common/TLSServer.pm	7	%%SITE_PERL%%/Munin/Common/TLSServer.pm
6	%%SITE_PERL%%/Munin/Common/Timeout.pm	8	%%SITE_PERL%%/Munin/Common/Timeout.pm
7	@dirrm %%SITE_PERL%%/Munin/Common	9	@dirrm %%SITE_PERL%%/Munin/Common
8	@dirrm %%SITE_PERL%%/Munin	10	@dirrm %%SITE_PERL%%/Munin
9	@exec mkdir -p %%LOGDIR%%	11	@exec mkdir -p %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%%
10	@unexec /bin/rmdir %%LOGDIR%% 2>/dev/null \|\| /usr/bin/true	12	@exec chown %%USER%%:%%GROUP%% %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%%
11	@exec mkdir -p %%STATEDIR%%	13	@unexec rmdir %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%% 2>/dev/null \|\| /usr/bin/true
12	@unexec /bin/rmdir %%STATEDIR%% 2>/dev/null \|\| /usr/bin/true




MUNIN_VERSION=	2.0.5
MUNIN_SITES=	SF/${PORTNAME}/stable/${PORTVERSION}
MUNIN_DISTINFO=	${PORTSDIR}/sysutils/munin-common/distinfo
MUNIN_PATCHES=	${PORTSDIR}/sysutils/munin-common/files/patch-Makefile \
		${PORTSDIR}/sysutils/munin-common/files/patch-Makefile.config

DBDIR?=		/var/${PORTNAME}
LOGDIR?=	/var/log/${PORTNAME}
STATEDIR?=	/var/run/${PORTNAME}
SPOOLDIR?=	/var/spool/${PORTNAME}
MUNIN_DIRS=	BINDIR=${PREFIX}/bin \
		CGIDIR=${PREFIX}/www/cgi-bin \
		CONFDIR=${ETCDIR} \

		LOGDIR=${LOGDIR} \
		MANDIR=${MANPREFIX}/man \
		SBINDIR=${PREFIX}/sbin \
		STATEDIR=${STATEDIR} \
		SPOOLDIR=${SPOOLDIR}
MAKE_ARGS=	${MUNIN_DIRS} \
		BASH=${LOCALBASE}/bin/bash \
		PERL=${PERL} PERLLIB=${PREFIX}/${SITE_PERL_REL}
MUNIN_USER=	munin
MUNIN_GROUP=	munin
PLIST_SUB=	${MUNIN_DIRS} USER=${MUNIN_USER} GROUP=${MUNIN_GROUP}

Lines 6-14 Link Here

(-)munin-common/Makefile (-4 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= munin	8	PORTNAME= munin
9	PORTVERSION= 1.4.7	9	PORTVERSION= ${MUNIN_VERSION}
10	CATEGORIES= sysutils perl5	10	CATEGORIES= sysutils perl5
11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION}	11	MASTER_SITES= ${MUNIN_SITES}
12	PKGNAMESUFFIX= -common	12	PKGNAMESUFFIX= -common
13		13
14	MAINTAINER= flo@FreeBSD.org	14	MAINTAINER= flo@FreeBSD.org
Lines 24-29 Link Here
24		24
25	.include "${.CURDIR}/../munin-common/munin.mk"	25	.include "${.CURDIR}/../munin-common/munin.mk"
26		26
		27	USERS= ${MUNIN_USER}
		28	GROUPS= ${MUNIN_GROUP}
		29
27	ALL_TARGET= build-common-prime	30	ALL_TARGET= build-common-prime
28	INSTALL_TARGET= install-common	31	INSTALL_TARGET= install-common
29		32
Lines 35-42 Link Here
35	Munin::Common::Timeout.3	38	Munin::Common::Timeout.3
36		39
37	post-install:	40	post-install:
38	@${MKDIR} ${LOGDIR}	41	@${MKDIR} ${LOGDIR} ${STATEDIR} ${SPOOLDIR}
39	@${CHOWN} ${USERS}:${GROUPS} ${LOGDIR}	42	@${CHOWN} ${USERS}:${GROUPS} ${LOGDIR} ${STADEDIR} ${SPOOLDIR}
40	@(cd ${WRKSRC}/common/blib/libdoc && for man in ${MAN3} ; do \	43	@(cd ${WRKSRC}/common/blib/libdoc && for man in ${MAN3} ; do \
41	${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \	44	${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \
42	done)	45	done)

Return to bug 171116

Lines 1-20 Link Here

(-)munin-master/files/patch-master-__bin-munin-check.in (-20 lines)
1	--- master/_bin/munin-check.in.orig 2009-12-29 17:03:49.000000000 +0100
2	+++ master/_bin/munin-check.in 2010-12-02 23:48:25.854543201 +0100
3	@@ -78,7 +78,7 @@
4	object=$1; shift \|\| exit 1
5	correctowner=$1; shift \|\| exit 1
6
7	- owner=$(stat -c%U $object)
8	+ owner=$(stat -f%Su $object)
9	if [ "$owner" != "$correctowner" ]; then
10	echo "# $object : Wrong owner ($owner != $correctowner)";
11	if [ "$PLEASE_FIXME" = "true" ]; then
12	@@ -108,7 +108,7 @@
13	object=$1; shift \|\| exit 1
14	correctperm=$1; shift \|\| exit 1
15
16	- perm=$(stat -c%a $object)
17	+ perm=$(stat -f%OLp $object)
18	if [ "$perm" != "$correctperm" ]; then
19	echo "# $object : Wrong permissions ($perm != $correctperm)";
20	if [ "$PLEASE_FIXME" = "true" ]; then

Lines 1-14 Link Here

(-)munin-master/files/patch-Makefile.config (-14 lines)
1	--- Makefile.config.orig 2009-12-30 05:55:56.000000000 -0700
2	+++ Makefile.config 2010-01-30 11:17:34.000000000 -0700
3	@@ -126,9 +129,8 @@
4	# Which command to use to check if the USER and GROUP to run Munin as, exists.
5	# These will work on most modern OSes:
6	#
7	-GETENT := $(shell which getent \|\| which true 2>/dev/null)
8	-CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
9	-CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
10	+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"))
11	+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"))
12
13	# For OSX, comment out the previous two lines and comment in these
14	#

Lines 6-15 Link Here

(-)munin-master/Makefile (-6 / +15 lines)
6	#	6	#
7		7
8	PORTNAME= munin	8	PORTNAME= munin
9	PORTVERSION= 1.4.7	9	PORTVERSION= ${MUNIN_VERSION}
10	PORTREVISION= 3
11	CATEGORIES= sysutils perl5	10	CATEGORIES= sysutils perl5
12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION}	11	MASTER_SITES= ${MUNIN_SITES}
13	PKGNAMESUFFIX= -master	12	PKGNAMESUFFIX= -master
14		13
15	MAINTAINER= flo@FreeBSD.org	14	MAINTAINER= flo@FreeBSD.org
Lines 17-38 Link Here
17		16
18	BUILD_DEPENDS= p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build \	17	BUILD_DEPENDS= p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build \
19	munin-common>=0:${PORTSDIR}/sysutils/munin-common \	18	munin-common>=0:${PORTSDIR}/sysutils/munin-common \
20	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
21	rrdtool>=0:${PORTSDIR}/databases/rrdtool \	19	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
22	p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \	20	p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
		21	p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \
23	p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \	22	p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \
		23	p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
24	p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \	24	p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
25	p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \	25	p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
		26	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
26	p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \	27	p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
		28	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
		29	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
27	p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced	30	p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced
28	RUN_DEPENDS= munin-common>=0:${PORTSDIR}/sysutils/munin-common \	31	RUN_DEPENDS= munin-common>=0:${PORTSDIR}/sysutils/munin-common \
29	rrdtool>=0:${PORTSDIR}/databases/rrdtool \	32	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
30	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \	33	p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \
31	p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \	34	p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
32	p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \	35	p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \
		36	p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
33	p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \	37	p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
34	p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \	38	p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
		39	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
35	p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \	40	p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
		41	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
		42	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
36	p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced	43	p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced
37		44
38	USE_PERL5= yes	45	USE_PERL5= yes
Lines 41-47 Link Here
41		48
42	.include "${.CURDIR}/../munin-common/munin.mk"	49	.include "${.CURDIR}/../munin-common/munin.mk"
43		50
44	ALL_TARGET= build-master build-man	51	EXTRA_PATCHES= ${MUNIN_PATCHES}
		52	DISTINFO_FILE= ${MUNIN_DISTINFO}
		53	ALL_TARGET= infiles build-master build-man
45	INSTALL_TARGET= install-master-prime	54	INSTALL_TARGET= install-master-prime
46		55
47	MAN3= Munin::Master::Config.3 \	56	MAN3= Munin::Master::Config.3 \

Line 0 Link Here

(-)munin-node/files/munin-sched.in (+27 lines)
	1	#!/bin/sh
	2	#
	3
	4	# PROVIDE: munin-sched
	5	# REQUIRE: DAEMON
	6	# BEFORE: cron
	7
	8	#
	9	# Add the following lines to /etc/rc.conf to enable munin-sched:
	10	# munin_sched_enable (bool): Set to "NO" by default.
	11	# Set it to "YES" to enable munin-sched
	12	# munin_sched_config (path): Set to "%%PREFIX%%/etc/munin/munin-node.conf" by default.
	13	#
	14
	15	. /etc/rc.subr
	16
	17	name="munin_sched"
	18	rcvar=munin_sched_enable
	19
	20	[ -z "$munin_sched_enable" ] && munin_sched_enable="NO"
	21	[ -z "$munin_sched_config" ] && munin_sched_config="%%PREFIX%%/etc/munin/munin-node.conf"
	22
	23	command="%%PREFIX%%/sbin/munin-sched"
	24	pidfile=`awk '$1 == "pid_file" { print $2 }' $munin_sched_config`
	25
	26	load_rc_config $name
	27	run_rc_command "$1"

Lines 1-14 Link Here

(-)munin-node/files/patch-Makefile (-14 lines)
1	--- Makefile.orig 2009-12-30 05:55:56.000000000 -0700
2	+++ Makefile 2010-01-30 12:57:44.000000000 -0700
3	@@ -65,11 +65,8 @@
4	endif
5
6	install-pre: Makefile Makefile.config
7	- @$(CHECKUSER)
8	- mkdir -p $(LOGDIR)
9	mkdir -p $(STATEDIR)
10	mkdir -p $(CONFDIR)
11	- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)
12
13	install-master-prime: $(INFILES_MASTER) install-pre install-master
14	mkdir -p $(CONFDIR)/templates

Lines 1-14 Link Here

(-)munin-node/files/patch-Makefile.config (-14 lines)
1	--- Makefile.config.orig 2009-12-30 05:55:56.000000000 -0700
2	+++ Makefile.config 2010-01-30 11:17:34.000000000 -0700
3	@@ -126,9 +129,8 @@
4	# Which command to use to check if the USER and GROUP to run Munin as, exists.
5	# These will work on most modern OSes:
6	#
7	-GETENT := $(shell which getent \|\| which true 2>/dev/null)
8	-CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
9	-CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
10	+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"))
11	+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"))
12
13	# For OSX, comment out the previous two lines and comment in these
14	#

Lines 1-11 Link Here

(-)munin-common/files/patch-Makefile (-7 / +14 lines)
1	--- Makefile.orig 2010-01-30 10:49:44.000000000 -0700	1	--- Makefile.orig 2012-08-14 17:19:40.000000000 +0200
2	+++ Makefile 2010-01-30 10:49:53.000000000 -0700	2	+++ Makefile 2012-08-27 13:30:39.664510751 +0200
3	@@ -69,7 +69,7 @@	3	@@ -68,11 +68,11 @@
4	mkdir -p $(LOGDIR)	4
5	mkdir -p $(STATEDIR)	5	install-pre: Makefile Makefile.config
		6	@$(CHECKUSER)
		7	- mkdir -p $(LOGDIR)
		8	- mkdir -p $(STATEDIR)
		9	- mkdir -p $(SPOOLDIR)
		10	+# mkdir -p $(LOGDIR)
		11	+# mkdir -p $(STATEDIR)
		12	+# mkdir -p $(SPOOLDIR)
6	mkdir -p $(CONFDIR)	13	mkdir -p $(CONFDIR)
7	- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)	14	- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
8	+ $(CHOWN) $(USER) $(STATEDIR)	15	+# $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
9		16
10	install-master-prime: $(INFILES_MASTER) install-pre install-master	17	install-master-prime: $(INFILES_MASTER) install-pre install-master
11	mkdir -p $(CONFDIR)/templates	18	mkdir -p $(CONFDIR)/templates

Lines 1-6 Link Here

(-)munin-common/munin.mk (-4 / +12 lines)
		1	MUNIN_VERSION= 2.0.5
		2	MUNIN_SITES= SF/${PORTNAME}/stable/${PORTVERSION}
		3	MUNIN_DISTINFO= ${PORTSDIR}/sysutils/munin-common/distinfo
		4	MUNIN_PATCHES= ${PORTSDIR}/sysutils/munin-common/files/patch-Makefile \
		5	${PORTSDIR}/sysutils/munin-common/files/patch-Makefile.config
		6
1	DBDIR?= /var/${PORTNAME}	7	DBDIR?= /var/${PORTNAME}
2	LOGDIR?= /var/log/${PORTNAME}	8	LOGDIR?= /var/log/${PORTNAME}
3	STATEDIR?= /var/run/${PORTNAME}	9	STATEDIR?= /var/run/${PORTNAME}
		10	SPOOLDIR?= /var/spool/${PORTNAME}
4	MUNIN_DIRS= BINDIR=${PREFIX}/bin \	11	MUNIN_DIRS= BINDIR=${PREFIX}/bin \
5	CGIDIR=${PREFIX}/www/cgi-bin \	12	CGIDIR=${PREFIX}/www/cgi-bin \
6	CONFDIR=${ETCDIR} \	13	CONFDIR=${ETCDIR} \
Lines 11-20 Link Here
11	LOGDIR=${LOGDIR} \	18	LOGDIR=${LOGDIR} \
12	MANDIR=${MANPREFIX}/man \	19	MANDIR=${MANPREFIX}/man \
13	SBINDIR=${PREFIX}/sbin \	20	SBINDIR=${PREFIX}/sbin \
14	STATEDIR=${STATEDIR}	21	STATEDIR=${STATEDIR} \
		22	SPOOLDIR=${SPOOLDIR}
15	MAKE_ARGS= ${MUNIN_DIRS} \	23	MAKE_ARGS= ${MUNIN_DIRS} \
16	BASH=${LOCALBASE}/bin/bash \	24	BASH=${LOCALBASE}/bin/bash \
17	PERL=${PERL} PERLLIB=${PREFIX}/${SITE_PERL_REL}	25	PERL=${PERL} PERLLIB=${PREFIX}/${SITE_PERL_REL}
18	PLIST_SUB= ${MUNIN_DIRS}	26	MUNIN_USER= munin
19	USERS= munin	27	MUNIN_GROUP= munin
20	GROUPS= munin	28	PLIST_SUB= ${MUNIN_DIRS} USER=${MUNIN_USER} GROUP=${MUNIN_GROUP}