diff options
| author | jgh <jgh@FreeBSD.org> | 2012-06-24 03:08:17 +0800 |
|---|---|---|
| committer | jgh <jgh@FreeBSD.org> | 2012-06-24 03:08:17 +0800 |
| commit | 90ec87485604006ab5445e57f6f9a1f008cb7594 (patch) | |
| tree | 7d40f95d5d86a7b792f5f2835d45c954b38e1277 | |
| parent | eb466eb4b69a376fba806fd44b1b3c10534b0e13 (diff) | |
| download | freebsd-ports-gnome-90ec87485604006ab5445e57f6f9a1f008cb7594.tar.gz freebsd-ports-gnome-90ec87485604006ab5445e57f6f9a1f008cb7594.tar.zst freebsd-ports-gnome-90ec87485604006ab5445e57f6f9a1f008cb7594.zip | |
- update to 0.9.10
- while here adjust BUILD_DEPENDS
PR: ports/169311
Submitted by: brd@
Approved by: maintainer, bsdports@wayfair.com
| -rw-r--r-- | databases/py-carbon/Makefile | 4 | ||||
| -rw-r--r-- | databases/py-carbon/distinfo | 4 | ||||
| -rw-r--r-- | databases/py-carbon/files/patch-setup.py | 10 | ||||
| -rw-r--r-- | databases/py-carbon/pkg-plist | 6 |
4 files changed, 15 insertions, 9 deletions
diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile index c2c48100e524..686bfa3a09dd 100644 --- a/databases/py-carbon/Makefile +++ b/databases/py-carbon/Makefile @@ -6,7 +6,7 @@ # PORTNAME= carbon -PORTVERSION= 0.9.9 +PORTVERSION= 0.9.10 CATEGORIES= databases python MASTER_SITES= http://launchpad.net/graphite/0.9/${PORTVERSION}/+download/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,7 +17,7 @@ COMMENT= Backend storage application for graphite RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:${PORTSDIR}/net/py-txamqp \ ${PYTHON_PKGNAMEPREFIX}whisper>=0.9.9:${PORTSDIR}/databases/py-whisper \ ${PYTHON_PKGNAMEPREFIX}twisted>=11.0.0:${PORTSDIR}/devel/py-twisted -BUILD_DEPENDS= ${RUN_DEPENDS} +BUILD_DEPENDS:= ${RUN_DEPENDS} USE_PYTHON= 2.6+ USE_PYDISTUTILS= yes diff --git a/databases/py-carbon/distinfo b/databases/py-carbon/distinfo index 58483e992f4d..b32c59b8fe1d 100644 --- a/databases/py-carbon/distinfo +++ b/databases/py-carbon/distinfo @@ -1,2 +1,2 @@ -SHA256 (carbon-0.9.9.tar.gz) = b3d42e3b93c09a82646168d7439e25cfc52143d77eba8a1f8ed45e415bb3b5cb -SIZE (carbon-0.9.9.tar.gz) = 39813 +SHA256 (carbon-0.9.10.tar.gz) = 4f37e00595b5b078edb9b3f5cae318f752f4446a82623ea4da97dd7d0f6a5072 +SIZE (carbon-0.9.10.tar.gz) = 42201 diff --git a/databases/py-carbon/files/patch-setup.py b/databases/py-carbon/files/patch-setup.py index 2153d33e841e..13c148185118 100644 --- a/databases/py-carbon/files/patch-setup.py +++ b/databases/py-carbon/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig 2011-04-03 22:20:13.000000000 -0400 -+++ setup.py 2011-05-05 22:03:42.000000000 -0400 +--- setup.py.ori 2012-06-21 16:04:03.284808706 -0700 ++++ setup.py 2012-06-21 16:05:09.681811949 -0700 @@ -12,9 +12,9 @@ setup_kwargs = dict() @@ -10,6 +10,6 @@ +storage_dirs = [ ('/var/db/graphite/storage/whisper',[]), ('/var/db/graphite/storage/lists',[]), + ('/var/db/graphite/storage/log',[]), ('/var/db/graphite/storage/rrd',[]) ] +conf_files = [ ('/usr/local/etc/carbon', glob('conf/*.example')) ] - - setup( - name='carbon', + #XXX Need a way to have these work for bdist_rpm but be left alone for everything else + #init_scripts = [ ('/etc/init.d', ['distro/redhat/init.d/carbon-cache', + # 'distro/redhat/init.d/carbon-relay', diff --git a/databases/py-carbon/pkg-plist b/databases/py-carbon/pkg-plist index a7007456884c..b64a10266230 100644 --- a/databases/py-carbon/pkg-plist +++ b/databases/py-carbon/pkg-plist @@ -9,6 +9,9 @@ etc/carbon/carbon.conf.example etc/carbon/aggregation-rules.conf.example etc/carbon/relay-rules.conf.example etc/carbon/storage-schemas.conf.example +etc/carbon/blacklist.conf.example +etc/carbon/storage-aggregation.conf.example +etc/carbon/whitelist.conf.example %%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_aggregator_plugin.py %%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_relay_plugin.py %%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_cache_plugin.py @@ -94,6 +97,9 @@ etc/carbon/storage-schemas.conf.example %%PYTHON_SITELIBDIR%%/carbon/state.pyo %%PYTHON_SITELIBDIR%%/carbon/service.pyo %%PYTHON_SITELIBDIR%%/carbon/protocols.pyo +%%PYTHON_SITELIBDIR%%/carbon/regexlist.py +%%PYTHON_SITELIBDIR%%/carbon/regexlist.pyc +%%PYTHON_SITELIBDIR%%/carbon/regexlist.pyo @dirrm etc/carbon @dirrm %%PYTHON_SITELIBDIR%%/carbon/aggregator @dirrm %%PYTHON_SITELIBDIR%%/carbon |