Date: Tue, 25 Nov 2014 15:07:24 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373412 - in head/sysutils: munin-common munin-common/files munin-master munin-node Message-ID: <201411251507.sAPF7Of3009964@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Nov 25 15:07:23 2014 New Revision: 373412 URL: https://svnweb.freebsd.org/changeset/ports/373412 QAT: https://qat.redports.org/buildarchive/r373412/ Log: Update to 2.0.25. Sponsored by: Absolight Modified: head/sysutils/munin-common/distinfo head/sysutils/munin-common/files/patch-Makefile head/sysutils/munin-common/files/patch-Makefile.config head/sysutils/munin-common/munin.mk head/sysutils/munin-master/Makefile head/sysutils/munin-master/pkg-plist head/sysutils/munin-node/Makefile head/sysutils/munin-node/pkg-plist Modified: head/sysutils/munin-common/distinfo ============================================================================== --- head/sysutils/munin-common/distinfo Tue Nov 25 15:01:58 2014 (r373411) +++ head/sysutils/munin-common/distinfo Tue Nov 25 15:07:23 2014 (r373412) @@ -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 Modified: head/sysutils/munin-common/files/patch-Makefile ============================================================================== --- head/sysutils/munin-common/files/patch-Makefile Tue Nov 25 15:01:58 2014 (r373411) +++ head/sysutils/munin-common/files/patch-Makefile Tue Nov 25 15:07:23 2014 (r373412) @@ -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 \ Modified: head/sysutils/munin-common/files/patch-Makefile.config ============================================================================== --- head/sysutils/munin-common/files/patch-Makefile.config Tue Nov 25 15:01:58 2014 (r373411) +++ head/sysutils/munin-common/files/patch-Makefile.config Tue Nov 25 15:07:23 2014 (r373412) @@ -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: # Modified: head/sysutils/munin-common/munin.mk ============================================================================== --- head/sysutils/munin-common/munin.mk Tue Nov 25 15:01:58 2014 (r373411) +++ head/sysutils/munin-common/munin.mk Tue Nov 25 15:07:23 2014 (r373412) @@ -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 Modified: head/sysutils/munin-master/Makefile ============================================================================== --- head/sysutils/munin-master/Makefile Tue Nov 25 15:01:58 2014 (r373411) +++ head/sysutils/munin-master/Makefile Tue Nov 25 15:07:23 2014 (r373412) @@ -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> Modified: head/sysutils/munin-master/pkg-plist ============================================================================== --- head/sysutils/munin-master/pkg-plist Tue Nov 25 15:01:58 2014 (r373411) +++ head/sysutils/munin-master/pkg-plist Tue Nov 25 15:07:23 2014 (r373412) @@ -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 Modified: head/sysutils/munin-node/Makefile ============================================================================== --- head/sysutils/munin-node/Makefile Tue Nov 25 15:01:58 2014 (r373411) +++ head/sysutils/munin-node/Makefile Tue Nov 25 15:07:23 2014 (r373412) @@ -3,7 +3,6 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 3 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -node Modified: head/sysutils/munin-node/pkg-plist ============================================================================== --- head/sysutils/munin-node/pkg-plist Tue Nov 25 15:01:58 2014 (r373411) +++ head/sysutils/munin-node/pkg-plist Tue Nov 25 15:07:23 2014 (r373412) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411251507.sAPF7Of3009964>