ports/75885: [maintainer update] sysutils/munin-node 1.0.4 -> 1.0.5

Lupe Christoph lupe at lupe-christoph.de
Thu Jan 6 14:40:24 UTC 2005 

>Number:         75885
>Category:       ports
>Synopsis:       [maintainer update] sysutils/munin-node 1.0.4 -> 1.0.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 06 14:40:20 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Lupe Christoph
>Release:        FreeBSD 5.3-RELEASE i386
>Organization:
>Environment:
System: FreeBSD vmw-freebsd5.lupe-christoph.de 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Sun Nov 7 16:52:12 CET 2004 lupe at vmw-freebsd5.lupe-christoph.de:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	Update to support Munin 1.0.5.
	Upgrade FreeBSD4 support to rcNG.
	Use INSTALL_SCRIPT to install the start-stop script.
	Remove patches to support 6-CURRENT, Munin has that now in the tarball.
	Correct rcNG version of pkg-message, adding PREFIX.

	Files changed:
		Makefile
		distinfo
		files/munin-node.sh
		files/pkg-message
	Files removed:
		files/munin_node.sh
		files/patch-cpu.in
		files/patch-vmstat.in
		files/pkg-message.4
>How-To-Repeat:
	
>Fix:

	

--- munin-node-1.0.5.patch begins here ---
diff -ruN /usr/ports/sysutils/munin-node/Makefile munin-node-1.0.5/Makefile
--- /usr/ports/sysutils/munin-node/Makefile	Sat Dec 25 10:22:52 2004
+++ munin-node-1.0.5/Makefile	Thu Jan  6 13:05:14 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	munin
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	munin
@@ -37,22 +37,16 @@
 MAN5=		munin-node.conf.5
 MAN8=		munin-node-configure.8 munin-node.8 munin-run.8
 
-.if ${OSVERSION} < 500000
-PKGMSG=${FILESDIR}/pkg-message.4
-STARTSTOP_SRC=${FILESDIR}/munin-node.sh
-.else
 PKGMSG=${FILESDIR}/pkg-message
-STARTSTOP_SRC=${FILESDIR}/munin_node.sh
-.endif
-STARTSTOP_DST=${PREFIX}/etc/rc.d/munin-node.sh
+USE_RC_SUBR=	YES
 
 pre-install:
 	@${SED} 's@%%PREFIX%%@${PREFIX}@g' ${PKGMSG} > ${PKGMESSAGE}
 	@PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
 
 post-install:
