diff options
| -rw-r--r-- | sysutils/munin-common/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/munin-common/files/patch-Makefile | 10 | ||||
| -rw-r--r-- | sysutils/munin-common/files/patch-Makefile.config | 6 | ||||
| -rw-r--r-- | sysutils/munin-common/munin.mk | 2 | ||||
| -rw-r--r-- | sysutils/munin-master/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/munin-master/pkg-plist | 3 | ||||
| -rw-r--r-- | sysutils/munin-node/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/munin-node/pkg-plist | 2 |
8 files changed, 15 insertions, 14 deletions
diff --git a/sysutils/munin-common/distinfo b/sysutils/munin-common/distinfo index 8f2255a1e729..d5805aa8b847 100644 --- a/sysutils/munin-common/distinfo +++ b/sysutils/munin-common/distinfo @@ -1,2 +1,2 @@ -SHA256 (munin-2.0.24.tar.gz) = 74940896326bbb33d5607c39d1f972f69c5fc4278c93ae185338113a62a6a4e6 -SIZE (munin-2.0.24.tar.gz) = 1337330 +SHA256 (munin-2.0.25.tar.gz) = 6832bc5839d03639e4309178d9370697fc8a80a83d9b6653953f40161e949694 +SIZE (munin-2.0.25.tar.gz) = 1337586 diff --git a/sysutils/munin-common/files/patch-Makefile b/sysutils/munin-common/files/patch-Makefile index 47380649dc19..33f2a8964cc9 100644 --- a/sysutils/munin-common/files/patch-Makefile +++ b/sysutils/munin-common/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2014-10-17 09:03:12 UTC +--- Makefile.orig 2014-11-24 21:46:24 UTC +++ Makefile -@@ -68,60 +68,48 @@ +@@ -68,60 +68,48 @@ install: install-master-prime install-co install-pre: Makefile Makefile.config @$(CHECKUSER) @@ -89,7 +89,7 @@ # Not ready to be installed yet # $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/ -@@ -139,33 +127,29 @@ +@@ -139,33 +127,29 @@ endif install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config @$(CHECKGROUP) @@ -135,7 +135,7 @@ fi \ done -@@ -183,7 +167,7 @@ +@@ -183,7 +167,7 @@ install-async: install-node-prime: install-node-pre install-node install-node-pre: build/node/munin-node.conf install-pre @@ -144,7 +144,7 @@ install-common-prime: build-common install-common -@@ -466,6 +450,7 @@ +@@ -466,6 +450,7 @@ install-%: %/Build --install_path sbin=$(SBINDIR) \ --install_path bindoc=$(MANDIR)/man1 \ --install_path libdoc=$(MANDIR)/man3 \ diff --git a/sysutils/munin-common/files/patch-Makefile.config b/sysutils/munin-common/files/patch-Makefile.config index 668cf67cafd7..bfdb4c2416dd 100644 --- a/sysutils/munin-common/files/patch-Makefile.config +++ b/sysutils/munin-common/files/patch-Makefile.config @@ -1,4 +1,4 @@ ---- Makefile.config.orig 2014-10-17 09:03:12 UTC +--- Makefile.config.orig 2014-11-24 21:46:24 UTC +++ Makefile.config @@ -17,62 +17,62 @@ # @@ -82,7 +82,7 @@ # The java library dir to use (used by some plugins) # this is needed in order to be able to install -@@ -92,7 +92,7 @@ +@@ -92,7 +92,7 @@ JAVALIBDIR = $(LIBDIR) 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 @@ -91,7 +91,7 @@ # Server only - Where to install the perl libraries PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2) -@@ -129,9 +129,8 @@ +@@ -129,9 +129,8 @@ CGIUSER := nobody # 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/munin.mk b/sysutils/munin-common/munin.mk index d8e00a796db1..bc08f5c92382 100644 --- a/sysutils/munin-common/munin.mk +++ b/sysutils/munin-common/munin.mk @@ -1,4 +1,4 @@ -MUNIN_VERSION= 2.0.24 +MUNIN_VERSION= 2.0.25 MUNIN_SITES= SF/${PORTNAME}/stable/${MUNIN_VERSION} DISTINFO_FILE= ${PORTSDIR}/sysutils/munin-common/distinfo diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile index 6bacc0774581..f67f360ae8a6 100644 --- a/sysutils/munin-master/Makefile +++ b/sysutils/munin-master/Makefile @@ -61,5 +61,6 @@ post-install: ) (cd ${STAGEDIR}${ETCDIR}; for i in `find . -type f`; do mv $$i $$i.sample; done) ${MV} ${STAGEDIR}${WWWDIR}/.htaccess ${STAGEDIR}${WWWDIR}/.htaccess.sample + @${RMDIR} ${STAGEDIR}${DBDIR} 2>/dev/null || : .include <bsd.port.mk> diff --git a/sysutils/munin-master/pkg-plist b/sysutils/munin-master/pkg-plist index 187fcbd3a3ca..8cc28a0fb14a 100644 --- a/sysutils/munin-master/pkg-plist +++ b/sysutils/munin-master/pkg-plist @@ -78,5 +78,6 @@ man/man8/munin-update.8.gz www/cgi-bin/munin-cgi-graph www/cgi-bin/munin-cgi-html @sample %%WWWDIR%%/.htaccess.sample +@dir %%ETCDIR%%/munin-conf.d @dir(%%USER%%,%%GROUP%%,) %%WWWDIR%% -@dir(%%WWWOWN%%,%%WWWGRP%%,) %%DBDIRNODE%%/cgi-tmp +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%DBDIR%%/cgi-tmp diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile index de7bd6dce2f3..44d2fb0db6ef 100644 --- a/sysutils/munin-node/Makefile +++ b/sysutils/munin-node/Makefile @@ -3,7 +3,6 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 3 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -node diff --git a/sysutils/munin-node/pkg-plist b/sysutils/munin-node/pkg-plist index e417ff73552b..f85983631e05 100644 --- a/sysutils/munin-node/pkg-plist +++ b/sysutils/munin-node/pkg-plist @@ -249,5 +249,5 @@ sbin/munin-sched %%PERL%%%%DATADIR%%/plugins/varnish_ %%DATADIR%%/plugins/vmstat %%DATADIR%%/plugins/zimbra_ -@dir(%%USER%%,%%GROUP%%,) %%DBDIR%%/plugin-state +@dir(%%USER%%,%%GROUP%%,) %%DBDIRNODE%%/plugin-state @dir %%ETCDIR%%/plugins |