svn commit: r430480 - branches/2017Q1/sysutils/munin-node

[Mathieu Arnold]

Author: mat
Date: Tue Jan  3 15:52:06 2017
New Revision: 430480
URL: https://svnweb.freebsd.org/changeset/ports/430480

Log:
  MFH: r430479
  
  Fix plugin configurations.
  
  Munin seems to read all the files in its .d directory, so the .sample is
  always read after the actual .conf, and overwrites its defaults.
  Which is, obviously, a bad thing.
  
  Sponsored by:	Absolight

Modified:
  branches/2017Q1/sysutils/munin-node/Makefile
  branches/2017Q1/sysutils/munin-node/pkg-plist
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/sysutils/munin-node/Makefile
==============================================================================
--- branches/2017Q1/sysutils/munin-node/Makefile	Tue Jan  3 15:48:47 2017	(r430479)
+++ branches/2017Q1/sysutils/munin-node/Makefile	Tue Jan  3 15:52:06 2017	(r430480)
@@ -3,7 +3,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-node
@@ -77,7 +77,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf \
 		${STAGEDIR}${ETCDIR}/munin-node.conf.sample
 	${INSTALL_DATA} ${WRKDIR}/plugins.conf \
-		${STAGEDIR}${ETCDIR}/plugin-conf.d/plugins.conf.sample
+		${STAGEDIR}${ETCDIR}/plugins.conf.sample
 	(cd ${WRKSRC}/node/blib/bindoc; \
 		${INSTALL_MAN} munin-node-configure.1 munin-node.1 munin-run.1 munin-sched.1 munindoc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1; \
 	)

Modified: branches/2017Q1/sysutils/munin-node/pkg-plist
==============================================================================
--- branches/2017Q1/sysutils/munin-node/pkg-plist	Tue Jan  3 15:48:47 2017	(r430479)
+++ branches/2017Q1/sysutils/munin-node/pkg-plist	Tue Jan  3 15:52:06 2017	(r430480)
@@ -1,6 +1,7 @@
 bin/munindoc
 @sample %%ETCDIR%%/munin-node.conf.sample
- at sample %%ETCDIR%%/plugin-conf.d/plugins.conf.sample
+ at dir %%ETCDIR%%/plugin-conf.d
+ at sample %%ETCDIR%%/plugins.conf.sample %%ETCDIR%%/plugin-conf.d/plugins.conf
 @comment the directory exists in STAGEDIR because it is present in
 @comment BSD.local.dist but if not registered here, it will not exist in PREFIX
 @comment when the package is installed.