Hello.
This is a bugfix update for munin to 2.0.21.
While here I moved munin-async to munin-node package where it belongs and
added munin-asyncd rc script.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/munin/Makefile,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 Makefile
--- Makefile 25 Mar 2014 08:42:25 -0000 1.38
+++ Makefile 29 May 2014 17:29:53 -0000
@@ -3,7 +3,7 @@
COMMENT-main = flexible network host monitoring, client
COMMENT-server =flexible network host monitoring, server
-V = 2.0.19
+V = 2.0.21
DISTNAME = munin-$V
PKGNAME-main = munin-node-$V
PKGNAME-server =munin-server-$V
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/munin/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo 25 Mar 2014 08:42:25 -0000 1.12
+++ distinfo 29 May 2014 17:29:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (munin-2.0.19.tar.gz) = E9ubANQyuSkH1h+fK9GMKq/KA7Km4lciL/8Xqk7QKJY=
-SIZE (munin-2.0.19.tar.gz) = 1335496
+SHA256 (munin-2.0.21.tar.gz) = dq1mAnBvNEnnJ62/w1AU6bQZOzaRpcoDLVqNeOntJZs=
+SIZE (munin-2.0.21.tar.gz) = 1336783
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/net/munin/patches/patch-Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-Makefile
--- patches/patch-Makefile 18 Dec 2013 14:17:32 -0000 1.7
+++ patches/patch-Makefile 29 May 2014 17:29:53 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.7 2013/12/18 14:17:32 kirby Exp $
---- Makefile.orig Wed Nov 13 00:13:23 2013
-+++ Makefile Tue Dec 3 15:15:23 2013
+--- Makefile.orig Sat Mar 29 01:25:57 2014
++++ Makefile Wed Apr 2 15:53:34 2014
@@ -72,7 +72,6 @@ install-pre: Makefile Makefile.config
mkdir -p $(STATEDIR)
mkdir -p $(SPOOLDIR)
@@ -45,77 +45,7 @@ $OpenBSD: patch-Makefile,v 1.7 2013/12/1
$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
-@@ -254,38 +253,37 @@ build/%: %.in
- build-common-prime: build-common-pre
common/blib/lib/Munin/Common/Defaults.pm build-common
-
- substitue-confvar-inline:
-- @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \
-- -e 's|@@CONFDIR@@|$(CONFDIR)|g' \
-- -e 's|@@BINDIR@@|$(BINDIR)|g' \
-- -e 's|@@SBINDIR@@|$(SBINDIR)|g' \
-- -e 's|@@DOCDIR@@|$(DOCDIR)|g' \
-- -e 's|@@LIBDIR@@|$(LIBDIR)|g' \
-- -e 's|@@MANDIR@@|$(MANDIR)|g' \
-- -e 's|@@LOGDIR@@|$(LOGDIR)|g' \
-- -e 's|@@HTMLDIR@@|$(HTMLDIR)|g' \
-- -e 's|@@DBDIR@@|$(DBDIR)|g' \
-- -e 's|@@STATEDIR@@|$(STATEDIR)|g' \
-- -e 's|@@SPOOLDIR@@|$(SPOOLDIR)|g' \
-- -e 's|@@PERL@@|$(PERL)|g' \
-- -e 's|@@PERLLIB@@|$(PERLLIB)|g' \
-- -e 's|@@PYTHON@@|$(PYTHON)|g' \
-- -e 's|@@RUBY@@|$(RUBY)|g' \
-- -e 's|@@JAVARUN@@|$(JAVARUN)|g' \
-- -e 's|@@JAVALIBDIR@@|$(JAVALIBDIR)|g' \
-- -e 's|@@OSTYPE@@|$(OSTYPE)|g' \
-- -e 's|@@HOSTNAME@@|$(HOSTNAME)|g' \
-- -e 's|@@MKTEMP@@|$(MKTEMP)|g' \
-- -e 's|@@VERSION@@|$(VERSION)|g' \
-- -e 's|@@PLUGSTATE@@|$(PLUGSTATE)|g' \
-- -e 's|@@CGIDIR@@|$(CGIDIR)|g' \
-- -e 's|@@USER@@|$(USER)|g' \
-- -e 's|@@GROUP@@|$(GROUP)|g' \
-- -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g' \
-- -e 's|@@GOODSH@@|$(GOODSH)|g' \
-- -e 's|@@BASH@@|$(BASH)|g' \
-- -e 's|@@HASSETR@@|$(HASSETR)|g' \
-- --in-place \
-- ./master/blib/libdoc/Munin::Master::HTMLOld.3pm \
-+ @perl -pi -e "s'@@PREFIX@@'$(PREFIX)'g;" \
-+ -e "s'@@CONFDIR@@'$(CONFDIR)'g;" \
-+ -e "s'@@BINDIR@@'$(BINDIR)'g;" \
-+ -e "s'@@SBINDIR@@'$(SBINDIR)'g;" \
-+ -e "s'@@DOCDIR@@'$(DOCDIR)'g;" \
-+ -e "s'@@LIBDIR@@'$(LIBDIR)'g;" \
-+ -e "s'@@MANDIR@@'$(MANDIR)'g;" \
-+ -e "s'@@LOGDIR@@'$(LOGDIR)'g;" \
-+ -e "s'@@HTMLDIR@@'$(HTMLDIR)'g;" \
-+ -e "s'@@DBDIR@@'$(DBDIR)'g;" \
-+ -e "s'@@STATEDIR@@'$(STATEDIR)'g;" \
-+ -e "s'@@SPOOLDIR@@'$(SPOOLDIR)'g;" \
-+ -e "s'@@PERL@@'$(PERL)'g;" \
-+ -e "s'@@PERLLIB@@'$(PERLLIB)'g;" \
-+ -e "s'@@PYTHON@@'$(PYTHON)'g;" \
-+ -e "s'@@RUBY@@'$(RUBY)'g;" \
-+ -e "s'@@JAVARUN@@'$(JAVARUN)'g;" \
-+ -e "s'@@JAVALIBDIR@@'$(JAVALIBDIR)'g;" \
-+ -e "s'@@OSTYPE@@'$(OSTYPE)'g;" \
-+ -e "s'@@HOSTNAME@@'$(HOSTNAME)'g;" \
-+ -e "s'@@MKTEMP@@'$(MKTEMP)'g;" \
-+ -e "s'@@VERSION@@'$(VERSION)'g;" \
-+ -e "s'@@PLUGSTATE@@'$(PLUGSTATE)'g;" \
-+ -e "s'@@CGIDIR@@'$(CGIDIR)'g;" \
-+ -e "s'@@USER@@'$(USER)'g;" \
-+ -e "s'@@GROUP@@'$(GROUP)'g;" \
-+ -e "s'@@PLUGINUSER@@'$(PLUGINUSER)'g;" \
-+ -e "s'@@GOODSH@@'$(GOODSH)'g;" \
-+ -e "s'@@BASH@@'$(BASH)'g;" \
-+ -e "s'@@HASSETR@@'$(HASSETR)'g;" \
-+ ./master/blib/libdoc/Munin::Master::HTMLOld.3p \
- ./master/blib/lib/Munin/Master/HTMLOld.pm \
- ./node/blib/sbin/munin-node-configure \
- ./node/blib/sbin/munin-node \
-@@ -466,7 +464,7 @@ install-%: %/Build
+@@ -465,7 +464,7 @@ install-%: %/Build
--install_path script=$(BINDIR) \
--install_path sbin=$(SBINDIR) \
--install_path bindoc=$(MANDIR)/man1 \
Index: patches/patch-node__bin_munin-asyncd_in
===================================================================
RCS file: patches/patch-node__bin_munin-asyncd_in
diff -N patches/patch-node__bin_munin-asyncd_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-node__bin_munin-asyncd_in 29 May 2014 17:29:53 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- node/_bin/munin-asyncd.in.orig Wed Apr 2 17:57:15 2014
++++ node/_bin/munin-asyncd.in Wed Apr 2 17:58:32 2014
+@@ -311,7 +311,7 @@ munin-asyncd [options]
+
+ Options:
+ --host <hostname:port> Connect to this munin-node [localhost:4949]
+- -s --spool <spooldir> Store the spooled data in this dir
[/var/lib/munin-async]
++ -s --spool <spooldir> Store the spooled data in this dir
[@@SPOOLDIR@@]
+ -i --interval <seconds> Override default interval size of one day
[86400]
+ --timeout <seconds> Wake up at least this number of seconds.
[3600]
+ --minrate <seconds> This is the minimal rate you want to poll a
node [300]
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/munin/pkg/PLIST-main,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 PLIST-main
--- pkg/PLIST-main 3 Jun 2013 19:45:32 -0000 1.14
+++ pkg/PLIST-main 29 May 2014 17:29:53 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.14 2013/06/03 19:45:32 kirby Exp $
+@conflict munin-server-<2.0.21
@newgroup _munin:644
@newgroup _munin-plugin:645
@newuser _munin:644:_munin:daemon:munin user:/nonexistent:/sbin/nologin
@@ -9,6 +10,7 @@
@mode 775
@owner _munin-plugin
@group _munin
+@sample /var/db/munin/spool/
@sample /var/db/munin-pluginstate/
@sample /var/log/munin/
@sample /var/run/munin/
@@ -65,6 +67,8 @@ libdata/perl5/site_perl/Munin/Plugin/
libdata/perl5/site_perl/Munin/Plugin.pm
libdata/perl5/site_perl/Munin/Plugin/Pgsql.pm
libdata/perl5/site_perl/Munin/Plugin/SNMP.pm
+libexec/munin/munin-async
+libexec/munin/munin-asyncd
libexec/munin/plugins/
libexec/munin/plugins/amavis
libexec/munin/plugins/apache_accesses
@@ -329,4 +333,5 @@ share/examples/munin/plugin-conf.d/openb
@sample ${SYSCONFDIR}/munin/plugin-conf.d/openbsd-packages
share/examples/munin/plugins/
@sample ${SYSCONFDIR}/munin/plugins/
+@rcscript ${RCDIR}/munin_asyncd
@rcscript ${RCDIR}/munin_node
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/net/munin/pkg/PLIST-server,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST-server
--- pkg/PLIST-server 22 Mar 2013 15:00:29 -0000 1.5
+++ pkg/PLIST-server 29 May 2014 17:29:53 -0000
@@ -5,15 +5,12 @@
@sample /var/db/munin/cgi-tmp/
@owner _munin
@sample /var/db/munin/
-@sample /var/db/munin/spool/
@sample /var/www/htdocs/munin/
@owner
bin/munin-cron
libexec/munin/
libexec/munin/DejaVuSans.ttf
libexec/munin/DejaVuSansMono.ttf
-libexec/munin/munin-async
-libexec/munin/munin-asyncd
libexec/munin/munin-datafile2storable
libexec/munin/munin-graph
libexec/munin/munin-html
Index: pkg/README-main
===================================================================
RCS file: /cvs/ports/net/munin/pkg/README-main,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 README-main
--- pkg/README-main 25 Mar 2014 08:42:25 -0000 1.2
+++ pkg/README-main 29 May 2014 17:29:53 -0000
@@ -35,4 +35,4 @@ SNMP-based monitors are also available;
p5-Net-SNMP package.
For further information, see
-http://munin-monitoring.org/wiki/Documentation
+http://munin.readthedocs.org/
Index: pkg/munin_asyncd.rc
===================================================================
RCS file: pkg/munin_asyncd.rc
diff -N pkg/munin_asyncd.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/munin_asyncd.rc 29 May 2014 17:29:53 -0000
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# $OpenBSD: munin_node.rc,v 1.6 2013/01/08 11:14:02 kirby Exp $
+
+daemon="${TRUEPREFIX}/libexec/munin/munin-asyncd"
+daemon_flags="--fork"
+daemon_user="_munin"
+
+. /etc/rc.d/rc.subr
+
+pexp="perl: munin-asyncd"
+
+rc_bg=YES
+
+rc_cmd $1Index: Makefile
===================================================================
RCS file: /cvs/ports/net/munin/Makefile,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 Makefile
--- Makefile 25 Mar 2014 08:42:25 -0000 1.38
+++ Makefile 29 May 2014 17:29:53 -0000
@@ -3,7 +3,7 @@
COMMENT-main = flexible network host monitoring, client
COMMENT-server =flexible network host monitoring, server
-V = 2.0.19
+V = 2.0.21
DISTNAME = munin-$V
PKGNAME-main = munin-node-$V
PKGNAME-server =munin-server-$V
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/munin/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo 25 Mar 2014 08:42:25 -0000 1.12
+++ distinfo 29 May 2014 17:29:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (munin-2.0.19.tar.gz) = E9ubANQyuSkH1h+fK9GMKq/KA7Km4lciL/8Xqk7QKJY=
-SIZE (munin-2.0.19.tar.gz) = 1335496
+SHA256 (munin-2.0.21.tar.gz) = dq1mAnBvNEnnJ62/w1AU6bQZOzaRpcoDLVqNeOntJZs=
+SIZE (munin-2.0.21.tar.gz) = 1336783
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/net/munin/patches/patch-Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-Makefile
--- patches/patch-Makefile 18 Dec 2013 14:17:32 -0000 1.7
+++ patches/patch-Makefile 29 May 2014 17:29:53 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.7 2013/12/18 14:17:32 kirby Exp $
---- Makefile.orig Wed Nov 13 00:13:23 2013
-+++ Makefile Tue Dec 3 15:15:23 2013
+--- Makefile.orig Sat Mar 29 01:25:57 2014
++++ Makefile Wed Apr 2 15:53:34 2014
@@ -72,7 +72,6 @@ install-pre: Makefile Makefile.config
mkdir -p $(STATEDIR)
mkdir -p $(SPOOLDIR)
@@ -45,77 +45,7 @@ $OpenBSD: patch-Makefile,v 1.7 2013/12/1
$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
-@@ -254,38 +253,37 @@ build/%: %.in
- build-common-prime: build-common-pre common/blib/lib/Munin/Common/Defaults.pm build-common
-
- substitue-confvar-inline:
-- @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \
-- -e 's|@@CONFDIR@@|$(CONFDIR)|g' \
-- -e 's|@@BINDIR@@|$(BINDIR)|g' \
-- -e 's|@@SBINDIR@@|$(SBINDIR)|g' \
-- -e 's|@@DOCDIR@@|$(DOCDIR)|g' \
-- -e 's|@@LIBDIR@@|$(LIBDIR)|g' \
-- -e 's|@@MANDIR@@|$(MANDIR)|g' \
-- -e 's|@@LOGDIR@@|$(LOGDIR)|g' \
-- -e 's|@@HTMLDIR@@|$(HTMLDIR)|g' \
-- -e 's|@@DBDIR@@|$(DBDIR)|g' \
-- -e 's|@@STATEDIR@@|$(STATEDIR)|g' \
-- -e 's|@@SPOOLDIR@@|$(SPOOLDIR)|g' \
-- -e 's|@@PERL@@|$(PERL)|g' \
-- -e 's|@@PERLLIB@@|$(PERLLIB)|g' \
-- -e 's|@@PYTHON@@|$(PYTHON)|g' \
-- -e 's|@@RUBY@@|$(RUBY)|g' \
-- -e 's|@@JAVARUN@@|$(JAVARUN)|g' \
-- -e 's|@@JAVALIBDIR@@|$(JAVALIBDIR)|g' \
-- -e 's|@@OSTYPE@@|$(OSTYPE)|g' \
-- -e 's|@@HOSTNAME@@|$(HOSTNAME)|g' \
-- -e 's|@@MKTEMP@@|$(MKTEMP)|g' \
-- -e 's|@@VERSION@@|$(VERSION)|g' \
-- -e 's|@@PLUGSTATE@@|$(PLUGSTATE)|g' \
-- -e 's|@@CGIDIR@@|$(CGIDIR)|g' \
-- -e 's|@@USER@@|$(USER)|g' \
-- -e 's|@@GROUP@@|$(GROUP)|g' \
-- -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g' \
-- -e 's|@@GOODSH@@|$(GOODSH)|g' \
-- -e 's|@@BASH@@|$(BASH)|g' \
-- -e 's|@@HASSETR@@|$(HASSETR)|g' \
-- --in-place \
-- ./master/blib/libdoc/Munin::Master::HTMLOld.3pm \
-+ @perl -pi -e "s'@@PREFIX@@'$(PREFIX)'g;" \
-+ -e "s'@@CONFDIR@@'$(CONFDIR)'g;" \
-+ -e "s'@@BINDIR@@'$(BINDIR)'g;" \
-+ -e "s'@@SBINDIR@@'$(SBINDIR)'g;" \
-+ -e "s'@@DOCDIR@@'$(DOCDIR)'g;" \
-+ -e "s'@@LIBDIR@@'$(LIBDIR)'g;" \
-+ -e "s'@@MANDIR@@'$(MANDIR)'g;" \
-+ -e "s'@@LOGDIR@@'$(LOGDIR)'g;" \
-+ -e "s'@@HTMLDIR@@'$(HTMLDIR)'g;" \
-+ -e "s'@@DBDIR@@'$(DBDIR)'g;" \
-+ -e "s'@@STATEDIR@@'$(STATEDIR)'g;" \
-+ -e "s'@@SPOOLDIR@@'$(SPOOLDIR)'g;" \
-+ -e "s'@@PERL@@'$(PERL)'g;" \
-+ -e "s'@@PERLLIB@@'$(PERLLIB)'g;" \
-+ -e "s'@@PYTHON@@'$(PYTHON)'g;" \
-+ -e "s'@@RUBY@@'$(RUBY)'g;" \
-+ -e "s'@@JAVARUN@@'$(JAVARUN)'g;" \
-+ -e "s'@@JAVALIBDIR@@'$(JAVALIBDIR)'g;" \
-+ -e "s'@@OSTYPE@@'$(OSTYPE)'g;" \
-+ -e "s'@@HOSTNAME@@'$(HOSTNAME)'g;" \
-+ -e "s'@@MKTEMP@@'$(MKTEMP)'g;" \
-+ -e "s'@@VERSION@@'$(VERSION)'g;" \
-+ -e "s'@@PLUGSTATE@@'$(PLUGSTATE)'g;" \
-+ -e "s'@@CGIDIR@@'$(CGIDIR)'g;" \
-+ -e "s'@@USER@@'$(USER)'g;" \
-+ -e "s'@@GROUP@@'$(GROUP)'g;" \
-+ -e "s'@@PLUGINUSER@@'$(PLUGINUSER)'g;" \
-+ -e "s'@@GOODSH@@'$(GOODSH)'g;" \
-+ -e "s'@@BASH@@'$(BASH)'g;" \
-+ -e "s'@@HASSETR@@'$(HASSETR)'g;" \
-+ ./master/blib/libdoc/Munin::Master::HTMLOld.3p \
- ./master/blib/lib/Munin/Master/HTMLOld.pm \
- ./node/blib/sbin/munin-node-configure \
- ./node/blib/sbin/munin-node \
-@@ -466,7 +464,7 @@ install-%: %/Build
+@@ -465,7 +464,7 @@ install-%: %/Build
--install_path script=$(BINDIR) \
--install_path sbin=$(SBINDIR) \
--install_path bindoc=$(MANDIR)/man1 \
Index: patches/patch-node__bin_munin-asyncd_in
===================================================================
RCS file: patches/patch-node__bin_munin-asyncd_in
diff -N patches/patch-node__bin_munin-asyncd_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-node__bin_munin-asyncd_in 29 May 2014 17:29:53 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- node/_bin/munin-asyncd.in.orig Wed Apr 2 17:57:15 2014
++++ node/_bin/munin-asyncd.in Wed Apr 2 17:58:32 2014
+@@ -311,7 +311,7 @@ munin-asyncd [options]
+
+ Options:
+ --host <hostname:port> Connect to this munin-node [localhost:4949]
+- -s --spool <spooldir> Store the spooled data in this dir [/var/lib/munin-async]
++ -s --spool <spooldir> Store the spooled data in this dir [@@SPOOLDIR@@]
+ -i --interval <seconds> Override default interval size of one day [86400]
+ --timeout <seconds> Wake up at least this number of seconds. [3600]
+ --minrate <seconds> This is the minimal rate you want to poll a node [300]
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/munin/pkg/PLIST-main,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 PLIST-main
--- pkg/PLIST-main 3 Jun 2013 19:45:32 -0000 1.14
+++ pkg/PLIST-main 29 May 2014 17:29:53 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.14 2013/06/03 19:45:32 kirby Exp $
+@conflict munin-server-<2.0.21
@newgroup _munin:644
@newgroup _munin-plugin:645
@newuser _munin:644:_munin:daemon:munin user:/nonexistent:/sbin/nologin
@@ -9,6 +10,7 @@
@mode 775
@owner _munin-plugin
@group _munin
+@sample /var/db/munin/spool/
@sample /var/db/munin-pluginstate/
@sample /var/log/munin/
@sample /var/run/munin/
@@ -65,6 +67,8 @@ libdata/perl5/site_perl/Munin/Plugin/
libdata/perl5/site_perl/Munin/Plugin.pm
libdata/perl5/site_perl/Munin/Plugin/Pgsql.pm
libdata/perl5/site_perl/Munin/Plugin/SNMP.pm
+libexec/munin/munin-async
+libexec/munin/munin-asyncd
libexec/munin/plugins/
libexec/munin/plugins/amavis
libexec/munin/plugins/apache_accesses
@@ -329,4 +333,5 @@ share/examples/munin/plugin-conf.d/openb
@sample ${SYSCONFDIR}/munin/plugin-conf.d/openbsd-packages
share/examples/munin/plugins/
@sample ${SYSCONFDIR}/munin/plugins/
+@rcscript ${RCDIR}/munin_asyncd
@rcscript ${RCDIR}/munin_node
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/net/munin/pkg/PLIST-server,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST-server
--- pkg/PLIST-server 22 Mar 2013 15:00:29 -0000 1.5
+++ pkg/PLIST-server 29 May 2014 17:29:53 -0000
@@ -5,15 +5,12 @@
@sample /var/db/munin/cgi-tmp/
@owner _munin
@sample /var/db/munin/
-@sample /var/db/munin/spool/
@sample /var/www/htdocs/munin/
@owner
bin/munin-cron
libexec/munin/
libexec/munin/DejaVuSans.ttf
libexec/munin/DejaVuSansMono.ttf
-libexec/munin/munin-async
-libexec/munin/munin-asyncd
libexec/munin/munin-datafile2storable
libexec/munin/munin-graph
libexec/munin/munin-html
Index: pkg/README-main
===================================================================
RCS file: /cvs/ports/net/munin/pkg/README-main,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 README-main
--- pkg/README-main 25 Mar 2014 08:42:25 -0000 1.2
+++ pkg/README-main 29 May 2014 17:29:53 -0000
@@ -35,4 +35,4 @@ SNMP-based monitors are also available;
p5-Net-SNMP package.
For further information, see
-http://munin-monitoring.org/wiki/Documentation
+http://munin.readthedocs.org/
Index: pkg/munin_asyncd.rc
===================================================================
RCS file: pkg/munin_asyncd.rc
diff -N pkg/munin_asyncd.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/munin_asyncd.rc 29 May 2014 17:29:53 -0000
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# $OpenBSD: munin_node.rc,v 1.6 2013/01/08 11:14:02 kirby Exp $
+
+daemon="${TRUEPREFIX}/libexec/munin/munin-asyncd"
+daemon_flags="--fork"
+daemon_user="_munin"
+
+. /etc/rc.d/rc.subr
+
+pexp="perl: munin-asyncd"
+
+rc_bg=YES
+
+rc_cmd $1
