3 files changed, 9 insertions, 10 deletions
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();