Cleanup collectd* Makefiles

[Edgar Fuß <ef%math.uni-bonn.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Edgar Fuß <ef%math.uni-bonn.de@localhost>
Pushed By:	ef
Date:		Thu Sep 10 17:48:38 2020 +0200
Changeset:	c2c009f35a1ceb9dcd3839af5d3f10ba9f7597fa

Modified Files:
	collectd-riemann/Makefile
	collectd/Makefile
	collectd/Makefile.common

Log Message:
Cleanup collectd* Makefiles

For DEFAULT_PLUGINS and COLLECTD_LIBS, join the two blocks, sort them and break into shorter lines.
Likewise, re-format CONFIGURE_ARGS.

Remove "used by" entry for wip/collectd-memcached/Makefile, which was renamed to -memcachec, sort in entry for the the latter.

Remove commented-out entries in collectd-riemann/Makefile.

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

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

diffstat:
 collectd-riemann/Makefile |  2 --
 collectd/Makefile         | 19 ++++++++++---------
 collectd/Makefile.common  | 24 +++++++++++++-----------
 3 files changed, 23 insertions(+), 22 deletions(-)

diffs:
diff --git a/collectd-riemann/Makefile b/collectd-riemann/Makefile
index 83f078dc9b..01dc7832c5 100644
--- a/collectd-riemann/Makefile
+++ b/collectd-riemann/Makefile
@@ -5,9 +5,7 @@ COLLECTD_PLUGINS=	write_riemann
 
 COMMENT=		Statistics collection daemon - riemann plugin
 
-#.include "../../devel/protobuf-c/buildlink3.mk"
 .include "../../sysutils/riemann-client/buildlink3.mk"
-#COLLECTD_LIB.protobuf-c=${BUILDLINK_PREFIX.protobuf-c}
 COLLECTD_LIB.riemann-client=${BUILDLINK_PREFIX.riemann-client}
 
 .include "../../devel/protobuf-c/buildlink3.mk"
diff --git a/collectd/Makefile b/collectd/Makefile
index 71a256986f..2c28b61665 100644
--- a/collectd/Makefile
+++ b/collectd/Makefile
@@ -9,15 +9,16 @@ RCD_SCRIPTS=	collectd
 .include "../../mk/bsd.prefs.mk"
 
 # Simple plugins that have no dependencies
-DEFAULT_PLUGINS+=	aggregation apcups csv email exec filecount	\
-			hddtemp logfile match_empty_counter match_hashed\
-			match_regex match_timediff match_value mbmon	\
-			ntpd olsrd openvpn powerdns statsd table tail	\
-			tail_csv target_notification target_replace	\
-			target_scale target_set	target_v5upgrade	\
-			teamspeak2 threshold unixsock uuid write_graphite
-
-DEFAULT_PLUGINS+=	check_uptime chrony logparser memcached notify_nagios write_influxdb_udp write_log write_sensu write_syslog write_tsdb zookeeper
+DEFAULT_PLUGINS=	aggregation apcups check_uptime chrony csv	\
+			email exec filecount hddtemp logfile logparser	\
+			match_empty_counter match_hashed match_regex	\
+			match_timediff match_value mbmon memcached	\
+			notify_nagios ntpd olsrd openvpn powerdns	\
+			statsd table tail tail_csv target_notification	\
+			target_replace target_scale target_set		\
+			target_v5upgrade teamspeak2 threshold unixsock	\
+			uuid write_graphite write_influxdb_udp write_log\
+			write_sensu write_syslog write_tsdb zookeeper
 
 .for option in ${DEFAULT_PLUGINS}
 CONFIGURE_ARGS+=	--enable-${option}
diff --git a/collectd/Makefile.common b/collectd/Makefile.common
index 29b9f8dd2e..57488065ba 100644
--- a/collectd/Makefile.common
+++ b/collectd/Makefile.common
@@ -10,7 +10,7 @@
 # used by wip/collectd-grpc/Makefile
 # used by wip/collectd-kafka/Makefile
 # used by wip/collectd-lua/Makefile
-# used by wip/collectd-memcached/Makefile
+# used by wip/collectd-memcachec/Makefile
 # used by wip/collectd-mongodb/Makefile
 # used by wip/collectd-mysql/Makefile
 # used by wip/collectd-network/Makefile
@@ -33,7 +33,6 @@
 # used by wip/collectd-yajl/Makefile
 # used by wip/p5-collectd/Makefile
 # used by wip/py-collectd/Makefile
-# used by wip/collectd-memcachec/Makefile
 
 DISTNAME=	collectd-5.11.0
 MASTER_SITES=	http://collectd.org/files/
@@ -73,15 +72,18 @@ GENERATE_PLIST+=	${ECHO} "lib/collectd/${plugin}.la";
 BUILD_DEFS+=		VARBASE
 
 # special case for grpc++ below
-COLLECTD_LIBS=		aquaero5 hiredis curl dbi esmtp ganglia gcrypt	\
-			iptc memcached mnl modbus mongoc mysql	\
-			netsnmp oping owcapi pcap perl pq python \
-			rabbitmq routeros rrd sensors statgrab	\
-			tokyotyrant upsclient varnish xmms yajl
-COLLECTD_LIBS+=		atasmart dpdk gps iptc jansson jevents ldap microhttpd mosquitto netapp netsnmpagent pqos protobuf protobuf-c qpid-proton rdkafka ssl slurm udev xenctrl
-
-CONFIGURE_ARGS+=	--with-cuda=no --with-java=no --with-mic=no --with-oracle=no \
-			--with-perl-bindings=no \
+COLLECTD_LIBS=		aquaero5 atasmart curl dbi dpdk esmtp ganglia	\
+			gcrypt gps hiredis iptc iptc jansson jevents	\
+			ldap memcached microhttpd mnl modbus mongoc	\
+			mosquitto mysql netapp netsnmp netsnmpagent	\
+			oping owcapi pcap perl pq pqos protobuf		\
+			protobuf-c python qpid-proton rabbitmq rdkafka	\
+			routeros rrd sensors slurm ssl statgra		\
+			tokyotyrant udev upsclient varnish xenctrl xmms	\
+			yajl
+
+CONFIGURE_ARGS+=	--with-cuda=no --with-java=no --with-mic=no	\
+			--with-oracle=no --with-perl-bindings=no	\
 			--disable-all-plugins
 
 .for lib in ${COLLECTD_LIBS}