8 files changed, 157 insertions, 115 deletions

diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile
index 129dd62c12d8..28167e6cacc9 100644
--- a/sysutils/munin-master/Makefile
+++ b/sysutils/munin-master/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	munin-main
+# New ports collection makefile for:	munin-master
 # Date created:				25 Januar 2004
 # Whom:					Lupe Christoph <lupe@lupe-christoph.de>
 #
@@ -6,49 +6,86 @@
 #
 
 PORTNAME=	munin
-PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTVERSION=	1.4.3
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION}
-PKGNAMESUFFIX=	-main
-DISTNAME=	${PORTNAME}_${PORTVERSION:S/.r/rc/}
+PKGNAMESUFFIX=	-master
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	Collector part of Munin
 
-USE_PERL5=	yes
-
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool \
+BUILD_DEPENDS=	${SITE_PERL}/Module/Build.pm:${PORTSDIR}/devel/p5-Module-Build \
+		${SITE_PERL}/Munin/Common/Defaults.pm:${PORTSDIR}/sysutils/munin-common \
+		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
+		${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool \
+		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/converters/p5-Storable-AMF \
+		${SITE_PERL}/DateTime/HiRes.pm:${PORTSDIR}/devel/p5-DateTime-HiRes \
+		${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
+		${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
+		${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl \
+		${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced
+RUN_DEPENDS=	${SITE_PERL}/Munin/Common/Defaults.pm:${PORTSDIR}/sysutils/munin-common \
+		${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool \
+		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
+		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/converters/p5-Storable-AMF \
+		${SITE_PERL}/DateTime/HiRes.pm:${PORTSDIR}/devel/p5-DateTime-HiRes \
+		${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
 		${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
-		${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip
-BUILD_DEPENDS=	${RUN_DEPENDS}
+		${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl \
+		${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced
 
+USE_PERL5=	yes
 USE_GMAKE=	yes
 PATCH_STRIP=	-p1
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
 PKGMESSAGE=	${WRKDIR}/pkg-message
-ALL_TARGET=	WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} build build-man
-INSTALL_TARGET=	WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-main
 
+MAKE_ARGS=	LIBDIR=${DATADIR} CONFDIR=${ETCDIR} \
+		WWWDIR=${WWWDIR} CGIDIR=${WWWDIR}/cgi-bin \
+		PERL=${PERL} SITE_PERL_REL=${SITE_PERL_REL}
+ALL_TARGET=	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::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
+MAN8=		munin-cron.8 \
+		munin-graph.8 \
+		munin-html.8 \
+		munin-limits.8 \
+		munin-update.8
 
-SUB_FILES=pkg-message
+SUB_FILES=	pkg-message
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/build/server/munin.conf ${PREFIX}/etc/munin/munin.conf.sample
-	@for man in ${MAN5}; do \
-		${INSTALL_MAN} -C ${WRKSRC}/build/doc/$$man ${PREFIX}/man/man5; \
-	done
-	@for man in ${MAN8}; do \
-		${INSTALL_MAN} -C ${WRKSRC}/build/doc/$$man ${PREFIX}/man/man8; \
-	done
+	@${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)
 	@DATADIR=${DATADIR} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
-	@${CHOWN} munin /var/log/munin-main
-	@${CHGRP} munin /var/run/munin /var/log/munin-main ${WWWDIR} ${PREFIX}/var/munin
+	@${CHOWN} munin /var/log/munin-master
+	@${CHGRP} munin /var/run/munin /var/log/munin-master ${WWWDIR} ${PREFIX}/var/munin
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/sysutils/munin-master/distinfo b/sysutils/munin-master/distinfo
index 3222d2677ecc..b74600488bbb 100644
--- a/sysutils/munin-master/distinfo
+++ b/sysutils/munin-master/distinfo
@@ -1,3 +1,3 @@
-MD5 (munin_1.2.6.tar.gz) = 45f84d58f80642ce914f147232f0d396
-SHA256 (munin_1.2.6.tar.gz) = 3b04d72810317a91225c78652277079ec3cc5791ef8991326da219a05d2477d8
-SIZE (munin_1.2.6.tar.gz) = 360694
+MD5 (munin-1.4.3.tar.gz) = 229646facc4e2bca6511b20b3e5eb73f
+SHA256 (munin-1.4.3.tar.gz) = c5f1c8e5e71e9ffd5c74037ec3eec4da362fd2aecea3c788abb7d92b461834d0
+SIZE (munin-1.4.3.tar.gz) = 1205698
diff --git a/sysutils/munin-master/files/patch-Makefile b/sysutils/munin-master/files/patch-Makefile
index e67b632a10e7..22cd60e4fefe 100644
--- a/sysutils/munin-master/files/patch-Makefile
+++ b/sysutils/munin-master/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.orig	Tue May 11 22:23:06 2004
-+++ Makefile	Fri Jun  4 00:25:54 2004
-@@ -26,7 +26,7 @@
- 	mkdir -p $(HTMLDIR)
- 	mkdir -p $(DBDIR)
+--- Makefile.orig	2010-01-30 10:49:44.000000000 -0700
++++ Makefile	2010-01-30 10:49:53.000000000 -0700
+@@ -69,7 +69,7 @@
+ 	mkdir -p $(LOGDIR)
+ 	mkdir -p $(STATEDIR)
+ 	mkdir -p $(CONFDIR)
+-	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)
++	$(CHOWN) $(USER) $(STATEDIR)
  
--	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
-+	$(CHOWN) $(USER) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
- 
- 	for p in server/*.tmpl; do    		              \
- 		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
+ install-master-prime: $(INFILES_MASTER) install-pre install-master
+ 	mkdir -p $(CONFDIR)/templates
diff --git a/sysutils/munin-master/files/patch-Makefile.config b/sysutils/munin-master/files/patch-Makefile.config
index a231598e53d3..d26dd1be439c 100644
--- a/sysutils/munin-master/files/patch-Makefile.config
+++ b/sysutils/munin-master/files/patch-Makefile.config
@@ -1,6 +1,6 @@
---- Makefile.config.orig	2008-01-20 20:32:46.000000000 +0100
-+++ Makefile.config	2008-08-09 15:44:18.000000000 +0200
-@@ -7,46 +7,50 @@
+--- Makefile.config.orig	2009-12-30 05:55:56.000000000 -0700
++++ Makefile.config	2010-01-30 11:17:34.000000000 -0700
+@@ -17,29 +17,33 @@
  #
  # the base of the Munin installation.
  # 
@@ -36,11 +36,16 @@
 +LIBDIR     = $(DATADIR)
  
  # Server only - Output directory
--HTMLDIR    = $(PREFIX)/var/www
--CGIDIR     = $(HTMLDIR)/cgi
+-HTMLDIR    = $(PREFIX)/www/docs
+-CGIDIR     = $(PREFIX)/www/cgi
 +HTMLDIR    = $(WWWDIR)
 +CGIDIR     = $(PREFIX)/www/cgi-bin
  
+ # Server only - spool directory for data gathered from nodes by
+ # munin-gather - experimental.  Place on ramdisk to make munin
+@@ -52,21 +56,20 @@
+ # SSPOOLDIR := /tmp/muninspool
+ 
  # Client only - Where to put RRD files and other intenal data
 -DBDIR      = $(DESTDIR)/var/opt/munin
 +DBDIR      = $(PREFIX)/var/munin
@@ -50,8 +55,8 @@
  PLUGSTATE  = $(DBDIR)/plugin-state
  
  # Where Munin should place its logs.
--LOGDIR     = $(DESTDIR)/var/log/munin
-+LOGDIR     = /var/log/munin-main
+-LOGDIR     = $(PREFIX)/log/munin
++LOGDIR     = /var/log/munin-master
  
  # Location of PID files and other statefiles. On the server, must be
  # writable by the user "munin".
@@ -59,33 +64,33 @@
 +STATEDIR   = /var/run/munin
  
  # The perl interpreter to use
--PERL       = $(shell which perl)
-+# Passed in from FreeBSD port Makefile.
+-PERL       := $(shell which perl)
  
  # The python interpreter to use (used by some plugins)
- PYTHON     = /usr/bin/env python
-@@ -62,10 +66,10 @@
- GOODSH     = $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"')
+ PYTHON     := /usr/bin/env python
+@@ -95,11 +98,11 @@
+ GOODSH     := $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"')
  
  # Path of bash for bash specific plugins
--BASH       = /bin/bash
-+BASH       = /usr/local/bin/bash
+-BASH       := /bin/bash
++BASH       := /usr/local/bin/bash
  
  # Server only - Where to install the perl libraries
--PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
+ PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
+-PERLLIB    = $(DESTDIR)$(PERLSITELIB)
 +PERLLIB    = $(PREFIX)/$(SITE_PERL_REL)
  
  # Client only - Install plugins for this architecture
- OSTYPE     = $(shell uname | tr '[A-Z]' '[a-z]')
-@@ -90,9 +94,8 @@
- PLUGINUSER = nobody
- 
+ OSTYPE     := $(shell uname | tr '[A-Z]' '[a-z]')
+@@ -126,9 +129,8 @@
  # Which command to use to check if the USER and GROUP to run Munin as, exists.
--GETENT = $(shell which getent || which true 2>/dev/null)
--CHECKUSER  = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
--CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
+ # 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 
- #CHECKUSER  = $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) 
+ # For OSX, comment out the previous two lines and comment in these
+ #
diff --git a/sysutils/munin-master/files/pkg-message.in b/sysutils/munin-master/files/pkg-message.in
index df049437efa1..3a9a5ff0c819 100644
--- a/sysutils/munin-master/files/pkg-message.in
+++ b/sysutils/munin-master/files/pkg-message.in
@@ -1,6 +1,6 @@
 ********************************************************************
 Unless this file already existed, a sample configuration file
-has been placed in %%PREFIX%%/etc/munin/munin.conf.
+has been placed in %%ETCDIR%%/munin/munin.conf.
 
 Please edit it according to your needs.
 
diff --git a/sysutils/munin-master/pkg-deinstall b/sysutils/munin-master/pkg-deinstall
index c658a8021c00..68a56ca6be80 100644
--- a/sysutils/munin-master/pkg-deinstall
+++ b/sysutils/munin-master/pkg-deinstall
@@ -85,19 +85,19 @@ delete_crontab_entries() {
 
 delnewsyslog() {
     tmp="/etc/#munin-node$$"
-    sed -e '/^\/var\/log\/munin-main\/\*\.log[ 	]/d' /etc/newsyslog.conf >${tmp}
+    sed -e '/^\/var\/log\/munin-master\/\*\.log[ 	]/d' /etc/newsyslog.conf >${tmp}
     cat ${tmp} > /etc/newsyslog.conf
     rm ${tmp}
 }
 
 newsyslog() {
-    ENTRY=`fgrep '/var/log/munin-main/*' /etc/newsyslog.conf`
-    DEFAULT='/var/log/munin-main/*.log munin:munin	644  7	   *	@T00  GNWZ'
+    ENTRY=`fgrep '/var/log/munin-master/*' /etc/newsyslog.conf`
+    DEFAULT='/var/log/munin-master/*.log munin:munin	644  7	   *	@T00  GNWZ'
     if [ -z "$ENTRY" ]; then
         exit 0
     elif [ "$ENTRY" = "$DEFAULT" ]; then
         delnewsyslog
-    elif yesno "You have changed the default munin-main entry in \"/etc/newsyslog.conf\".
+    elif yesno "You have changed the default munin-master entry in \"/etc/newsyslog.conf\".
 Do you want me to delete it?" y; then
         delnewsyslog
         echo "Done."
diff --git a/sysutils/munin-master/pkg-install b/sysutils/munin-master/pkg-install
index e068113d3c43..17d54351737c 100644
--- a/sysutils/munin-master/pkg-install
+++ b/sysutils/munin-master/pkg-install
@@ -88,11 +88,11 @@ mklogdir() {
 }
 
 newsyslog() {
-    if fgrep -q '/var/log/munin-main/*' /etc/newsyslog.conf; then
+    if fgrep -q '/var/log/munin-master/*' /etc/newsyslog.conf; then
         :
     else
         cat >> /etc/newsyslog.conf <<EOT
-/var/log/munin-main/*.log munin:munin	644  7	   *	@T00  GNWZ
+/var/log/munin-master/*.log munin:munin	644  7	   *	@T00  GNWZ
 EOT
     fi  
 }
diff --git a/sysutils/munin-master/pkg-plist b/sysutils/munin-master/pkg-plist
index 87eed812ca29..605e70380e4b 100644
--- a/sysutils/munin-master/pkg-plist
+++ b/sysutils/munin-master/pkg-plist
@@ -1,55 +1,55 @@
-@exec mkdir -p /var/run/munin && chown munin:munin /var/run/munin
-@exec mkdir -p /var/log/munin-main && chown munin:munin /var/log/munin-main
-@exec mkdir -p %D/%%WWWDIR%% && chown munin:munin %D/%%WWWDIR%%
-@exec mkdir -p %D/var/munin && chown munin:munin %D/var/munin
+bin/munin-check
 bin/munin-cron
-@unexec if cmp -s %D/etc/munin/munin.conf.sample %D/etc/munin/munin.conf; then rm -f %D/etc/munin/munin.conf; fi
-etc/munin/munin.conf.sample
-etc/munin/templates/definitions.html
-@unexec if cmp -s %D/etc/munin/templates/logo.png %D/%%WWWDIR%%/logo.png; then rm -f %D/%%WWWDIR%%/logo.png; fi
-etc/munin/templates/logo.png
-etc/munin/templates/munin-comparison-day.tmpl
-etc/munin/templates/munin-comparison-month.tmpl
-etc/munin/templates/munin-comparison-week.tmpl
-etc/munin/templates/munin-comparison-year.tmpl
-etc/munin/templates/munin-domainview.tmpl
-etc/munin/templates/munin-nodeview.tmpl
-etc/munin/templates/munin-overview.tmpl
-etc/munin/templates/munin-serviceview.tmpl
-@unexec if cmp -s %D/etc/munin/templates/style.css %D/%%WWWDIR%%/style.css; then rm -f %D/%%WWWDIR%%/style.css; fi
-etc/munin/templates/style.css
-%%SITE_PERL%%/Munin.pm
-%%DATADIR%%/VeraMono.ttf
+%%ETCDIR%%/munin.conf.sample
+%%ETCDIR%%/templates/definitions.html
+%%ETCDIR%%/templates/favicon.ico
+%%ETCDIR%%/templates/logo-h.png
+%%ETCDIR%%/templates/logo.png
+%%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-domainview.tmpl
+%%ETCDIR%%/templates/munin-nodeview.tmpl
+%%ETCDIR%%/templates/munin-overview.tmpl
+%%ETCDIR%%/templates/munin-serviceview.tmpl
+%%ETCDIR%%/templates/partial/bottom_navigation.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_path.tmpl
+%%ETCDIR%%/templates/partial/path.tmpl
+%%ETCDIR%%/templates/style-1.2.css
+%%ETCDIR%%/templates/style.css
+%%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/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
+%%DATADIR%%/DejaVuSans.ttf
+%%DATADIR%%/DejaVuSansMono.ttf
 %%DATADIR%%/munin-graph
 %%DATADIR%%/munin-html
 %%DATADIR%%/munin-limits
 %%DATADIR%%/munin-update
-www/cgi-bin/munin-cgi-graph
-@unexec rm -f /var/run/munin/munin-*.lock
-@dirrmtry /var/run/munin
-@dirrmtry /var/log/munin-main
+%%WWWDIR%%/cgi-bin/munin-cgi-graph
+%%WWWDIR%%/cgi-bin/munin-fastcgi-graph
+%%WWWDIR%%/.htaccess
+@dirrmtry %%WWWDIR%%/cgi-bin
 @dirrmtry %%WWWDIR%%
-@dirrmtry www/cgi-bin
-@dirrmtry var/munin
 @dirrmtry %%DATADIR%%
-@dirrmtry etc/munin/templates
-@dirrmtry etc/munin
-@unexec echo
-@unexec echo '********************************************************************'
-@unexec echo "If you want to *completely* remove munin-main, you have to"
-@unexec echo
-@unexec echo "           rm -rf \\"
-@unexec if [ -d %D/%%WWWDIR%% ]; then echo "           %D/%%WWWDIR%% \\"; fi
-@unexec if [ -d %D/var/munin ]; then ls -d %D/var/munin/* | grep -v plugin-state | fmt -40 | sed -e 's/^/           /' -e 's/$/ \\/'; fi
-@unexec if [ -f %D/etc/munin/munin.conf ]; then echo "           %D/etc/munin/munin.conf \\"; fi
-@unexec if [ -d %D/etc/munin/templates ]; then echo "           %D/etc/munin/templates \\"; fi
-@unexec echo "           /var/log/munin-main"
-@unexec echo
-@unexec echo "If you have already deinstalled munin-node, you can also"
-@unexec echo
-@unexec echo "    rmdir %D/etc/munin %D/var/munin"
-@unexec echo
-@unexec echo "These files and directories have to be left on the system because"
-@unexec echo "you may be performing an update. This process can't tell."
-@unexec echo '********************************************************************'
-@unexec echo
+@dirrmtry var/munin
+@dirrm %%SITE_PERL%%/Munin/Master
+@dirrmtry %%SITE_PERL%%/Munin
+@dirrmtry %%ETCDIR%%/templates
+@dirrmtry %%ETCDIR%%