Index: head/databases/py-carbon/Makefile
===================================================================
--- head/databases/py-carbon/Makefile	(revision 465297)
+++ head/databases/py-carbon/Makefile	(revision 465298)
@@ -1,35 +1,36 @@
 # Created by: Evan Sarmiento <bsdports@wayfair.com>
 # $FreeBSD$
 
 PORTNAME=	carbon
-PORTVERSION=	1.0.2
+PORTVERSION=	1.1.2
 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}twisted>=0:devel/py-twisted@${FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.4:www/py-django@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:net/py-txamqp@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}whisper>=0.9.10:databases/py-whisper@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18@${FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}whisper>=0.9.10:databases/py-whisper@${FLAVOR}
 
 NO_ARCH=	yes
 USE_PYTHON=	distutils
 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
 	${RMDIR} ${STAGEDIR}${PREFIX}/examples
 
 .include <bsd.port.mk>
Index: head/databases/py-carbon/distinfo
===================================================================
--- head/databases/py-carbon/distinfo	(revision 465297)
+++ head/databases/py-carbon/distinfo	(revision 465298)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508333587
-SHA256 (graphite-project-carbon-1.0.2_GH0.tar.gz) = 817be9dd99635dad437e3f12f8a3b163d34de5586a686ac619c28e38358ef0e8
-SIZE (graphite-project-carbon-1.0.2_GH0.tar.gz) = 82090
+TIMESTAMP = 1521720872
+SHA256 (graphite-project-carbon-1.1.2_GH0.tar.gz) = f0fa61ff9fb3f3c20a802ecbf2da2f11abcc04c41ec2139bfc3192b79b82bf7e
+SIZE (graphite-project-carbon-1.1.2_GH0.tar.gz) = 92933
Index: head/databases/py-carbon/pkg-plist
===================================================================
--- head/databases/py-carbon/pkg-plist	(revision 465297)
+++ head/databases/py-carbon/pkg-plist	(revision 465298)
@@ -1,123 +1,130 @@
 bin/carbon-aggregator.py
+bin/carbon-aggregator-cache.py
 bin/carbon-cache.py
 bin/carbon-client.py
 bin/carbon-relay.py
 bin/validate-storage-schemas.py
 @sample %%ETCDIR%%/aggregation-rules.conf.example etc/carbon/aggregation-rules.conf
 @sample %%ETCDIR%%/blacklist.conf.example etc/carbon/blacklist.conf
 @sample %%ETCDIR%%/carbon.amqp.conf.example etc/carbon/carbon.amqp.conf
 @sample %%ETCDIR%%/carbon.conf.example etc/carbon/carbon.conf
 @sample %%ETCDIR%%/relay-rules.conf.example etc/carbon/relay-rules.conf
 @sample %%ETCDIR%%/rewrite-rules.conf.example etc/carbon/rewrite-rules.conf
 @sample %%ETCDIR%%/storage-aggregation.conf.example etc/carbon/storage-aggregation.conf
 @sample %%ETCDIR%%/storage-schemas.conf.example etc/carbon/storage-schemas.conf
 @sample %%ETCDIR%%/whitelist.conf.example etc/carbon/whitelist.conf
 %%PYTHON_SITELIBDIR%%/carbon/__init__.py
 %%PYTHON_SITELIBDIR%%/carbon/__init__.pyc
 %%PYTHON_SITELIBDIR%%/carbon/__init__.pyo
 %%PYTHON_SITELIBDIR%%/carbon/aggregator/__init__.py
 %%PYTHON_SITELIBDIR%%/carbon/aggregator/__init__.pyc
 %%PYTHON_SITELIBDIR%%/carbon/aggregator/__init__.pyo
 %%PYTHON_SITELIBDIR%%/carbon/aggregator/buffers.py
 %%PYTHON_SITELIBDIR%%/carbon/aggregator/buffers.pyc
 %%PYTHON_SITELIBDIR%%/carbon/aggregator/buffers.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
-%%PYTHON_SITELIBDIR%%/carbon/amqp0-8.xml
 %%PYTHON_SITELIBDIR%%/carbon/amqp_listener.py
 %%PYTHON_SITELIBDIR%%/carbon/amqp_listener.pyc
 %%PYTHON_SITELIBDIR%%/carbon/amqp_listener.pyo
 %%PYTHON_SITELIBDIR%%/carbon/amqp_publisher.py
 %%PYTHON_SITELIBDIR%%/carbon/amqp_publisher.pyc
 %%PYTHON_SITELIBDIR%%/carbon/amqp_publisher.pyo
