pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re-wrote collectd references from sysutils to wip
Module Name: pkgsrc-wip
Committed By: Edgar Fuß <ef%math.uni-bonn.de@localhost>
Pushed By: ef
Date: Fri Jul 17 14:35:45 2020 +0200
Changeset: f3de9c55e381fb3dad7bac592833c1edebbae4aa
Modified Files:
collectd-amqp/Makefile
collectd-curl/Makefile
collectd-dbi/Makefile
collectd-dns/Makefile
collectd-lua/Makefile
collectd-memcached/Makefile
collectd-mysql/Makefile
collectd-network/Makefile
collectd-notify-email/Makefile
collectd-postgresql/Makefile
collectd-redis/Makefile
collectd-riemann/Makefile
collectd-rrdtool/Makefile
collectd-snmp/Makefile
collectd-write_prometheus/Makefile
collectd/Makefile
collectd/Makefile.common
p5-collectd/Makefile
py-collectd/Makefile
Log Message:
Re-wrote collectd references from sysutils to wip
Re-wrote all file references in collectd .include statements and "use by"-comments that pointed to sysutils to now point to wip.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f3de9c55e381fb3dad7bac592833c1edebbae4aa
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
collectd-amqp/Makefile | 2 +-
collectd-curl/Makefile | 2 +-
collectd-dbi/Makefile | 2 +-
collectd-dns/Makefile | 2 +-
collectd-lua/Makefile | 2 +-
collectd-memcached/Makefile | 2 +-
collectd-mysql/Makefile | 2 +-
collectd-network/Makefile | 2 +-
collectd-notify-email/Makefile | 2 +-
collectd-postgresql/Makefile | 2 +-
collectd-redis/Makefile | 2 +-
collectd-riemann/Makefile | 2 +-
collectd-rrdtool/Makefile | 2 +-
collectd-snmp/Makefile | 2 +-
collectd-write_prometheus/Makefile | 2 +-
collectd/Makefile | 2 +-
collectd/Makefile.common | 38 +++++++++++++++++++-------------------
p5-collectd/Makefile | 2 +-
py-collectd/Makefile | 2 +-
19 files changed, 37 insertions(+), 37 deletions(-)
diffs:
diff --git a/collectd-amqp/Makefile b/collectd-amqp/Makefile
index 8deae584ee..e14ac22534 100644
--- a/collectd-amqp/Makefile
+++ b/collectd-amqp/Makefile
@@ -5,7 +5,7 @@ COLLECTD_PACKAGE= amqp
COMMENT= Statistics collection daemon - amqp plugin
PKGREVISION= 3
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
CONFIGURE_ARGS+= --with-librabbitmq=${BUILDLINK_PREFIX.rabbitmq-c}
diff --git a/collectd-curl/Makefile b/collectd-curl/Makefile
index db293d5c09..fc3d1ddf94 100644
--- a/collectd-curl/Makefile
+++ b/collectd-curl/Makefile
@@ -6,7 +6,7 @@ COLLECTD_PLUGINS= curl curl_json curl_xml apache bind nginx write_http
COMMENT= Statistics collection daemon - curl-based plugins
PKGREVISION= 15
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
CONFIGURE_ARGS+= --with-libcurl=${BUILDLINK_PREFIX.curl}
CONFIGURE_ARGS+= --with-libyajl=${BUILDLINK_PREFIX.yajl}
diff --git a/collectd-dbi/Makefile b/collectd-dbi/Makefile
index 5c8a1b9f35..e4646eb86c 100644
--- a/collectd-dbi/Makefile
+++ b/collectd-dbi/Makefile
@@ -5,7 +5,7 @@ COLLECTD_PACKAGE= dbi
COMMENT= Statistics collection daemon - dbi plugin
PKGREVISION= 2
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
CONFIGURE_ARGS+= --with-libdbi=${BUILDLINK_PREFIX.libdbi}
diff --git a/collectd-dns/Makefile b/collectd-dns/Makefile
index 190d543bb1..cc85644102 100644
--- a/collectd-dns/Makefile
+++ b/collectd-dns/Makefile
@@ -5,7 +5,7 @@ COLLECTD_PACKAGE= dns
COMMENT= Statistics collection daemon - dns plugin
PKGREVISION= 3
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
CONFIGURE_ARGS+= --with-libpcap=${BUILDLINK_PREFIX.libpcap}
diff --git a/collectd-lua/Makefile b/collectd-lua/Makefile
index bc82242cc7..96ca991dd8 100644
--- a/collectd-lua/Makefile
+++ b/collectd-lua/Makefile
@@ -6,7 +6,7 @@ COLLECTD_PLUGINS= lua
COMMENT= Statistics collection daemon - lua plugin
PKGREVISION= 2
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
CONFIGURE_ARGS+= --enable-lua
diff --git a/collectd-memcached/Makefile b/collectd-memcached/Makefile
index 3ee3492c71..56ab70c017 100644
--- a/collectd-memcached/Makefile
+++ b/collectd-memcached/Makefile
@@ -6,7 +6,7 @@ COLLECTD_PLUGINS= memcachec memcached
COMMENT= Statistics collection daemon - memcached plugins
PKGREVISION= 2
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
CONFIGURE_ARGS+= --with-libmemcached=${BUILDLINK_PREFIX.libmemcached}
diff --git a/collectd-mysql/Makefile b/collectd-mysql/Makefile
index 8858b0a6a2..6301b436c7 100644
--- a/collectd-mysql/Makefile
+++ b/collectd-mysql/Makefile
@@ -6,7 +6,7 @@ PKGNAME= ${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}${MYSQL_VERSION}/}
PKGREVISION= 2
COMMENT= Statistics collection daemon - mysql plugin
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
CONFIGURE_ARGS+= --with-libmysql=${BUILDLINK_PREFIX.mysql-client}
diff --git a/collectd-network/Makefile b/collectd-network/Makefile
index ccd7fb5976..3c574fe192 100644
--- a/collectd-network/Makefile
+++ b/collectd-network/Makefile
@@ -4,7 +4,7 @@ COLLECTD_PACKAGE= network
COMMENT= Statistics collection daemon - network plugin
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
CONFIGURE_ARGS+= --with-libgcrypt=${BUILDLINK_PREFIX.libgcrypt}/bin/libgcrypt-config
diff --git a/collectd-notify-email/Makefile b/collectd-notify-email/Makefile
index 582630580e..b6b8345b06 100644
--- a/collectd-notify-email/Makefile
+++ b/collectd-notify-email/Makefile
@@ -5,7 +5,7 @@ COLLECTD_PACKAGE= notify-email
COMMENT= Statistics collection daemon - notify_email plugin
PKGREVISION= 3
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
CONFIGURE_ARGS+= --with-libesmtp=${BUILDLINK_PREFIX.libesmtp}
diff --git a/collectd-postgresql/Makefile b/collectd-postgresql/Makefile
index 3d19dd049a..6b887f86a3 100644
--- a/collectd-postgresql/Makefile
+++ b/collectd-postgresql/Makefile
@@ -6,7 +6,7 @@ PKGNAME= ${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}${PGSQL_VERSION}/}
PKGREVISION= 2
COMMENT= Statistics collection daemon - postgresql plugin
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
CONFIGURE_ARGS+= --with-libpq=${PGSQL_PREFIX}
diff --git a/collectd-redis/Makefile b/collectd-redis/Makefile
index a4806d9da4..9701373de6 100644
--- a/collectd-redis/Makefile
+++ b/collectd-redis/Makefile
@@ -9,7 +9,7 @@ MAKE_ENV+= DESTDIR=${DESTDIR}
COMMENT= Statistics collection daemon - redis plugins
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
CONFIGURE_ARGS+= --with-libhires=${BUILDLINK_PREFIX.hiredis}
diff --git a/collectd-riemann/Makefile b/collectd-riemann/Makefile
index 5a630f649e..4a5519ad9d 100644
--- a/collectd-riemann/Makefile
+++ b/collectd-riemann/Makefile
@@ -6,7 +6,7 @@ COLLECTD_PLUGINS= write_riemann
COMMENT= Statistics collection daemon - riemann plugin
PKGREVISION= 7
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
.include "../../devel/protobuf-c/buildlink3.mk"
.include "../../sysutils/riemann-client/buildlink3.mk"
diff --git a/collectd-rrdtool/Makefile b/collectd-rrdtool/Makefile
index 598fb67ba5..0dc6bbb9ef 100644
--- a/collectd-rrdtool/Makefile
+++ b/collectd-rrdtool/Makefile
@@ -6,7 +6,7 @@ COLLECTD_PLUGINS= rrdtool rrdcached
COMMENT= Statistics collection daemon - rrdtool plugins
PKGREVISION= 9
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
CONFIGURE_ARGS+= --with-librrd=${BUILDLINK_PREFIX.rrdtool}
diff --git a/collectd-snmp/Makefile b/collectd-snmp/Makefile
index 72d7848b32..79d4c226e6 100644
--- a/collectd-snmp/Makefile
+++ b/collectd-snmp/Makefile
@@ -5,7 +5,7 @@ COLLECTD_PACKAGE= snmp
COMMENT= Statistics collection daemon - snmp plugin
PKGREVISION= 3
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
CONFIGURE_ARGS+= --with-libnetsnmp=${BUILDLINK_PREFIX.net-snmp}/bin/net-snmp-config
diff --git a/collectd-write_prometheus/Makefile b/collectd-write_prometheus/Makefile
index d458301815..8a566a06df 100644
--- a/collectd-write_prometheus/Makefile
+++ b/collectd-write_prometheus/Makefile
@@ -5,7 +5,7 @@ COLLECTD_PACKAGE= write_prometheus
COMMENT= Statistics collection daemon - write_prometheus plugin
PKGREVISION= 7
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
.include "../../devel/protobuf-c/buildlink3.mk"
.include "../../www/libmicrohttpd/buildlink3.mk"
diff --git a/collectd/Makefile b/collectd/Makefile
index caca53e33a..c60d1ca7e8 100644
--- a/collectd/Makefile
+++ b/collectd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.26 2020/07/05 13:57:32 he Exp $
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
PKGREVISION= 4
diff --git a/collectd/Makefile.common b/collectd/Makefile.common
index f705923bc7..59c9ef12d2 100644
--- a/collectd/Makefile.common
+++ b/collectd/Makefile.common
@@ -1,21 +1,21 @@
# $NetBSD: Makefile.common,v 1.24 2020/06/02 11:12:05 nia Exp $
#
-# used by sysutils/collectd/Makefile
-# used by sysutils/collectd-amqp/Makefile
-# used by sysutils/collectd-curl/Makefile
-# used by sysutils/collectd-dbi/Makefile
-# used by sysutils/collectd-dns/Makefile
-# used by sysutils/collectd-memcached/Makefile
-# used by sysutils/collectd-mysql/Makefile
-# used by sysutils/collectd-network/Makefile
-# used by sysutils/collectd-notify-email/Makefile
-# used by sysutils/collectd-postgresql/Makefile
-# used by sysutils/collectd-riemann/Makefile
-# used by sysutils/collectd-rrdtool/Makefile
-# used by sysutils/collectd-snmp/Makefile
-# used by sysutils/collectd-write_prometheus/Makefile
-# used by sysutils/p5-collectd/Makefile
-# used by sysutils/py-collectd/Makefile
+# used by wip/collectd/Makefile
+# used by wip/collectd-amqp/Makefile
+# used by wip/collectd-curl/Makefile
+# used by wip/collectd-dbi/Makefile
+# used by wip/collectd-dns/Makefile
+# used by wip/collectd-memcached/Makefile
+# used by wip/collectd-mysql/Makefile
+# used by wip/collectd-network/Makefile
+# used by wip/collectd-notify-email/Makefile
+# used by wip/collectd-postgresql/Makefile
+# used by wip/collectd-riemann/Makefile
+# used by wip/collectd-rrdtool/Makefile
+# used by wip/collectd-snmp/Makefile
+# used by wip/collectd-write_prometheus/Makefile
+# used by wip/p5-collectd/Makefile
+# used by wip/py-collectd/Makefile
DISTNAME= collectd-5.8.0
MASTER_SITES= http://collectd.org/files/
@@ -32,13 +32,13 @@ USE_LIBTOOL= yes
USE_TOOLS+= autoconf automake pkg-config
USE_LANGUAGES= c c99 c++
-DISTINFO_FILE= ${.CURDIR}/../../sysutils/collectd/distinfo
-PATCHDIR= ${.CURDIR}/../../sysutils/collectd/patches
+DISTINFO_FILE= ${.CURDIR}/../../wip/collectd/distinfo
+PATCHDIR= ${.CURDIR}/../../wip/collectd/patches
.if !empty(COLLECTD_PACKAGE)
PKGNAME?= ${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}/}
-DEPENDS+= collectd>=${PKGVERSION_NOREV}:../../sysutils/collectd
+DEPENDS+= collectd>=${PKGVERSION_NOREV}:../../wip/collectd
COLLECTD_PLUGINS?= ${COLLECTD_PACKAGE:S/-/_/}
diff --git a/p5-collectd/Makefile b/p5-collectd/Makefile
index 6c83d8832a..6650f1af52 100644
--- a/p5-collectd/Makefile
+++ b/p5-collectd/Makefile
@@ -6,7 +6,7 @@ COLLECTD_PACKAGE= perl
COMMENT= Statistics collection daemon - perl plugin
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
USE_TOOLS+= perl
diff --git a/py-collectd/Makefile b/py-collectd/Makefile
index cd27b4d906..dc20932b70 100644
--- a/py-collectd/Makefile
+++ b/py-collectd/Makefile
@@ -6,7 +6,7 @@ COLLECTD_PACKAGE= python
COMMENT= Statistics collection daemon - python plugin
-.include "../../sysutils/collectd/Makefile.common"
+.include "../../wip/collectd/Makefile.common"
CONFIGURE_ARGS+= --enable-python
CONFIGURE_ENV+= PYTHON_CONFIG=${PREFIX}/bin/python${PYVERSSUFFIX}-config
Home |
Main Index |
Thread Index |
Old Index