Date: Thu, 16 Jul 2015 20:24:01 +0000 From: bugzilla-noreply@freebsd.org To: freebsd-ports-bugs@FreeBSD.org Subject: [Bug 201514] net-mgmt/collectd5 - upstream released version 5.5.0 Message-ID: <bug-201514-13-SHPtG4ot1U@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-201514-13@https.bugs.freebsd.org/bugzilla/> References: <bug-201514-13@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=201514 --- Comment #15 from elij <elij+freebsd@wundrd.net> --- https://github.com/collectd/collectd/blob/master/README#L836 Indeed. Building without logstash appears to have worked. Not sure if this is exactly the right patch to make it optional... -----8<----- diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile index dfcec28..2c81c15 100644 --- a/net-mgmt/collectd5/Makefile +++ b/net-mgmt/collectd5/Makefile @@ -42,6 +42,7 @@ MYSQL_DESC= Enable mysql-based plugins NOTIFYEMAIL_DESC= Enable notifications via email NOTIFYDESKTOP_DESC= Enable desktop notifications NUTUPS_DESC= Enable nut (ups) plugin +LOGSTASH_DESC= Enable logstash plugin OLRSD_DESC= Enable olsrd plugin ONEWIRE_DESC= Eanble onewire plugin (via owfs) OPENLDAP_DESC= Enable OpenLDAP plugin @@ -119,7 +120,6 @@ CONFIGURE_ARGS+= \ --enable-filecount \ --enable-load \ --enable-logfile \ - --enable-log_logstash \ --enable-match_empty_counter \ --enable-match_hashed \ --enable-match_regex \ @@ -314,6 +314,15 @@ CONFIGURE_ARGS+=--without-libupsclient --disable-nut PLIST_SUB+= NUTUPS="@comment " .endif +.if ${PORT_OPTIONS:MLOGSTASH} +LIB_DEPENDS+= libyajl.so:${PORTSDIR}/devel/yajl +CONFIGURE_ARGS+=--enable-log_logstash +PLIST_SUB+= LOGSTASH="" +.else +CONFIGURE_ARGS+=--disable-log_logstash +PLIST_SUB+= LOGSTASH="@comment " +.endif + .if ${PORT_OPTIONS:MOLSRD} CONFIGURE_ARGS+=--enable-olsrd PLIST_SUB+= OLSRD="" diff --git a/net-mgmt/collectd5/pkg-plist b/net-mgmt/collectd5/pkg-plist index e37bac3..7e6f936 100644 --- a/net-mgmt/collectd5/pkg-plist +++ b/net-mgmt/collectd5/pkg-plist @@ -36,7 +36,7 @@ lib/collectd/filecount.so %%IPMI%%lib/collectd/ipmi.so @dir /var/lib/collectd lib/collectd/load.so -lib/collectd/log_logstash.so +%%LOGSTASH%%lib/collectd/log_logstash.so lib/collectd/logfile.so lib/collectd/match_empty_counter.so lib/collectd/match_hashed.so -----8<----- -- You are receiving this mail because: You are the assignee for the bug.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-201514-13-SHPtG4ot1U>