+%%PYTHON_SITELIBDIR%%/carbon/amqp0-8.xml
 %%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
 %%PYTHON_SITELIBDIR%%/carbon/exceptions.py
 %%PYTHON_SITELIBDIR%%/carbon/exceptions.pyc
 %%PYTHON_SITELIBDIR%%/carbon/exceptions.pyo
 %%PYTHON_SITELIBDIR%%/carbon/hashing.py
 %%PYTHON_SITELIBDIR%%/carbon/hashing.pyc
 %%PYTHON_SITELIBDIR%%/carbon/hashing.pyo
+%%PYTHON_SITELIBDIR%%/carbon/http.py
+%%PYTHON_SITELIBDIR%%/carbon/http.pyc
+%%PYTHON_SITELIBDIR%%/carbon/http.pyo
 %%PYTHON_SITELIBDIR%%/carbon/instrumentation.py
 %%PYTHON_SITELIBDIR%%/carbon/instrumentation.pyc
 %%PYTHON_SITELIBDIR%%/carbon/instrumentation.pyo
 %%PYTHON_SITELIBDIR%%/carbon/log.py
 %%PYTHON_SITELIBDIR%%/carbon/log.pyc
 %%PYTHON_SITELIBDIR%%/carbon/log.pyo
 %%PYTHON_SITELIBDIR%%/carbon/management.py
 %%PYTHON_SITELIBDIR%%/carbon/management.pyc
 %%PYTHON_SITELIBDIR%%/carbon/management.pyo
 %%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
 %%PYTHON_SITELIBDIR%%/carbon/regexlist.py
 %%PYTHON_SITELIBDIR%%/carbon/regexlist.pyc
 %%PYTHON_SITELIBDIR%%/carbon/regexlist.pyo
 %%PYTHON_SITELIBDIR%%/carbon/relayrules.py
 %%PYTHON_SITELIBDIR%%/carbon/relayrules.pyc
 %%PYTHON_SITELIBDIR%%/carbon/relayrules.pyo
 %%PYTHON_SITELIBDIR%%/carbon/rewrite.py
 %%PYTHON_SITELIBDIR%%/carbon/rewrite.pyc
 %%PYTHON_SITELIBDIR%%/carbon/rewrite.pyo
 %%PYTHON_SITELIBDIR%%/carbon/routers.py
 %%PYTHON_SITELIBDIR%%/carbon/routers.pyc
 %%PYTHON_SITELIBDIR%%/carbon/routers.pyo
 %%PYTHON_SITELIBDIR%%/carbon/service.py
 %%PYTHON_SITELIBDIR%%/carbon/service.pyc
 %%PYTHON_SITELIBDIR%%/carbon/service.pyo
 %%PYTHON_SITELIBDIR%%/carbon/state.py
 %%PYTHON_SITELIBDIR%%/carbon/state.pyc
 %%PYTHON_SITELIBDIR%%/carbon/state.pyo
 %%PYTHON_SITELIBDIR%%/carbon/storage.py
 %%PYTHON_SITELIBDIR%%/carbon/storage.pyc
 %%PYTHON_SITELIBDIR%%/carbon/storage.pyo
 %%PYTHON_SITELIBDIR%%/carbon/util.py
 %%PYTHON_SITELIBDIR%%/carbon/util.pyc
 %%PYTHON_SITELIBDIR%%/carbon/util.pyo
 %%PYTHON_SITELIBDIR%%/carbon/writer.py
 %%PYTHON_SITELIBDIR%%/carbon/writer.pyc
 %%PYTHON_SITELIBDIR%%/carbon/writer.pyo
+%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_aggregator_cache_plugin.py
+%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_aggregator_cache_plugin.pyc
+%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_aggregator_cache_plugin.pyo
 %%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_aggregator_plugin.py
 %%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_aggregator_plugin.pyc
 %%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_aggregator_plugin.pyo
 %%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_cache_plugin.py
 %%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_cache_plugin.pyc
 %%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_cache_plugin.pyo
 %%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
 @dir /var/db/carbon/whisper
 @dir /var/db/carbon