pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc py-graphite-web, py-carbon: remove



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2da310a4311b
branches:  trunk
changeset: 385208:2da310a4311b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Sep 11 17:58:46 2022 +0000

description:
py-graphite-web, py-carbon: remove

Only supports python 2.x

Newer version in wip; needs updating to latest version.

diffstat:

 databases/Makefile                                    |    3 +-
 databases/py-carbon/DESCR                             |    1 -
 databases/py-carbon/Makefile                          |   77 -
 databases/py-carbon/Makefile.common                   |   16 -
 databases/py-carbon/PLIST                             |  107 --
 databases/py-carbon/distinfo                          |    7 -
 databases/py-carbon/files/carbon-aggregator.sh        |   73 -
 databases/py-carbon/files/carbon-cache.sh             |   73 -
 databases/py-carbon/files/carbon-relay.sh             |   73 -
 databases/py-carbon/options.mk                        |   22 -
 databases/py-carbon/patches/patch-carbon_conf_example |   57 -
 databases/py-carbon/patches/patch-setup.py            |   29 -
 doc/CHANGES-2022                                      |    4 +-
 www/Makefile                                          |    3 +-
 www/py-graphite-web/DESCR                             |   10 -
 www/py-graphite-web/MESSAGE                           |   12 -
 www/py-graphite-web/Makefile                          |   79 -
 www/py-graphite-web/PLIST                             |  764 ------------------
 www/py-graphite-web/distinfo                          |    7 -
 www/py-graphite-web/patches/patch-bin_build-index.sh  |   21 -
 www/py-graphite-web/patches/patch-setup.py            |   31 -
 21 files changed, 5 insertions(+), 1464 deletions(-)

diffs (truncated from 1580 to 300 lines):

diff -r eb3e14a8f694 -r 2da310a4311b databases/Makefile
--- a/databases/Makefile        Sun Sep 11 17:54:57 2022 +0000
+++ b/databases/Makefile        Sun Sep 11 17:58:46 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.665 2022/07/12 08:59:08 wiz Exp $
+# $NetBSD: Makefile,v 1.666 2022/09/11 17:58:46 wiz Exp $
 
 COMMENT=       Databases
 
@@ -356,7 +356,6 @@
 SUBDIR+=       py-asyncpg
 SUBDIR+=       py-barman
 SUBDIR+=       py-bsddb3
-SUBDIR+=       py-carbon
 SUBDIR+=       py-cassa
 SUBDIR+=       py-cassandra-driver
 SUBDIR+=       py-cdb
