Bug 170920 - Update to databases/py-carbon
Summary: Update to databases/py-carbon
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Ruslan Makhmatkhanov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-08-23 16:00 UTC by Chris McCoy
Modified: 2012-09-16 15:30 UTC (History)
0 users

See Also:


Attachments
file.diff (2.07 KB, patch)
2012-08-23 16:00 UTC, Chris McCoy
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Chris McCoy 2012-08-23 16:00:07 UTC
Attached is the diff to get py-carbon to build correctly.

I've attached the diff file, I couldn't tell if this required a SHAR file or a DIFF, but am will to provide the SHAR if needed.

Thanks

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer 2012-08-23 16:00:45 UTC
Responsible Changed
From-To: freebsd-ports-bugs->freebsd-python

freebsd-python@ wants this port PRs (via the GNATS Auto Assign Tool)
Comment 2 Ruslan Makhmatkhanov freebsd_committer 2012-09-16 15:20:31 UTC
Responsible Changed
From-To: freebsd-python->rm

I will take it.
Comment 3 dfilter service freebsd_committer 2012-09-16 15:22:23 UTC
Author: rm
Date: Sun Sep 16 14:22:12 2012
New Revision: 304351
URL: http://svn.freebsd.org/changeset/ports/304351

Log:
  - 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)

Modified:
  head/databases/py-carbon/Makefile
  head/databases/py-carbon/files/carbon.in
  head/databases/py-carbon/files/pkg_message.in
  head/databases/py-carbon/pkg-descr
  head/databases/py-carbon/pkg-plist

Modified: head/databases/py-carbon/Makefile
==============================================================================
--- head/databases/py-carbon/Makefile	Sun Sep 16 14:16:20 2012	(r304350)
+++ head/databases/py-carbon/Makefile	Sun Sep 16 14:22:12 2012	(r304351)
@@ -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
 

Modified: head/databases/py-carbon/files/carbon.in
==============================================================================
--- head/databases/py-carbon/files/carbon.in	Sun Sep 16 14:16:20 2012	(r304350)
+++ head/databases/py-carbon/files/carbon.in	Sun Sep 16 14:22:12 2012	(r304351)
@@ -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
 

Modified: head/databases/py-carbon/files/pkg_message.in
==============================================================================
--- head/databases/py-carbon/files/pkg_message.in	Sun Sep 16 14:16:20 2012	(r304350)
+++ head/databases/py-carbon/files/pkg_message.in	Sun Sep 16 14:22:12 2012	(r304351)
@@ -14,6 +14,4 @@ to /etc/rc.conf, then start it via:
 
 Once started, finish setting up Graphite
 
-
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-

Modified: head/databases/py-carbon/pkg-descr
==============================================================================
--- head/databases/py-carbon/pkg-descr	Sun Sep 16 14:16:20 2012	(r304350)
+++ head/databases/py-carbon/pkg-descr	Sun Sep 16 14:22:12 2012	(r304351)
@@ -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

Modified: head/databases/py-carbon/pkg-plist
==============================================================================
--- head/databases/py-carbon/pkg-plist	Sun Sep 16 14:16:20 2012	(r304350)
+++ head/databases/py-carbon/pkg-plist	Sun Sep 16 14:22:12 2012	(r304351)
@@ -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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 dfilter service freebsd_committer 2012-09-16 15:23:34 UTC
Author: rm
Date: Sun Sep 16 14:23:25 2012
New Revision: 304352
URL: http://svn.freebsd.org/changeset/ports/304352

Log:
  - bump PORTREVISION because of changes in previous commit
  
  PR:		170920

Modified:
  head/databases/py-carbon/Makefile

Modified: head/databases/py-carbon/Makefile
==============================================================================
--- head/databases/py-carbon/Makefile	Sun Sep 16 14:22:12 2012	(r304351)
+++ head/databases/py-carbon/Makefile	Sun Sep 16 14:23:25 2012	(r304352)
@@ -7,6 +7,7 @@
 
 PORTNAME=	carbon
 PORTVERSION=	0.9.10
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	http://launchpad.net/graphite/0.9/${PORTVERSION}/+download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 5 Ruslan Makhmatkhanov freebsd_committer 2012-09-16 15:24:14 UTC
State Changed
From-To: open->closed

Committed, thank you!