[Midnightbsd-cvs] mports [16060] U trunk/sysutils/munin-node/files: upgrade munin to 2.0.17

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Mar 16 18:20:25 EDT 2014 

Revision: 16060
          http://svnweb.midnightbsd.org/mports/?rev=16060
Author:   laffer1
Date:     2014-03-16 18:20:24 -0400 (Sun, 16 Mar 2014)
Log Message:
-----------
upgrade munin to 2.0.17

Modified Paths:
--------------
    trunk/sysutils/munin-common/Makefile
    trunk/sysutils/munin-common/distinfo
    trunk/sysutils/munin-common/munin.mk
    trunk/sysutils/munin-master/Makefile
    trunk/sysutils/munin-node/Makefile
    trunk/sysutils/munin-node/distinfo
    trunk/sysutils/munin-node/files/munin-node.in
    trunk/sysutils/munin-node/files/munin-sched.in
    trunk/sysutils/munin-node/files/pkg-message.in

Removed Paths:
-------------
    trunk/sysutils/munin-node/files/patch-plugins__node.d__http_loadtime.in

Property Changed:
----------------
    trunk/sysutils/munin-common/munin.mk
    trunk/sysutils/munin-common/pkg-descr
    trunk/sysutils/munin-node/files/munin-node.in
    trunk/sysutils/munin-node/files/munin-sched.in
    trunk/sysutils/munin-node/files/patch-munin-node.conf.in
    trunk/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff
    trunk/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff
    trunk/sysutils/munin-node/files/patch-node__sbin__munin-node
    trunk/sysutils/munin-node/files/patch-node__sbin__munin-node-configure
    trunk/sysutils/munin-node/files/patch-node__sbin__munin-run
    trunk/sysutils/munin-node/files/patch-ntp_offset.in
    trunk/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in
    trunk/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in
    trunk/sysutils/munin-node/files/patch-plugins__node.d__processes.in
    trunk/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in
    trunk/sysutils/munin-node/files/pkg-message.in
    trunk/sysutils/munin-node/files/plugins.conf

Modified: trunk/sysutils/munin-common/Makefile
===================================================================
--- trunk/sysutils/munin-common/Makefile	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-common/Makefile	2014-03-16 22:20:24 UTC (rev 16060)
@@ -8,6 +8,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Common components between a munin node and server
+
 LICENSE=	gpl2
 
 BUILD_DEPENDS=	p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build \
