From owner-svn-ports-all@freebsd.org Sat Sep 26 15:53:40 2015 Return-Path: Delivered-To: svn-ports-all@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 D901FA0AA1F; Sat, 26 Sep 2015 15:53:40 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 C963A3DA; Sat, 26 Sep 2015 15:53:40 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8QFreH6046453; Sat, 26 Sep 2015 15:53:40 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8QFre76046452; Sat, 26 Sep 2015 15:53:40 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201509261553.t8QFre76046452@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 26 Sep 2015 15:53:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397989 - head/databases/py-carbon X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Sep 2015 15:53:41 -0000 Author: bapt Date: Sat Sep 26 15:53:39 2015 New Revision: 397989 URL: https://svnweb.freebsd.org/changeset/ports/397989 Log: Convert to new @sample Modified: head/databases/py-carbon/pkg-plist Modified: head/databases/py-carbon/pkg-plist ============================================================================== --- head/databases/py-carbon/pkg-plist Sat Sep 26 15:36:20 2015 (r397988) +++ head/databases/py-carbon/pkg-plist Sat Sep 26 15:53:39 2015 (r397989) @@ -3,33 +3,15 @@ bin/carbon-cache.py bin/carbon-client.py bin/carbon-relay.py bin/validate-storage-schemas.py -@unexec if cmp -s %D/etc/carbon/rewrite-rules.conf.example %D/etc/carbon/rewrite-rules.conf; then rm -f %D/etc/carbon/rewrite-rules.conf; fi -%%ETCDIR%%/rewrite-rules.conf.example -@exec if [ ! -f %D/etc/carbon/rewrite-rules.conf ] ; then cp -p %D/%F %B/rewrite-rules.conf; fi -@unexec if cmp -s %D/etc/carbon/carbon.amqp.conf.example %D/etc/carbon/carbon.amqp.conf; then rm -f %D/etc/carbon/carbon.amqp.conf; fi -%%ETCDIR%%/carbon.amqp.conf.example -@exec if [ ! -f %D/etc/carbon/carbon.amqp.conf ] ; then cp -p %D/%F %B/carbon.amqp.conf; fi -@unexec if cmp -s %D/etc/carbon/carbon.conf.example %D/etc/carbon/carbon.conf; then rm -f %D/etc/carbon/carbon.conf; fi -%%ETCDIR%%/carbon.conf.example -@exec if [ ! -f %D/etc/carbon/carbon.conf ] ; then cp -p %D/%F %B/carbon.conf; fi -@unexec if cmp -s %D/etc/carbon/aggregation-rules.conf.example %D/etc/carbon/aggregation-rules.conf; then rm -f %D/etc/carbon/aggregation-rules.conf; fi -%%ETCDIR%%/aggregation-rules.conf.example -@exec if [ ! -f %D/etc/carbon/aggregation-rules.conf ] ; then cp -p %D/%F %B/aggregation-rules.conf; fi -@unexec if cmp -s %D/etc/carbon/relay-rules.conf.example %D/etc/carbon/relay-rules.conf; then rm -f %D/etc/carbon/relay-rules.conf; fi -%%ETCDIR%%/relay-rules.conf.example -@exec if [ ! -f %D/etc/carbon/relay-rules.conf ] ; then cp -p %D/%F %B/relay-rules.conf; fi -@unexec if cmp -s %D/etc/carbon/storage-schemas.conf.example %D/etc/carbon/storage-schemas.conf; then rm -f %D/etc/carbon/storage-schemas.conf; fi -%%ETCDIR%%/storage-schemas.conf.example -@exec if [ ! -f %D/etc/carbon/storage-schemas.conf ] ; then cp -p %D/%F %B/storage-schemas.conf; fi -@unexec if cmp -s %D/etc/carbon/blacklist.conf.example %D/etc/carbon/blacklist.conf; then rm -f %D/etc/carbon/blacklist.conf; fi -%%ETCDIR%%/blacklist.conf.example -@exec if [ ! -f %D/etc/carbon/blacklist.conf ] ; then cp -p %D/%F %B/blacklist.conf; fi -@unexec if cmp -s %D/etc/carbon/storage-aggregation.conf.example %D/etc/carbon/storage-aggregation.conf; then rm -f %D/etc/carbon/storage-aggregation.conf; fi -%%ETCDIR%%/storage-aggregation.conf.example -@exec if [ ! -f %D/etc/carbon/storage-aggregation.conf ] ; then cp -p %D/%F %B/storage-aggregation.conf; fi -@unexec if cmp -s %D/etc/carbon/whitelist.conf.example %D/etc/carbon/whitelist.conf; then rm -f %D/etc/carbon/whitelist.conf; fi -%%ETCDIR%%/whitelist.conf.example -@exec if [ ! -f %D/etc/carbon/whitelist.conf ] ; then cp -p %D/%F %B/whitelist.conf; fi +@sample %%ETCDIR%%/rewrite-rules.conf.example etc/carbon/rewrite-rules.conf +@sample %%ETCDIR%%/carbon.amqp.conf.example etc/carbon/carbon.amqp.conf +@sample %%ETCDIR%%/carbon.conf.example etc/carbon/carbon.conf +@sample %%ETCDIR%%/aggregation-rules.conf.example etc/carbon/aggregation-rules.conf +@sample %%ETCDIR%%/relay-rules.conf.example etc/carbon/relay-rules.conf +@sample %%ETCDIR%%/storage-schemas.conf.example etc/carbon/storage-schemas.conf +@sample %%ETCDIR%%/blacklist.conf.example etc/carbon/blacklist.conf +@sample %%ETCDIR%%/storage-aggregation.conf.example etc/carbon/storage-aggregation.conf +@sample %%ETCDIR%%/whitelist.conf.example etc/carbon/whitelist.conf %%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_aggregator_plugin.py %%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_relay_plugin.py %%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_cache_plugin.py