diff options
| -rw-r--r-- | databases/py-carbon/Makefile | 7 | ||||
| -rw-r--r-- | databases/py-carbon/distinfo | 5 | ||||
| -rw-r--r-- | databases/py-carbon/files/patch-setup.cfg | 9 | ||||
| -rw-r--r-- | databases/py-carbon/files/patch-setup.py | 25 | ||||
| -rw-r--r-- | databases/py-carbon/pkg-plist | 19 |
5 files changed, 39 insertions, 26 deletions
diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile index a3cc38341f9a..c551932e2e97 100644 --- a/databases/py-carbon/Makefile +++ b/databases/py-carbon/Makefile @@ -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 diff --git a/databases/py-carbon/distinfo b/databases/py-carbon/distinfo index a2feb9d59910..5a76f56029a7 100644 --- a/databases/py-carbon/distinfo +++ b/databases/py-carbon/distinfo @@ -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 diff --git a/databases/py-carbon/files/patch-setup.cfg b/databases/py-carbon/files/patch-setup.cfg deleted file mode 100644 index a33354a1ebf1..000000000000 --- a/databases/py-carbon/files/patch-setup.cfg +++ /dev/null @@ -1,9 +0,0 @@ ---- setup.cfg.orig 2015-11-27 18:37:07 UTC -+++ setup.cfg -@@ -1,6 +1,4 @@ - [install] --prefix = /opt/graphite --install-lib = %(prefix)s/lib - - [bdist_rpm] - requires = python-twisted diff --git a/databases/py-carbon/files/patch-setup.py b/databases/py-carbon/files/patch-setup.py index 63c603bdc667..ca2ea4e6c812 100644 --- a/databases/py-carbon/files/patch-setup.py +++ b/databases/py-carbon/files/patch-setup.py @@ -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 diff --git a/databases/py-carbon/pkg-plist b/databases/py-carbon/pkg-plist index c1891bb57b13..d34f88a8ae7f 100644 --- a/databases/py-carbon/pkg-plist +++ b/databases/py-carbon/pkg-plist @@ -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 |