From owner-svn-ports-head@freebsd.org  Tue Mar 20 09:51:36 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A8ACAF630DD;
 Tue, 20 Mar 2018 09:51:36 +0000 (UTC)
 (envelope-from yuri@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 5B7D96A085;
 Tue, 20 Mar 2018 09:51:36 +0000 (UTC)
 (envelope-from yuri@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3CC3F1B616;
 Tue, 20 Mar 2018 09:51:36 +0000 (UTC)
 (envelope-from yuri@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2K9paYI018146;
 Tue, 20 Mar 2018 09:51:36 GMT (envelope-from yuri@FreeBSD.org)
Received: (from yuri@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2K9paQG018144;
 Tue, 20 Mar 2018 09:51:36 GMT (envelope-from yuri@FreeBSD.org)
Message-Id: <201803200951.w2K9paQG018144@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: yuri set sender to
 yuri@FreeBSD.org using -f
From: Yuri Victorovich <yuri@FreeBSD.org>
Date: Tue, 20 Mar 2018 09:51:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r465077 - head/databases/go-carbon
X-SVN-Group: ports-head
X-SVN-Commit-Author: yuri
X-SVN-Commit-Paths: head/databases/go-carbon
X-SVN-Commit-Revision: 465077
X-SVN-Commit-Repository: ports
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.25
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, 20 Mar 2018 09:51:36 -0000

Author: yuri
Date: Tue Mar 20 09:51:35 2018
New Revision: 465077
URL: https://svnweb.freebsd.org/changeset/ports/465077

Log:
  databases/go-carbon: Prevent overwriting config files by adding the @sample keyword
  
  PR:		226796
  Submitted by:	Andreas Andersson  <a.andersson.thn@gmail.com> (maintainer)

Modified:
  head/databases/go-carbon/Makefile
  head/databases/go-carbon/pkg-plist

Modified: head/databases/go-carbon/Makefile
==============================================================================
--- head/databases/go-carbon/Makefile	Tue Mar 20 09:35:49 2018	(r465076)
+++ head/databases/go-carbon/Makefile	Tue Mar 20 09:51:35 2018	(r465077)
@@ -3,6 +3,7 @@
 PORTNAME=		go-carbon
 DISTVERSIONPREFIX=	v
 DISTVERSION=		0.12.0
+PORTREVISION=		1
 CATEGORIES=		databases
 
 MAINTAINER=		a.andersson.thn@gmail.com
@@ -31,8 +32,8 @@ do-install:
 	@${MKDIR} ${STAGEDIR}/var/log/go-carbon
 	@${MKDIR} ${STAGEDIR}/${PREFIX}/etc/go-carbon
 	${INSTALL_PROGRAM} ${WRKSRC}/go-carbon ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL} ${WRKSRC}/deploy/go-carbon.conf ${STAGEDIR}${PREFIX}/etc/go-carbon/
-	${INSTALL} ${WRKSRC}/deploy/storage-aggregation.conf ${STAGEDIR}${PREFIX}/etc/go-carbon/
-	${INSTALL} ${WRKSRC}/deploy/storage-schemas.conf ${STAGEDIR}${PREFIX}/etc/go-carbon/
+	${INSTALL_DATA} ${WRKSRC}/deploy/go-carbon.conf ${STAGEDIR}${PREFIX}/etc/go-carbon/go-carbon.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/deploy/storage-aggregation.conf ${STAGEDIR}${PREFIX}/etc/go-carbon/storage-aggregation.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/deploy/storage-schemas.conf ${STAGEDIR}${PREFIX}/etc/go-carbon/storage-schemas.conf.sample
 
 .include <bsd.port.mk>

Modified: head/databases/go-carbon/pkg-plist
==============================================================================
--- head/databases/go-carbon/pkg-plist	Tue Mar 20 09:35:49 2018	(r465076)
+++ head/databases/go-carbon/pkg-plist	Tue Mar 20 09:51:35 2018	(r465077)
@@ -1,6 +1,6 @@
 bin/%%GO_PKGNAME%%
-%%ETCDIR%%/%%GO_PKGNAME%%.conf
-%%ETCDIR%%/storage-aggregation.conf
-%%ETCDIR%%/storage-schemas.conf
+@sample %%ETCDIR%%/%%GO_PKGNAME%%.conf.sample
+@sample %%ETCDIR%%/storage-aggregation.conf.sample
+@sample %%ETCDIR%%/storage-schemas.conf.sample
 @dir(carbon,carbon,0750) /var/db/%%GO_PKGNAME%%
 @dir(carbon,carbon,0750) /var/log/%%GO_PKGNAME%%