- update dependency version on databases/py-whisper

- fix comments in carbon's rc-script
- checksum change, that was in original PR is rejected, because it fetches
  fine with old checksums and fails to fetch with new ones.

while here:
- change etc/carbon to %%ETCDIR%% in pkg-plist
- remove unneeded newlines in files/pkg_message.in
- add license (AL2)
- remove BUILD_DEPENDS (setup.py didn't cheking for it on build phase)
- limit python version to 2.x
- tab -> space in pkg-descr:WWW
- this port depends on twisted both directly and via USE_TWISTED. Since
  I wasn't able to find which twisted components it actually needed, I
  just dropped USE_TWISTED and let the port to depend on it via
  devel/py-twisted meta-port

PR:		170920
Submitted by:	Chris McCoy <bsdports at wayfair dot com> (maintainer)

5 files changed, 31 insertions, 29 deletions

diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile
index 434d986f84d8..bb225e6eab28 100644
--- a/databases/py-carbon/Makefile
+++ b/databases/py-carbon/Makefile
@@ -14,14 +14,14 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	bsdports@wayfair.com
 COMMENT=	Backend storage application for graphite
 
+LICENSE=	AL2
+
 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}
+		${PYTHON_PKGNAMEPREFIX}whisper>=0.9.10:${PORTSDIR}/databases/py-whisper \
+		${PYTHON_PKGNAMEPREFIX}twisted>=11.0.0:${PORTSDIR}/devel/py-twisted
 
-USE_PYTHON=	2.6+
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=	yes
-USE_TWISTED=	yes
 FETCH_ARGS=	-pRr
 USE_RC_SUBR=	carbon
 
diff --git a/databases/py-carbon/files/carbon.in b/databases/py-carbon/files/carbon.in
index 8fc587b1e5cf..a0379c4b1777 100644
--- a/databases/py-carbon/files/carbon.in
+++ b/databases/py-carbon/files/carbon.in
@@ -8,17 +8,21 @@
 #
 # carbon_enable (bool):	Set to NO by default.
 #			Set it to YES to enable it.
-# carbon_conf_dir:	Directory where sabnzbd configuration
-#			data is stored.
-#			Default: /usr/local/sabnzbd
-# carbon_user:	    	The user account sabnzbd daemon runs as what
-#			you want it to be. It uses 'www' user by
-#			default. Do not sets it as empty or it will run
-#			as root.
-# carbon_group:    	The group account sabnzbd daemon runs as what
-#			you want it to be. It uses 'www' group by
-#			default. Do not sets it as empty or it will run
-#			as wheel.
+# carbon_user:		The user account carbon daemon runs as what
+#			you want it to be. It uses 'root' user by
+#			default.
+# carbon_group:		The group account carbon daemon runs as what
+#			you want it to be. It uses 'wheel' group by
+#			default.
+# carbon_debug:		Determines if you want carbon to run in debug
+#			mode, it may be very verbose. It will not run
+#			in debug by default.
+# carbon_logdir:	Directory where carbon logs are stored.
+#			Default: /usr/local/graphite/storage/log
+# carbon_conf:		File where carbon configuration resides
+#			Default: /usr/local/etc/carbon/carbon.conf
+# carbon_pidfile:	Location where carbon should place its pid file
+#			Default: /var/run/carbon.pid
 
 . /etc/rc.subr
 
diff --git a/databases/py-carbon/files/pkg_message.in b/databases/py-carbon/files/pkg_message.in
index 71daf8b5e9e8..18d9949bfdfd 100644
--- a/databases/py-carbon/files/pkg_message.in
+++ b/databases/py-carbon/files/pkg_message.in
@@ -14,6 +14,4 @@ to /etc/rc.conf, then start it via:
 
 Once started, finish setting up Graphite
 
-
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
diff --git a/databases/py-carbon/pkg-descr b/databases/py-carbon/pkg-descr
index 16c2cb915ec9..b95f8bb9f62f 100644
--- a/databases/py-carbon/pkg-descr
+++ b/databases/py-carbon/pkg-descr
@@ -1,3 +1,3 @@
 Carbon is a backend data caching and persistence daemon for Graphite
 
-WWW:	http://launchpad.net/graphite
+WWW: http://launchpad.net/graphite
diff --git a/databases/py-carbon/pkg-plist b/databases/py-carbon/pkg-plist
index b64a10266230..85a534d0e56b 100644
--- a/databases/py-carbon/pkg-plist
+++ b/databases/py-carbon/pkg-plist
@@ -3,15 +3,15 @@ bin/carbon-cache.py
 bin/carbon-client.py
 bin/carbon-relay.py
 bin/validate-storage-schemas.py
-etc/carbon/rewrite-rules.conf.example
-etc/carbon/carbon.amqp.conf.example
-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
+%%ETCDIR%%/rewrite-rules.conf.example
+%%ETCDIR%%/carbon.amqp.conf.example
+%%ETCDIR%%/carbon.conf.example
+%%ETCDIR%%/aggregation-rules.conf.example
+%%ETCDIR%%/relay-rules.conf.example
+%%ETCDIR%%/storage-schemas.conf.example
+%%ETCDIR%%/blacklist.conf.example
+%%ETCDIR%%/storage-aggregation.conf.example
+%%ETCDIR%%/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
@@ -100,6 +100,6 @@ etc/carbon/whitelist.conf.example
 %%PYTHON_SITELIBDIR%%/carbon/regexlist.py
 %%PYTHON_SITELIBDIR%%/carbon/regexlist.pyc
 %%PYTHON_SITELIBDIR%%/carbon/regexlist.pyo
-@dirrm etc/carbon
+@dirrm %%ETCDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/carbon/aggregator
 @dirrm %%PYTHON_SITELIBDIR%%/carbon