diff --git a/sysutils/munin-common/distinfo b/sysutils/munin-common/distinfo
index 8f2255a1e729..d5805aa8b847 100644
--- a/sysutils/munin-common/distinfo
+++ b/sysutils/munin-common/distinfo
@@ -1,2 +1,2 @@
-SHA256 (munin-2.0.24.tar.gz) = 74940896326bbb33d5607c39d1f972f69c5fc4278c93ae185338113a62a6a4e6
-SIZE (munin-2.0.24.tar.gz) = 1337330
+SHA256 (munin-2.0.25.tar.gz) = 6832bc5839d03639e4309178d9370697fc8a80a83d9b6653953f40161e949694
+SIZE (munin-2.0.25.tar.gz) = 1337586
diff --git a/sysutils/munin-common/files/patch-Makefile b/sysutils/munin-common/files/patch-Makefile
index 47380649dc19..33f2a8964cc9 100644
--- a/sysutils/munin-common/files/patch-Makefile
+++ b/sysutils/munin-common/files/patch-Makefile
@@ -1,154 +1,154 @@
---- Makefile.orig	2014-10-17 09:03:12 UTC
+--- Makefile.orig	2014-11-24 21:46:24 UTC
 +++ Makefile
-@@ -68,60 +68,48 @@
+@@ -68,60 +68,48 @@ install: install-master-prime install-co
  
  install-pre: Makefile Makefile.config
  	@$(CHECKUSER)
 -	mkdir -p $(LOGDIR)
 -	mkdir -p $(STATEDIR)
 -	mkdir -p $(SPOOLDIR)
 -	mkdir -p $(CONFDIR)
 -	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
 +	mkdir -p $(DESTDIR)$(CONFDIR)
  
  install-master-prime: $(INFILES_MASTER) install-pre install-master
 -	mkdir -p $(CONFDIR)/templates
 -	mkdir -p $(CONFDIR)/static
 -	mkdir -p $(CONFDIR)/templates/partial
 -	mkdir -p $(CONFDIR)/munin-conf.d
 -	mkdir -p $(LIBDIR)
 -	mkdir -p $(BINDIR)
 -	mkdir -p $(PERLLIB)
 -	mkdir -p $(PERLLIB)/Munin/Master
 -	mkdir -p $(HTMLDIR)
 -	mkdir -p $(DBDIR)
 -	mkdir -p $(DBDIR)/cgi-tmp
 -	mkdir -p $(CGIDIR)
 -
 -	$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
 -	$(CHMOD) 0755 $(DBDIR)
 -
 -	$(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp
 -	$(CHMOD) 0755 $(DBDIR)/cgi-tmp
 +	mkdir -p $(DESTDIR)$(CONFDIR)/templates
 +	mkdir -p $(DESTDIR)$(CONFDIR)/static
 +	mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial
 +	mkdir -p $(DESTDIR)$(CONFDIR)/munin-conf.d
 +	mkdir -p $(DESTDIR)$(LIBDIR)
 +	mkdir -p $(DESTDIR)$(BINDIR)
 +	mkdir -p $(DESTDIR)$(HTMLDIR)
 +	mkdir -p $(DESTDIR)$(DBDIR)
 +	mkdir -p $(DESTDIR)$(DBDIR)/cgi-tmp
 +	mkdir -p $(DESTDIR)$(CGIDIR)
  
  	for p in master/www/*.tmpl ;  do \
 -		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
 +		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
  	done
  
  	for p in master/static/* ; do \
 -		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/static/ ; \
 +		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/static/ ; \
  	done
  
  	for p in master/www/partial/*.tmpl; do \
 -		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \
 +		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/partial/ ; \
  	done
  
 -	$(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/
 -	$(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/
 +	$(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(DESTDIR)$(LIBDIR)/
 +	$(INSTALL) -m 0644 master/DejaVuSans.ttf $(DESTDIR)$(LIBDIR)/
  
 -	test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
 -	test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
 +	$(INSTALL) -m 0644 build/master/www/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess
 +	$(INSTALL) -m 0644 build/master/munin.conf $(DESTDIR)$(CONFDIR)/
  
 -	$(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/
 -	$(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/
 -	$(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/
 -	$(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/
 -	$(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/
 -	$(INSTALL) -m 0755 build/master/_bin/munin-limits $(LIBDIR)/
 -	$(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(LIBDIR)/
 -	$(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(LIBDIR)/
 -	$(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/munin-cgi-graph
 -	$(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(CGIDIR)/munin-cgi-html
 +	$(INSTALL) -m 0755 build/master/_bin/munin-cron $(DESTDIR)$(BINDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-check $(DESTDIR)$(BINDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-update $(DESTDIR)$(LIBDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-html $(DESTDIR)$(LIBDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-graph $(DESTDIR)$(LIBDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-limits $(DESTDIR)$(LIBDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(DESTDIR)$(LIBDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(DESTDIR)$(LIBDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(DESTDIR)$(CGIDIR)/munin-cgi-graph
 +	$(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(DESTDIR)$(CGIDIR)/munin-cgi-html
  
  # Not ready to be installed yet
  # $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/
-@@ -139,33 +127,29 @@
+@@ -139,33 +127,29 @@ endif
  install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
  	@$(CHECKGROUP)
  
 -	mkdir -p $(CONFDIR)/plugins
 -	mkdir -p $(CONFDIR)/plugin-conf.d
 -	mkdir -p $(LIBDIR)/plugins
 -	mkdir -p $(PLUGSTATE)
 -
 -	$(CHOWN) root:root $(PLUGSTATE)
 -	$(CHMOD) 0755 $(PLUGSTATE)
 -	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
 +	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
 +	mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
 +	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
 +	mkdir -p $(DESTDIR)$(PLUGSTATE)
  
  	for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
  	    if test -f "$$p" ; then                            \
  		echo Installing $$p;                           \
 -		$(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/;     \
 +		$(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/;     \
  	    fi                                                 \
  	done
 -	$(HPUXONLY) mv $(LIBDIR)/plugins/*.adv $(LIBDIR)
 -	$(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/
 -	$(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/
 +	$(HPUXONLY) mv $(DESTDIR)$(LIBDIR)/plugins/*.adv $(DESTDIR)$(LIBDIR)
 +	$(INSTALL) -m 0644 build/plugins/plugins.history $(DESTDIR)$(LIBDIR)/plugins/
 +	$(INSTALL) -m 0644 build/plugins/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/
  
  install-plugins-java: build-plugins-java
 -	mkdir -p $(JAVALIBDIR)
 -	$(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(JAVALIBDIR)/
 -	mkdir -p $(LIBDIR)/plugins
 +	mkdir -p $(DESTDIR)$(JAVALIBDIR)
 +	$(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(DESTDIR)$(JAVALIBDIR)/
 +	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
  	for p in build/plugins/node.d.java/*; do               \
  	    if test -f "$$p" ; then                            \
  		echo Installing $$p;                           \
 -		$(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/;     \
 +		$(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/;     \
  	    fi                                                 \
  	done
  
-@@ -183,7 +167,7 @@
+@@ -183,7 +167,7 @@ install-async:
  install-node-prime: install-node-pre install-node
  
  install-node-pre: build/node/munin-node.conf install-pre
 -	test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
 +	test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/
  
  
  install-common-prime: build-common install-common
-@@ -466,6 +450,7 @@
+@@ -466,6 +450,7 @@ install-%: %/Build
              --install_path sbin=$(SBINDIR)		\
              --install_path bindoc=$(MANDIR)/man1	\
              --install_path libdoc=$(MANDIR)/man3	\
 +	    --destdir=$(DESTDIR)
  
  test-%: %/Build
  	cd $* && $(PERL) Build test --verbose=0 || true
diff --git a/sysutils/munin-common/files/patch-Makefile.config b/sysutils/munin-common/files/patch-Makefile.config
index 668cf67cafd7..bfdb4c2416dd 100644
--- a/sysutils/munin-common/files/patch-Makefile.config
+++ b/sysutils/munin-common/files/patch-Makefile.config
@@ -1,105 +1,105 @@
---- Makefile.config.orig	2014-10-17 09:03:12 UTC
+--- Makefile.config.orig	2014-11-24 21:46:24 UTC
 +++ Makefile.config
 @@ -17,62 +17,62 @@
  #
  # the base of the Munin installation.
  #
 -PREFIX     = $(DESTDIR)/opt/munin
 +PREFIX     ?= $(DESTDIR)/opt/munin
  
  # Where Munin keeps its configurations (server.conf, client.conf, ++)
 -CONFDIR    = $(DESTDIR)/etc/opt/munin
 +CONFDIR    ?= $(DESTDIR)/etc/opt/munin
  
  # Server only - where to put munin-cron
 -BINDIR     = $(PREFIX)/bin
 +BINDIR     ?= $(PREFIX)/bin
  
  # Client only - where to put munin-node, munin-node-configure, and munin-run
 -SBINDIR    = $(PREFIX)/sbin
 +SBINDIR    ?= $(PREFIX)/sbin
  
  # Where to put text and html documentation
 -DOCDIR     = $(PREFIX)/doc
 +DOCDIR     ?= $(PREFIX)/doc
  
  # Where to put man pages
 -MANDIR     = $(PREFIX)/man
 +MANDIR     ?= $(PREFIX)/man
  
  # Where to put internal binaries and plugin repository
 -LIBDIR     = $(PREFIX)/lib
 +LIBDIR     ?= $(PREFIX)/lib
  
  # Server only - Output directory
 -HTMLDIR    = $(PREFIX)/www/docs
 -CGIDIR     = $(PREFIX)/www/cgi
 +HTMLDIR    ?= $(PREFIX)/www/docs
 +CGIDIR     ?= $(PREFIX)/www/cgi
  
  # Where to put internal data for master (RRD, internal files, ...)
 -DBDIR      = $(DESTDIR)/var/opt/munin
 +DBDIR      ?= $(DESTDIR)/var/opt/munin
  
  # Where to put internal data for node (plugin state, ...)
 -DBDIRNODE  = $(DESTDIR)/var/opt/munin-node
 +DBDIRNODE  ?= $(DESTDIR)/var/opt/munin-node
  
  # Client only - Where the spool files are written. Must be writable by
  # group "munin", and should be preserved between reboots
 -SPOOLDIR   = $(DBDIR)/spool
 +SPOOLDIR   ?= $(DBDIR)/spool
  
  # Client only - Where plugins should put their states. Must be writable by
  # group "munin", and should be preserved between reboots
 -PLUGSTATE  = $(DBDIRNODE)/plugin-state
 +PLUGSTATE  ?= $(DBDIRNODE)/plugin-state
  
  # Where Munin should place its logs.
 -LOGDIR     = $(PREFIX)/log/munin
 +LOGDIR     ?= $(PREFIX)/log/munin
  
  # Location of PID files and other statefiles. On the server, must be
  # writable by the user "munin".
 -STATEDIR   = $(DESTDIR)/var/run/munin
 +STATEDIR   ?= $(DESTDIR)/var/run/munin
  
  # The perl interpreter to use
 -PERL       := $(shell which perl)
 +PERL       := /usr/local/bin/perl
  
  # The python interpreter to use (used by some plugins)
 -PYTHON     := /usr/bin/env python
 +PYTHON     := /usr/local/bin/python
  
  # The ruby interpreter to use (used by some plugins)
 -RUBY       := /usr/bin/env ruby
 +RUBY       := /usr/local/bin/ruby
  
  # The java runtime to use (used by some plugins)
 -JAVARUN    := /usr/bin/java
 +JAVARUN    := /usr/local/bin/java
  
  # The java library dir to use (used by some plugins)
  # this is needed in order to be able to install
-@@ -92,7 +92,7 @@
+@@ -92,7 +92,7 @@ JAVALIBDIR = $(LIBDIR)
  GOODSH     := $(shell PATH=`getconf PATH 2>/dev/null || echo $(PATH)` LANG=C sh -c 'type sh | sed "s/.* //"')
  
  # Path of bash for bash specific plugins
 -BASH       := /bin/bash
 +BASH       := /usr/local/bin/bash
  
  # Server only - Where to install the perl libraries
  PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
-@@ -129,9 +129,8 @@
+@@ -129,9 +129,8 @@ CGIUSER := nobody
  # Which command to use to check if the USER and GROUP to run Munin as, exists.
  # These will work on most modern OSes:
  #
 -GETENT     := $(shell which getent || which true 2>/dev/null)
 -CHECKUSER  := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
 -CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
 +CHECKUSER:= $(shell /usr/sbin/pw user show $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
 +CHECKGROUP:= $(shell /usr/sbin/pw group show $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
  
  # For OSX, comment out the previous two lines and comment in these
  #
diff --git a/sysutils/munin-common/munin.mk b/sysutils/munin-common/munin.mk
index d8e00a796db1..bc08f5c92382 100644
--- a/sysutils/munin-common/munin.mk
+++ b/sysutils/munin-common/munin.mk
@@ -1,35 +1,35 @@
-MUNIN_VERSION=	2.0.24
+MUNIN_VERSION=	2.0.25
 MUNIN_SITES=	SF/${PORTNAME}/stable/${MUNIN_VERSION}
 DISTINFO_FILE=	${PORTSDIR}/sysutils/munin-common/distinfo
 
 .if ${PKGNAMESUFFIX} != -common
 EXTRA_PATCHES+=	${PORTSDIR}/sysutils/munin-common/files/patch-Makefile \
 		${PORTSDIR}/sysutils/munin-common/files/patch-Makefile.config
 .endif
 
 PORTSCOUT=	limit:^2\.0\.
 
 DBDIR?=		/var/${PORTNAME}
 DBDIRNODE?=	/var/${PORTNAME}
 LOGDIR?=	/var/log/${PORTNAME}
 STATEDIR?=	/var/run/${PORTNAME}
 SPOOLDIR?=	/var/spool/${PORTNAME}
 MUNIN_DIRS=	BINDIR=${PREFIX}/bin \
 		CGIDIR=${PREFIX}/www/cgi-bin \
 		CONFDIR=${ETCDIR} \
 		DBDIR=${DBDIR} \
 		DBDIRNODE=${DBDIRNODE} \
 		DOCDIR=${DOCSDIR} \
 		HTMLDIR=${WWWDIR} \
 		LIBDIR=${DATADIR} \
 		LOGDIR=${LOGDIR} \
 		MANDIR=${MANPREFIX}/man \
 		SBINDIR=${PREFIX}/sbin \
 		STATEDIR=${STATEDIR} \
 		SPOOLDIR=${SPOOLDIR}
 MAKE_ARGS=	${MUNIN_DIRS} \
 		BASH=${LOCALBASE}/bin/bash \
 		PERL=${PERL} PERLLIB=${PREFIX}/${SITE_PERL_REL}
 USERS=		munin
 GROUPS=		munin
 PLIST_SUB=	${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS}
diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile
index 6bacc0774581..f67f360ae8a6 100644
--- a/sysutils/munin-master/Makefile
+++ b/sysutils/munin-master/Makefile
@@ -1,65 +1,66 @@
 # Created by: Lupe Christoph <lupe@lupe-christoph.de>
 # $FreeBSD$
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-master
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Collector part of Munin
 
 BUILD_DEPENDS=	p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build \
 		munin-common>=0:${PORTSDIR}/sysutils/munin-common \
 		rrdtool>=0:${PORTSDIR}/databases/rrdtool \
 		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
 		p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \
 		p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \
 		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
 		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
 		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
 		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
 		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
 		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
 		p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced
 RUN_DEPENDS=	munin-common>=0:${PORTSDIR}/sysutils/munin-common \
 		rrdtool>=0:${PORTSDIR}/databases/rrdtool \
 		p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \
 		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
 		p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \
 		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
 		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
 		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
 		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
 		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
 		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
 		p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced \
 		p5-URI>=0:${PORTSDIR}/net/p5-URI \
 		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
 		p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI
 
 USES=		gmake perl5
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .include "${.CURDIR}/../munin-common/munin.mk"
 
 ALL_TARGET=	infiles build-master build-man
 INSTALL_TARGET=	install-master-prime
 NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
 PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 post-install:
 	(cd ${WRKSRC}/build/doc; \
 		${INSTALL_MAN} munin.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5; \
 		${INSTALL_MAN} munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8 ${STAGEDIR}${MAN8PREFIX}/man/man8; \
 	)
 	(cd ${STAGEDIR}${ETCDIR}; for i in `find . -type f`; do mv $$i $$i.sample; done)
 	${MV} ${STAGEDIR}${WWWDIR}/.htaccess ${STAGEDIR}${WWWDIR}/.htaccess.sample
+	@${RMDIR} ${STAGEDIR}${DBDIR} 2>/dev/null || :
 
 .include <bsd.port.mk>
diff --git a/sysutils/munin-master/pkg-plist b/sysutils/munin-master/pkg-plist
index 187fcbd3a3ca..8cc28a0fb14a 100644
--- a/sysutils/munin-master/pkg-plist
+++ b/sysutils/munin-master/pkg-plist
@@ -1,82 +1,83 @@
 bin/munin-check
 bin/munin-cron
 @sample %%ETCDIR%%/munin.conf.sample
 @sample %%ETCDIR%%/static/definitions.html.sample
 @sample %%ETCDIR%%/static/dynazoom.html.sample
 @sample %%ETCDIR%%/static/favicon.ico.sample
 @sample %%ETCDIR%%/static/formatdate.js.sample
 @sample %%ETCDIR%%/static/logo-h.png.sample
 @sample %%ETCDIR%%/static/logo.png.sample
 @sample %%ETCDIR%%/static/querystring.js.sample
 @sample %%ETCDIR%%/static/style-1.2.css.sample
 @sample %%ETCDIR%%/static/style-new.css.sample
 @sample %%ETCDIR%%/static/style.css.sample
 @sample %%ETCDIR%%/static/zoom.js.sample
 @sample %%ETCDIR%%/templates/munin-categoryview.tmpl.sample
 @sample %%ETCDIR%%/templates/munin-comparison-day.tmpl.sample
 @sample %%ETCDIR%%/templates/munin-comparison-month.tmpl.sample
 @sample %%ETCDIR%%/templates/munin-comparison-week.tmpl.sample
 @sample %%ETCDIR%%/templates/munin-comparison-year.tmpl.sample
 @sample %%ETCDIR%%/templates/munin-domainview.tmpl.sample
 @sample %%ETCDIR%%/templates/munin-dynazoom.tmpl.sample
 @sample %%ETCDIR%%/templates/munin-nodeview.tmpl.sample
 @sample %%ETCDIR%%/templates/munin-overview.tmpl.sample
 @sample %%ETCDIR%%/templates/munin-problemview.tmpl.sample
 @sample %%ETCDIR%%/templates/munin-serviceview.tmpl.sample
 @sample %%ETCDIR%%/templates/partial/bottom_navigation.tmpl.sample
 @sample %%ETCDIR%%/templates/partial/footer.tmpl.sample
 @sample %%ETCDIR%%/templates/partial/generated_by.tmpl.sample
 @sample %%ETCDIR%%/templates/partial/head.tmpl.sample
 @sample %%ETCDIR%%/templates/partial/logo_navigation.tmpl.sample
 @sample %%ETCDIR%%/templates/partial/logo_navigation_comparison.tmpl.sample
 @sample %%ETCDIR%%/templates/partial/logo_navigation_problem.tmpl.sample
 @sample %%ETCDIR%%/templates/partial/logo_path.tmpl.sample
 @sample %%ETCDIR%%/templates/partial/navigation.tmpl.sample
 @sample %%ETCDIR%%/templates/partial/path.tmpl.sample
 %%SITE_PERL%%/Munin/Master/Config.pm
 %%SITE_PERL%%/Munin/Master/GraphOld.pm
 %%SITE_PERL%%/Munin/Master/Group.pm
 %%SITE_PERL%%/Munin/Master/GroupRepository.pm
 %%SITE_PERL%%/Munin/Master/HTMLConfig.pm
 %%SITE_PERL%%/Munin/Master/HTMLOld.pm
 %%SITE_PERL%%/Munin/Master/Host.pm
 %%SITE_PERL%%/Munin/Master/LimitsOld.pm
 %%SITE_PERL%%/Munin/Master/Logger.pm
 %%SITE_PERL%%/Munin/Master/Node.pm
 %%SITE_PERL%%/Munin/Master/ProcessManager.pm
 %%SITE_PERL%%/Munin/Master/Update.pm
 %%SITE_PERL%%/Munin/Master/UpdateWorker.pm
 %%SITE_PERL%%/Munin/Master/Utils.pm
 %%SITE_PERL%%/Munin/Master/Worker.pm
 man/man3/Munin::Master::Config.3.gz
 man/man3/Munin::Master::Group.3.gz
 man/man3/Munin::Master::GroupRepository.3.gz
 man/man3/Munin::Master::HTMLOld.3.gz
 man/man3/Munin::Master::Host.3.gz
 man/man3/Munin::Master::LimitsOld.3.gz
 man/man3/Munin::Master::Logger.3.gz
 man/man3/Munin::Master::Node.3.gz
 man/man3/Munin::Master::ProcessManager.3.gz
 man/man3/Munin::Master::Update.3.gz
 man/man3/Munin::Master::UpdateWorker.3.gz
 man/man3/Munin::Master::Utils.3.gz
 man/man3/Munin::Master::Worker.3.gz
 man/man5/munin.conf.5.gz
 man/man8/munin-cron.8.gz
 man/man8/munin-graph.8.gz
 man/man8/munin-html.8.gz
 man/man8/munin-limits.8.gz
 man/man8/munin-update.8.gz
 %%DATADIR%%/DejaVuSans.ttf
 %%DATADIR%%/DejaVuSansMono.ttf
 %%DATADIR%%/munin-datafile2storable
 %%DATADIR%%/munin-graph
 %%DATADIR%%/munin-html
 %%DATADIR%%/munin-limits
 %%DATADIR%%/munin-storable2datafile
 %%DATADIR%%/munin-update
 www/cgi-bin/munin-cgi-graph
 www/cgi-bin/munin-cgi-html
 @sample %%WWWDIR%%/.htaccess.sample
+@dir %%ETCDIR%%/munin-conf.d
 @dir(%%USER%%,%%GROUP%%,) %%WWWDIR%%
-@dir(%%WWWOWN%%,%%WWWGRP%%,) %%DBDIRNODE%%/cgi-tmp
+@dir(%%WWWOWN%%,%%WWWGRP%%,) %%DBDIR%%/cgi-tmp
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index de7bd6dce2f3..44d2fb0db6ef 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -1,90 +1,89 @@
 # Created by: Lupe Christoph <lupe@lupe-christoph.de>
 # $FreeBSD$
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
-PORTREVISION=	3
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-node
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Node-specific part of Munin
 
 BUILD_DEPENDS=	p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build \
 		p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \
 		munin-common>=0:${PORTSDIR}/sysutils/munin-common \
 		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
 		bash:${PORTSDIR}/shells/bash
 RUN_DEPENDS=	p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
 		p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \
 		munin-common>=0:${PORTSDIR}/sysutils/munin-common \
 		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
 		p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 		bash:${PORTSDIR}/shells/bash
 
 USES=		gmake perl5 shebangfix
 PKGMESSAGE=	${WRKDIR}/pkg-message
 REINPLACE_ARGS=	-i ""
 SHEBANG_FILES=	node/sbin/munin-node node/sbin/munin-sched \
 		node/sbin/munin-run node/sbin/munin-node-configure
 
 .include "${.CURDIR}/../munin-common/munin.mk"
 
 ALL_TARGET=	build-node build-plugins
 INSTALL_TARGET=	install-node-prime install-plugins-prime
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	SNMP PERL JAVA
 OPTIONS_DEFAULT=	SNMP PERL
 OPTIONS_SUB=	yes
 SNMP_DESC=	Include SNMP plugins
 PERL_DESC=	Include all Perl modules (adds dependencies)
 JAVA_DESC=	Include JAVA plugins
 
 SNMP_BUILD_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
 SNMP_RUN_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
 PERL_RUN_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg \
 		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
 		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
 		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
 JAVA_USE=	java=yes
 JAVA_INSTALL_TARGET=	install-plugins-java
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 
 SUB_FILES=	pkg-message plugins.conf
 USE_RC_SUBR=	munin-node munin-sched
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/node/sbin/munin-node \
 		${WRKSRC}/node/sbin/munin-node-configure \
 		${WRKSRC}/node/sbin/munin-run
 	@${REINPLACE_CMD} \
 		-e 's|^\(BASH[[:space:]]*:=\).*|\1 ${bash_CMD}|' \
 		-e 's|^\(JAVARUN[[:space:]]*:=\).*|\1 ${java_CMD}|' \
 		-e 's|^\(PERL[[:space:]]*:=\).*|\1 ${perl_CMD}|' \
 		-e 's|^\(PYTHON[[:space:]]*:=\).*|\1 ${python_CMD}|' \
 		-e 's|^\(RUBY[[:space:]]*:=\).*|\1 ${ruby_CMD}|' \
 		${WRKSRC}/Makefile.config
 	@${FIND} ${WRKSRC}/node/sbin -type f -name "*.orig" -delete
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DBDIR}/plugin-state
 	${INSTALL_SCRIPT} ${WRKDIR}/munin-node \
 		${STAGEDIR}${PREFIX}/etc/rc.d/munin-node
 	${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf \
 		${STAGEDIR}${ETCDIR}/munin-node.conf.sample
 	${INSTALL_DATA} ${WRKDIR}/plugins.conf \
 		${STAGEDIR}${ETCDIR}/plugin-conf.d/plugins.conf.sample
 	(cd ${WRKSRC}/node/blib/bindoc; \
 		${INSTALL_MAN} munin-node-configure.1 munin-node.1 munin-run.1 munin-sched.1 munindoc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1; \
 	)
 	(cd ${WRKSRC}/build/doc; \
 		${INSTALL_MAN} munin-node.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5; \
 		${INSTALL_MAN} munin.8 ${STAGEDIR}${MAN8PREFIX}/man/man8; \
 	)
 
 .include <bsd.port.mk>
diff --git a/sysutils/munin-node/pkg-plist b/sysutils/munin-node/pkg-plist
index e417ff73552b..f85983631e05 100644
--- a/sysutils/munin-node/pkg-plist
+++ b/sysutils/munin-node/pkg-plist
@@ -1,253 +1,253 @@
 bin/munindoc
 @sample %%ETCDIR%%/munin-node.conf.sample
 @sample %%ETCDIR%%/plugin-conf.d/plugins.conf.sample
 %%SITE_PERL%%/Munin/Node/Config.pm
 %%SITE_PERL%%/Munin/Node/Configure/Debug.pm
 %%SITE_PERL%%/Munin/Node/Configure/History.pm
 %%SITE_PERL%%/Munin/Node/Configure/HostEnumeration.pm
 %%SITE_PERL%%/Munin/Node/Configure/Plugin.pm
 %%SITE_PERL%%/Munin/Node/Configure/PluginList.pm
 %%SITE_PERL%%/Munin/Node/Logger.pm
 %%SITE_PERL%%/Munin/Node/OS.pm
 %%SITE_PERL%%/Munin/Node/ProxySpooler.pm
 %%SITE_PERL%%/Munin/Node/SNMPConfig.pm
 %%SITE_PERL%%/Munin/Node/Server.pm
 %%SITE_PERL%%/Munin/Node/Service.pm
 %%SITE_PERL%%/Munin/Node/Session.pm
 %%SITE_PERL%%/Munin/Node/SpoolReader.pm
 %%SITE_PERL%%/Munin/Node/SpoolWriter.pm
 %%SITE_PERL%%/Munin/Node/Utils.pm
 %%SITE_PERL%%/Munin/Plugin.pm
 %%SITE_PERL%%/Munin/Plugin/Pgsql.pm
 %%SITE_PERL%%/Munin/Plugin/SNMP.pm
 man/man1/munin-node-configure.1.gz
 man/man1/munin-node.1.gz
 man/man1/munin-run.1.gz
 man/man1/munin-sched.1.gz
 man/man1/munindoc.1.gz
 man/man3/Munin::Node::Config.3.gz
 man/man3/Munin::Node::Configure::Debug.3.gz
 man/man3/Munin::Node::Configure::History.3.gz
 man/man3/Munin::Node::Configure::HostEnumeration.3.gz
 man/man3/Munin::Node::Configure::Plugin.3.gz
 man/man3/Munin::Node::Configure::PluginList.3.gz
 man/man3/Munin::Node::Logger.3.gz
 man/man3/Munin::Node::OS.3.gz
 man/man3/Munin::Node::ProxySpooler.3.gz
 man/man3/Munin::Node::SNMPConfig.3.gz
 man/man3/Munin::Node::Server.3.gz
 man/man3/Munin::Node::Service.3.gz
 man/man3/Munin::Node::Session.3.gz
 man/man3/Munin::Node::SpoolReader.3.gz
 man/man3/Munin::Node::SpoolWriter.3.gz
 man/man3/Munin::Node::Utils.3.gz
 man/man3/Munin::Plugin.3.gz
 man/man3/Munin::Plugin::Pgsql.3.gz
 man/man3/Munin::Plugin::SNMP.3.gz
 man/man5/munin-node.conf.5.gz
 man/man8/munin.8.gz
 sbin/munin-node
 sbin/munin-node-configure
 sbin/munin-run
 sbin/munin-sched
 %%JAVA%%%%DATADIR%%/munin-jmx-plugins.jar
 %%DATADIR%%/plugins/amavis
 %%DATADIR%%/plugins/apache_accesses
 %%DATADIR%%/plugins/apache_processes
 %%DATADIR%%/plugins/apache_volume
 %%DATADIR%%/plugins/apc_envunit_
 %%DATADIR%%/plugins/apc_nis
 %%DATADIR%%/plugins/asterisk_channels
 %%DATADIR%%/plugins/asterisk_channelstypes
 %%DATADIR%%/plugins/asterisk_codecs
 %%DATADIR%%/plugins/asterisk_meetme
 %%DATADIR%%/plugins/asterisk_meetmeusers
 %%DATADIR%%/plugins/asterisk_sipchannels
 %%DATADIR%%/plugins/asterisk_sippeers
 %%DATADIR%%/plugins/asterisk_voicemail
 %%DATADIR%%/plugins/bind9
 %%DATADIR%%/plugins/bind9_rndc
 %%DATADIR%%/plugins/cmc_tc_sensor_
 %%DATADIR%%/plugins/coretemp
 %%DATADIR%%/plugins/courier_
 %%DATADIR%%/plugins/courier_mta_mailqueue
 %%DATADIR%%/plugins/courier_mta_mailstats
 %%DATADIR%%/plugins/courier_mta_mailvolume
 %%DATADIR%%/plugins/cpu
 %%DATADIR%%/plugins/cupsys_pages
 %%DATADIR%%/plugins/dev_cpu_
 %%DATADIR%%/plugins/df
 %%DATADIR%%/plugins/df_inode
 %%DATADIR%%/plugins/dhcpd3
 %%DATADIR%%/plugins/digitemp_
 %%DATADIR%%/plugins/ejabberd_
 %%DATADIR%%/plugins/exim_mailqueue
 %%DATADIR%%/plugins/exim_mailqueue_alt
 %%DATADIR%%/plugins/exim_mailstats
 %%DATADIR%%/plugins/fail2ban
 %%DATADIR%%/plugins/foldingathome
 %%DATADIR%%/plugins/foldingathome_rank
 %%DATADIR%%/plugins/foldingathome_wu
 %%DATADIR%%/plugins/freeradius_acct
 %%DATADIR%%/plugins/freeradius_auth
 %%DATADIR%%/plugins/freeradius_proxy_acct
 %%DATADIR%%/plugins/freeradius_proxy_auth
 %%DATADIR%%/plugins/haproxy_
 %%DATADIR%%/plugins/haproxy_ng
 %%DATADIR%%/plugins/hddtemp
 %%DATADIR%%/plugins/hddtemp2
 %%DATADIR%%/plugins/hddtemp_smartctl
 %%DATADIR%%/plugins/hddtempd
 %%PERL%%%%DATADIR%%/plugins/hp2000_
 %%DATADIR%%/plugins/http_loadtime
 %%DATADIR%%/plugins/if_
 %%DATADIR%%/plugins/if_errcoll_
 %%DATADIR%%/plugins/if_packets_
 %%DATADIR%%/plugins/ifx_concurrent_sessions_
 %%DATADIR%%/plugins/iostat
 %%DATADIR%%/plugins/ipac-ng
 %%DATADIR%%/plugins/ipmi_
 %%DATADIR%%/plugins/ipmi_sensor_
 %%DATADIR%%/plugins/ircu
 %%JAVA%%%%DATADIR%%/plugins/jmx_
 %%JAVA%%%%DATADIR%%/plugins/jmx_tomcat_dbpools
 %%DATADIR%%/plugins/load
 %%DATADIR%%/plugins/loggrep
 %%DATADIR%%/plugins/lpstat
 %%DATADIR%%/plugins/mailman
 %%DATADIR%%/plugins/mailscanner
 %%DATADIR%%/plugins/mbmon_
 %%DATADIR%%/plugins/memcached_
 %%DATADIR%%/plugins/memory
 %%DATADIR%%/plugins/mhttping
 %%DATADIR%%/plugins/multiping
 %%DATADIR%%/plugins/multips
 %%DATADIR%%/plugins/multips_memory
 %%DATADIR%%/plugins/munin_stats
 %%DATADIR%%/plugins/munin_update
 %%DATADIR%%/plugins/mysql_
 %%DATADIR%%/plugins/mysql_bytes
 %%DATADIR%%/plugins/mysql_innodb
 %%DATADIR%%/plugins/mysql_isam_space_
 %%DATADIR%%/plugins/mysql_queries
 %%DATADIR%%/plugins/mysql_slowqueries
 %%DATADIR%%/plugins/mysql_threads
 %%DATADIR%%/plugins/named
 %%DATADIR%%/plugins/netopia
 %%DATADIR%%/plugins/netstat
 %%DATADIR%%/plugins/nginx_request
 %%DATADIR%%/plugins/nginx_status
 %%DATADIR%%/plugins/nomadix_users_
 %%PERL%%%%DATADIR%%/plugins/ntp_
 %%DATADIR%%/plugins/ntp_kernel_err
 %%DATADIR%%/plugins/ntp_kernel_pll_freq
 %%DATADIR%%/plugins/ntp_kernel_pll_off
 %%DATADIR%%/plugins/ntp_offset
 %%PERL%%%%DATADIR%%/plugins/ntp_states
 %%DATADIR%%/plugins/nut_misc
 %%DATADIR%%/plugins/nut_volts
 %%DATADIR%%/plugins/nutups_
 %%DATADIR%%/plugins/nvidia_
 %%DATADIR%%/plugins/open_files
 %%DATADIR%%/plugins/openvpn
 %%DATADIR%%/plugins/perdition
 %%PERL%%%%DATADIR%%/plugins/pgbouncer_connections
 %%PERL%%%%DATADIR%%/plugins/pgbouncer_requests
 %%DATADIR%%/plugins/ping_
 %%DATADIR%%/plugins/plugin.sh
 %%DATADIR%%/plugins/plugins.history
 %%DATADIR%%/plugins/pm3users_
 %%DATADIR%%/plugins/pop_stats
 %%DATADIR%%/plugins/postfix_mailqueue
 %%DATADIR%%/plugins/postfix_mailstats
 %%DATADIR%%/plugins/postfix_mailvolume
 %%PERL%%%%DATADIR%%/plugins/postgres_autovacuum
 %%PERL%%%%DATADIR%%/plugins/postgres_bgwriter
 %%PERL%%%%DATADIR%%/plugins/postgres_cache_
 %%PERL%%%%DATADIR%%/plugins/postgres_checkpoints
 %%PERL%%%%DATADIR%%/plugins/postgres_connections_
 %%PERL%%%%DATADIR%%/plugins/postgres_connections_db
 %%PERL%%%%DATADIR%%/plugins/postgres_locks_
 %%PERL%%%%DATADIR%%/plugins/postgres_oldest_prepared_xact_
 %%PERL%%%%DATADIR%%/plugins/postgres_prepared_xacts_
 %%PERL%%%%DATADIR%%/plugins/postgres_querylength_
 %%PERL%%%%DATADIR%%/plugins/postgres_scans_
 %%PERL%%%%DATADIR%%/plugins/postgres_size_
 %%PERL%%%%DATADIR%%/plugins/postgres_streaming_
 %%PERL%%%%DATADIR%%/plugins/postgres_transactions_
 %%PERL%%%%DATADIR%%/plugins/postgres_tuples_
 %%PERL%%%%DATADIR%%/plugins/postgres_users
 %%PERL%%%%DATADIR%%/plugins/postgres_xlog
 %%DATADIR%%/plugins/processes
 %%DATADIR%%/plugins/proxy_plugin
 %%DATADIR%%/plugins/ps_
 %%DATADIR%%/plugins/psu_
 %%DATADIR%%/plugins/qmailqstat
 %%DATADIR%%/plugins/qmailscan
 %%DATADIR%%/plugins/qmailscan-simple
 %%DATADIR%%/plugins/samba
 %%DATADIR%%/plugins/sendmail_mailqueue
 %%DATADIR%%/plugins/sendmail_mailstats
 %%DATADIR%%/plugins/sendmail_mailtraffic
 %%DATADIR%%/plugins/slapd_
 %%DATADIR%%/plugins/slapd_bdb_cache_
 %%PERL%%%%DATADIR%%/plugins/slony_lag_
 %%DATADIR%%/plugins/smart_
 %%SNMP%%%%DATADIR%%/plugins/snmp__cpuload
 %%SNMP%%%%DATADIR%%/plugins/snmp__df
 %%SNMP%%%%DATADIR%%/plugins/snmp__df_ram
 %%SNMP%%%%DATADIR%%/plugins/snmp__fc_if_
 %%SNMP%%%%DATADIR%%/plugins/snmp__fc_if_err_
 %%SNMP%%%%DATADIR%%/plugins/snmp__if_
 %%SNMP%%%%DATADIR%%/plugins/snmp__if_err_
 %%SNMP%%%%DATADIR%%/plugins/snmp__if_multi
 %%SNMP%%%%DATADIR%%/plugins/snmp__load
 %%SNMP%%%%DATADIR%%/plugins/snmp__memory
 %%SNMP%%%%DATADIR%%/plugins/snmp__netapp_diskusage_
 %%SNMP%%%%DATADIR%%/plugins/snmp__netapp_inodeusage_
 %%SNMP%%%%DATADIR%%/plugins/snmp__netstat
 %%SNMP%%%%DATADIR%%/plugins/snmp__print_pages
 %%SNMP%%%%DATADIR%%/plugins/snmp__print_supplies
 %%SNMP%%%%DATADIR%%/plugins/snmp__processes
 %%SNMP%%%%DATADIR%%/plugins/snmp__rdp_users
 %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_fsc_bx_fan
 %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_fsc_bx_temp
 %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_fsc_fan
 %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_fsc_temp
 %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_mbm_fan
 %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_mbm_temp
 %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_mbm_volt
 %%SNMP%%%%DATADIR%%/plugins/snmp__swap
 %%SNMP%%%%DATADIR%%/plugins/snmp__uptime
 %%SNMP%%%%DATADIR%%/plugins/snmp__users
 %%SNMP%%%%DATADIR%%/plugins/snmp__winload
 %%SNMP%%%%DATADIR%%/plugins/snmp__winmem
 %%DATADIR%%/plugins/snort_alerts
 %%DATADIR%%/plugins/snort_bytes_pkt
 %%DATADIR%%/plugins/snort_drop_rate
 %%DATADIR%%/plugins/snort_pattern_match
 %%DATADIR%%/plugins/snort_pkts
 %%DATADIR%%/plugins/snort_traffic
 %%DATADIR%%/plugins/spamstats
 %%DATADIR%%/plugins/squeezebox_
 %%DATADIR%%/plugins/squid_cache
 %%DATADIR%%/plugins/squid_icp
 %%DATADIR%%/plugins/squid_objectsize
 %%DATADIR%%/plugins/squid_requests
 %%DATADIR%%/plugins/squid_traffic
 %%DATADIR%%/plugins/surfboard
 %%DATADIR%%/plugins/swap
 %%DATADIR%%/plugins/sybase_space
 %%DATADIR%%/plugins/systat
 %%DATADIR%%/plugins/tomcat_
 %%DATADIR%%/plugins/tomcat_access
 %%DATADIR%%/plugins/tomcat_jvm
 %%DATADIR%%/plugins/tomcat_threads
 %%DATADIR%%/plugins/tomcat_volume
 %%DATADIR%%/plugins/uptime
 %%DATADIR%%/plugins/users
 %%PERL%%%%DATADIR%%/plugins/varnish_
 %%DATADIR%%/plugins/vmstat
 %%DATADIR%%/plugins/zimbra_
-@dir(%%USER%%,%%GROUP%%,) %%DBDIR%%/plugin-state
+@dir(%%USER%%,%%GROUP%%,) %%DBDIRNODE%%/plugin-state
 @dir %%ETCDIR%%/plugins