From owner-svn-ports-all@freebsd.org Wed Oct 18 14:58:14 2017 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 DC796E3B30F; Wed, 18 Oct 2017 14:58:14 +0000 (UTC) (envelope-from swills@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 B0F2A80DA4; Wed, 18 Oct 2017 14:58:14 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9IEwDm1089795; Wed, 18 Oct 2017 14:58:13 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9IEwDlc089790; Wed, 18 Oct 2017 14:58:13 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201710181458.v9IEwDlc089790@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Wed, 18 Oct 2017 14:58:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r452341 - in head/databases/py-carbon: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/databases/py-carbon: . files X-SVN-Commit-Revision: 452341 X-SVN-Commit-Repository: ports 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.23 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: Wed, 18 Oct 2017 14:58:15 -0000 Author: swills Date: Wed Oct 18 14:58:13 2017 New Revision: 452341 URL: https://svnweb.freebsd.org/changeset/ports/452341 Log: databases/py-carbon: update to 1.0.2 Deleted: head/databases/py-carbon/files/patch-setup.cfg Modified: head/databases/py-carbon/Makefile head/databases/py-carbon/distinfo head/databases/py-carbon/files/patch-setup.py head/databases/py-carbon/pkg-plist Modified: head/databases/py-carbon/Makefile ============================================================================== --- head/databases/py-carbon/Makefile Wed Oct 18 14:53:19 2017 (r452340) +++ head/databases/py-carbon/Makefile Wed Oct 18 14:58:13 2017 (r452341) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= carbon -PORTVERSION= 0.9.15 -PORTREVISION= 2 +PORTVERSION= 1.0.2 CATEGORIES= databases python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -24,6 +23,10 @@ USES= python:2.7 USE_RC_SUBR= carbon USE_GITHUB= yes GH_ACCOUNT= graphite-project +MAKE_ENV= GRAPHITE_NO_PREFIX=yes + +post-patch: + @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/setup.py post-install: ${RM} -r ${STAGEDIR}${PREFIX}/examples/init.d Modified: head/databases/py-carbon/distinfo ============================================================================== --- head/databases/py-carbon/distinfo Wed Oct 18 14:53:19 2017 (r452340) +++ head/databases/py-carbon/distinfo Wed Oct 18 14:58:13 2017 (r452341) @@ -1,2 +1,3 @@ -SHA256 (graphite-project-carbon-0.9.15_GH0.tar.gz) = 3bfab79b7bf11a0f49414a45fa5fcd71e104fec3242f6dec26869060e69924a0 -SIZE (graphite-project-carbon-0.9.15_GH0.tar.gz) = 57328 +TIMESTAMP = 1508333587 +SHA256 (graphite-project-carbon-1.0.2_GH0.tar.gz) = 817be9dd99635dad437e3f12f8a3b163d34de5586a686ac619c28e38358ef0e8 +SIZE (graphite-project-carbon-1.0.2_GH0.tar.gz) = 82090 Modified: head/databases/py-carbon/files/patch-setup.py ============================================================================== --- head/databases/py-carbon/files/patch-setup.py Wed Oct 18 14:53:19 2017 (r452340) +++ head/databases/py-carbon/files/patch-setup.py Wed Oct 18 14:58:13 2017 (r452341) @@ -1,15 +1,20 @@ ---- setup.py.orig 2015-11-27 18:37:07 UTC -+++ setup.py -@@ -13,9 +13,9 @@ else: +--- setup.py.orig 2017-07-11 17:42:10.000000000 -0400 ++++ setup.py 2017-10-18 10:23:03.662885000 -0400 +@@ -50,12 +50,11 @@ + from distutils.core import setup setup_kwargs = dict() - --storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]), -- ('storage/log',[]), ('storage/rrd',[]) ] +- +-storage_dirs = [ ('storage/ceres', []), ('storage/whisper',[]), +- ('storage/lists',[]), ('storage/log',[]), +- ('storage/rrd',[]) ] -conf_files = [ ('conf', glob('conf/*.example')) ] -+storage_dirs = [ ('/var/db/carbon/whisper',[]), ('/var/db/carbon/lists',[]), -+ ('/var/db/carbon/log',[]), ('/var/db/carbon/rrd',[]) ] -+conf_files = [ ('/usr/local/etc/carbon', glob('conf/*.example')) ] - +- ++storage_dirs = [ ('/var/db/carbon/ceres',[]), ('/var/db/carbon/whisper',[]), ++ ('/var/db/carbon/lists',[]), ('/var/db/carbon/log',[]), ++ ('/var/db/carbon/rrd',[]) ] ++conf_files = [ ('%%PREFIX%%/etc/carbon', glob('conf/*.example')) ] ++ install_files = storage_dirs + conf_files + # Let's include redhat init scripts, despite build platform Modified: head/databases/py-carbon/pkg-plist ============================================================================== --- head/databases/py-carbon/pkg-plist Wed Oct 18 14:53:19 2017 (r452340) +++ head/databases/py-carbon/pkg-plist Wed Oct 18 14:58:13 2017 (r452341) @@ -21,9 +21,9 @@ bin/validate-storage-schemas.py %%PYTHON_SITELIBDIR%%/carbon/aggregator/buffers.py %%PYTHON_SITELIBDIR%%/carbon/aggregator/buffers.pyc %%PYTHON_SITELIBDIR%%/carbon/aggregator/buffers.pyo -%%PYTHON_SITELIBDIR%%/carbon/aggregator/receiver.py -%%PYTHON_SITELIBDIR%%/carbon/aggregator/receiver.pyc -%%PYTHON_SITELIBDIR%%/carbon/aggregator/receiver.pyo +%%PYTHON_SITELIBDIR%%/carbon/aggregator/processor.py +%%PYTHON_SITELIBDIR%%/carbon/aggregator/processor.pyc +%%PYTHON_SITELIBDIR%%/carbon/aggregator/processor.pyo %%PYTHON_SITELIBDIR%%/carbon/aggregator/rules.py %%PYTHON_SITELIBDIR%%/carbon/aggregator/rules.pyc %%PYTHON_SITELIBDIR%%/carbon/aggregator/rules.pyo @@ -37,12 +37,18 @@ bin/validate-storage-schemas.py %%PYTHON_SITELIBDIR%%/carbon/cache.py %%PYTHON_SITELIBDIR%%/carbon/cache.pyc %%PYTHON_SITELIBDIR%%/carbon/cache.pyo +%%PYTHON_SITELIBDIR%%/carbon/carbon_pb2.py +%%PYTHON_SITELIBDIR%%/carbon/carbon_pb2.pyc +%%PYTHON_SITELIBDIR%%/carbon/carbon_pb2.pyo %%PYTHON_SITELIBDIR%%/carbon/client.py %%PYTHON_SITELIBDIR%%/carbon/client.pyc %%PYTHON_SITELIBDIR%%/carbon/client.pyo %%PYTHON_SITELIBDIR%%/carbon/conf.py %%PYTHON_SITELIBDIR%%/carbon/conf.pyc %%PYTHON_SITELIBDIR%%/carbon/conf.pyo +%%PYTHON_SITELIBDIR%%/carbon/database.py +%%PYTHON_SITELIBDIR%%/carbon/database.pyc +%%PYTHON_SITELIBDIR%%/carbon/database.pyo %%PYTHON_SITELIBDIR%%/carbon/events.py %%PYTHON_SITELIBDIR%%/carbon/events.pyc %%PYTHON_SITELIBDIR%%/carbon/events.pyo @@ -64,6 +70,12 @@ bin/validate-storage-schemas.py %%PYTHON_SITELIBDIR%%/carbon/manhole.py %%PYTHON_SITELIBDIR%%/carbon/manhole.pyc %%PYTHON_SITELIBDIR%%/carbon/manhole.pyo +%%PYTHON_SITELIBDIR%%/carbon/pipeline.py +%%PYTHON_SITELIBDIR%%/carbon/pipeline.pyc +%%PYTHON_SITELIBDIR%%/carbon/pipeline.pyo +%%PYTHON_SITELIBDIR%%/carbon/protobuf.py +%%PYTHON_SITELIBDIR%%/carbon/protobuf.pyc +%%PYTHON_SITELIBDIR%%/carbon/protobuf.pyo %%PYTHON_SITELIBDIR%%/carbon/protocols.py %%PYTHON_SITELIBDIR%%/carbon/protocols.pyc %%PYTHON_SITELIBDIR%%/carbon/protocols.pyo @@ -103,6 +115,7 @@ bin/validate-storage-schemas.py %%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_relay_plugin.py %%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_relay_plugin.pyc %%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_relay_plugin.pyo +@dir /var/db/carbon/ceres @dir /var/db/carbon/lists @dir /var/db/carbon/log @dir /var/db/carbon/rrd