Attachment 160849 Details for Bug 202487 – collectd5-5.5.0_3.patch

[patch] collectd5-5.5.0_3.patch

collectd5-5.5.0_3.patch (text/plain), 2.57 KB, created by Jason Unovitch on 2015-09-09 01:17:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Unovitch

Created: 2015-09-09 01:17:29 UTC

Size: 2.57 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 396449)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	collectd
> PORTVERSION=	5.5.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net-mgmt
> MASTER_SITES=	https://collectd.org/files/ \
> 		http://collectd.org/files/
>@@ -24,7 +24,7 @@
> 
> OPTIONS_DEFINE=		CGI DEBUG GCRYPT LOGSTASH VIRT
> OPTIONS_GROUP=		INPUT OUTPUT
>-OPTIONS_GROUP_OUTPUT=	RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP RIEMANN
>+OPTIONS_GROUP_OUTPUT=	KAFKA NOTIFYDESKTOP NOTIFYEMAIL RIEMANN RRDTOOL
> OPTIONS_GROUP_INPUT=	CURL DBI IPMI JSON MEMCACHEC MODBUS MONGODB MYSQL \
> 			NUTUPS OLSRD ONEWIRE OPENLDAP PERL PGSQL PINBA PING \
> 			PYTHON RABBITMQ REDIS ROUTEROS SIGROK SNMP STATGRAB \
>@@ -32,18 +32,19 @@
> 
> CGI_DESC=		Install collection.cgi (requires rrdtool)
> CURL_DESC=		Enable curl-based plugins (apache, nginx, etc)
>+DBI_DESC=		Enable dbi plugin
> DEBUG_DESC=		Enable debugging
>-DBI_DESC=		Enable dbi plugin
> GCRYPT_DESC=		Build with libgcrypt
> IPMI_DESC=		Enable OpenIPMI plugin
> JSON_DESC=		Enable JSON plugins
>+KAFKA_DESC=		Enable write_kafka plugin
> LOGSTASH_DESC=		Enable log_logstash plugin (requires json)
> MEMCACHEC_DESC=		Enable memcachec plugin
> MODBUS_DESC=		Enable modbus plugin
> MONGODB_DESC=		Enable MongoDB-based plugins
> MYSQL_DESC=		Enable mysql-based plugins
>+NOTIFYDESKTOP_DESC=	Enable desktop notifications
> NOTIFYEMAIL_DESC=	Enable notifications via email
>-NOTIFYDESKTOP_DESC=	Enable desktop notifications
> NUTUPS_DESC=		Enable nut (ups) plugin
> OLSRD_DESC=		Enable olsrd plugin
> ONEWIRE_DESC=		Eanble onewire plugin (via owfs)
>@@ -99,7 +100,6 @@
> 		--without-libnetapp \
> 		--without-libowcapi \
> 		--without-libperfstat \
>-		--without-librdkafka \
> 		--without-libsensors \
> 		--without-libvarnish \
> 		--without-lvm \
>@@ -251,6 +251,15 @@
> CONFIGURE_ARGS+=--without-libyajl
> .endif
> 
>+.if ${PORT_OPTIONS:MKAFKA}
>+LIB_DEPENDS+=	librdkafka.so:${PORTSDIR}/net/librdkafka
>+CONFIGURE_ARGS+=--enable-write_kafka
>+PLIST_SUB+=	KAFKA=""
>+.else
>+CONFIGURE_ARGS+=--disable-write_kafka
>+PLIST_SUB+=	KAFKA="@comment "
>+.endif
>+
> .if ${PORT_OPTIONS:MLOGSTASH}
> CONFIGURE_ARGS+=--enable-log_logstash
> PLIST_SUB+=	LOGSTASH=""
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 396449)
>+++ pkg-plist	(working copy)
>@@ -97,6 +97,7 @@
> lib/collectd/write_graphite.so
> %%CURL%%lib/collectd/write_http.so
> lib/collectd/write_log.so
>+%%KAFKA%%lib/collectd/write_kafka.so
> %%MONGODB%%lib/collectd/write_mongodb.so
> %%REDIS%%lib/collectd/write_redis.so
> %%RIEMANN%%lib/collectd/write_riemann.so

Actions: View | Diff

Attachments on bug 202487: 160107 | 160134 | 160461 | 160849