-	@${SED} 's@%PREFIX%@${PREFIX}@g' ${STARTSTOP_SRC} > ${STARTSTOP_DST}
-	@${CHMOD} +x ${STARTSTOP_DST}
+	@${SED} -e 's@%%PREFIX%%@${PREFIX}@g' -e 's@%%RC_SUBR%%@${RC_SUBR}@g' ${FILESDIR}/munin-node.sh > ${WRKSRC}/munin-node.sh
+	${INSTALL_SCRIPT} ${WRKSRC}/munin-node.sh ${PREFIX}/etc/rc.d/munin-node.sh
 	${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf ${PREFIX}/etc/munin/munin-node.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/plugins.conf ${PREFIX}/etc/munin/plugin-conf.d/plugins.conf.sample
 	@if [ ! -f ${PREFIX}/etc/munin/plugin-conf.d/plugins.conf ]; then \
diff -ruN /usr/ports/sysutils/munin-node/distinfo munin-node-1.0.5/distinfo
--- /usr/ports/sysutils/munin-node/distinfo	Sat Dec 25 10:22:52 2004
+++ munin-node-1.0.5/distinfo	Thu Jan  6 13:05:24 2005
@@ -1,2 +1,2 @@
-MD5 (munin_1.0.4.tar.gz) = 00721181e1ff81be85ad89307457d998
-SIZE (munin_1.0.4.tar.gz) = 214902
+MD5 (munin_1.0.5.tar.gz) = bf9694f0ace0af91c848f92b764b46fa
+SIZE (munin_1.0.5.tar.gz) = 215578
diff -ruN /usr/ports/sysutils/munin-node/files/munin-node.sh munin-node-1.0.5/files/munin-node.sh
--- /usr/ports/sysutils/munin-node/files/munin-node.sh	Sat Dec 25 10:22:52 2004
+++ munin-node-1.0.5/files/munin-node.sh	Thu Jan  6 13:00:19 2005
@@ -1,32 +1,28 @@
 #!/bin/sh
+#
 
-PROGRAM=%PREFIX%/sbin/munin-node
-CONFIG=%PREFIX%/etc/munin/munin-node.conf
+# PROVIDE: munin-node
+# REQUIRE: DAEMON
+# BEFORE:  cron
+# KEYWORD: FreeBSD
 
-case "$1" in
-	start)
-		if [ -x $PROGRAM -a -f $CONFIG -a -d $PLUGINS ]; then
-			$PROGRAM --config $CONFIG && echo -n ' munin-node'
-		fi
-	;;
-
-	stop)
-		if [ -f $CONFIG ]; then
-			PIDFILE=`awk '$1 == "pid_file" { print $2 }' $CONFIG`
-			if [ -f $PIDFILE ]; then
-				PID=`cat $PIDFILE`
-				CMD=`ps -xa -o command -p $PID | sed 1d`
-				case "$CMD" in
-				*munin-node*)
-					/bin/kill $PID && echo -n ' munin-node'
-					;;
-				esac
-			fi
-		fi
-	;;
-
-	*)
-		echo "Usage: `basename $0` { start | stop }"
-		exit 64
-	;;
-esac
+#
+# Add the following lines to /etc/rc.conf to enable munin-node:
+# munin_node_enable (bool):      Set to "NO" by default.
+#                                Set it to "YES" to enable munin-node
+# munin_node_config (path):      Set to "%%PREFIX%%/etc/munin/munin-node.conf" by default.
+#
+
+. %%RC_SUBR%%
+
+name="munin_node"
+rcvar=`set_rcvar`
+
+[ -z "$munin_node_enable" ] && munin_node_enable="NO"
+[ -z "$munin_node_config" ] && munin_node_config="/usr/local/etc/munin/munin-node.conf"
+
+command="/usr/local/sbin/munin-node"
+pidfile=`awk '$1 == "pid_file" { print $2 }' $munin_node_config`
+
+load_rc_config $name
+run_rc_command "$1"
diff -ruN /usr/ports/sysutils/munin-node/files/munin_node.sh munin-node-1.0.5/files/munin_node.sh
--- /usr/ports/sysutils/munin-node/files/munin_node.sh	Tue Dec 14 02:44:54 2004
+++ munin-node-1.0.5/files/munin_node.sh	Thu Jan  1 01:00:00 1970
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-
-# PROVIDE: munin-node
-# REQUIRE: DAEMON
-# BEFORE:  cron
-# KEYWORD: FreeBSD
-
-#
-# Add the following lines to /etc/rc.conf to enable munin-node:
-# munin_node_enable (bool):      Set to "NO" by default.
-#                                Set it to "YES" to enable munin-node
-# munin_node_config (path):      Set to "%PREFIX%/etc/munin/munin-node.conf" by default.
-#
-
-. /etc/rc.subr
-
-name="munin_node"
-rcvar=`set_rcvar`
-
-[ -z "$munin_node_enable" ] && munin_node_enable="NO"
-[ -z "$munin_node_config" ] && munin_node_config="/usr/local/etc/munin/munin-node.conf"
-
-command="/usr/local/sbin/munin-node"
-pidfile=`awk '$1 == "pid_file" { print $2 }' $munin_node_config`
-
-load_rc_config $name
-run_rc_command "$1"
diff -ruN /usr/ports/sysutils/munin-node/files/patch-cpu.in munin-node-1.0.5/files/patch-cpu.in
--- /usr/ports/sysutils/munin-node/files/patch-cpu.in	Tue Dec 14 02:44:54 2004
+++ munin-node-1.0.5/files/patch-cpu.in	Thu Jan  1 01:00:00 1970
@@ -1,15 +0,0 @@
---- munin-1.0.4.orig/node/node.d.freebsd/cpu.in	Sun May  9 21:18:35 2004
-+++ munin-1.0.4/node/node.d.freebsd/cpu.in	Sat Nov 20 15:32:50 2004
-@@ -59,10 +59,10 @@
- 	OSV=`/sbin/sysctl -n kern.osrelease | cut -f1 -d.`
- 	if [ "$OSV" = "4" ]; then
- 		STATUNITS=`/sbin/sysctl -n kern.clockrate | cut -f16 -d' '`
--	elif [ "$OSV" = "5" ]; then
-+	elif [ "$OSV" -ge "5" ]; then
- 		STATUNITS=`/sbin/sysctl -n kern.clockrate | cut -f13 -d' '`
- 	fi
--#	PERCENT=`/sbin/sysctl -n hw.ncpu | awk '{print ($1)*100}'`
-+	PERCENT=`/sbin/sysctl -n hw.ncpu | awk '{print ($1)*100}'`
- 	SCALE=`echo 'scale=5;' $PERCENT/$STATUNITS | bc -q `
- 	NCPU=`/sbin/sysctl -n hw.ncpu`
- 	if [ "$scaleto100" = yes ]; then
diff -ruN /usr/ports/sysutils/munin-node/files/patch-vmstat.in munin-node-1.0.5/files/patch-vmstat.in
--- /usr/ports/sysutils/munin-node/files/patch-vmstat.in	Tue Dec 14 02:44:54 2004
+++ munin-node-1.0.5/files/patch-vmstat.in	Thu Jan  1 01:00:00 1970
@@ -1,29 +0,0 @@
---- munin-1.0.4.orig/node/node.d.freebsd/vmstat.in	Sun Feb  1 19:59:54 2004
-+++ munin-1.0.4/node/node.d.freebsd/vmstat.in	Sat Nov 20 14:14:54 2004
-@@ -32,7 +32,7 @@
- OSV=`/sbin/sysctl -n kern.osrelease | cut -f1 -d.`
- 
- if [ "$1" = "autoconf" ]; then
--	if [ "$OSV" = "5" ]; then
-+	if [ "$OSV" -ge "5" ]; then
- 		/sbin/sysctl -n vm.vmtotal 2>/dev/null >/dev/null
- 		RESULT=$?
- 		NAME=/sbin/sysctl
-@@ -59,7 +59,7 @@
- 	echo 'graph_title VMstat'
- 	echo 'graph_args --base 1000 -l 0'
- 	echo 'graph_vlabel process states'
--	if [ "$OSV" = "5" ]; then
-+	if [ "$OSV" -ge "5" ]; then
- 		echo 'running.label running'
- 		echo 'running.type GAUGE'
- 		echo 'diskwait.label diskwait'
-@@ -77,7 +77,7 @@
- 	exit 0
- fi
- 
--if [ "$OSV" = "5" ]; then
-+if [ "$OSV" -ge "5" ]; then
- 	sysctl -n vm.vmtotal | awk '
- /^Processes:/ {
- 	print "running.value", $3;
diff -ruN /usr/ports/sysutils/munin-node/files/pkg-message munin-node-1.0.5/files/pkg-message
--- /usr/ports/sysutils/munin-node/files/pkg-message	Sat Dec 25 10:22:53 2004
+++ munin-node-1.0.5/files/pkg-message	Thu Jan  6 13:04:48 2005
@@ -15,6 +15,6 @@
 Then, it will be started on the next boot. To start it now, use
 this command:
 
-    /etc/rc.d/munin_node start
+    %%PREFIX%%/etc/rc.d/munin-node.sh start
 ********************************************************************
 
diff -ruN /usr/ports/sysutils/munin-node/files/pkg-message.4 munin-node-1.0.5/files/pkg-message.4
--- /usr/ports/sysutils/munin-node/files/pkg-message.4	Tue Dec 14 02:44:54 2004
+++ munin-node-1.0.5/files/pkg-message.4	Thu Jan  1 01:00:00 1970
@@ -1,12 +0,0 @@
-
-********************************************************************
-Unless this file already existed, a sample configuration file
-has been placed in %%PREFIX%%/etc/munin/munin-node.conf.
-
-Please edit it according to your needs.
-
-The Munin client will be started at system boot automatically.
-You can start it manually with:
-    %%PREFIX%%/etc/rc.d/munin-node.sh start
-********************************************************************
-
--- munin-node-1.0.5.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list