diff -r eb3e14a8f694 -r 2da310a4311b databases/py-carbon/DESCR
--- a/databases/py-carbon/DESCR Sun Sep 11 17:54:57 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Carbon is a backend data caching and persistence daemon for Graphite.
diff -r eb3e14a8f694 -r 2da310a4311b databases/py-carbon/Makefile
--- a/databases/py-carbon/Makefile      Sun Sep 11 17:54:57 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2022/02/13 08:53:42 wiz Exp $
-
-DISTNAME=      carbon-0.9.15
-PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
-CATEGORIES=    databases
-GITHUB_PROJECT=        carbon
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=graphite-project/}
-
-MAINTAINER=    riz%NetBSD.org@localhost
-HOMEPAGE=      https://launchpad.net/graphite
-COMMENT=       Backend storage application for graphite
-LICENSE=       apache-2.0
-
-DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted19
-DEPENDS+=      ${PYPKGPREFIX}-whisper>=${PKGVERSION_NOREV}:../../databases/py-whisper
-
-USE_LANGUAGES= # none
-
-PYTHON_VERSIONS_ACCEPTED=      27 # py-whisper
-
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
-BUILD_DEFS+=   VARBASE GRAPHITE_USER GRAPHITE_GROUP GRAPHITE_DIR
-
-RCD_SCRIPTS=           carbon-aggregator carbon-cache carbon-relay
-FILES_SUBST+=          GRAPHITE_USER=${GRAPHITE_USER} GRAPHITE_GROUP=${GRAPHITE_GROUP} \
-                       GRAPHITE_DIR=${GRAPHITE_DIR}
-
-OWN_DIRS_PERMS+=       ${GRAPHITE_DIR} ${WWW_USER} ${GRAPHITE_GROUP} 0775
-OWN_DIRS_PERMS+=       ${GRAPHITE_DIR}/lists ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
-OWN_DIRS_PERMS+=       ${GRAPHITE_DIR}/rrd ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
-OWN_DIRS_PERMS+=       ${GRAPHITE_DIR}/whisper ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
-OWN_DIRS_PERMS+=       ${GRAPHITE_LOG_DIR} ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
-OWN_DIRS_PERMS+=       ${VARBASE}/run/graphite ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
-
-
-SUBST_CLASSES+=                dirs
-SUBST_STAGE.dirs=      pre-configure
-SUBST_MESSAGE.dirs=    Patching default storage directory
-SUBST_FILES.dirs=      setup.py conf/*
-SUBST_VARS.dirs=       GRAPHITE_DIR GRAPHITE_EGDIR GRAPHITE_USER PREFIX \
-                       PKG_SYSCONFDIR VARBASE
-
-# NetBSD has posix_fallocate in libc, but fs can't actually use it.
-SUBST_CLASSES.NetBSD+=         fallocate
-SUBST_STAGE.fallocate=         pre-configure
-SUBST_MESSAGE.fallocate=       Patching for NetBSD defaults
-SUBST_FILES.fallocate=         conf/carbon.conf.example
-SUBST_SED.fallocate=           -e 's,^\(WHISPER_FALLOCATE_CREATE *= *\)\(.*\),\1False,'
-
-PKG_SYSCONFSUBDIR=     graphite
-
-GRAPHITE_CONF_FILES=   aggregation-rules.conf                  \
-                       blacklist.conf                          \
-                       carbon.amqp.conf                        \
-                       carbon.conf                             \
-                       relay-rules.conf                        \
-                       rewrite-rules.conf                      \
-                       storage-aggregation.conf                \
-                       storage-schemas.conf                    \
-                       whitelist.conf
-
-.for file in ${GRAPHITE_CONF_FILES}
-CONF_FILES+=           ${GRAPHITE_EGDIR}/${file}.example \
-                       ${PKG_SYSCONFDIR}/${file}
-.endfor
-
-PYSETUPINSTALLARGS=    --prefix=${PREFIX} \
-                       --install-lib=${PREFIX}/${PYSITELIB}
-
-INSTALLATION_DIRS+=    share/examples/graphite
-
-.include "../../databases/py-carbon/Makefile.common"
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r eb3e14a8f694 -r 2da310a4311b databases/py-carbon/Makefile.common
--- a/databases/py-carbon/Makefile.common       Sun Sep 11 17:54:57 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile.common,v 1.1 2015/12/11 21:40:50 riz Exp $
-
-# used by databases/py-carbon/Makefile
-# used by www/py-graphite-web/Makefile
-
-GRAPHITE_USER?=                graphite
-GRAPHITE_GROUP?=       graphite
-WWW_USER?=             www
-WWW_GROUP?=            www
-GRAPHITE_DIR?=         ${VARBASE}/graphite
-GRAPHITE_EGDIR?=       share/examples/graphite
-GRAPHITE_LOG_DIR?=     ${VARBASE}/log/graphite
-
-PKG_GROUPS+=                   ${GRAPHITE_GROUP} ${WWW_GROUP}
-PKG_USERS+=                    ${GRAPHITE_USER}:${GRAPHITE_GROUP} ${WWW_USER}:${WWW_GROUP}
-PKG_GECOS.${GRAPHITE_USER}=    Graphite Carbon user
diff -r eb3e14a8f694 -r 2da310a4311b databases/py-carbon/PLIST
--- a/databases/py-carbon/PLIST Sun Sep 11 17:54:57 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2022/01/14 17:51:51 wiz Exp $
-bin/carbon-aggregator.py
-bin/carbon-cache.py
-bin/carbon-client.py
-bin/carbon-relay.py
-bin/validate-storage-schemas.py
-${PYSITELIB}/${EGG_INFODIR}
-${PYSITELIB}/carbon/__init__.py
-${PYSITELIB}/carbon/__init__.pyc
-${PYSITELIB}/carbon/__init__.pyo
-${PYSITELIB}/carbon/aggregator/__init__.py
-${PYSITELIB}/carbon/aggregator/__init__.pyc
-${PYSITELIB}/carbon/aggregator/__init__.pyo
-${PYSITELIB}/carbon/aggregator/buffers.py
-${PYSITELIB}/carbon/aggregator/buffers.pyc
-${PYSITELIB}/carbon/aggregator/buffers.pyo
-${PYSITELIB}/carbon/aggregator/receiver.py
-${PYSITELIB}/carbon/aggregator/receiver.pyc
-${PYSITELIB}/carbon/aggregator/receiver.pyo
-${PYSITELIB}/carbon/aggregator/rules.py
-${PYSITELIB}/carbon/aggregator/rules.pyc
-${PYSITELIB}/carbon/aggregator/rules.pyo
-${PYSITELIB}/carbon/amqp0-8.xml
-${PYSITELIB}/carbon/amqp_listener.py
-${PYSITELIB}/carbon/amqp_listener.pyc
-${PYSITELIB}/carbon/amqp_listener.pyo
-${PYSITELIB}/carbon/amqp_publisher.py
-${PYSITELIB}/carbon/amqp_publisher.pyc
-${PYSITELIB}/carbon/amqp_publisher.pyo
-${PYSITELIB}/carbon/cache.py
-${PYSITELIB}/carbon/cache.pyc
-${PYSITELIB}/carbon/cache.pyo
-${PYSITELIB}/carbon/client.py
-${PYSITELIB}/carbon/client.pyc
-${PYSITELIB}/carbon/client.pyo
-${PYSITELIB}/carbon/conf.py
-${PYSITELIB}/carbon/conf.pyc
-${PYSITELIB}/carbon/conf.pyo
-${PYSITELIB}/carbon/events.py
-${PYSITELIB}/carbon/events.pyc
-${PYSITELIB}/carbon/events.pyo
-${PYSITELIB}/carbon/exceptions.py
-${PYSITELIB}/carbon/exceptions.pyc
-${PYSITELIB}/carbon/exceptions.pyo
-${PYSITELIB}/carbon/hashing.py
-${PYSITELIB}/carbon/hashing.pyc
-${PYSITELIB}/carbon/hashing.pyo
-${PYSITELIB}/carbon/instrumentation.py
-${PYSITELIB}/carbon/instrumentation.pyc
-${PYSITELIB}/carbon/instrumentation.pyo
-${PYSITELIB}/carbon/log.py
-${PYSITELIB}/carbon/log.pyc
-${PYSITELIB}/carbon/log.pyo
-${PYSITELIB}/carbon/management.py
-${PYSITELIB}/carbon/management.pyc
-${PYSITELIB}/carbon/management.pyo
-${PYSITELIB}/carbon/manhole.py
-${PYSITELIB}/carbon/manhole.pyc
-${PYSITELIB}/carbon/manhole.pyo
-${PYSITELIB}/carbon/protocols.py
-${PYSITELIB}/carbon/protocols.pyc
-${PYSITELIB}/carbon/protocols.pyo
-${PYSITELIB}/carbon/regexlist.py
-${PYSITELIB}/carbon/regexlist.pyc
-${PYSITELIB}/carbon/regexlist.pyo
-${PYSITELIB}/carbon/relayrules.py
-${PYSITELIB}/carbon/relayrules.pyc
-${PYSITELIB}/carbon/relayrules.pyo
-${PYSITELIB}/carbon/rewrite.py
-${PYSITELIB}/carbon/rewrite.pyc
-${PYSITELIB}/carbon/rewrite.pyo
-${PYSITELIB}/carbon/routers.py
-${PYSITELIB}/carbon/routers.pyc
-${PYSITELIB}/carbon/routers.pyo
-${PYSITELIB}/carbon/service.py
-${PYSITELIB}/carbon/service.pyc
-${PYSITELIB}/carbon/service.pyo
-${PYSITELIB}/carbon/state.py
-${PYSITELIB}/carbon/state.pyc
-${PYSITELIB}/carbon/state.pyo
-${PYSITELIB}/carbon/storage.py
-${PYSITELIB}/carbon/storage.pyc
-${PYSITELIB}/carbon/storage.pyo
-${PYSITELIB}/carbon/util.py
-${PYSITELIB}/carbon/util.pyc
-${PYSITELIB}/carbon/util.pyo
-${PYSITELIB}/carbon/writer.py
-${PYSITELIB}/carbon/writer.pyc
-${PYSITELIB}/carbon/writer.pyo
-${PYSITELIB}/twisted/plugins/carbon_aggregator_plugin.py
-${PYSITELIB}/twisted/plugins/carbon_aggregator_plugin.pyc
-${PYSITELIB}/twisted/plugins/carbon_aggregator_plugin.pyo
-${PYSITELIB}/twisted/plugins/carbon_cache_plugin.py
-${PYSITELIB}/twisted/plugins/carbon_cache_plugin.pyc
-${PYSITELIB}/twisted/plugins/carbon_cache_plugin.pyo
-${PYSITELIB}/twisted/plugins/carbon_relay_plugin.py
-${PYSITELIB}/twisted/plugins/carbon_relay_plugin.pyc
-${PYSITELIB}/twisted/plugins/carbon_relay_plugin.pyo
-share/examples/graphite/aggregation-rules.conf.example
-share/examples/graphite/blacklist.conf.example
-share/examples/graphite/carbon.amqp.conf.example
-share/examples/graphite/carbon.conf.example
-share/examples/graphite/relay-rules.conf.example
-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
diff -r eb3e14a8f694 -r 2da310a4311b databases/py-carbon/distinfo
--- a/databases/py-carbon/distinfo      Sun Sep 11 17:54:57 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 10:09:49 nia Exp $
-
-BLAKE2s (carbon-0.9.15.tar.gz) = 9f467db87f0430c621a821cf780ca7ab6a03a4fa5f9105e567acdecbb8a34b14
-SHA512 (carbon-0.9.15.tar.gz) = cc56257e703fc262dd27019d4a4e86d483daf55bb4c0792200be82533fc721b087b9eb5926cd007bf1e1c0f799729de871de5182f807fa9e0394ba08eccfa2fe
-Size (carbon-0.9.15.tar.gz) = 57328 bytes
-SHA1 (patch-carbon_conf_example) = 75153928e117e5a982dd00ae18b715f272854306
-SHA1 (patch-setup.py) = c9d08fcc91db9329b35ff79fdb08c1aa4bc0fd8d
diff -r eb3e14a8f694 -r 2da310a4311b databases/py-carbon/files/carbon-aggregator.sh
--- a/databases/py-carbon/files/carbon-aggregator.sh    Sun Sep 11 17:54:57 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: carbon-aggregator.sh,v 1.1 2015/12/11 21:40:50 riz Exp $
-#
-# PROVIDE: carbon-aggregator
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-if [ -f /etc/rc.subr ]; then
-       . /etc/rc.subr
-fi
-
-name="carbon_aggregator"
-rcvar=$name
-command="@PREFIX@/bin/carbon-aggregator.py"
-config="--config=@PKG_SYSCONFDIR@/carbon.conf"
-graphite_user="@GRAPHITE_USER@"
-graphite_group="@GRAPHITE_GROUP@"
-graphite_dir="@GRAPHITE_DIR@"
-extra_commands="status"
-start_cmd="${name}_start"
-stop_cmd="${name}_stop"
-status_cmd="${name}_status"
-start_precmd='setproclimits'
-
-setproclimits()
-{
-       local climit
-       climit=$(ulimit -n)
-       if [ "$climit" -lt 4096 ]; then
-               ulimit -n 4096
-       fi
-}
-
-carbon_aggregator_start()
-{
-       @SU@ -m ${graphite_user} -c "${command} ${config}  start"
-}
-
-carbon_aggregator_stop()
-{
-       @SU@ -m ${graphite_user} -c "${command} ${config} stop"
-}
-
-carbon_aggregator_status()
-{
-       @SU@ -m ${graphite_user} -c "${command} ${config} status"
-}
-
-
-if [ -f /etc/rc.subr -a -f /etc/rc.conf ]; then



Home | Main Index | Thread Index | Old Index