Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Mar 2018 09:51:36 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r465077 - head/databases/go-carbon
Message-ID:  <201803200951.w2K9paQG018144@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803200951.w2K9paQG018144>