Update munin to 2.0.23.

Sponsored by:	Absolight

8 files changed, 26 insertions, 12 deletions

diff --git a/sysutils/munin-common/Makefile b/sysutils/munin-common/Makefile
index d794a2828808..e405916a959e 100644
--- a/sysutils/munin-common/Makefile
+++ b/sysutils/munin-common/Makefile
@@ -21,6 +21,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 ALL_TARGET=	build-common-prime
 INSTALL_TARGET=	install-common
+NO_ARCH=	yes
 
 post-install:
 	${MKDIR} ${STAGEDIR}${LOGDIR} ${STAGEDIR}${STATEDIR} ${STAGEDIR}${SPOOLDIR}
diff --git a/sysutils/munin-common/distinfo b/sysutils/munin-common/distinfo
index 4e50f61e1856..5ec6466999af 100644
--- a/sysutils/munin-common/distinfo
+++ b/sysutils/munin-common/distinfo
@@ -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
diff --git a/sysutils/munin-common/files/patch-Makefile b/sysutils/munin-common/files/patch-Makefile
index 44573017969c..47380649dc19 100644
--- a/sysutils/munin-common/files/patch-Makefile
+++ b/sysutils/munin-common/files/patch-Makefile
@@ -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	\
diff --git a/sysutils/munin-common/files/patch-Makefile.config b/sysutils/munin-common/files/patch-Makefile.config
index 8fea97224b26..668cf67cafd7 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-04-22 19:29:32 UTC
+--- Makefile.config.orig	2014-10-17 09:03:12 UTC
 +++ Makefile.config
 @@ -17,62 +17,62 @@
  #
diff --git a/sysutils/munin-common/munin.mk b/sysutils/munin-common/munin.mk
index 685d87a5b5b9..aaa0c4b05a8c 100644
--- a/sysutils/munin-common/munin.mk
+++ b/sysutils/munin-common/munin.mk
@@ -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 \
diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile
index e7da47954812..057da73ed52a 100644
--- a/sysutils/munin-master/Makefile
+++ b/sysutils/munin-master/Makefile
@@ -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}
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index b73dcfa5fc06..7c461d32799a 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -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
diff --git a/sysutils/munin-node/pkg-plist b/sysutils/munin-node/pkg-plist
index f9f9222fd611..5e5ff31f6b5d 100644
--- a/sysutils/munin-node/pkg-plist
+++ b/sysutils/munin-node/pkg-plist
@@ -249,3 +249,4 @@ sbin/munin-sched
 %%DATADIR%%/plugins/vmstat
 %%DATADIR%%/plugins/zimbra_
 @dir(%%USER%%,%%GROUP%%,) %%DBDIR%%/plugin-state
+@dir %%ETCDIR%%/plugins