From owner-svn-ports-head@freebsd.org  Tue Jan  3 15:48:48 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F2910C9D1DA;
 Tue,  3 Jan 2017 15:48:48 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A81071998;
 Tue,  3 Jan 2017 15:48:48 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v03FmlYK059724;
 Tue, 3 Jan 2017 15:48:47 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v03FmlHG059722;
 Tue, 3 Jan 2017 15:48:47 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201701031548.v03FmlHG059722@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 3 Jan 2017 15:48:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r430479 - head/sysutils/munin-node
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jan 2017 15:48:49 -0000

Author: mat
Date: Tue Jan  3 15:48:47 2017
New Revision: 430479
URL: https://svnweb.freebsd.org/changeset/ports/430479

Log:
  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:
  head/sysutils/munin-node/Makefile   (contents, props changed)
  head/sysutils/munin-node/pkg-plist   (contents, props changed)

Modified: head/sysutils/munin-node/Makefile
==============================================================================
--- head/sysutils/munin-node/Makefile	Tue Jan  3 15:20:02 2017	(r430478)
+++ head/sysutils/munin-node/Makefile	Tue Jan  3 15:48:47 2017	(r430479)
@@ -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: head/sysutils/munin-node/pkg-plist
==============================================================================
--- head/sysutils/munin-node/pkg-plist	Tue Jan  3 15:20:02 2017	(r430478)
+++ head/sysutils/munin-node/pkg-plist	Tue Jan  3 15:48:47 2017	(r430479)
@@ -1,6 +1,7 @@
 bin/munindoc
 @sample %%ETCDIR%%/munin-node.conf.sample
-@sample %%ETCDIR%%/plugin-conf.d/plugins.conf.sample
+@dir %%ETCDIR%%/plugin-conf.d
+@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.