Update munin packages to 1.3.2, latest development release

with fixes from the stable branch.

Changes since previous version:

This release implements proper TLS support, as well as all the
bugfixes from the 1.2 stable series.

pkgsrc changes:

* Fixed many pkglint warnings.
* Install munin.conf and munin-node.conf as ${INSTALL_DATA} not
  ${INSTALL_SCRIPT}, I couldn't see any reason why those were
  installed as scripts.
* Added VARBASE into BUILD_DEFS, as suggested by pkglint.

4 files changed, 14 insertions, 12 deletions

diff --git a/sysutils/munin-node/MESSAGE b/sysutils/munin-node/MESSAGE
index f6e21a5ce49..71df9d5c4fa 100644
--- a/sysutils/munin-node/MESSAGE
+++ b/sysutils/munin-node/MESSAGE
@@ -1,9 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2006/06/09 13:22:44 he Exp $
+$NetBSD: MESSAGE,v 1.3 2006/12/05 14:53:32 xtraeme Exp $
 
 Plugins can be auto-configured with "munin-node-configure --shell | sh"
 
-
 You may also want to add an entry such as
 
 ${VARBASE}/log/munin/munin-node.log   munin:munin 644 7 *    24   Z
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index 99e3dd121ab..7a023922a87 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2006/07/21 23:28:37 abs Exp $
+# $NetBSD: Makefile,v 1.8 2006/12/05 14:53:32 xtraeme Exp $
 #
 
 DISTNAME=	munin_${VER}
-VER=		1.3.1
+VER=		1.3.2
 PKGNAME=	munin-node-${VER}
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=munin/}
-PKGREVISION=	4
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://munin.sourceforge.net/
@@ -16,7 +15,7 @@ DEPENDS+=	p5-Net-Server>=0:../../net/p5-Net-Server
 DEPENDS+=	p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay
 DEPENDS+=	munin-doc>=1.3.1:../../sysutils/munin-doc
 
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	perl:run tar
 USE_TOOLS+=	gmake
 USE_PKGINSTALL=	YES
 
@@ -67,6 +66,8 @@ FILES_SUBST+=	MUNIN_GROUP=${MUNIN_GROUP:Q}
 
 MESSAGE_SUBST+=	VARBASE=${VARBASE:Q}
 
+BUILD_DEFS+=	VARBASE
+
 RCD_SCRIPTS+=	munin-node
 
 EGDIR=		${PREFIX}/share/examples/munin
@@ -79,7 +80,7 @@ pre-configure:
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/build/node/munin-node.conf ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf ${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
 .include "../../lang/python/application.mk"
diff --git a/sysutils/munin-node/PLIST b/sysutils/munin-node/PLIST
index ca5380e7f68..718763422bf 100644
--- a/sysutils/munin-node/PLIST
+++ b/sysutils/munin-node/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/11/19 10:02:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/12/05 14:53:32 xtraeme Exp $
 lib/munin/plugins/acpi
 lib/munin/plugins/amavis
 lib/munin/plugins/apache_accesses
@@ -40,6 +40,7 @@ lib/munin/plugins/load
 lib/munin/plugins/loggrep
 lib/munin/plugins/mailman
 lib/munin/plugins/mailscanner
+lib/munin/plugins/mbmon_
 lib/munin/plugins/memory
 lib/munin/plugins/memory_pools
 lib/munin/plugins/memory_types
@@ -81,6 +82,7 @@ lib/munin/plugins/sendmail_mailstats
 lib/munin/plugins/sendmail_mailtraffic
 lib/munin/plugins/sensors_
 lib/munin/plugins/smart_
+lib/munin/plugins/snmp__cpuload
 lib/munin/plugins/snmp__df
 lib/munin/plugins/snmp__fc_if_
 lib/munin/plugins/snmp__fc_if_err_
diff --git a/sysutils/munin-node/distinfo b/sysutils/munin-node/distinfo
index a25bbcd0db5..62d13d2b73d 100644
--- a/sysutils/munin-node/distinfo
+++ b/sysutils/munin-node/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2006/11/19 10:02:09 wiz Exp $
+$NetBSD: distinfo,v 1.4 2006/12/05 14:53:32 xtraeme Exp $
 
-SHA1 (munin_1.3.1.tar.gz) = f7783b645abbb25524c3f1b6e0fe27185f1de3db
-RMD160 (munin_1.3.1.tar.gz) = a6ea4e1839f4c787457e4051d55007b7bcebd1d4
-Size (munin_1.3.1.tar.gz) = 315743 bytes
+SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a
+RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4
+Size (munin_1.3.2.tar.gz) = 309319 bytes
 SHA1 (patch-aa) = df9b128721166912c086a54b29b7971a00581ea0
 SHA1 (patch-ab) = bb0f63cdef893d8c224cdd03a4a4125d03f85f80
 SHA1 (patch-ac) = 9ef503b4d20f65e990c332c7789188a6fbad618e