@@ -37,6 +38,6 @@
 	@(cd ${WRKSRC}/common/blib/libdoc && for man in ${MAN3} ; do \
 		${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \
 	done)
-	${REINPLACE_CMD} -e 's|${FAKE_DESTDIR}||g' ${FAKE_DESTDIR}${TRUE_PREFIX}/lib/perl5/site_perl/5.14.2/Munin/Common/Defaults.pm
+	${REINPLACE_CMD} -e 's|${FAKE_DESTDIR}||g' ${FAKE_DESTDIR}${TRUE_PREFIX}/lib/perl5/site_perl/${PERL_VER}/Munin/Common/Defaults.pm
 
 .include <bsd.port.mk>

Modified: trunk/sysutils/munin-common/distinfo
===================================================================
--- trunk/sysutils/munin-common/distinfo	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-common/distinfo	2014-03-16 22:20:24 UTC (rev 16060)
@@ -1,2 +1,2 @@
-SHA256 (munin-2.0.11.1.tar.gz) = 89ac6a46e82471206c37ed11a9fe2023cbf4c7482517f70a67d5aa5f32366c18
-SIZE (munin-2.0.11.1.tar.gz) = 1331839
+SHA256 (munin-2.0.17.tar.gz) = cfcc5bf3f8e568574ce897af7c17cc160def280e1ac63cd0796ca300ffef439e
+SIZE (munin-2.0.17.tar.gz) = 1334184

Modified: trunk/sysutils/munin-common/munin.mk
===================================================================
--- trunk/sysutils/munin-common/munin.mk	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-common/munin.mk	2014-03-16 22:20:24 UTC (rev 16060)
@@ -1,5 +1,5 @@
-MUNIN_VERSION=	2.0.11.1
-MUNIN_SITES=	SF/${PORTNAME}/stable/2.0.11
+MUNIN_VERSION=	2.0.17
+MUNIN_SITES=	SF/${PORTNAME}/stable/${MUNIN_VERSION}
 MUNIN_DISTINFO=	${PORTSDIR}/sysutils/munin-common/distinfo
 MUNIN_PATCHES=	${PORTSDIR}/sysutils/munin-common/files/patch-Makefile \
 		${PORTSDIR}/sysutils/munin-common/files/patch-Makefile.config


Property changes on: trunk/sysutils/munin-common/munin.mk
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/sysutils/munin-common/pkg-descr
===================================================================
--- trunk/sysutils/munin-common/pkg-descr	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-common/pkg-descr	2014-03-16 22:20:24 UTC (rev 16060)

Property changes on: trunk/sysutils/munin-common/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/sysutils/munin-master/Makefile
===================================================================
--- trunk/sysutils/munin-master/Makefile	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-master/Makefile	2014-03-16 22:20:24 UTC (rev 16060)
@@ -8,6 +8,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Collector part of Munin
+
 LICENSE=	gpl2
 
 BUILD_DEPENDS=	p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build \

Modified: trunk/sysutils/munin-node/Makefile
===================================================================
--- trunk/sysutils/munin-node/Makefile	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/Makefile	2014-03-16 22:20:24 UTC (rev 16060)
@@ -2,7 +2,6 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
-PORTREVISION=	2
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-node
@@ -9,6 +8,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Node-specific part of Munin
+
 LICENSE=	gpl2
 
 BUILD_DEPENDS=	p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build \

Modified: trunk/sysutils/munin-node/distinfo
===================================================================
--- trunk/sysutils/munin-node/distinfo	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/distinfo	2014-03-16 22:20:24 UTC (rev 16060)
@@ -1,2 +1,2 @@
-SHA256 (munin-2.0.11.1.tar.gz) = 89ac6a46e82471206c37ed11a9fe2023cbf4c7482517f70a67d5aa5f32366c18
-SIZE (munin-2.0.11.1.tar.gz) = 1331839
+SHA256 (munin-2.0.17.tar.gz) = cfcc5bf3f8e568574ce897af7c17cc160def280e1ac63cd0796ca300ffef439e
+SIZE (munin-2.0.17.tar.gz) = 1334184

Modified: trunk/sysutils/munin-node/files/munin-node.in
===================================================================
--- trunk/sysutils/munin-node/files/munin-node.in	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/files/munin-node.in	2014-03-16 22:20:24 UTC (rev 16060)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $MidnightBSD$
+# $FreeBSD$
 #
 # PROVIDE: munin-node
 # REQUIRE: DAEMON
@@ -15,7 +15,7 @@
 
 . /etc/rc.subr
 
-name="munin_node"
+name=munin_node
 rcvar=munin_node_enable
 
 load_rc_config $name
@@ -24,7 +24,7 @@
 : ${munin_node_config="%%PREFIX%%/etc/munin/munin-node.conf"}
 
 command="%%PREFIX%%/sbin/munin-node"
-command_interpreter="/usr/bin/perl"
+command_interpreter="%%PREFIX%%/bin/perl"
 start_precmd=find_pidfile
 status_precmd=find_pidfile
 stop_precmd=find_pidfile
@@ -31,12 +31,8 @@
 
 find_pidfile()
 {
-	if type get_pidfile_from_conf >/dev/null 2>&1 &&
-		get_pidfile_from_conf pid_file $munin_node_config; then
-	    pidfile="$_pidfile_from_conf"
-	else
-	    pidfile=`awk '$1 == "pid_file" { print $2 }' $munin_node_config`
-	fi
+	get_pidfile_from_conf pid_file $munin_node_config
+	pidfile="$_pidfile_from_conf"
 }
 
-run_rc_command "$1"
+run_rc_command $1


Property changes on: trunk/sysutils/munin-node/files/munin-node.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/sysutils/munin-node/files/munin-sched.in
===================================================================
--- trunk/sysutils/munin-node/files/munin-sched.in	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/files/munin-sched.in	2014-03-16 22:20:24 UTC (rev 16060)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $MidnightBSD$
+# $FreeBSD$
 #
 # PROVIDE: munin-sched
 # REQUIRE: DAEMON
@@ -15,7 +15,7 @@
 
 . /etc/rc.subr
 
-name="munin_sched"
+name=munin_sched
 rcvar=munin_sched_enable
 
 load_rc_config $name
@@ -30,13 +30,9 @@
 
 find_pidfile()
 {
-	if type get_pidfile_from_conf >/dev/null 2>&1 &&
-		get_pidfile_from_conf pid_file $munin_node_config; then
-	    pidfile="${_pidfile_from_conf%node*}sched"
-	    pidfile="${pidfile}${_pidfile_from_conf#*node}"
-	else
-	    pidfile=`awk '$1 == "pid_file" { gsub("node","sched",$2); print $2; }' $munin_sched_config`
-	fi
+	get_pidfile_from_conf pid_file $munin_sched_config
+	pidfile="${_pidfile_from_conf%node*}sched"
+	pidfile="${pidfile}${_pidfile_from_conf#*node}"
 }
 
 run_rc_command "$1"


Property changes on: trunk/sysutils/munin-node/files/munin-sched.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/munin-node/files/patch-munin-node.conf.in
===================================================================
--- trunk/sysutils/munin-node/files/patch-munin-node.conf.in	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/files/patch-munin-node.conf.in	2014-03-16 22:20:24 UTC (rev 16060)

Property changes on: trunk/sysutils/munin-node/files/patch-munin-node.conf.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff
===================================================================
--- trunk/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff	2014-03-16 22:20:24 UTC (rev 16060)

Property changes on: trunk/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff
===================================================================
--- trunk/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff	2014-03-16 22:20:24 UTC (rev 16060)

Property changes on: trunk/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/munin-node/files/patch-node__sbin__munin-node
===================================================================
--- trunk/sysutils/munin-node/files/patch-node__sbin__munin-node	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/files/patch-node__sbin__munin-node	2014-03-16 22:20:24 UTC (rev 16060)

Property changes on: trunk/sysutils/munin-node/files/patch-node__sbin__munin-node
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/munin-node/files/patch-node__sbin__munin-node-configure
===================================================================
--- trunk/sysutils/munin-node/files/patch-node__sbin__munin-node-configure	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/files/patch-node__sbin__munin-node-configure	2014-03-16 22:20:24 UTC (rev 16060)

Property changes on: trunk/sysutils/munin-node/files/patch-node__sbin__munin-node-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/munin-node/files/patch-node__sbin__munin-run
===================================================================
--- trunk/sysutils/munin-node/files/patch-node__sbin__munin-run	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/files/patch-node__sbin__munin-run	2014-03-16 22:20:24 UTC (rev 16060)

Property changes on: trunk/sysutils/munin-node/files/patch-node__sbin__munin-run
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/munin-node/files/patch-ntp_offset.in
===================================================================
--- trunk/sysutils/munin-node/files/patch-ntp_offset.in	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/files/patch-ntp_offset.in	2014-03-16 22:20:24 UTC (rev 16060)

Property changes on: trunk/sysutils/munin-node/files/patch-ntp_offset.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in
===================================================================
--- trunk/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in	2014-03-16 22:20:24 UTC (rev 16060)

Property changes on: trunk/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in
===================================================================
--- trunk/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in	2014-03-16 22:20:24 UTC (rev 16060)

Property changes on: trunk/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/sysutils/munin-node/files/patch-plugins__node.d__http_loadtime.in
===================================================================
--- trunk/sysutils/munin-node/files/patch-plugins__node.d__http_loadtime.in	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/files/patch-plugins__node.d__http_loadtime.in	2014-03-16 22:20:24 UTC (rev 16060)
@@ -1,11 +0,0 @@
---- ./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
- 

Index: trunk/sysutils/munin-node/files/patch-plugins__node.d__processes.in
===================================================================
--- trunk/sysutils/munin-node/files/patch-plugins__node.d__processes.in	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/files/patch-plugins__node.d__processes.in	2014-03-16 22:20:24 UTC (rev 16060)

Property changes on: trunk/sysutils/munin-node/files/patch-plugins__node.d__processes.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in
===================================================================
--- trunk/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in	2014-03-16 22:20:24 UTC (rev 16060)

Property changes on: trunk/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/sysutils/munin-node/files/pkg-message.in
===================================================================
--- trunk/sysutils/munin-node/files/pkg-message.in	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/files/pkg-message.in	2014-03-16 22:20:24 UTC (rev 16060)
@@ -17,3 +17,10 @@
 
     %%PREFIX%%/etc/rc.d/munin-node start
 ********************************************************************
+
+For a list of plugins that will probably work run
+%%PREFIX%%/sbin/munin-node-configure --suggest
+
+If this is a fresh install run
+%%PREFIX%%/sbin/munin-node-configure --shell | sh -x
+to install the plugins automatically


Property changes on: trunk/sysutils/munin-node/files/pkg-message.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Index: trunk/sysutils/munin-node/files/plugins.conf
===================================================================
--- trunk/sysutils/munin-node/files/plugins.conf	2014-03-16 22:17:23 UTC (rev 16059)
+++ trunk/sysutils/munin-node/files/plugins.conf	2014-03-16 22:20:24 UTC (rev 16060)

Property changes on: trunk/sysutils/munin-node/files/plugins.conf
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property

More information about the Midnightbsd-cvs mailing list