Update py-carbon to 0.9.15

[Jeff Rizzo <riz%tastylime.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jeff Rizzo <riz%tastylime.net@localhost>
Pushed By:	riz
Date:		Thu Dec 3 11:22:01 2015 -0800
Changeset:	d387fcefa2d58726a18a47b913260c03f4f9221f

Modified Files:
	py-carbon/Makefile
	py-carbon/PLIST
	py-carbon/distinfo
	py-carbon/patches/patch-setup.py

Log Message:
Update py-carbon to 0.9.15

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d387fcefa2d58726a18a47b913260c03f4f9221f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-carbon/Makefile               |  5 +++--
 py-carbon/PLIST                  |  3 +++
 py-carbon/distinfo               |  9 +++++----
 py-carbon/patches/patch-setup.py | 17 ++++++++++++-----
 4 files changed, 23 insertions(+), 11 deletions(-)

diffs:
diff --git a/py-carbon/Makefile b/py-carbon/Makefile
index c5a0a83..b7217b6 100644
--- a/py-carbon/Makefile
+++ b/py-carbon/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.7 2014/05/09 07:38:46 thomasklausner Exp $
 
-DISTNAME=	carbon-0.9.12
+DISTNAME=	carbon-0.9.15
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases
 MASTER_SITES=	-https://github.com/graphite-project/carbon/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX}
@@ -31,6 +31,7 @@ PKG_GECOS.${GRAPHITE_USER}=	Graphite Carbon user
 
 GRAPHITE_DIR?=		${VARBASE}/graphite
 GRAPHITE_EGDIR?=	share/examples/graphite
+GRAPHITE_RCD?=		share/examples/rc.d
 
 OWN_DIRS_PERMS+=	${GRAPHITE_DIR} ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
 OWN_DIRS_PERMS+=	${GRAPHITE_DIR}/lists ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
@@ -42,7 +43,7 @@ SUBST_CLASSES+=		dirs
 SUBST_STAGE.dirs=	pre-configure
 SUBST_MESSAGE.dirs=	Patching default storage directory
 SUBST_FILES.dirs=	setup.py
-SUBST_VARS.dirs=	GRAPHITE_DIR GRAPHITE_EGDIR PREFIX
+SUBST_VARS.dirs=	GRAPHITE_DIR GRAPHITE_EGDIR GRAPHITE_RCD PREFIX
 
 PKG_SYSCONFSUBDIR=	graphite
 
diff --git a/py-carbon/PLIST b/py-carbon/PLIST
index 46051f0..0c6dc7e 100644
--- a/py-carbon/PLIST
+++ b/py-carbon/PLIST
@@ -105,3 +105,6 @@ share/examples/graphite/rewrite-rules.conf.example
 share/examples/graphite/storage-aggregation.conf.example
 share/examples/graphite/storage-schemas.conf.example
 share/examples/graphite/whitelist.conf.example
+share/examples/rc.d/carbon-aggregator
+share/examples/rc.d/carbon-cache
+share/examples/rc.d/carbon-relay
diff --git a/py-carbon/distinfo b/py-carbon/distinfo
index ef15e47..d5b0738 100644
--- a/py-carbon/distinfo
+++ b/py-carbon/distinfo
@@ -1,6 +1,7 @@
 $NetBSD: distinfo,v 1.2 2014/03/13 20:47:13 fhajny Exp $
 
-SHA1 (carbon-0.9.12.tar.gz) = 7dad24c3a441a39af0f8d48315ca13649a2fda19
-RMD160 (carbon-0.9.12.tar.gz) = 9df1939eea1a0895da91619ba369edc2caf7d533
-Size (carbon-0.9.12.tar.gz) = 52107 bytes
-SHA1 (patch-setup.py) = 9dc431096fdfc5c10ee045f447371b2ab0dd12e9
+SHA1 (carbon-0.9.15.tar.gz) = 204e837684c29ac09069d740d009f070bfb942d3
+RMD160 (carbon-0.9.15.tar.gz) = 4a1b11d8ba06357f44e6eca3d45ee0f89dfef98a
+SHA512 (carbon-0.9.15.tar.gz) = cc56257e703fc262dd27019d4a4e86d483daf55bb4c0792200be82533fc721b087b9eb5926cd007bf1e1c0f799729de871de5182f807fa9e0394ba08eccfa2fe
+Size (carbon-0.9.15.tar.gz) = 57328 bytes
+SHA1 (patch-setup.py) = b3f5d9c312b295d5e0ccf08a5364eaf313bf32ee
diff --git a/py-carbon/patches/patch-setup.py b/py-carbon/patches/patch-setup.py
index 9a64270..421a417 100644
--- a/py-carbon/patches/patch-setup.py
+++ b/py-carbon/patches/patch-setup.py
@@ -1,9 +1,8 @@
-$NetBSD: patch-setup.py,v 1.2 2014/03/13 20:47:13 fhajny Exp $
+$NetBSD$
 
-Use proper paths for storage and config example files.
---- setup.py.orig	2013-08-21 16:52:35.000000000 +0000
-+++ setup.py
-@@ -13,9 +13,9 @@ else:
+--- setup.py.orig	2015-11-27 10:37:07.000000000 -0800
++++ setup.py	2015-12-03 10:56:59.000000000 -0800
+@@ -13,15 +13,16 @@
    setup_kwargs = dict()
  
  
@@ -16,3 +15,11 @@ Use proper paths for storage and config example files.
  
  install_files = storage_dirs + conf_files
  
+ # Let's include redhat init scripts, despite build platform
+ # but won't put them in /etc/init.d/ automatically anymore
+-init_scripts = [ ('examples/init.d', ['distro/redhat/init.d/carbon-cache',
++init_scripts = [ ('@GRAPHITE_RCD@',
++                                     ['distro/redhat/init.d/carbon-cache',
+                                       'distro/redhat/init.d/carbon-relay',
+                                       'distro/redhat/init.d/carbon-aggregator']) ]
+ install_files += init_scripts