Try and fix the ownership of munin's home directory.

Sponsored by:	Absolight, The FreeBSD Foundation

6 files changed, 10 insertions, 9 deletions

diff --git a/sysutils/munin-common/Makefile b/sysutils/munin-common/Makefile
index b30ad42beef1..b41bc1e6189f 100644
--- a/sysutils/munin-common/Makefile
+++ b/sysutils/munin-common/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-common
@@ -25,6 +25,6 @@ INSTALL_TARGET=	install-common
 NO_ARCH=	yes
 
 post-install:
-	${MKDIR} ${STAGEDIR}${LOGDIR} ${STAGEDIR}${STATEDIR} ${STAGEDIR}${SPOOLDIR}
+	${MKDIR} ${STAGEDIR}${LOGDIR} ${STAGEDIR}${STATEDIR} ${STAGEDIR}${SPOOLDIR} ${STAGEDIR}${DBDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/munin-common/files/patch-Makefile b/sysutils/munin-common/files/patch-Makefile
index 33f2a8964cc9..12af94e59f0b 100644
--- a/sysutils/munin-common/files/patch-Makefile
+++ b/sysutils/munin-common/files/patch-Makefile
@@ -1,6 +1,6 @@
 --- Makefile.orig	2014-11-24 21:46:24 UTC
 +++ Makefile
-@@ -68,60 +68,48 @@ install: install-master-prime install-co
+@@ -68,60 +68,47 @@ install: install-master-prime install-co
  
  install-pre: Makefile Makefile.config
  	@$(CHECKUSER)
@@ -37,7 +37,6 @@
 +	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)
  
@@ -89,7 +88,7 @@
  
  # Not ready to be installed yet
  # $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/
-@@ -139,33 +127,29 @@ endif
+@@ -139,33 +126,29 @@ endif
  install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
  	@$(CHECKGROUP)
  
@@ -135,7 +134,7 @@
  	    fi                                                 \
  	done
  
-@@ -183,7 +167,7 @@ install-async:
+@@ -183,7 +166,7 @@ install-async:
  install-node-prime: install-node-pre install-node
  
  install-node-pre: build/node/munin-node.conf install-pre
@@ -144,7 +143,7 @@
  
  
  install-common-prime: build-common install-common
-@@ -466,6 +450,7 @@ install-%: %/Build
+@@ -466,6 +449,7 @@ install-%: %/Build
              --install_path sbin=$(SBINDIR)		\
              --install_path bindoc=$(MANDIR)/man1	\
              --install_path libdoc=$(MANDIR)/man3	\
diff --git a/sysutils/munin-common/pkg-plist b/sysutils/munin-common/pkg-plist
index 6b7f0c5e03d5..780cf7e5c266 100644
--- a/sysutils/munin-common/pkg-plist
+++ b/sysutils/munin-common/pkg-plist
@@ -15,3 +15,4 @@ man/man3/Munin::Common::Timeout.3.gz
 @dir(%%USER%%,%%GROUP%%,) %%LOGDIR%%
 @dir(%%USER%%,%%GROUP%%,) %%STATEDIR%%
 @dir(%%USER%%,%%GROUP%%,) %%SPOOLDIR%%
+@dir(%%USER%%,%%GROUP%%,) %%DBDIR%%
diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile
index 2d010485b63c..c82b134d58a7 100644
--- a/sysutils/munin-master/Makefile
+++ b/sysutils/munin-master/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-master
diff --git a/sysutils/munin-master/pkg-plist b/sysutils/munin-master/pkg-plist
index a35af892b0a4..a71b65f9edaa 100644
--- a/sysutils/munin-master/pkg-plist
+++ b/sysutils/munin-master/pkg-plist
@@ -81,4 +81,4 @@ www/cgi-bin/munin-cgi-html
 @dir %%ETCDIR%%/munin-conf.d
 @dir(%%USER%%,%%GROUP%%,) %%WWWDIR%%
 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%DBDIR%%/cgi-tmp
-@dir(%%USER%%,%%GROUP%%,) %%DBDIR%%
+@comment @dir %%DBDIR%%
diff --git a/sysutils/munin-node/pkg-plist b/sysutils/munin-node/pkg-plist
index f85983631e05..838f50c2b0a0 100644
--- a/sysutils/munin-node/pkg-plist
+++ b/sysutils/munin-node/pkg-plist
@@ -251,3 +251,4 @@ sbin/munin-sched
 %%DATADIR%%/plugins/zimbra_
 @dir(%%USER%%,%%GROUP%%,) %%DBDIRNODE%%/plugin-state
 @dir %%ETCDIR%%/plugins
+@comment @dir %%DBDIRNODE%%