- bugfix update to 2.0.21

- move MESSAGE-* to README-*
 - enable memory plugin from NetBSD
 - disable FreeBSD's iostat plugin

With input from rpe@ and tweaks from sthen@. Thanks!
OK sthen@

net/munin/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.30 2013/03/11 11:35:49 espie Exp $
+# $OpenBSD: Makefile,v 1.31 2013/03/22 15:00:29 kirby Exp $
 
 COMMENT-main =	flexible network host monitoring, client
 COMMENT-server =flexible network host monitoring, server
 
-V =		2.0.10
+V =		2.0.12
 DISTNAME =	munin-$V
 PKGNAME-main =	munin-node-$V
 PKGNAME-server =munin-server-$V
@@ -70,9 +70,10 @@ SUBST_LIST += ${FILESDIR}/$i ${WRKSRC}/plugins/node.d.openbsd/$i.in
 post-extract:
 	cp -Rp ${WRKSRC}/plugins/node.d.freebsd ${WRKSRC}/plugins/node.d.openbsd
 	cp -p ${WRKSRC}/plugins/node.d.netbsd/uptime.in ${WRKSRC}/plugins/node.d.openbsd
+	cp -p ${WRKSRC}/plugins/node.d.netbsd/memory.in ${WRKSRC}/plugins/node.d.openbsd
 	${SUBST_CMD} -c ${SUBST_LIST}
 	chmod -R +x ${WRKSRC}/plugins/node.d.openbsd
-	rm ${WRKSRC}/plugins/node.d.openbsd/memory.in # not yet ported
+	rm ${WRKSRC}/plugins/node.d.openbsd/iostat.in # not yet ported
 
 # Fixup hardcoded paths in plugins to use TRUEPREFIX/LOCALBASE as appropriate,
 # there are far too many to handle this via patches/SUBST_CMD, and this method

net/munin/distinfo

@@ -1,2 +1,2 @@
-SHA256 (munin-2.0.10.tar.gz) = ulM5YHpYSuX6XCo13kUvAkV06iVY695KT+7pXx/yGa8=
-SIZE (munin-2.0.10.tar.gz) = 1330859
+SHA256 (munin-2.0.12.tar.gz) = BkE5q2Ja+IT4fxtY9gCBVISLYuYTUu1ixiJkCR7CuAk=
+SIZE (munin-2.0.12.tar.gz) = 1331986

net/munin/pkg/MESSAGE-main

@@ -1,7 +0,0 @@
-Install p5-Net-SNMP to use the optional SNMP-based monitors.
-
-Before starting munin-node, you should create symlinks in
-${SYSCONFDIR}/munin/plugins as described in the manual (manually or
-using the output from munin-node-configure --shell), adapt
-${SYSCONFDIR}/munin/munin-node.conf if necessary (e.g. if a remote
-server will query this node).

net/munin/pkg/MESSAGE-server

@@ -1,5 +0,0 @@
-After configuring at least one munin-node instance and adapting
-${SYSCONFDIR}/munin/munin.conf as desired, you may run the periodic
-tasks from cron with the following line:
-
-*/5     *       *       *       *       sudo -u _munin /usr/local/bin/munin-cron

net/munin/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.12 2013/01/18 12:23:24 gonzalo Exp $
+@comment $OpenBSD: PLIST-main,v 1.13 2013/03/22 15:00:29 kirby Exp $
 @newgroup _munin:644
 @newgroup _munin-plugin:645
 @newuser _munin:644:_munin:daemon:munin user:/nonexistent:/sbin/nologin
@@ -121,7 +121,6 @@ libexec/munin/plugins/if_errcoll_
 libexec/munin/plugins/if_pps_
 libexec/munin/plugins/ifx_concurrent_sessions_
 libexec/munin/plugins/intr
-libexec/munin/plugins/iostat
 @comment libexec/munin/plugins/ipac-ng
 libexec/munin/plugins/ipmi_
 libexec/munin/plugins/ipmi_sensor_
@@ -133,6 +132,7 @@ libexec/munin/plugins/mailman
 libexec/munin/plugins/mailscanner
 @comment libexec/munin/plugins/mbmon_
 libexec/munin/plugins/memcached_
+libexec/munin/plugins/memory
 libexec/munin/plugins/mhttping
 libexec/munin/plugins/multiping
 libexec/munin/plugins/multips
@@ -321,6 +321,7 @@ sbin/munin-run
 sbin/munin-sched
 share/doc/munin/
 share/doc/munin/UPGRADING
+share/doc/pkg-readmes/${FULLPKGNAME}
 share/examples/munin/munin-node.conf
 @sample ${SYSCONFDIR}/munin/munin-node.conf
 share/examples/munin/plugin-conf.d/

net/munin/pkg/PLIST-server

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-server,v 1.4 2012/10/12 09:46:46 kirby Exp $
+@comment $OpenBSD: PLIST-server,v 1.5 2013/03/22 15:00:29 kirby Exp $
 @extraunexec rm -rf /var/www/htdocs/munin/*
 @extraunexec rm -rf /var/db/munin/*
 @owner www
@@ -31,6 +31,7 @@ share/examples/munin/munin-cgi-graph.log
 share/examples/munin/munin-cgi-html.log
 @sample /var/log/munin/munin-cgi-html.log
 @owner
+share/doc/pkg-readmes/${FULLPKGNAME}
 share/examples/munin/munin-conf.d/
 @sample ${SYSCONFDIR}/munin/munin-conf.d/
 share/examples/munin/munin.conf

net/munin/pkg/README-main

@@ -0,0 +1,34 @@
+$OpenBSD: README-main,v 1.1 2013/03/22 15:00:29 kirby Exp $
+
++-----------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-----------------------------------------------------------------------
+
+munin-node is the "client" side of Munin; it runs on various hosts and
+accepts requests from a munin-server, and invokes various plugins to
+provide statistics about the host.
+
+Before starting munin-node, you will need to configure access controls
+and choose which plugins to use.
+
+Access controls are configured in ${SYSCONFDIR}/munin/munin-node.conf.
+
+Plugins are enabled by creating symlinks in ${SYSCONFDIR}/munin/plugins.
+Run "munin-node-configure --shell" to output a set of shell commands to
+enable plugins which can be auto-detected. (These commands are not run
+automatically, so you can easily choose which you would like to enable).
+
+Some plugins require access to log files which are normally readable only
+by root (a common example is /var/log/maillog), but by default the
+plugins are run by the "_munin-plugin" user.
+
+You can change permissions and ownership of the log files (and edit
+/etc/newsyslog.conf to match). If necessary you can configure the plugin
+to run as a different user with the "user" option (see
+${SYSCONFDIR}/munin/plugin-conf.d/openbsd-packages).
+
+SNMP-based monitors are also available; to use these, install the
+p5-Net-SNMP package.
+
+For further information, see
+http://munin-monitoring.org/wiki/Documentation

net/munin/pkg/README-server

@@ -0,0 +1,11 @@
+$OpenBSD: README-server,v 1.1 2013/03/22 15:00:29 kirby Exp $
+
++-----------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-----------------------------------------------------------------------
+
+After configuring at least one munin-node instance and adapting
+$SYSCONFDIR}/munin/munin.conf as desired, you may run the periodic
+tasks from cron with the following line:
+
+*/5     *       *       *       *       sudo -u _munin ${TRUEPRIFIX}/bin/munin-cron