6 files changed, 23 insertions, 12 deletions

diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index 3642f294808c..a5dab22b9e4a 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	1.4.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION}
 PKGNAMESUFFIX=	-node
diff --git a/sysutils/munin-node/files/patch-node-node.d.freebsd-coretemp.diff b/sysutils/munin-node/files/patch-node-node.d.freebsd-coretemp.diff
index 30e4328cdf7e..72eecbc63e3b 100644
--- a/sysutils/munin-node/files/patch-node-node.d.freebsd-coretemp.diff
+++ b/sysutils/munin-node/files/patch-node-node.d.freebsd-coretemp.diff
@@ -1,11 +1,11 @@
---- plugins/node.d.freebsd/coretemp.in.orig	2009-04-01 14:24:27.000000000 +0200
-+++ plugins/node.d.freebsd/coretemp.in	2010-12-02 11:21:05.512573734 +0100
+--- ./plugins/node.d.freebsd/coretemp.in.orig	2011-02-14 23:51:14.000000000 +0100
++++ ./plugins/node.d.freebsd/coretemp.in	2011-02-14 23:52:10.000000000 +0100
 @@ -75,7 +75,7 @@
  	reqcpus
  	for cpu in $cpus ; do
  		echo -n "CPU$cpu.value "
 -		sysctl -n dev.cpu.$cpu.temperature
-+		sysctl -n dev.cpu.$cpu.temperature | tr -cd '0-9.'
++		sysctl -n dev.cpu.$cpu.temperature | tr -d 'C'
  	done
  }
  
diff --git a/sysutils/munin-node/files/patch-node-node.d.freebsd-dev_cpu_.diff b/sysutils/munin-node/files/patch-node-node.d.freebsd-dev_cpu_.diff
index b474d1bc40ac..34ed23fb9217 100644
--- a/sysutils/munin-node/files/patch-node-node.d.freebsd-dev_cpu_.diff
+++ b/sysutils/munin-node/files/patch-node-node.d.freebsd-dev_cpu_.diff
@@ -1,11 +1,11 @@
---- plugins/node.d.freebsd/dev_cpu_.in.orig	2009-09-16 12:04:17.000000000 +0200
-+++ plugins/node.d.freebsd/dev_cpu_.in	2010-12-02 11:22:28.183558536 +0100
+--- ./plugins/node.d.freebsd/dev_cpu_.in.orig	2011-02-15 00:02:38.000000000 +0100
++++ ./plugins/node.d.freebsd/dev_cpu_.in	2011-02-15 00:03:19.000000000 +0100
 @@ -109,7 +109,7 @@
  	reqcpus
  	for cpu in $cpus ; do
  		echo -n "CPU$cpu.value "
 -		sysctl -n "dev.cpu.$cpu.$func"
-+		sysctl -n "dev.cpu.$cpu.$func" | tr -cd '0-9.'
++		sysctl -n "dev.cpu.$cpu.$func" | tr -d 'C'
  	done
  }
  
diff --git a/sysutils/munin-node/files/patch-plugins__node.d__http_loadtime.in b/sysutils/munin-node/files/patch-plugins__node.d__http_loadtime.in
new file mode 100644
index 000000000000..8b12252f6e71
--- /dev/null
+++ b/sysutils/munin-node/files/patch-plugins__node.d__http_loadtime.in
@@ -0,0 +1,11 @@
+--- ./plugins/node.d/http_loadtime.in.orig	2011-02-14 23:59:36.000000000 +0100
++++ ./plugins/node.d/http_loadtime.in	2011-02-14 23:59:56.000000000 +0100
+@@ -55,7 +55,7 @@
+     exit 0
+ fi
+ 
+-TMPDIR=`mktemp -d` || exit 1
++TMPDIR=`mktemp -d /tmp/munin.http_loadtime.XXXXXX` || exit 1
+ 
+ trap "rm -rf $TMPDIR" EXIT
+ 
diff --git a/sysutils/munin-node/pkg-deinstall b/sysutils/munin-node/pkg-deinstall
index 358fae50e416..cc61d62e58f9 100644
--- a/sysutils/munin-node/pkg-deinstall
+++ b/sysutils/munin-node/pkg-deinstall
@@ -51,14 +51,14 @@ delete_crontab_entries() {
 
 delnewsyslog() {
     tmp="/etc/#munin-node$$"
-    sed -e '/^\/var\/log\/munin-node.log[ 	]/d' /etc/newsyslog.conf >${tmp}
+    sed -e '/^\/var\/log\/munin\/munin-node.log[ 	]/d' /etc/newsyslog.conf >${tmp}
     cat ${tmp} > /etc/newsyslog.conf
     rm ${tmp}
 }
 
 newsyslog() {
-    ENTRY=`grep /var/log/munin-node.log /etc/newsyslog.conf`
-    DEFAULT='/var/log/munin-node.log			644  7	   *	@T00  Z	/var/run/munin/munin-node.pid'
+    ENTRY=`grep /var/log/munin/munin-node.log /etc/newsyslog.conf`
+    DEFAULT='/var/log/munin/munin-node.log			644  7	   *	@T00  Z	/var/run/munin/munin-node.pid'
     if [ -z "$ENTRY" ]; then
 	exit 0
     elif [ "$ENTRY" = "$DEFAULT" ]; then
diff --git a/sysutils/munin-node/pkg-install b/sysutils/munin-node/pkg-install
index 3b5fd90ff602..844291440b42 100644
--- a/sysutils/munin-node/pkg-install
+++ b/sysutils/munin-node/pkg-install
@@ -66,11 +66,11 @@ EOT
 
 newsyslog() {
     if yesno "Would you like me to set up log rotation" y; then
-	if grep -q /var/log/munin-node.log /etc/newsyslog.conf; then
+	if grep -q /var/log/munin/munin-node.log /etc/newsyslog.conf; then
 	    :
 	else
 	    cat >> /etc/newsyslog.conf <<EOT
-/var/log/munin-node.log			644  7	   *	@T00  Z	/var/run/munin/munin-node.pid
+/var/log/munin/munin-node.log			644  7	   *	@T00  Z	/var/run/munin/munin-node.pid
 EOT
 	fi
 	if [ -f ${PKG_PREFIX}/bin/munin-node-revive ]; then