- update to 2.0.9

- use correct pidfile for munin-sched rc script [1]
- munin-cgi-graph requires FCGI [2]

Submitted by:	Geoffroy Desvernay <dgeo@centrale-marseille.fr> [1]
		Sergey V. Dyatko <sergey.dyatko@gmail.com> [2]
Feature safe:	yes

8 files changed, 16 insertions, 15 deletions

diff --git a/sysutils/munin-common/distinfo b/sysutils/munin-common/distinfo
index 2031df885a12..405598644f9a 100644
--- a/sysutils/munin-common/distinfo
+++ b/sysutils/munin-common/distinfo
@@ -1,2 +1,2 @@
-SHA256 (munin-2.0.7.tar.gz) = 3daf42722ebd74a6269aa290b9f5821e2206df7b0fd6a39876863ff1a9b50c2e
-SIZE (munin-2.0.7.tar.gz) = 1326773
+SHA256 (munin-2.0.9.tar.gz) = 6bb2b42de29a438ad80f1d6c53f4a35e9a74cb5a2103ea7a9530cba2d75c7309
+SIZE (munin-2.0.9.tar.gz) = 1328972
diff --git a/sysutils/munin-common/munin.mk b/sysutils/munin-common/munin.mk
index c5248a8fce20..72fd9ee7272f 100644
--- a/sysutils/munin-common/munin.mk
+++ b/sysutils/munin-common/munin.mk
@@ -1,4 +1,4 @@
-MUNIN_VERSION=	2.0.7
+MUNIN_VERSION=	2.0.9
 MUNIN_SITES=	SF/${PORTNAME}/stable/${PORTVERSION}
 MUNIN_DISTINFO=	${PORTSDIR}/sysutils/munin-common/distinfo
 MUNIN_PATCHES=	${PORTSDIR}/sysutils/munin-common/files/patch-Makefile \
diff --git a/sysutils/munin-common/pkg-plist b/sysutils/munin-common/pkg-plist
index a1a26eee7272..73257e8de25b 100644
--- a/sysutils/munin-common/pkg-plist
+++ b/sysutils/munin-common/pkg-plist
@@ -10,4 +10,4 @@
 @dirrm %%SITE_PERL%%/Munin
 @exec mkdir -p %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%%
 @exec chown %%USER%%:%%GROUP%% %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%%
-@unexec rmdir %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%% 2>/dev/null || /usr/bin/true
+@unexec rmdir %%DBDIR%% %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%% 2>/dev/null || /usr/bin/true
diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile
index 48a726390294..6cc74e312df2 100644
--- a/sysutils/munin-master/Makefile
+++ b/sysutils/munin-master/Makefile
@@ -38,7 +38,8 @@ RUN_DEPENDS=	munin-common>=0:${PORTSDIR}/sysutils/munin-common \
 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
 		p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced \
 		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip
+		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
+		p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/munin-master/pkg-plist b/sysutils/munin-master/pkg-plist
index 4995d9895f5a..3150031ebc6e 100644
--- a/sysutils/munin-master/pkg-plist
+++ b/sysutils/munin-master/pkg-plist
@@ -64,6 +64,7 @@ www/cgi-bin/munin-cgi-html
 @dirrmtry www/cgi-bin
 @dirrmtry %%WWWDIR%%
 @dirrmtry %%DATADIR%%
+@dirrmtry %%DBDIR%%/cgi-tmp
 @dirrmtry %%DBDIR%%
 @dirrm %%SITE_PERL%%/Munin/Master
 @dirrmtry %%SITE_PERL%%/Munin
diff --git a/sysutils/munin-node/files/munin-node.in b/sysutils/munin-node/files/munin-node.in
index 38f6bf4b3842..f481b83621b7 100644
--- a/sysutils/munin-node/files/munin-node.in
+++ b/sysutils/munin-node/files/munin-node.in
@@ -21,6 +21,7 @@ rcvar=munin_node_enable
 [ -z "$munin_node_config" ] && munin_node_config="%%PREFIX%%/etc/munin/munin-node.conf"
 
 command="%%PREFIX%%/sbin/munin-node"
+command_interpreter="%%PERL%%"
 pidfile=`awk '$1 == "pid_file" { print $2 }' $munin_node_config`
 
 load_rc_config $name
diff --git a/sysutils/munin-node/files/munin-sched.in b/sysutils/munin-node/files/munin-sched.in
index da980abf8e0e..488d3d205e67 100644
--- a/sysutils/munin-node/files/munin-sched.in
+++ b/sysutils/munin-node/files/munin-sched.in
@@ -21,7 +21,7 @@ rcvar=munin_sched_enable
 [ -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`
+pidfile=`awk '$1 == "pid_file" { gsub("node","sched",$2); print $2; }' $munin_sched_config`
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/sysutils/munin-node/files/patch-node__sbin__munin-node b/sysutils/munin-node/files/patch-node__sbin__munin-node
index 792c9a645408..cb411ce82779 100644
--- a/sysutils/munin-node/files/patch-node__sbin__munin-node
+++ b/sysutils/munin-node/files/patch-node__sbin__munin-node
@@ -1,15 +1,13 @@
---- node/sbin/munin-node.orig	2012-07-24 12:45:57.000000000 +0200
-+++ node/sbin/munin-node	2012-07-30 11:30:49.735734436 +0200
-@@ -53,8 +53,11 @@
-         $ENV{$key} =~ /^(.*)$/;
+--- node/sbin/munin-node.orig	2012-11-12 14:10:58.234196646 +0100
++++ node/sbin/munin-node	2012-11-12 14:11:19.591568597 +0100
+@@ -54,6 +54,10 @@
          $ENV{$key} = $1;
      }
+ 
 +    # plugins run in taint mode because the uid is changed, so the path
 +    # must not contain writable directories.
 +    $ENV{PATH}='/bin:/sbin:/usr/bin:/usr/sbin:%%PREFIX%%/bin:%%PREFIX%%/sbin';
- 
--    $0 =~ /([^\/]*)$/;
-+    $0 =~ /^(.*)$/;
-     $0 = $1;
- 
++
      parse_args();
+ 
+     my $config = Munin::Node::Config->instance();