Index: head/databases/py-carbon/Makefile =================================================================== --- head/databases/py-carbon/Makefile (revision 538424) +++ head/databases/py-carbon/Makefile (revision 538425) @@ -1,38 +1,39 @@ # Created by: Evan Sarmiento # $FreeBSD$ PORTNAME= carbon -PORTVERSION= 1.1.5 -PORTREVISION= 1 +PORTVERSION= 1.1.7 CATEGORIES= databases python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= swills@FreeBSD.org COMMENT= Backend storage application for graphite LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cachetools3>=1.1.0:devel/py-cachetools3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:net/py-txamqp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}whisper>=0.9.10:databases/py-whisper@${PY_FLAVOR} -NO_ARCH= yes -USE_PYTHON= distutils -USES= python:2.7 +USES= python +USE_PYTHON= distutils py3kplist USE_RC_SUBR= carbon USE_GITHUB= yes GH_ACCOUNT= graphite-project + MAKE_ENV= GRAPHITE_NO_PREFIX=yes + +NO_ARCH= yes post-patch: @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/setup.py post-install: ${RM} -r ${STAGEDIR}${PREFIX}/examples/init.d ${RMDIR} ${STAGEDIR}${PREFIX}/examples .include Index: head/databases/py-carbon/distinfo =================================================================== --- head/databases/py-carbon/distinfo (revision 538424) +++ head/databases/py-carbon/distinfo (revision 538425) @@ -1,3 +1,3 @@ -TIMESTAMP = 1545929235 -SHA256 (graphite-project-carbon-1.1.5_GH0.tar.gz) = fe4278eead6f2e8726c6576cdb0a6fde8a28cfd851309f82927ce6dcda38ff31 -SIZE (graphite-project-carbon-1.1.5_GH0.tar.gz) = 97614 +TIMESTAMP = 1587670553 +SHA256 (graphite-project-carbon-1.1.7_GH0.tar.gz) = 8541a9c25aada40009770bac877dd730edac0ef27613509049d9ee8d5a4f5244 +SIZE (graphite-project-carbon-1.1.7_GH0.tar.gz) = 98861 Index: head/databases/py-carbon/files/patch-setup.py =================================================================== --- head/databases/py-carbon/files/patch-setup.py (revision 538424) +++ head/databases/py-carbon/files/patch-setup.py (revision 538425) @@ -1,17 +1,17 @@ ---- setup.py.orig 2018-04-04 03:38:32.000000000 -0400 -+++ setup.py 2018-04-23 12:08:38.358102000 -0400 +--- setup.py.orig 2020-03-16 15:22:22 UTC ++++ setup.py @@ -58,10 +58,10 @@ else: setup_kwargs = dict() -storage_dirs = [ ('storage/ceres/dummy.txt', []), ('storage/whisper/dummy.txt',[]), - ('storage/lists',[]), ('storage/log/dummy.txt',[]), - ('storage/rrd/dummy.txt',[]) ] -conf_files = [ ('conf', 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