svn commit: r339321 - head/net-mgmt/collectd5
Dmitry Sivachenko
demon at FreeBSD.org
Fri Jan 10 08:25:35 UTC 2014
Author: demon
Date: Fri Jan 10 08:25:34 2014
New Revision: 339321
URL: http://svnweb.freebsd.org/changeset/ports/339321
Log:
Add new optional sigrok support;
Remove GLIB as runtime dependency unless sigrok plugin is enabled.
Approved by: maintainer
Modified:
head/net-mgmt/collectd5/Makefile
head/net-mgmt/collectd5/pkg-plist
Modified: head/net-mgmt/collectd5/Makefile
==============================================================================
--- head/net-mgmt/collectd5/Makefile Fri Jan 10 08:22:53 2014 (r339320)
+++ head/net-mgmt/collectd5/Makefile Fri Jan 10 08:25:34 2014 (r339321)
@@ -15,14 +15,16 @@ USES= gmake pkgconfig
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= aclocal autoconf autoheader automake libltdl libtool
-USE_GNOME= glib20
+
+# Only autoconf stage and sigrok plugin need GLIB:
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc:${PORTSDIR}/devel/glib20
OPTIONS_DEFINE= CGI DEBUG GCRYPT VIRT
OPTIONS_GROUP= INPUT OUTPUT
OPTIONS_GROUP_OUTPUT= RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP
OPTIONS_GROUP_INPUT= CURL DBI JSON MEMCACHEC MODBUS MYSQL \
NUTUPS PGSQL PING PYTHON RABBITMQ REDIS \
- ROUTEROS SNMP STATGRAB TOKYOTYRANT XML XMMS
+ ROUTEROS SIGROK SNMP STATGRAB TOKYOTYRANT XML XMMS
CGI_DESC= Install collection.cgi (requires rrdtool)
CURL_DESC= Enable curl-based plugins (apache, nginx, etc)
@@ -43,6 +45,7 @@ RABBITMQ_DESC= Enable rabbitmq-based pl
REDIS_DESC= Enable redis-based plugins
ROUTEROS_DESC= Enable routeros plugin
RRDTOOL_DESC= Enable rrdtool plugin (also rrdcached plugin)
+SIGROK_DESC= Enable sigrok plugin
SNMP_DESC= Enable SNMP plugin
STATGRAB_DESC= Enable statgrab-based plugins (disk, interface, etc)
TOKYOTYRANT_DESC= Enable tokyotyrant plugin
@@ -364,6 +367,16 @@ PLIST_SUB+= USERS=""
PLIST_SUB+= USERS="@comment "
.endif
+.if ${PORT_OPTIONS:MSIGROK}
+USE_GNOME+= glib20
+LIB_DEPENDS+= libsigrok.so:${PORTSDIR}/devel/libsigrok
+CONFIGURE_ARGS+=--with-libsigrok --enable-sigrok
+PLIST_SUB+= SIGROK=""
+.else
+CONFIGURE_ARGS+=--disable-sigrok
+PLIST_SUB+= SIGROK="@comment "
+.endif
+
.if ${PORT_OPTIONS:MSNMP}
LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
CONFIGURE_ARGS+=--with-libnetsnmp --enable-snmp
Modified: head/net-mgmt/collectd5/pkg-plist
==============================================================================
--- head/net-mgmt/collectd5/pkg-plist Fri Jan 10 08:22:53 2014 (r339320)
+++ head/net-mgmt/collectd5/pkg-plist Fri Jan 10 08:25:34 2014 (r339321)
@@ -154,6 +154,9 @@ lib/collectd/processes.la
%%RRDTOOL%%lib/collectd/rrdtool.a
%%RRDTOOL%%lib/collectd/rrdtool.so
%%RRDTOOL%%lib/collectd/rrdtool.la
+%%SIGROK%%lib/collectd/sigrok.a
+%%SIGROK%%lib/collectd/sigrok.la
+%%SIGROK%%lib/collectd/sigrok.so
%%SNMP%%lib/collectd/snmp.a
%%SNMP%%lib/collectd/snmp.so
%%SNMP%%lib/collectd/snmp.la
More information about the svn-ports-all
mailing list