Date: Wed, 22 Oct 2014 14:13:41 +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: r371359 - in head/sysutils: munin-common munin-common/files munin-master munin-node Message-ID: <201410221413.s9MEDfaU080093@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Oct 22 14:13:40 2014 New Revision: 371359 URL: https://svnweb.freebsd.org/changeset/ports/371359 QAT: https://qat.redports.org/buildarchive/r371359/ Log: Update munin to 2.0.23. Sponsored by: Absolight Modified: head/sysutils/munin-common/Makefile 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-node/Makefile head/sysutils/munin-node/pkg-plist Modified: head/sysutils/munin-common/Makefile ============================================================================== --- head/sysutils/munin-common/Makefile Wed Oct 22 13:29:30 2014 (r371358) +++ head/sysutils/munin-common/Makefile Wed Oct 22 14:13:40 2014 (r371359) @@ -21,6 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER ALL_TARGET= build-common-prime INSTALL_TARGET= install-common +NO_ARCH= yes post-install: ${MKDIR} ${STAGEDIR}${LOGDIR} ${STAGEDIR}${STATEDIR} ${STAGEDIR}${SPOOLDIR} Modified: head/sysutils/munin-common/distinfo ============================================================================== --- head/sysutils/munin-common/distinfo Wed Oct 22 13:29:30 2014 (r371358) +++ head/sysutils/munin-common/distinfo Wed Oct 22 14:13:40 2014 (r371359) @@ -1,2 +1,2 @@ -SHA256 (munin-2.0.21.tar.gz) = 76ad6602706f3449e727adbfc35014e9b4193b3691a5ca032d5a8d78e9ed259b -SIZE (munin-2.0.21.tar.gz) = 1336783 +SHA256 (munin-2.0.23.tar.gz) = efc23be5a2fd31eacbd6a55eb3526858c4618baff01c16cbe64918a5cfa5df5a +SIZE (munin-2.0.23.tar.gz) = 1337241 Modified: head/sysutils/munin-common/files/patch-Makefile ============================================================================== --- head/sysutils/munin-common/files/patch-Makefile Wed Oct 22 13:29:30 2014 (r371358) +++ head/sysutils/munin-common/files/patch-Makefile Wed Oct 22 14:13:40 2014 (r371359) @@ -1,4 +1,4 @@ ---- Makefile.orig 2014-04-22 19:29:32 UTC +--- Makefile.orig 2014-10-17 09:03:12 UTC +++ Makefile @@ -68,60 +68,48 @@ @@ -96,15 +96,16 @@ - mkdir -p $(CONFDIR)/plugins - mkdir -p $(CONFDIR)/plugin-conf.d - mkdir -p $(LIBDIR)/plugins +- mkdir -p $(PLUGSTATE) +- +- $(CHOWN) root:root $(PLUGSTATE) +- $(CHMOD) 0755 $(PLUGSTATE) +- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d + mkdir -p $(DESTDIR)$(CONFDIR)/plugins + mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d + mkdir -p $(DESTDIR)$(LIBDIR)/plugins - mkdir -p $(PLUGSTATE) ++ mkdir -p $(DESTDIR)$(PLUGSTATE) -- $(CHOWN) root:root $(PLUGSTATE) -- $(CHMOD) 0755 $(PLUGSTATE) -- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d -- for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \ if test -f "$$p" ; then \ echo Installing $$p; \ @@ -120,9 +121,10 @@ + $(INSTALL) -m 0644 build/plugins/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/ install-plugins-java: build-plugins-java - mkdir -p $(JAVALIBDIR) +- mkdir -p $(JAVALIBDIR) - $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(JAVALIBDIR)/ - mkdir -p $(LIBDIR)/plugins ++ mkdir -p $(DESTDIR)$(JAVALIBDIR) + $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(DESTDIR)$(JAVALIBDIR)/ + mkdir -p $(DESTDIR)$(LIBDIR)/plugins for p in build/plugins/node.d.java/*; do \ @@ -133,6 +135,15 @@ fi \ done +@@ -183,7 +167,7 @@ + install-node-prime: install-node-pre install-node + + install-node-pre: build/node/munin-node.conf install-pre +- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ ++ test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/ + + + install-common-prime: build-common install-common @@ -466,6 +450,7 @@ --install_path sbin=$(SBINDIR) \ --install_path bindoc=$(MANDIR)/man1 \ Modified: head/sysutils/munin-common/files/patch-Makefile.config ============================================================================== --- head/sysutils/munin-common/files/patch-Makefile.config Wed Oct 22 13:29:30 2014 (r371358) +++ head/sysutils/munin-common/files/patch-Makefile.config Wed Oct 22 14:13:40 2014 (r371359) @@ -1,4 +1,4 @@ ---- Makefile.config.orig 2014-04-22 19:29:32 UTC +--- Makefile.config.orig 2014-10-17 09:03:12 UTC +++ Makefile.config @@ -17,62 +17,62 @@ # Modified: head/sysutils/munin-common/munin.mk ============================================================================== --- head/sysutils/munin-common/munin.mk Wed Oct 22 13:29:30 2014 (r371358) +++ head/sysutils/munin-common/munin.mk Wed Oct 22 14:13:40 2014 (r371359) @@ -1,4 +1,4 @@ -MUNIN_VERSION= 2.0.21 +MUNIN_VERSION= 2.0.23 MUNIN_SITES= SF/${PORTNAME}/stable/${MUNIN_VERSION} MUNIN_DISTINFO= ${PORTSDIR}/sysutils/munin-common/distinfo MUNIN_PATCHES= ${PORTSDIR}/sysutils/munin-common/files/patch-Makefile \ Modified: head/sysutils/munin-master/Makefile ============================================================================== --- head/sysutils/munin-master/Makefile Wed Oct 22 13:29:30 2014 (r371358) +++ head/sysutils/munin-master/Makefile Wed Oct 22 14:13:40 2014 (r371359) @@ -51,6 +51,7 @@ EXTRA_PATCHES= ${MUNIN_PATCHES} DISTINFO_FILE= ${MUNIN_DISTINFO} ALL_TARGET= infiles build-master build-man INSTALL_TARGET= install-master-prime +NO_ARCH= yes SUB_FILES= pkg-message PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} Modified: head/sysutils/munin-node/Makefile ============================================================================== --- head/sysutils/munin-node/Makefile Wed Oct 22 13:29:30 2014 (r371358) +++ head/sysutils/munin-node/Makefile Wed Oct 22 14:13:40 2014 (r371359) @@ -3,7 +3,6 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 1 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -node @@ -36,6 +35,7 @@ DISTINFO_FILE= ${MUNIN_DISTINFO} EXTRA_PATCHES+= ${MUNIN_PATCHES} ALL_TARGET= build-node build-plugins INSTALL_TARGET= install-node-prime install-plugins-prime +NO_ARCH= yes OPTIONS_DEFINE= SNMP JAVA OPTIONS_DEFAULT= SNMP Modified: head/sysutils/munin-node/pkg-plist ============================================================================== --- head/sysutils/munin-node/pkg-plist Wed Oct 22 13:29:30 2014 (r371358) +++ head/sysutils/munin-node/pkg-plist Wed Oct 22 14:13:40 2014 (r371359) @@ -249,3 +249,4 @@ sbin/munin-sched %%DATADIR%%/plugins/vmstat %%DATADIR%%/plugins/zimbra_ @dir(%%USER%%,%%GROUP%%,) %%DBDIR%%/plugin-state +@dir %%ETCDIR%%/plugins
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410221413.s9MEDfaU080093>