From owner-svn-ports-head@freebsd.org  Sun Jan  3 21:15:58 2016
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 8D828A604D4;
 Sun,  3 Jan 2016 21:15:58 +0000 (UTC)
 (envelope-from olgeni@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 5D5D314CB;
 Sun,  3 Jan 2016 21:15:58 +0000 (UTC)
 (envelope-from olgeni@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u03LFvB7047412;
 Sun, 3 Jan 2016 21:15:57 GMT (envelope-from olgeni@FreeBSD.org)
Received: (from olgeni@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u03LFvFg047410;
 Sun, 3 Jan 2016 21:15:57 GMT (envelope-from olgeni@FreeBSD.org)
Message-Id: <201601032115.u03LFvFg047410@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: olgeni set sender to
 olgeni@FreeBSD.org using -f
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Sun, 3 Jan 2016 21:15:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r405186 - head/www/grafana2
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.20
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: Sun, 03 Jan 2016 21:15:58 -0000

Author: olgeni
Date: Sun Jan  3 21:15:57 2016
New Revision: 405186
URL: https://svnweb.freebsd.org/changeset/ports/405186

Log:
  Install grafana2.conf using the @sample keyword, to preserve changes
  between upgrades.
  
  PR:		205803
  Submitted by:	olgeni
  Approved by:	maintainer

Modified:
  head/www/grafana2/Makefile
  head/www/grafana2/pkg-plist

Modified: head/www/grafana2/Makefile
==============================================================================
--- head/www/grafana2/Makefile	Sun Jan  3 21:10:26 2016	(r405185)
+++ head/www/grafana2/Makefile	Sun Jan  3 21:15:57 2016	(r405186)
@@ -2,6 +2,7 @@
 
 PORTNAME=	grafana2
 PORTVERSION=	2.6.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
@@ -151,7 +152,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data/log
 	${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana/conf/defaults.ini \
 	${STAGEDIR}${GRAFANAHOMEDIR}/conf/defaults.ini
-	${INSTALL_DATA} ${WRKDIR}/grafana2.conf ${STAGEDIR}${PREFIX}/etc/grafana2.conf
+	${INSTALL_DATA} ${WRKDIR}/grafana2.conf ${STAGEDIR}${PREFIX}/etc/grafana2.conf.sample
 
 .include <bsd.port.pre.mk>
 

Modified: head/www/grafana2/pkg-plist
==============================================================================
--- head/www/grafana2/pkg-plist	Sun Jan  3 21:10:26 2016	(r405185)
+++ head/www/grafana2/pkg-plist	Sun Jan  3 21:15:57 2016	(r405186)
@@ -1,5 +1,5 @@
 bin/grafana-server
-etc/grafana2.conf
+@sample etc/grafana2.conf.sample
 share/grafana/conf/defaults.ini
 share/grafana/public/app/app.js
 share/grafana/public/app/core/config.js