- Update to 2.0.6 based on [1]

- Add support for ada disk devices to hddtemp_smartctl [2]
- Add a patch for upstream bug 1251 to prevent huge munin-graph.log files

PR:		ports/171116 [1]
PR:		ports/169287 [2]
Submitted by:	mm [1], TAKEMON Takashi <takemon@bamboogate.co.jp> [2]

5 files changed, 51 insertions, 21 deletions

diff --git a/sysutils/munin-common/Makefile b/sysutils/munin-common/Makefile
index 6337e4362ece..d14f8ed36ff7 100644
--- a/sysutils/munin-common/Makefile
+++ b/sysutils/munin-common/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	munin
-PORTVERSION=	1.4.7
+PORTVERSION=	${MUNIN_VERSION}
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION}
+MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-common
 
 MAINTAINER=	flo@FreeBSD.org
@@ -24,6 +24,9 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 .include "${.CURDIR}/../munin-common/munin.mk"
 
+USERS=		${MUNIN_USER}
+GROUPS=		${MUNIN_GROUP}
+
 ALL_TARGET=	build-common-prime
 INSTALL_TARGET=	install-common
 
@@ -35,8 +38,8 @@ MAN3=		Munin::Common::Config.3 \
 		Munin::Common::Timeout.3
 
 post-install:
-	@${MKDIR} ${LOGDIR}
-	@${CHOWN} ${USERS}:${GROUPS} ${LOGDIR}
+	@${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)
diff --git a/sysutils/munin-common/distinfo b/sysutils/munin-common/distinfo
index 0821c1567803..04963a9569f8 100644
--- a/sysutils/munin-common/distinfo
+++ b/sysutils/munin-common/distinfo
@@ -1,2 +1,2 @@
-SHA256 (munin-1.4.7.tar.gz) = 9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af
-SIZE (munin-1.4.7.tar.gz) = 1236273
+SHA256 (munin-2.0.6.tar.gz) = ff99a3c36156adb6b867bb684ec508a857728336c0b81a93955bbcc9d5045ea6
+SIZE (munin-2.0.6.tar.gz) = 1325754
diff --git a/sysutils/munin-common/files/patch-Makefile b/sysutils/munin-common/files/patch-Makefile
index 22cd60e4fefe..962dd45ca0e5 100644
--- a/sysutils/munin-common/files/patch-Makefile
+++ b/sysutils/munin-common/files/patch-Makefile
@@ -1,11 +1,27 @@
---- 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)
+--- Makefile.orig	2012-08-31 17:22:50.000000000 +0200
++++ Makefile	2012-09-08 00:38:17.000000000 +0200
+@@ -68,11 +68,11 @@
+ 
+ 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)
--	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)
-+	$(CHOWN) $(USER) $(STATEDIR)
+-	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
++#	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
  
  install-master-prime: $(INFILES_MASTER) install-pre install-master
  	mkdir -p $(CONFDIR)/templates
+@@ -144,7 +144,7 @@
+ 	mkdir -p $(LIBDIR)/plugins
+ 	mkdir -p $(PLUGSTATE)
+ 
+-	$(CHOWN) root:root $(PLUGSTATE)
++	$(CHOWN) root:wheel $(PLUGSTATE)
+ 	$(CHMOD) 0755 $(PLUGSTATE)
+ 	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
+ 
diff --git a/sysutils/munin-common/munin.mk b/sysutils/munin-common/munin.mk
index dfade332557a..e3a9a9c6a0f3 100644
--- a/sysutils/munin-common/munin.mk
+++ b/sysutils/munin-common/munin.mk
@@ -1,20 +1,30 @@
+MUNIN_VERSION=	2.0.6
+MUNIN_SITES=	SF/${PORTNAME}/stable/${PORTVERSION}
+MUNIN_DISTINFO=	${PORTSDIR}/sysutils/munin-common/distinfo
+MUNIN_PATCHES=	${PORTSDIR}/sysutils/munin-common/files/patch-Makefile \
+		${PORTSDIR}/sysutils/munin-common/files/patch-Makefile.config
+
 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}
+		STATEDIR=${STATEDIR} \
+		SPOOLDIR=${SPOOLDIR}
 MAKE_ARGS=	${MUNIN_DIRS} \
 		BASH=${LOCALBASE}/bin/bash \
 		PERL=${PERL} PERLLIB=${PREFIX}/${SITE_PERL_REL}
-PLIST_SUB=	${MUNIN_DIRS}
-USERS=		munin
-GROUPS=		munin
+MUNIN_USER=	munin
+MUNIN_GROUP=	munin
+PLIST_SUB=	${MUNIN_DIRS} USER=${MUNIN_USER} GROUP=${MUNIN_GROUP}
diff --git a/sysutils/munin-common/pkg-plist b/sysutils/munin-common/pkg-plist
index ddbaecb47047..a1a26eee7272 100644
--- a/sysutils/munin-common/pkg-plist
+++ b/sysutils/munin-common/pkg-plist
@@ -1,12 +1,13 @@
 %%SITE_PERL%%/Munin/Common/Config.pm
 %%SITE_PERL%%/Munin/Common/Defaults.pm
+%%SITE_PERL%%/Munin/Common/DictFile.pm
+%%SITE_PERL%%/Munin/Common/SyncDictFile.pm
 %%SITE_PERL%%/Munin/Common/TLS.pm
 %%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%%
-@unexec /bin/rmdir %%LOGDIR%% 2>/dev/null || /usr/bin/true
-@exec mkdir -p %%STATEDIR%%
-@unexec /bin/rmdir %%STATEDIR%% 2>/dev/null || /usr/bin/true
+@exec mkdir -p %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%%
+@exec chown %%USER%%:%%GROUP%% %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%%
+@unexec rmdir %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%% 2>/dev/null || /usr/bin/true