- Stage

- Move a few patches around to stay consistent
- add a JAVA option to munin-node.

Sponsored by:	Absolight

14 files changed, 422 insertions, 272 deletions

diff --git a/sysutils/munin-common/Makefile b/sysutils/munin-common/Makefile
index f41c629d00b3..a694518443b7 100644
--- a/sysutils/munin-common/Makefile
+++ b/sysutils/munin-common/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-common
@@ -17,24 +18,12 @@ RUN_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
 USES=		gmake perl5
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../munin-common/munin.mk"
 
 ALL_TARGET=	build-common-prime
 INSTALL_TARGET=	install-common
 
-MAN3=		Munin::Common::Config.3 \
-		Munin::Common::Defaults.3 \
-		Munin::Common::TLS.3 \
-		Munin::Common::TLSClient.3 \
-		Munin::Common::TLSServer.3 \
-		Munin::Common::Timeout.3
-
 post-install:
-	@${MKDIR} ${LOGDIR} ${STATEDIR} ${SPOOLDIR}
-	@${CHOWN} ${USERS}:${GROUPS} ${LOGDIR} ${STADEDIR} ${SPOOLDIR}
-	@(cd ${WRKSRC}/common/blib/libdoc && for man in ${MAN3} ; do \
-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \
-	done)
+	${MKDIR} ${STAGEDIR}${LOGDIR} ${STAGEDIR}${STATEDIR} ${STAGEDIR}${SPOOLDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/munin-common/files/patch-Makefile b/sysutils/munin-common/files/patch-Makefile
index 962dd45ca0e5..4202408dcc37 100644
--- a/sysutils/munin-common/files/patch-Makefile
+++ b/sysutils/munin-common/files/patch-Makefile
@@ -1,27 +1,143 @@
---- Makefile.orig	2012-08-31 17:22:50.000000000 +0200
-+++ Makefile	2012-09-08 00:38:17.000000000 +0200
-@@ -68,11 +68,11 @@
+--- Makefile.orig	2013-07-19 16:30:03 UTC
++++ Makefile
+@@ -68,60 +68,48 @@
  
  install-pre: Makefile Makefile.config
  	@$(CHECKUSER)
 -	mkdir -p $(LOGDIR)
 -	mkdir -p $(STATEDIR)
 -	mkdir -p $(SPOOLDIR)
-+#	mkdir -p $(LOGDIR)
-+#	mkdir -p $(STATEDIR)
-+#	mkdir -p $(SPOOLDIR)
- 	mkdir -p $(CONFDIR)
+-	mkdir -p $(CONFDIR)
 -	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
-+#	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
++	mkdir -p $(DESTDIR)$(CONFDIR)
  
  install-master-prime: $(INFILES_MASTER) install-pre install-master
- 	mkdir -p $(CONFDIR)/templates
-@@ -144,7 +144,7 @@
- 	mkdir -p $(LIBDIR)/plugins
+-	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 @@
+ 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 $(DESTDIR)$(CONFDIR)/plugins
++	mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
++	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
  	mkdir -p $(PLUGSTATE)
  
 -	$(CHOWN) root:root $(PLUGSTATE)
-+	$(CHOWN) root:wheel $(PLUGSTATE)
- 	$(CHMOD) 0755 $(PLUGSTATE)
- 	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
+-	$(CHMOD) 0755 $(PLUGSTATE)
+-	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
+-
+ 	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
++	$(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
+ 
+@@ -426,6 +410,7 @@
+             --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 98a7052bf8ae..c154efd70e27 100644
--- a/sysutils/munin-common/files/patch-Makefile.config
+++ b/sysutils/munin-common/files/patch-Makefile.config
@@ -1,6 +1,97 @@
---- Makefile.config.orig	2009-12-30 05:55:56.000000000 -0700
-+++ Makefile.config	2010-01-30 11:17:34.000000000 -0700
-@@ -126,9 +129,8 @@
+--- Makefile.config.orig	2013-07-19 16:30:03 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 @@
+ 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 @@
  # Which command to use to check if the USER and GROUP to run Munin as, exists.
  # These will work on most modern OSes:
  #
diff --git a/sysutils/munin-common/pkg-plist b/sysutils/munin-common/pkg-plist
index 73257e8de25b..52eb8a059c7f 100644
--- a/sysutils/munin-common/pkg-plist
+++ b/sysutils/munin-common/pkg-plist
@@ -6,8 +6,14 @@
 %%SITE_PERL%%/Munin/Common/TLSClient.pm
 %%SITE_PERL%%/Munin/Common/TLSServer.pm
 %%SITE_PERL%%/Munin/Common/Timeout.pm
-@dirrm %%SITE_PERL%%/Munin/Common
-@dirrm %%SITE_PERL%%/Munin
-@exec mkdir -p %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%%
-@exec chown %%USER%%:%%GROUP%% %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%%
-@unexec rmdir %%DBDIR%% %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%% 2>/dev/null || /usr/bin/true
+man/man3/Munin::Common::Config.3.gz
+man/man3/Munin::Common::Defaults.3.gz
+man/man3/Munin::Common::TLS.3.gz
+man/man3/Munin::Common::TLSClient.3.gz
+man/man3/Munin::Common::TLSServer.3.gz
+man/man3/Munin::Common::Timeout.3.gz
+@dirrmtry %%SITE_PERL%%/Munin/Common
+@dirrmtry %%SITE_PERL%%/Munin
+@dirrmtry(%%USER%%,%%GROUP%%,) %%LOGDIR%%
+@dirrmtry(%%USER%%,%%GROUP%%,) %%STATEDIR%%
+@dirrmtry(%%USER%%,%%GROUP%%,) %%SPOOLDIR%%
diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile
index 5e47eda760e8..f78fb8d24328 100644
--- a/sysutils/munin-master/Makefile
+++ b/sysutils/munin-master/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-master
@@ -45,7 +46,6 @@ USES=		gmake perl5
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../munin-common/munin.mk"
 
 EXTRA_PATCHES=	${MUNIN_PATCHES}
@@ -53,51 +53,15 @@ DISTINFO_FILE=	${MUNIN_DISTINFO}
 ALL_TARGET=	infiles build-master build-man
 INSTALL_TARGET=	install-master-prime
 
-MAN3=		Munin::Master::Config.3 \
-		Munin::Master::Group.3 \
-		Munin::Master::GroupRepository.3 \
-		Munin::Master::HTMLOld.3 \
-		Munin::Master::Host.3 \
-		Munin::Master::LimitsOld.3 \
-		Munin::Master::Logger.3 \
-		Munin::Master::Node.3 \
-		Munin::Master::ProcessManager.3 \
-		Munin::Master::Update.3 \
-		Munin::Master::UpdateWorker.3 \
-		Munin::Master::Utils.3 \
-		Munin::Master::Worker.3
-MAN5=		munin.conf.5
-MAN8=		munin-cron.8 \
-		munin-graph.8 \
-		munin-html.8 \
-		munin-limits.8 \
-		munin-update.8
-
-PLIST_SUB=	DBDIR=${DBDIR}
 SUB_FILES=	pkg-message
-
-.include <bsd.port.pre.mk>
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL
+PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 post-install:
-	@${CHOWN} ${USERS}:${GROUPS} ${DBDIR} ${STATEDIR} ${WWWDIR}
-	@${CHOWN} ${WWWOWN} ${DBDIR}/cgi-tmp
-	@${INSTALL_DATA} ${WRKSRC}/build/master/munin.conf \
-		${PREFIX}/etc/munin/munin.conf.sample
-	@(cd ${WRKSRC}/master/blib/libdoc && for man in ${MAN3}; do \
-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \
-	done)
-	@(cd ${WRKSRC}/build/doc && for man in ${MAN5}; do \
-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man5; \
-	done)
-	@(cd ${WRKSRC}/build/doc && for man in ${MAN8}; do \
-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man8; \
-	done)
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
-	@${CAT} ${PKGMESSAGE}
+	(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
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/munin-master/pkg-plist b/sysutils/munin-master/pkg-plist
index d671d0bc98b0..5a8e5a77edb4 100644
--- a/sysutils/munin-master/pkg-plist
+++ b/sysutils/munin-master/pkg-plist
@@ -1,40 +1,38 @@
 bin/munin-check
 bin/munin-cron
-@unexec if cmp -s %D/%%ETCDIR%%/munin.conf.sample %D/%%ETCDIR%%/munin.conf ; then rm -f %D/%%ETCDIR%%/munin.conf ; fi
-%%ETCDIR%%/munin.conf.sample
-@exec if [ ! -f %D/%%ETCDIR%%/munin.conf ] ; then cp -p %D/%%ETCDIR%%/munin.conf.sample %D/%%ETCDIR%%/munin.conf ; fi
-%%ETCDIR%%/static/definitions.html
-%%ETCDIR%%/static/dynazoom.html
-%%ETCDIR%%/static/favicon.ico
-%%ETCDIR%%/static/formatdate.js
-%%ETCDIR%%/static/logo-h.png
-%%ETCDIR%%/static/logo.png
-%%ETCDIR%%/static/querystring.js
-%%ETCDIR%%/static/style-1.2.css
-%%ETCDIR%%/static/style-new.css
-%%ETCDIR%%/static/style.css
-%%ETCDIR%%/static/zoom.js
-%%ETCDIR%%/templates/munin-comparison-day.tmpl
-%%ETCDIR%%/templates/munin-comparison-month.tmpl
-%%ETCDIR%%/templates/munin-comparison-week.tmpl
-%%ETCDIR%%/templates/munin-comparison-year.tmpl
-%%ETCDIR%%/templates/munin-categoryview.tmpl
-%%ETCDIR%%/templates/munin-dynazoom.tmpl
-%%ETCDIR%%/templates/munin-domainview.tmpl
-%%ETCDIR%%/templates/munin-nodeview.tmpl
-%%ETCDIR%%/templates/munin-overview.tmpl
-%%ETCDIR%%/templates/munin-problemview.tmpl
-%%ETCDIR%%/templates/munin-serviceview.tmpl
-%%ETCDIR%%/templates/partial/bottom_navigation.tmpl
-%%ETCDIR%%/templates/partial/footer.tmpl
-%%ETCDIR%%/templates/partial/generated_by.tmpl
-%%ETCDIR%%/templates/partial/head.tmpl
-%%ETCDIR%%/templates/partial/logo_navigation.tmpl
-%%ETCDIR%%/templates/partial/logo_navigation_comparison.tmpl
-%%ETCDIR%%/templates/partial/logo_navigation_problem.tmpl
-%%ETCDIR%%/templates/partial/logo_path.tmpl
-%%ETCDIR%%/templates/partial/navigation.tmpl
-%%ETCDIR%%/templates/partial/path.tmpl
+@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
@@ -50,6 +48,25 @@ bin/munin-cron
 %%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
@@ -58,19 +75,16 @@ bin/munin-cron
 %%DATADIR%%/munin-limits
 %%DATADIR%%/munin-storable2datafile
 %%DATADIR%%/munin-update
-%%WWWDIR%%/.htaccess
 www/cgi-bin/munin-cgi-graph
 www/cgi-bin/munin-cgi-html
-@dirrmtry www/cgi-bin
-@dirrmtry %%WWWDIR%%
-@dirrmtry %%DATADIR%%
-@dirrm %%SITE_PERL%%/Munin/Master
-@dirrmtry %%SITE_PERL%%/Munin
+@sample %%WWWDIR%%/.htaccess.sample
+@dirrmtry %%ETCDIR%%/munin-conf.d
 @dirrmtry %%ETCDIR%%/static
 @dirrmtry %%ETCDIR%%/templates/partial
 @dirrmtry %%ETCDIR%%/templates
-@exec mkdir -p %D/%%ETCDIR%%/munin-conf.d
-@dirrmtry %%ETCDIR%%/munin-conf.d
 @dirrmtry %%ETCDIR%%
-@cwd /var
-@dirrmtry munin/cgi-tmp
+@dirrmtry %%SITE_PERL%%/Munin/Master
+@dirrmtry %%DATADIR%%
+@dirrmtry www/cgi-bin
+@dirrmtry(%%USER%%,%%GROUP%%,) %%WWWDIR%%
+@dirrmtry(%%WWWOWN%%,%%WWWGRP%%,) %%DBDIRNODE%%/cgi-tmp
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index 0689947295b4..b8f5e9d7a819 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-node
@@ -23,57 +23,30 @@ RUN_DEPENDS=	p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
 		p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
 		bash:${PORTSDIR}/shells/bash
 
-DISTINFO_FILE=	${MUNIN_DISTINFO}
-EXTRA_PATCHES+=	${MUNIN_PATCHES}
 USES=		gmake perl5 shebangfix
 PKGMESSAGE=	${WRKDIR}/pkg-message
 REINPLACE_ARGS=	-i ""
-SHEBANG_FILES=	node/sbin/munin-node
+SHEBANG_FILES=	node/sbin/munin-node node/sbin/munin-sched \
+		node/sbin/munin-run node/sbin/munin-node-configure
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../munin-common/munin.mk"
 
+DISTINFO_FILE=	${MUNIN_DISTINFO}
+EXTRA_PATCHES+=	${MUNIN_PATCHES}
 ALL_TARGET=	build-node build-plugins
 INSTALL_TARGET=	install-node-prime install-plugins-prime
 
-OPTIONS_DEFINE=	SNMP
+OPTIONS_DEFINE=	SNMP JAVA
 OPTIONS_DEFAULT=	SNMP
-SNMP_DESC=	Include support for SNMP plugins
+OPTIONS_SUB=	yes
+SNMP_DESC=	Include SNMP plugins
+JAVA_DESC=	Include JAVA plugins
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSNMP}
-BUILD_DEPENDS+=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
-RUN_DEPENDS+=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
-.endif
-
-MAN1=		munin-node-configure.1 \
-		munin-node.1 \
-		munin-run.1 \
-		munin-sched.1 \
-		munindoc.1
-MAN3_NODE=	Munin::Node::Config.3 \
-		Munin::Node::Configure::Debug.3 \
-		Munin::Node::Configure::History.3 \
-		Munin::Node::Configure::HostEnumeration.3 \
-		Munin::Node::Configure::Plugin.3 \
-		Munin::Node::Configure::PluginList.3 \
-		Munin::Node::Logger.3 \
-		Munin::Node::OS.3 \
-		Munin::Node::ProxySpooler.3 \
-		Munin::Node::SNMPConfig.3 \
-		Munin::Node::Server.3 \
-		Munin::Node::Service.3 \
-		Munin::Node::Session.3 \
-		Munin::Node::SpoolReader.3 \
-		Munin::Node::SpoolWriter.3 \
-		Munin::Node::Utils.3
-MAN3_PLUGIN=	Munin::Plugin.3 \
-		Munin::Plugin::Pgsql.3 \
-		Munin::Plugin::SNMP.3
-MAN3=		${MAN3_NODE} ${MAN3_PLUGIN}
-MAN5=		munin-node.conf.5
-MAN8=		munin.8
+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
+JAVA_USE=	java=yes
+JAVA_INSTALL_TARGET=	install-plugins-java
+JAVA_BUILD=	yes
 
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	munin-node munin-sched
@@ -92,43 +65,20 @@ post-patch:
 		${WRKSRC}/Makefile.config
 	@${FIND} ${WRKSRC}/node/sbin -type f -name "*.orig" -delete
 
-pre-su-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 post-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/munin-node \
-		${PREFIX}/etc/rc.d/munin-node
-	@${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf \
-		${ETCDIR}/munin-node.conf.sample
-	@if [ ! -f ${ETCDIR}/munin-node.conf ]; then \
-		${INSTALL_DATA} ${ETCDIR}/munin-node.conf.sample \
-			${ETCDIR}/munin-node.conf; \
-	fi
-	@${INSTALL_DATA} ${FILESDIR}/plugins.conf \
-		${ETCDIR}/plugin-conf.d/plugins.conf.sample
-	@if [ ! -f ${ETCDIR}/plugin-conf.d/plugins.conf ]; then \
-		${INSTALL_DATA} ${ETCDIR}/plugin-conf.d/plugins.conf.sample \
-			${ETCDIR}/plugin-conf.d/plugins.conf; \
-	fi
-	@(cd ${WRKSRC}/node/blib/bindoc && for man in ${MAN1}; do \
-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man1; \
-	done)
-	@(cd ${WRKSRC}/node/blib/libdoc && for man in ${MAN3_NODE}; do \
-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \
-	done)
-	@(cd ${WRKSRC}/plugins/blib/libdoc && for man in ${MAN3_PLUGIN}; do \
-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \
-	done)
-	@(cd ${WRKSRC}/build/doc && for man in ${MAN5}; do \
-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man5; \
-	done)
-	@(cd ${WRKSRC}/build/doc && for man in ${MAN8}; do \
-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man8; \
-	done)
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${ECHO} ${PORTVERSION} > /tmp/.munin-node.version
-	@${CAT} ${PKGMESSAGE}
+	${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} ${FILESDIR}/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/files/patch-munin-node.conf.in b/sysutils/munin-node/files/patch-node__munin-node.conf.in
index 8284ed61f943..10ab0fa8bb48 100644
--- a/sysutils/munin-node/files/patch-munin-node.conf.in
+++ b/sysutils/munin-node/files/patch-node__munin-node.conf.in
@@ -1,5 +1,5 @@
---- ./node/munin-node.conf.in.orig	2011-02-17 00:25:32.000000000 +0100
-+++ ./node/munin-node.conf.in	2011-02-17 00:25:47.000000000 +0100
+--- node/munin-node.conf.in.orig	2013-07-19 16:30:03 UTC
++++ node/munin-node.conf.in
 @@ -10,7 +10,7 @@
  setsid 1
  
@@ -7,9 +7,9 @@
 -group root
 +group wheel
  
- # Regexps for files to ignore
- 
-@@ -22,6 +22,7 @@
+ # This is the timeout for the whole transaction.
+ # Units are in sec. Default is 15 min
+@@ -30,6 +30,7 @@
  ignore_file \.dpkg-(tmp|new|old|dist)$
  ignore_file \.rpm(save|new)$
  ignore_file \.pod$
diff --git a/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_.in
index ff4aa9183927..addddd9e0bde 100644
--- a/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff
+++ b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_.in
@@ -1,6 +1,6 @@
---- plugins/node.d.freebsd/if_.in.orig	2009-12-30 13:55:55.000000000 +0100
-+++ plugins/node.d.freebsd/if_.in	2010-02-24 18:59:15.670282185 +0100
-@@ -81,9 +81,12 @@
+--- plugins/node.d.freebsd/if_.in.orig	2013-07-19 16:30:03 UTC
++++ plugins/node.d.freebsd/if_.in
+@@ -83,9 +83,12 @@
  	if (NF == 10) { 
  		print "rbytes.value", $6;
  		print "obytes.value", $9;
diff --git a/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_errcoll_.in
index 83b671655aaf..976422e790c0 100644
--- a/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff
+++ b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_errcoll_.in
@@ -1,5 +1,5 @@
---- plugins/node.d.freebsd/if_errcoll_.in.orig	2009-12-30 13:55:55.000000000 +0100
-+++ plugins/node.d.freebsd/if_errcoll_.in	2010-02-24 19:00:26.026407278 +0100
+--- plugins/node.d.freebsd/if_errcoll_.in.orig	2013-07-19 16:30:03 UTC
++++ plugins/node.d.freebsd/if_errcoll_.in
 @@ -59,9 +59,13 @@
  		print "ierrors.value", $5;
  		print "oerrors.value", $8;
diff --git a/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in
index b63336f3243a..c0a973d87a4b 100644
--- a/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in
+++ b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in
@@ -1,5 +1,5 @@
---- ./plugins/node.d.freebsd/iostat.in.orig	2012-07-11 14:14:27.841196443 +0200
-+++ ./plugins/node.d.freebsd/iostat.in	2012-07-11 14:14:32.619552027 +0200
+--- plugins/node.d.freebsd/iostat.in.orig	2013-07-19 16:30:03 UTC
++++ plugins/node.d.freebsd/iostat.in
 @@ -56,13 +56,11 @@
      for d in $drives; do
         echo "${d}_read.label ${d}"
diff --git a/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in b/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in
index ca6daea50fd7..13ce4b37db37 100644
--- a/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in
+++ b/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in
@@ -1,7 +1,7 @@
---- plugins/node.d/hddtemp_smartctl.in.orig	2012-09-11 11:26:15.928249255 +0200
-+++ plugins/node.d/hddtemp_smartctl.in	2012-09-11 11:26:48.947249274 +0200
-@@ -151,7 +151,7 @@
-   # without probing them.
+--- plugins/node.d/hddtemp_smartctl.in.orig	2013-07-19 16:30:03 UTC
++++ plugins/node.d/hddtemp_smartctl.in
+@@ -162,7 +162,7 @@
+   
  } elsif ($^O eq 'freebsd') {
    opendir(DEV, '/dev');
 -  @drives = grep /^ad[0-9]+$/, readdir DEV;
diff --git a/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in b/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in
index afc73b8fd4f5..d602b6742cc7 100644
--- a/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in
+++ b/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in
@@ -1,6 +1,6 @@
---- ./plugins/node.d/squeezebox_.in.orig	2012-08-14 17:19:40.000000000 +0200
-+++ ./plugins/node.d/squeezebox_.in	2012-08-27 13:55:40.573530762 +0200
-@@ -156,7 +156,7 @@
+--- plugins/node.d/squeezebox_.in.orig	2013-07-19 16:30:03 UTC
++++ plugins/node.d/squeezebox_.in
+@@ -157,7 +157,7 @@
  		printf "graph_order y"
          echo $years_array | sed 's/ / y/g'
  
@@ -9,7 +9,7 @@
  			year=$(echo ${arr1[$i]})
  			if [ $year = 0 ]; then
  				echo y0.label No year
-@@ -171,7 +171,7 @@
+@@ -172,7 +172,7 @@
  		done
  		exit 0
  	fi
@@ -18,7 +18,7 @@
  		year=$(echo ${arr1[$i]})
  		printf "y%s.value " ${year}
  		printf "%b" "albums 0 0 year:${year}\nexit\n" | $NC $HOST $PORT | sed 's/%3A/:/g' | cut -d ':' -f 3
-@@ -182,7 +182,7 @@
+@@ -183,7 +183,7 @@
              echo "graph_category Squeezebox"
              COUNT=$(printf "%b" "player count ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 3)
              (( COUNT-- ))
@@ -27,7 +27,7 @@
                  MAC=$(printf "%b" "player id $ID ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 4 | sed 's/%3A/:/g')
  		NAME=$(printf "%b" "player name $MAC ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 4 | sed 's/%20/ /g')
  		MAC2=$(echo $MAC | sed 's/://g; s/\./_/g')
-@@ -192,7 +192,7 @@
+@@ -193,7 +193,7 @@
          fi
          COUNT=$(printf "%b" "player count ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 3)
          (( COUNT-- ))
diff --git a/sysutils/munin-node/pkg-plist b/sysutils/munin-node/pkg-plist
index 5a86fb8e9125..6217737b7263 100644
--- a/sysutils/munin-node/pkg-plist
+++ b/sysutils/munin-node/pkg-plist
@@ -1,11 +1,6 @@
-@stopdaemon munin-node
 bin/munindoc
-@unexec if cmp -s %D/%%ETCDIR%%/munin-node.conf.sample %D/%%ETCDIR%%/munin-node.conf ; then rm -f %D/%%ETCDIR%%/munin-node.conf ; fi
-%%ETCDIR%%/munin-node.conf.sample
-@exec if [ ! -f %D/%%ETCDIR%%/munin-node.conf ] ; then cp -p %D/%%ETCDIR%%/munin-node.conf.sample %D/%%ETCDIR%%/munin-node.conf ; fi
-@unexec if cmp -s %D/%%ETCDIR%%/plugin-conf.d/plugins.conf.sample %D/%%ETCDIR%%/plugin-conf.d/plugins.conf ; then rm -f %D/%%ETCDIR%%/plugin-conf.d/plugins.conf ; fi
-%%ETCDIR%%/plugin-conf.d/plugins.conf.sample
-@exec if [ ! -f %D/%%ETCDIR%%/plugin-conf.d/plugins.conf ] ; then cp -p %D/%%ETCDIR%%/plugin-conf.d/plugins.conf.sample %D/%%ETCDIR%%/plugin-conf.d/plugins.conf ; fi
+@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
@@ -25,10 +20,37 @@ bin/munindoc
 %%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
@@ -86,6 +108,8 @@ sbin/munin-sched
 %%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
@@ -168,35 +192,35 @@ sbin/munin-sched
 %%DATADIR%%/plugins/slapd_bdb_cache_
 %%DATADIR%%/plugins/slony_lag_
 %%DATADIR%%/plugins/smart_
-%%DATADIR%%/plugins/snmp__cpuload
-%%DATADIR%%/plugins/snmp__df
-%%DATADIR%%/plugins/snmp__df_ram
-%%DATADIR%%/plugins/snmp__fc_if_
-%%DATADIR%%/plugins/snmp__fc_if_err_
-%%DATADIR%%/plugins/snmp__if_
-%%DATADIR%%/plugins/snmp__if_err_
-%%DATADIR%%/plugins/snmp__if_multi
-%%DATADIR%%/plugins/snmp__load
-%%DATADIR%%/plugins/snmp__memory
-%%DATADIR%%/plugins/snmp__netapp_diskusage_
-%%DATADIR%%/plugins/snmp__netapp_inodeusage_
-%%DATADIR%%/plugins/snmp__netstat
-%%DATADIR%%/plugins/snmp__print_pages
-%%DATADIR%%/plugins/snmp__print_supplies
-%%DATADIR%%/plugins/snmp__processes
-%%DATADIR%%/plugins/snmp__rdp_users
-%%DATADIR%%/plugins/snmp__sensors_fsc_bx_fan
-%%DATADIR%%/plugins/snmp__sensors_fsc_bx_temp
-%%DATADIR%%/plugins/snmp__sensors_fsc_fan
-%%DATADIR%%/plugins/snmp__sensors_fsc_temp
-%%DATADIR%%/plugins/snmp__sensors_mbm_fan
-%%DATADIR%%/plugins/snmp__sensors_mbm_temp
-%%DATADIR%%/plugins/snmp__sensors_mbm_volt
-%%DATADIR%%/plugins/snmp__swap
-%%DATADIR%%/plugins/snmp__uptime
-%%DATADIR%%/plugins/snmp__users
-%%DATADIR%%/plugins/snmp__winload
-%%DATADIR%%/plugins/snmp__winmem
+%%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
@@ -224,16 +248,12 @@ sbin/munin-sched
 %%DATADIR%%/plugins/varnish_
 %%DATADIR%%/plugins/vmstat
 %%DATADIR%%/plugins/zimbra_
-@dirrm %%DATADIR%%/plugins
-@dirrmtry %%DATADIR%%
-@dirrm %%SITE_PERL%%/Munin/Plugin
-@dirrm %%SITE_PERL%%/Munin/Node/Configure
-@dirrm %%SITE_PERL%%/Munin/Node
-@dirrmtry %%SITE_PERL%%/Munin
-@exec mkdir -p %D/%%ETCDIR%%/plugins
-@dirrmtry %%ETCDIR%%/plugins
-@exec mkdir -p %D/%%ETCDIR%%/plugin-conf.d
 @dirrmtry %%ETCDIR%%/plugin-conf.d
+@dirrmtry %%ETCDIR%%/plugins
 @dirrmtry %%ETCDIR%%
-@cwd /var
-@dirrmtry munin/plugin-state
+@dirrmtry %%SITE_PERL%%/Munin/Node/Configure
+@dirrmtry %%SITE_PERL%%/Munin/Node
+@dirrmtry %%SITE_PERL%%/Munin/Plugin
+@dirrmtry %%DATADIR%%/plugins
+@dirrmtry %%DATADIR%%
+@dirrmtry(%%USER%%,%%GROUP%%,) %%DBDIR%%/plugin-state