[pkgsrc/trunk]: pkgsrc/sysutils/munin-node Make sure /var/run/munin gets crea...

[he <he%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6d6d3a976271
branches:  trunk
changeset: 515200:6d6d3a976271
user:      he <he%pkgsrc.org@localhost>
date:      Tue Jun 27 13:05:49 2006 +0000

description:
Make sure /var/run/munin gets created on restart; /var/run is cleaned
out by NetBSD's rc.d scripts.  Also make STATEDIR overridable.
Bump revision to 2.

diffstat:

 sysutils/munin-node/Makefile            |  10 +++++++---
 sysutils/munin-node/files/munin-node.sh |   8 ++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diffs (62 lines):

diff -r 8d15a3a52a41 -r 6d6d3a976271 sysutils/munin-node/Makefile
--- a/sysutils/munin-node/Makefile      Tue Jun 27 12:27:06 2006 +0000
+++ b/sysutils/munin-node/Makefile      Tue Jun 27 13:05:49 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/06/09 13:22:44 he Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/27 13:05:49 he Exp $
 #
 
 DISTNAME=      munin_${VER}
@@ -6,7 +6,7 @@
 PKGNAME=       munin-node-${VER}
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=munin/}
-PKGREVISION=   1
+PKGREVISION=   2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://munin.sourceforge.net/
@@ -28,7 +28,8 @@
 PKG_GROUPS=    ${MUNIN_GROUP}
 PKG_USERS=     ${MUNIN_USER}:${MUNIN_GROUP}::Munin\\ user
 
-STATEDIR=      ${VARBASE}/munin/plugin-state
+STATEDIR?=     ${VARBASE}/munin/plugin-state
+MUNIN_RUN?=    ${VARBASE}/run/munin
 
 MAKE_DIRS=     ${VARBASE}/munin
 MAKE_DIRS+=    ${VARBASE}/run/munin
@@ -57,6 +58,9 @@
 FILES_SUBST+=  PERL=${PERL5:Q}
 FILES_SUBST+=  PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 FILES_SUBST+=  STATEDIR=${STATEDIR}
+FILES_SUBST+=  MUNIN_RUN=${MUNIN_RUN:Q}
+FILES_SUBST+=  MUNIN_USER=${MUNIN_USER:Q}
+FILES_SUBST+=  MUNIN_GROUP=${MUNIN_GROUP:Q}
 
 MESSAGE_SUBST+=        VARBASE=${VARBASE:Q}
 
diff -r 8d15a3a52a41 -r 6d6d3a976271 sysutils/munin-node/files/munin-node.sh
--- a/sysutils/munin-node/files/munin-node.sh   Tue Jun 27 12:27:06 2006 +0000
+++ b/sysutils/munin-node/files/munin-node.sh   Tue Jun 27 13:05:49 2006 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: munin-node.sh,v 1.1.1.1 2006/06/04 20:53:57 he Exp $
+# $NetBSD: munin-node.sh,v 1.2 2006/06/27 13:05:49 he Exp $
 #
 # PROVIDE: munin-node
 # REQUIRE: DAEMON
@@ -24,7 +24,11 @@
 
 if [ ! -d @STATEDIR@ ]; then
        mkdir @STATEDIR@
-       chown munin:munin /var/run/munin
+       chown @MUNIN_USER@:@MUNIN_GROUP@ @STATEDIR@
+fi
+if [ ! -d @MUNIN_RUN@ ]; then
+       mkdir @MUNIN_RUN@
+       chown @MUNIN_USER@:@MUNIN_GROUP@ @MUNIN_RUN@
 fi
 
 if [ -f /etc/rc.subr ]; then