svn commit: r398423 - in head/sysutils: munin-common munin-common/files munin-master munin-node
Mathieu Arnold
mat at FreeBSD.org
Fri Oct 2 07:52:38 UTC 2015
Author: mat
Date: Fri Oct 2 07:52:35 2015
New Revision: 398423
URL: https://svnweb.freebsd.org/changeset/ports/398423
Log:
Try and fix the ownership of munin's home directory.
Sponsored by: Absolight, The FreeBSD Foundation
Modified:
head/sysutils/munin-common/Makefile
head/sysutils/munin-common/files/patch-Makefile
head/sysutils/munin-common/pkg-plist
head/sysutils/munin-master/Makefile
head/sysutils/munin-master/pkg-plist
head/sysutils/munin-node/pkg-plist
Modified: head/sysutils/munin-common/Makefile
==============================================================================
--- head/sysutils/munin-common/Makefile Fri Oct 2 06:55:41 2015 (r398422)
+++ head/sysutils/munin-common/Makefile Fri Oct 2 07:52:35 2015 (r398423)
@@ -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>
Modified: head/sysutils/munin-common/files/patch-Makefile
==============================================================================
--- head/sysutils/munin-common/files/patch-Makefile Fri Oct 2 06:55:41 2015 (r398422)
+++ head/sysutils/munin-common/files/patch-Makefile Fri Oct 2 07:52:35 2015 (r398423)
@@ -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 \
Modified: head/sysutils/munin-common/pkg-plist
==============================================================================
--- head/sysutils/munin-common/pkg-plist Fri Oct 2 06:55:41 2015 (r398422)
+++ head/sysutils/munin-common/pkg-plist Fri Oct 2 07:52:35 2015 (r398423)
@@ -15,3 +15,4 @@ man/man3/Munin::Common::Timeout.3.gz
@dir(%%USER%%,%%GROUP%%,) %%LOGDIR%%
@dir(%%USER%%,%%GROUP%%,) %%STATEDIR%%
@dir(%%USER%%,%%GROUP%%,) %%SPOOLDIR%%
+ at dir(%%USER%%,%%GROUP%%,) %%DBDIR%%
Modified: head/sysutils/munin-master/Makefile
==============================================================================
--- head/sysutils/munin-master/Makefile Fri Oct 2 06:55:41 2015 (r398422)
+++ head/sysutils/munin-master/Makefile Fri Oct 2 07:52:35 2015 (r398423)
@@ -3,7 +3,7 @@
PORTNAME= munin
PORTVERSION= ${MUNIN_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils perl5
MASTER_SITES= ${MUNIN_SITES}
PKGNAMESUFFIX= -master
Modified: head/sysutils/munin-master/pkg-plist
==============================================================================
--- head/sysutils/munin-master/pkg-plist Fri Oct 2 06:55:41 2015 (r398422)
+++ head/sysutils/munin-master/pkg-plist Fri Oct 2 07:52:35 2015 (r398423)
@@ -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
- at dir(%%USER%%,%%GROUP%%,) %%DBDIR%%
+ at comment @dir %%DBDIR%%
Modified: head/sysutils/munin-node/pkg-plist
==============================================================================
--- head/sysutils/munin-node/pkg-plist Fri Oct 2 06:55:41 2015 (r398422)
+++ head/sysutils/munin-node/pkg-plist Fri Oct 2 07:52:35 2015 (r398423)
@@ -251,3 +251,4 @@ sbin/munin-sched
%%DATADIR%%/plugins/zimbra_
@dir(%%USER%%,%%GROUP%%,) %%DBDIRNODE%%/plugin-state
@dir %%ETCDIR%%/plugins
+ at comment @dir %%DBDIRNODE%%
More information about the svn-ports-all
mailing list