Index: head/net-mgmt/collectd5/Makefile =================================================================== --- head/net-mgmt/collectd5/Makefile (revision 393929) +++ head/net-mgmt/collectd5/Makefile (revision 393930) @@ -1,500 +1,588 @@ # Created by: Matt Peterson # $FreeBSD$ PORTNAME= collectd -PORTVERSION= 5.4.2 -PORTREVISION= 3 +PORTVERSION= 5.5.0 CATEGORIES= net-mgmt -MASTER_SITES= http://collectd.org/files/ +MASTER_SITES= https://collectd.org/files/ \ + http://collectd.org/files/ PKGNAMESUFFIX= 5 MAINTAINER= ports@bsdserwis.com COMMENT= Systems & network statistics collection daemon LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING # Only autoreconf stage and sigrok plugin need GLIB: BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/glib-2.0.m4:${PORTSDIR}/devel/glib20 LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl USES= autoreconf gmake libtool pkgconfig shebangfix tar:bzip2 GNU_CONFIGURE= yes -OPTIONS_DEFINE= CGI DEBUG GCRYPT VIRT +OPTIONS_DEFINE= CGI DEBUG GCRYPT LOGSTASH VIRT OPTIONS_GROUP= INPUT OUTPUT OPTIONS_GROUP_OUTPUT= RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP RIEMANN -OPTIONS_GROUP_INPUT= CURL DBI JSON MEMCACHEC MODBUS MONGODB MYSQL \ - NUTUPS PERL PGSQL PING PYTHON RABBITMQ REDIS \ - ROUTEROS SIGROK SNMP STATGRAB TOKYOTYRANT VARNISH \ - XML XMMS +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 \ + STATSD TOKYOTYRANT VARNISH XML XMMS ZOOKEEPER CGI_DESC= Install collection.cgi (requires rrdtool) CURL_DESC= Enable curl-based plugins (apache, nginx, etc) DEBUG_DESC= Enable debugging DBI_DESC= Enable dbi plugin GCRYPT_DESC= Build with libgcrypt +IPMI_DESC= Enable OpenIPMI plugin JSON_DESC= Enable JSON plugins +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 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) +OPENLDAP_DESC= Enable OpenLDAP plugin PERL_DESC= Enable libperl plugin and binding PGSQL_DESC= Enable postgresql-based plugins +PINBA_DESC= Enable pinba plugin (via protobuf-c) PING_DESC= Enable ping plugin PYTHON_DESC= Enable python-based plugins RABBITMQ_DESC= Enable rabbitmq-based plugins REDIS_DESC= Enable redis-based plugins RIEMANN_DESC= Enable write_riemann plugin (via protobuf-c) 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) +STATSD_DESC= Enable statsd plugin TOKYOTYRANT_DESC= Enable tokyotyrant plugin -VARNISH_DESC= Enable varnish 3.x cache statistics +VARNISH_DESC= Enable varnish 4.x cache statistics VIRT_DESC= Enable libvirt plugin (requires XML) XML_DESC= Enable XML plugins XMMS_DESC= Enable xmms plugin +ZOOKEEPER_DESC= Enable zookeeper plugin USE_RC_SUBR= collectd collectdmon USE_LDCONFIG= yes CONFLICTS= collectd-4.[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib .include # NOTE: Plugins without dependencies are defined further down. CONFIGURE_ARGS= --localstatedir=/var \ --disable-all-plugins \ --disable-static \ --without-amqp \ --without-java \ --without-libaquaero5 \ --without-libganglia \ --without-libiptc \ --without-libjvm \ + --without-liblvm2app \ --without-libkstat \ + --without-libldap \ + --without-libmnl \ --without-libmodbus \ --without-libnetlink \ --without-libnetapp \ - --without-libopenipmi \ --without-libowcapi \ --without-libperfstat \ + --without-librdkafka \ --without-libsensors \ + --without-libvarnish \ --without-lvm \ --without-mic \ - --without-oracle + --without-oracle \ + --disable-turbostat # NOTE: Plugins without external dependencies CONFIGURE_ARGS+= \ --enable-aggregation \ --enable-apcups \ --enable-contextswitch \ --enable-cpu \ --enable-csv \ --enable-df \ --enable-dns \ --enable-email \ --enable-exec \ + --enable-fhcount \ --enable-filecount \ --enable-load \ --enable-logfile \ --enable-match_empty_counter \ --enable-match_hashed \ --enable-match_regex \ --enable-match_timediff \ --enable-match_value \ --enable-mbmon \ --enable-memcached \ --enable-memory \ --enable-network \ --enable-ntpd \ --enable-openvpn \ --enable-powerdns \ --enable-pf \ --enable-processes \ --enable-statsd \ --enable-swap \ --enable-syslog \ --enable-table \ --enable-tail \ + --enable-tail_csv \ --enable-target_notification \ --enable-target_replace \ --enable-target_scale \ --enable-target_set \ --enable-target_v5upgrade \ --enable-tcpconns \ --enable-teamspeak2 \ --enable-ted \ --enable-threshold \ --enable-unixsock \ --enable-uptime \ --enable-uuid \ --enable-write_graphite \ - --enable-zfs_arc + --enable-write_log \ + --enable-zfs_arc \ .if ${PORT_OPTIONS:MCGI} RUN_DEPENDS+= p5-URI>=0:${PORTSDIR}/net/p5-URI \ p5-CGI>=0:${PORTSDIR}/www/p5-CGI \ p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \ p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser PLIST_SUB+= CGI="" .if empty(PORT_OPTIONS:MRRDTOOL) IGNORE= CGI requires RRDTOOL. Either select RRDTOOL or deselect CGI .endif .else PLIST_SUB+= CGI="@comment " .endif .if ${PORT_OPTIONS:MCURL} LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE} \ --enable-apache \ --enable-curl \ --enable-nginx \ --enable-write_http PLIST_SUB+= CURL="" .else CONFIGURE_ARGS+=--without-libcurl \ --disable-apache \ --disable-curl \ --disable-nginx \ --disable-write_http PLIST_SUB+= CURL="@comment " .endif .if ${PORT_OPTIONS:MCURL} && ${PORT_OPTIONS:MJSON} CONFIGURE_ARGS+=--enable-curl_json PLIST_SUB+= CURL_JSON="" .else CONFIGURE_ARGS+=--disable-curl_json PLIST_SUB+= CURL_JSON="@comment " .endif .if ${PORT_OPTIONS:MCURL} && ${PORT_OPTIONS:MXML} CONFIGURE_ARGS+= \ --enable-ascent \ --enable-bind \ --enable-curl_xml PLIST_SUB+= CURL_XML="" .else CONFIGURE_ARGS+= \ --disable-ascent \ --disable-bind \ --disable-curl_xml PLIST_SUB+= CURL_XML="@comment " .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug .else CONFIGURE_ARGS+=--disable-debug .endif .if ${PORT_OPTIONS:MDBI} LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi CONFIGURE_ARGS+=--with-libdbi=${LOCALBASE} --enable-dbi PLIST_SUB+= DBI="" CFLAGS+= -Wno-deprecated-declarations .else CONFIGURE_ARGS+=--without-libdbi --disable-dbi PLIST_SUB+= DBI="@comment " .endif .if ${PORT_OPTIONS:MGCRYPT} LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt CONFIGURE_ARGS+=--with-libgcrypt=${LOCALBASE} LIBS+= -lgcrypt .else CONFIGURE_ARGS+=--without-libgcrypt .endif +.if ${PORT_OPTIONS:MIPMI} +LIB_DEPENDS+= libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi +CONFIGURE_ARGS+=--enable-ipmi +PLIST_SUB+= IPMI="" +.else +CONFIGURE_ARGS+=--disable-ipmi +PLIST_SUB+= IPMI="@comment " +.endif + .if ${PORT_OPTIONS:MJSON} LIB_DEPENDS+= libyajl.so:${PORTSDIR}/devel/yajl CONFIGURE_ARGS+=--with-libyajl=${LOCALBASE} .else CONFIGURE_ARGS+=--without-libyajl .endif +.if ${PORT_OPTIONS:MLOGSTASH} +CONFIGURE_ARGS+=--enable-log_logstash +PLIST_SUB+= LOGSTASH="" +.if empty(PORT_OPTIONS:MJSON) +IGNORE= LOGSTASH requires JSON. Either select JSON or deselect LOGSTASH +.endif +.else +PLIST_SUB+= LOGSTASH="@comment " +.endif + .if ${PORT_OPTIONS:MMEMCACHEC} LIB_DEPENDS+= libmemcached.so:${PORTSDIR}/databases/libmemcached CONFIGURE_ARGS+=--with-libmemcached=${LOCALBASE} --enable-memcachec PLIST_SUB+= MEMCACHEC="" .else CONFIGURE_ARGS+=--without-libmemcached PLIST_SUB+= MEMCACHEC="@comment " .endif .if ${PORT_OPTIONS:MMODBUS} LIB_DEPENDS+= libmodbus.so:${PORTSDIR}/comms/libmodbus -CONFIGURE_ARGS+=--enable-modbus +CONFIGURE_ARGS+=--with-libmodbus=${LOCALBASE} --enable-modbus PLIST_SUB+= MODBUS="" .else PLIST_SUB+= MODBUS="@comment " .endif .if ${PORT_OPTIONS:MMONGODB} LIB_DEPENDS+= libmongoc.so:${PORTSDIR}/devel/mongo-c-driver CONFIGURE_ARGS+=--with-libmongoc=${LOCALBASE} \ --enable-write_mongodb PLIST_SUB+= MONGODB="" .else CONFIGURE_ARGS+=--without-libcmongoc \ --disable-write_mongodb PLIST_SUB+= MONGODB="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+=--with-libmysql=${LOCALBASE} --enable-mysql PLIST_SUB+= MYSQL="" .else CONFIGURE_ARGS+=--without-libmysql --disable-mysql PLIST_SUB+= MYSQL="@comment " .endif .if ${PORT_OPTIONS:MNOTIFYDESKTOP} LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+=--with-libnotify=${LOCALBASE} \ --enable-notify_desktop PLIST_SUB+= NOTIFYDESKTOP="" .else CONFIGURE_ARGS+=--without-libnotify --disable-notify_desktop PLIST_SUB+= NOTIFYDESKTOP="@comment " .endif .if ${PORT_OPTIONS:MNOTIFYEMAIL} LIB_DEPENDS+= libesmtp.so:${PORTSDIR}/mail/libesmtp CONFIGURE_ARGS+=--with-libesmtp=${LOCALBASE} \ --enable-notify_email PLIST_SUB+= NOTIFYEMAIL="" .else CONFIGURE_ARGS+=--without-libesmtp --disable-notify_email PLIST_SUB+= NOTIFYEMAIL="@comment " .endif .if ${PORT_OPTIONS:MNUTUPS} LIB_DEPENDS+= libupsclient.so:${PORTSDIR}/sysutils/nut CONFIGURE_ARGS+=--with-upsclient=${LOCALBASE} --enable-nut PLIST_SUB+= NUTUPS="" .else CONFIGURE_ARGS+=--without-libupsclient --disable-nut PLIST_SUB+= NUTUPS="@comment " .endif +.if ${PORT_OPTIONS:MOLSRD} +CONFIGURE_ARGS+=--enable-olsrd +PLIST_SUB+= OLSRD="" +.else +CONFIGURE_ARGS+=--enable-olsrd +PLIST_SUB+= OLSRD="@comment " +.endif + +.if ${PORT_OPTIONS:MONEWIRE} +LIB_DEPENDS+= libow.so:${PORTSDIR}/comms/owfs +CONFIGURE_ARGS+=--with-libowcapi=${LOCALBASE} --enable-onewire +PLIST_SUB+= ONEWIRE="" +.else +CONFIGURE_ARGS+=--disable-onewire +PLIST_SUB+= ONEWIRE="@comment " +.endif + +.if ${PORT_OPTIONS:MOPENLDAP} +USE_OPENLDAP= yes +CONFIGURE_ARGS+=--with-libldap=${LOCALBASE} --enable-openldap +PLIST_SUB+= OPENLDAP="" +.else +CONFIGURE_ARGS+=--disable-openldap +PLIST_SUB+= OPENLDAP="@comment " +.endif + .if ${PORT_OPTIONS:MPERL} USES+= perl5 CONFIGURE_ARGS+=--with-perl=${PERL} --with-perl-bindings --enable-perl PLIST_SUB+= PERL="" .else CONFIGURE_ARGS+=--without-perl --without-perl-bindings --disable-perl PLIST_SUB+= PERL="@comment " .endif .if ${PORT_OPTIONS:MPGSQL} USES+= pgsql CONFIGURE_ARGS+=--with-postgresql=${LOCALBASE} --enable-postgresql --with-libpq PLIST_SUB+= PGSQL="" .else CONFIGURE_ARGS+=--without-postgresql --disable-postgresql --without-libpq PLIST_SUB+= PGSQL="@comment " .endif +.if ${PORT_OPTIONS:MPINBA} +LIB_DEPENDS+= libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c +CONFIGURE_ARGS+=--enable-pinba +PLIST_SUB+= PINBA="" +.else +CONFIGURE_ARGS+=--disable-pinba +PLIST_SUB+= PINBA="@comment " +.endif + .if ${PORT_OPTIONS:MPING} LIB_DEPENDS+= liboping.so:${PORTSDIR}/net/liboping CONFIGURE_ARGS+=--with-liboping=${LOCALBASE} --enable-ping PLIST_SUB+= PING="" .else CONFIGURE_ARGS+=--without-liboping --disable-ping PLIST_SUB+= PING="@comment " .endif .if ${PORT_OPTIONS:MPYTHON} USES+= python:2 CONFIGURE_ARGS+=--with-python=${PYTHON_CMD} --enable-python PLIST_SUB+= PYTHON="" .else CONFIGURE_ARGS+=--without-python --disable-python PLIST_SUB+= PYTHON="@comment " .endif .if ${PORT_OPTIONS:MRABBITMQ} LIB_DEPENDS+= librabbitmq.so:${PORTSDIR}/net/rabbitmq-c CONFIGURE_ARGS+=--with-librabbitmq=${LOCALBASE} \ --enable-rabbitmq PLIST_SUB+= RABBITMQ="" .else CONFIGURE_ARGS+=--without-librabbitmq \ --disable-rabbitmq PLIST_SUB+= RABBITMQ="@comment " .endif .if ${PORT_OPTIONS:MREDIS} -LIB_DEPENDS+= libcredis.so:${PORTSDIR}/databases/credis -CONFIGURE_ARGS+=--with-libcredis=${LOCALBASE} \ +LIB_DEPENDS+= libhiredis.so:${PORTSDIR}/databases/hiredis +CONFIGURE_ARGS+=--with-libhiredis=${LOCALBASE} \ --enable-redis \ --enable-write_redis PLIST_SUB+= REDIS="" .else CONFIGURE_ARGS+=--without-libcredis \ --disable-redis \ --disable-write_redis PLIST_SUB+= REDIS="@comment " .endif .if ${PORT_OPTIONS:MRIEMANN} LIB_DEPENDS+= libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c CONFIGURE_ARGS+=--enable-write_riemann PLIST_SUB+= RIEMANN="" .else CONFIGURE_ARGS+=--disable-write_riemann PLIST_SUB+= RIEMANN="@comment " .endif .if ${PORT_OPTIONS:MROUTEROS} LIB_DEPENDS+= librouteros.so:${PORTSDIR}/net/librouteros CONFIGURE_ARGS+=--with-librouteros=${LOCALBASE} --enable-routeros PLIST_SUB+= ROUTEROS="" .else CONFIGURE_ARGS+=--without-librouteros --disable-routeros PLIST_SUB+= ROUTEROS="@comment " .endif .if ${PORT_OPTIONS:MRRDTOOL} LIB_DEPENDS+= librrd.so:${PORTSDIR}/databases/rrdtool CONFIGURE_ARGS+=--with-librrd=${LOCALBASE} \ --enable-rrdcached \ --enable-rrdtool PLIST_SUB+= RRDTOOL="" .else CONFIGURE_ARGS+=--without-librrd \ --disable-rrdcached \ --disable-rrdtool PLIST_SUB+= RRDTOOL="@comment " .endif .if ${PORT_OPTIONS:MSTATGRAB} -USES+= pkgconfig LIB_DEPENDS+= libstatgrab.so:${PORTSDIR}/devel/libstatgrab LIBS+= `pkg-config --libs libstatgrab` CONFIGURE_ARGS+=--with-libstatgrab=${LOCALBASE} \ --enable-disk \ --enable-interface PLIST_SUB+= STATGRAB="" .else CONFIGURE_ARGS+=--without-libstatgrab PLIST_SUB+= STATGRAB="@comment " .endif .if ${OSVERSION} >= 900007 CONFIGURE_ARGS+=--enable-users PLIST_SUB+= USERS="" .elif ${PORT_OPTIONS:MSTATGRAB} CONFIGURE_ARGS+=--enable-users PLIST_SUB+= USERS="" .else 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 +CFLAGS+= `pkg-config --cflags glib-2.0` 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 PLIST_SUB+= SNMP="" .else CONFIGURE_ARGS+=--without-libnetsnmp PLIST_SUB+= SNMP="@comment " .endif +.if ${PORT_OPTIONS:MSTATSD} +CONFIGURE_ARGS+=--enable-statsd +PLIST_SUB+= STATSD="" +.else +CONFIGURE_ARGS+=--disable-statsd +PLIST_SUB+= STATSD="@comment " +.endif + .if ${PORT_OPTIONS:MTOKYOTYRANT} LIB_DEPENDS+= libtokyotyrant.so:${PORTSDIR}/databases/tokyotyrant CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE} --enable-tokyotyrant PLIST_SUB+= TOKYOTYRANT="" .else CONFIGURE_ARGS+=--without-libtokyotyrant --disable-tokyotyrant PLIST_SUB+= TOKYOTYRANT="@comment " .endif .if ${PORT_OPTIONS:MVARNISH} -LIB_DEPENDS+= libvarnishapi.so:${PORTSDIR}/www/varnish +LIB_DEPENDS+= libvarnishapi.so:${PORTSDIR}/www/varnish4 CONFIGURE_ARGS+=--with-libvarnish=${LOCALBASE} --enable-varnish PLIST_SUB+= VARNISH="" .else CONFIGURE_ARGS+=--without-libvarnish PLIST_SUB+= VARNISH="@comment " .endif .if ${PORT_OPTIONS:MVIRT} .if empty(PORT_OPTIONS:MXML) IGNORE= VIRT requires XML. Either select XML or deselect VIRT. .endif LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt -CONFIGURE_ARGS+=--enable-libvirt +CONFIGURE_ARGS+=--enable-virt PLIST_SUB+= VIRT="" .else -CONFIGURE_ARGS+=--without-libvirt --disable-libvirt +CONFIGURE_ARGS+=--without-virt --disable-virt PLIST_SUB+= VIRT="@comment " .endif .if ${PORT_OPTIONS:MXML} LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2 CONFIGURE_ARGS+=--with-libxml2=${LOCALBASE} .endif .if ${PORT_OPTIONS:MXMMS} LIB_DEPENDS+= libxmms.so:${PORTSDIR}/multimedia/xmms CONFIGURE_ARGS+=--with-libxmms=${LOCALBASE} --enable-xmms CFLAGS+= `xmms-config --cflags` PLIST_SUB+= XMMS="" .else CONFIGURE_ARGS+=--without-libxmms --disable-xmms PLIST_SUB+= XMMS="@comment " .endif +.if ${PORT_OPTIONS:MZOOKEEPER} +LIB_DEPENDS+= libzookeeper_mt.so:${PORTSDIR}/devel/libzookeeper +CONFIGURE_ARGS+=--with-libzookeeper=${LOCALBASE} --enable-zookeeper +PLIST_SUB+= ZOOKEEPER="" +.else +CONFIGURE_ARGS+=--without-libzookeeper --disable-zookeeper +PLIST_SUB+= ZOOKEEPER="@comment " +.endif + INSTALL_TARGET=install-strip SHEBANG_FILES= contrib/collection.cgi post-patch: @${REINPLACE_CMD} 's/-Werror//' \ ${WRKSRC}/configure.ac ${WRKSRC}/src/Makefile.am \ ${WRKSRC}/src/libcollectdclient/Makefile.am @${REINPLACE_CMD} \ -e 's;@prefix@/var/;/var/;' \ -e 's;/var/lib/;/var/db/;' \ -e 's;@localstatedir@/lib/;/var/db/;' \ - ${WRKSRC}/src/collectd.conf.in + ${WRKSRC}/src/collectd.conf.in \ + ${WRKSRC}/src/collectd.conf.5 @${REINPLACE_CMD} \ -e 's;/etc/collection\.conf;${WWWDIR}/collection.conf;' \ ${WRKSRC}/contrib/collection.cgi @${REINPLACE_CMD} \ -e 's;/opt/collectd/var/lib;/var/db;' \ -e 's;/opt/collectd/lib;${PREFIX}/lib;' \ ${WRKSRC}/contrib/collection.conf post-install: @${MKDIR} ${STAGEDIR}/var/db/collectd .if ${PORT_OPTIONS:MCGI} @${MKDIR} ${STAGEDIR}${WWWDIR} ${INSTALL_SCRIPT} ${WRKSRC}/contrib/collection.cgi ${STAGEDIR}${WWWDIR}/ ${INSTALL_DATA} ${WRKSRC}/contrib/collection.conf \ ${STAGEDIR}${WWWDIR}/collection.conf.sample .endif .include Index: head/net-mgmt/collectd5/distinfo =================================================================== --- head/net-mgmt/collectd5/distinfo (revision 393929) +++ head/net-mgmt/collectd5/distinfo (revision 393930) @@ -1,2 +1,2 @@ -SHA256 (collectd-5.4.2.tar.bz2) = 9789e900c138b5dbe907d3d744143f12b1e30022276cb1d8c65bbabaf0c4e393 -SIZE (collectd-5.4.2.tar.bz2) = 1633610 +SHA256 (collectd-5.5.0.tar.bz2) = 847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88 +SIZE (collectd-5.5.0.tar.bz2) = 1824495 Index: head/net-mgmt/collectd5/files/patch-src_modbus.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src_modbus.c (revision 393929) +++ head/net-mgmt/collectd5/files/patch-src_modbus.c (nonexistent) @@ -1,12 +0,0 @@ ---- src/modbus.c.orig 2013-01-27 17:47:18.246255000 +0400 -+++ src/modbus.c 2013-05-14 18:40:05.000000000 +0400 -@@ -25,6 +25,9 @@ - #include "plugin.h" - #include "configfile.h" - -+/* FreeBSD needs this */ -+#include -+ - #include - - #include Property changes on: head/net-mgmt/collectd5/files/patch-src_modbus.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/collectd5/files/patch-src-curl_xml.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src-curl_xml.c (revision 393929) +++ head/net-mgmt/collectd5/files/patch-src-curl_xml.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/curl_xml.c.orig 2015-03-28 23:25:34.546602000 +0300 -+++ src/curl_xml.c 2015-03-28 23:25:51.513304000 +0300 -@@ -385,7 +385,7 @@ static int cx_handle_instance_xpath (xml - /* If the base xpath returns more than one block, the result is assumed to be - * a table. The `Instance' option is not optional in this case. Check for the - * condition and inform the user. */ -- if (is_table) -+ if (is_table && (vl->type_instance == NULL)) - { - WARNING ("curl_xml plugin: " - "Base-XPath %s is a table (more than one result was returned), " Property changes on: head/net-mgmt/collectd5/files/patch-src-curl_xml.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/collectd5/files/patch-src__collectd.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src__collectd.c (revision 393929) +++ head/net-mgmt/collectd5/files/patch-src__collectd.c (nonexistent) @@ -1,11 +0,0 @@ ---- ./src/collectd.c.orig 2014-01-26 08:09:14.840391000 +0000 -+++ ./src/collectd.c 2014-05-10 23:35:17.226683756 +0100 -@@ -288,7 +288,7 @@ - #endif - - #if HAVE_LIBSTATGRAB -- if (sg_init ()) -+ if (sg_init (0)) - { - ERROR ("sg_init: %s", sg_str_error (sg_get_error ())); - return (-1); Property changes on: head/net-mgmt/collectd5/files/patch-src__collectd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/collectd5/files/patch-src__users.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src__users.c (revision 393929) +++ head/net-mgmt/collectd5/files/patch-src__users.c (nonexistent) @@ -1,18 +0,0 @@ ---- ./src/users.c.orig 2014-06-02 22:12:33.650261000 -0700 -+++ ./src/users.c 2014-06-11 00:10:39.000000000 -0700 -@@ -101,12 +101,13 @@ - - #elif HAVE_LIBSTATGRAB - sg_user_stats *us; -+ size_t num_entries; - -- us = sg_get_user_stats (); -+ us = sg_get_user_stats (&num_entries); - if (us == NULL) - return (-1); - -- users_submit ((gauge_t) us->num_entries); -+ users_submit ((gauge_t) num_entries); - /* #endif HAVE_LIBSTATGRAB */ - - #else Property changes on: head/net-mgmt/collectd5/files/patch-src__users.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/collectd5/files/patch-src__disk.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src__disk.c (revision 393929) +++ head/net-mgmt/collectd5/files/patch-src__disk.c (nonexistent) @@ -1,12 +0,0 @@ ---- ./src/disk.c.orig 2014-01-26 08:09:14.856391000 +0000 -+++ ./src/disk.c 2014-05-10 23:35:17.232681397 +0100 -@@ -732,7 +732,8 @@ - - #elif defined(HAVE_LIBSTATGRAB) - sg_disk_io_stats *ds; -- int disks, counter; -+ size_t disks; -+ int counter; - char name[DATA_MAX_NAME_LEN]; - - if ((ds = sg_get_disk_io_stats(&disks)) == NULL) Property changes on: head/net-mgmt/collectd5/files/patch-src__disk.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/collectd5/files/patch-src__collectd.h =================================================================== --- head/net-mgmt/collectd5/files/patch-src__collectd.h (revision 393929) +++ head/net-mgmt/collectd5/files/patch-src__collectd.h (nonexistent) @@ -1,21 +0,0 @@ ---- ./src/collectd.h.orig 2013-01-27 13:47:18.246255000 +0000 -+++ ./src/collectd.h 2013-05-21 21:00:55.000000000 +0000 -@@ -235,15 +235,15 @@ - #endif - - #ifndef LOCALSTATEDIR --#define LOCALSTATEDIR PREFIX "/var" -+#define LOCALSTATEDIR "/var" - #endif - - #ifndef PKGLOCALSTATEDIR --#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME -+#define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME - #endif - - #ifndef PIDFILE --#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid" -+#define PIDFILE "/var/run/" PACKAGE_NAME ".pid" - #endif - - #ifndef PLUGINDIR Property changes on: head/net-mgmt/collectd5/files/patch-src__collectd.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/collectd5/files/patch-Makefile.am =================================================================== --- head/net-mgmt/collectd5/files/patch-Makefile.am (nonexistent) +++ head/net-mgmt/collectd5/files/patch-Makefile.am (revision 393930) @@ -0,0 +1,10 @@ +--- Makefile.am.orig 2015-03-09 09:38:22 UTC ++++ Makefile.am +@@ -8,7 +8,6 @@ EXTRA_DIST = contrib version-gen.sh + + install-exec-hook: + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run +- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME) + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log + + maintainer-clean-local: Property changes on: head/net-mgmt/collectd5/files/patch-Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/collectd5/files/patch-configure.ac =================================================================== --- head/net-mgmt/collectd5/files/patch-configure.ac (revision 393929) +++ head/net-mgmt/collectd5/files/patch-configure.ac (revision 393930) @@ -1,46 +1,48 @@ --- configure.ac.orig 2015-02-26 11:49:16 UTC +++ configure.ac -@@ -111,7 +111,7 @@ then +@@ -120,7 +120,7 @@ then fi # Where to install .pc files. -pkgconfigdir="${libdir}/pkgconfig" +pkgconfigdir="${prefix}/libdata/pkgconfig" AC_SUBST(pkgconfigdir) # Check for standards compliance mode -@@ -1440,6 +1440,7 @@ if test "x$with_kstat" = "xyes" +@@ -1495,6 +1495,7 @@ if test "x$with_kstat" = "xyes" then AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], []) fi + if test "x$with_kstat" = "xyes" then AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], []) -@@ -1449,6 +1450,8 @@ if test "x$with_kstat" = "xyes" +@@ -1504,6 +1505,8 @@ if test "x$with_kstat" = "xyes" then AC_DEFINE(HAVE_LIBKSTAT, 1, [Define to 1 if you have the 'kstat' library (-lkstat)]) + BUILD_WITH_LIBKSTAT_LIBS="-lkstat" + AC_SUBST(BUILD_WITH_LIBKSTAT_LIBS) fi AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes") AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes") -@@ -3508,7 +3511,7 @@ fi +@@ -3629,7 +3632,7 @@ fi if test "x$with_python" = "xyes" then LDFLAGS="-L$python_library_path $LDFLAGS" - LIBS="$python_library_flags $LIBS" + LIBS="$python_library_flags $LIBS -lm -lpthread -lutil" AC_CHECK_FUNC(PyObject_CallFunction, [with_python="yes"], -@@ -4415,7 +4418,7 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING( +@@ -4692,8 +4695,8 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING( + else if test -d "$with_libvarnish/lib" then AC_MSG_NOTICE([Not checking for libvarnish: Manually configured]) - with_libvarnish_cflags="-I$withval/include" +- with_libvarnish_cflags="-I$withval/include" - with_libvarnish_libs="-L$withval/lib -lvarnishapi" ++ with_libvarnish_cflags="-I$withval/include/varnish" + with_libvarnish_libs="-L$withval/lib/varnish -lvarnishapi" with_libvarnish="yes" fi; fi; fi ], Index: head/net-mgmt/collectd5/files/patch-src__Makefile.am =================================================================== --- head/net-mgmt/collectd5/files/patch-src__Makefile.am (revision 393929) +++ head/net-mgmt/collectd5/files/patch-src__Makefile.am (revision 393930) @@ -1,106 +1,97 @@ ---- src/Makefile.am.orig 2013-08-18 04:24:25.061973000 -0600 -+++ src/Makefile.am 2013-08-20 21:34:14.000000000 -0600 -@@ -10,7 +10,7 @@ - AM_CPPFLAGS = -DPREFIX='"${prefix}"' +--- src/Makefile.am.orig 2015-05-26 19:38:14 UTC ++++ src/Makefile.am +@@ -14,7 +14,7 @@ AM_CPPFLAGS = -I$(srcdir)/daemon + AM_CPPFLAGS += -DPREFIX='"${prefix}"' AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' -AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' +AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' if BUILD_FEATURE_DAEMON AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' endif -@@ -64,7 +64,7 @@ - collectd_LDADD += -lpthread - endif +@@ -218,7 +218,7 @@ cpu_la_CFLAGS = $(AM_CFLAGS) + cpu_la_LDFLAGS = $(PLUGIN_LDFLAGS) + cpu_la_LIBADD = if BUILD_WITH_LIBKSTAT --collectd_LDADD += -lkstat -+collectd_LDADD += $(BUILD_WITH_LIBKSTAT_LIBS) - endif - if BUILD_WITH_LIBDEVINFO - collectd_LDADD += -ldevinfo -@@ -275,7 +275,7 @@ - cpu_la_LDFLAGS = -module -avoid-version - cpu_la_LIBADD = - if BUILD_WITH_LIBKSTAT -cpu_la_LIBADD += -lkstat +cpu_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) endif if BUILD_WITH_LIBDEVINFO cpu_la_LIBADD += -ldevinfo -@@ -373,7 +373,7 @@ - disk_la_LDFLAGS = -module -avoid-version - disk_la_LIBADD = +@@ -303,7 +303,7 @@ disk_la_CFLAGS = $(AM_CFLAGS) + disk_la_LDFLAGS = $(PLUGIN_LDFLAGS) + disk_la_LIBADD = if BUILD_WITH_LIBKSTAT -disk_la_LIBADD += -lkstat +disk_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) endif if BUILD_WITH_LIBDEVINFO disk_la_LIBADD += -ldevinfo -@@ -480,7 +480,7 @@ +@@ -408,7 +408,7 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBS interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) else if BUILD_WITH_LIBKSTAT -interface_la_LIBADD += -lkstat +interface_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) endif if BUILD_WITH_LIBDEVINFO interface_la_LIBADD += -ldevinfo -@@ -694,7 +694,7 @@ - collectd_LDADD += "-dlopen" memory.la - collectd_DEPENDENCIES += memory.la +@@ -591,7 +591,7 @@ memory_la_CFLAGS = $(AM_CFLAGS) + memory_la_LDFLAGS = $(PLUGIN_LDFLAGS) + memory_la_LIBADD = if BUILD_WITH_LIBKSTAT -memory_la_LIBADD += -lkstat +memory_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) endif if BUILD_WITH_LIBDEVINFO memory_la_LIBADD += -ldevinfo -@@ -823,7 +823,7 @@ - pkglib_LTLIBRARIES += notify_email.la - notify_email_la_SOURCES = notify_email.c - notify_email_la_LDFLAGS = -module -avoid-version --notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread -ldl -+notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread - collectd_LDADD += "-dlopen" notify_email.la - collectd_DEPENDENCIES += notify_email.la - endif -@@ -1108,7 +1108,7 @@ - collectd_LDADD += "-dlopen" swap.la - collectd_DEPENDENCIES += swap.la +@@ -964,7 +964,7 @@ swap_la_CFLAGS = $(AM_CFLAGS) + swap_la_LDFLAGS = $(PLUGIN_LDFLAGS) + swap_la_LIBADD = if BUILD_WITH_LIBKSTAT -swap_la_LIBADD += -lkstat +swap_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) endif if BUILD_WITH_LIBDEVINFO swap_la_LIBADD += -ldevinfo -@@ -1162,7 +1162,7 @@ +@@ -1010,7 +1010,7 @@ if BUILD_PLUGIN_TAPE pkglib_LTLIBRARIES += tape.la tape_la_SOURCES = tape.c - tape_la_LDFLAGS = -module -avoid-version + tape_la_LDFLAGS = $(PLUGIN_LDFLAGS) -tape_la_LIBADD = -lkstat -ldevinfo +tape_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) -ldevinfo - collectd_LDADD += "-dlopen" tape.la - collectd_DEPENDENCIES += tape.la endif -@@ -1285,7 +1285,7 @@ - uptime_la_LDFLAGS = -module -avoid-version + + if BUILD_PLUGIN_TARGET_NOTIFICATION +@@ -1116,7 +1116,7 @@ uptime_la_CFLAGS = $(AM_CFLAGS) + uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS) uptime_la_LIBADD = if BUILD_WITH_LIBKSTAT -uptime_la_LIBADD += -lkstat +uptime_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) endif if BUILD_WITH_PERFSTAT uptime_la_LIBADD += -lperfstat -@@ -1519,12 +1519,7 @@ +@@ -1275,7 +1275,7 @@ if BUILD_LINUX + # zfs_arc requires no library on linux + else + # solaris +-zfs_arc_la_LIBADD = -lkstat ++zfs_arc_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) + endif + endif + endif +@@ -1364,12 +1364,7 @@ endif install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(sysconfdir) - if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ - then \ - $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \ - else \ - $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \ - fi; \ + $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) $(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db; $(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \ Index: head/net-mgmt/collectd5/files/patch-src__Makefile.in =================================================================== --- head/net-mgmt/collectd5/files/patch-src__Makefile.in (nonexistent) +++ head/net-mgmt/collectd5/files/patch-src__Makefile.in (revision 393930) @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig 2015-05-27 07:51:49.001922000 +0000 ++++ src/Makefile.in +@@ -2434,7 +2434,7 @@ PLUGIN_LDFLAGS = -module -avoid-version + AM_CPPFLAGS = -I$(srcdir)/daemon -DPREFIX='"${prefix}"' \ + -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ + -DLOCALSTATEDIR='"${localstatedir}"' \ +- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \ ++ -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' \ + $(am__append_2) -DPLUGINDIR='"${pkglibdir}"' \ + -DPKGDATADIR='"${pkgdatadir}"' + AUTOMAKE_OPTIONS = subdir-objects Property changes on: head/net-mgmt/collectd5/files/patch-src__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am =================================================================== --- head/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am (nonexistent) +++ head/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am (revision 393930) @@ -0,0 +1,20 @@ +--- src/daemon/Makefile.am.orig 2015-05-26 19:38:31 UTC ++++ src/daemon/Makefile.am +@@ -6,7 +6,7 @@ + AM_CPPFLAGS += -DPREFIX='"${prefix}"' + AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' + AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' +-AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' ++AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' + if BUILD_FEATURE_DAEMON + AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' + endif +@@ -49,7 +49,7 @@ collectd_CPPFLAGS = $(AM_CPPFLAGS) $(LT + collectd_CFLAGS = $(AM_CFLAGS) + collectd_LDFLAGS = -export-dynamic + collectd_LDADD = libavltree.la libcommon.la libheap.la -lm +-collectd_DEPENDENCIES = ++collectd_DEPENDENCIES = libavltree.la libcommon.la libheap.la + + # Link to these libraries.. + if BUILD_WITH_LIBRT Property changes on: head/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h =================================================================== --- head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h (nonexistent) +++ head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h (revision 393930) @@ -0,0 +1,21 @@ +--- src/daemon/collectd.h.orig 2015-05-22 10:04:36 UTC ++++ src/daemon/collectd.h +@@ -240,15 +240,15 @@ typedef int _Bool; + #endif + + #ifndef LOCALSTATEDIR +-#define LOCALSTATEDIR PREFIX "/var" ++#define LOCALSTATEDIR "/var" + #endif + + #ifndef PKGLOCALSTATEDIR +-#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME ++#define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME + #endif + + #ifndef PIDFILE +-#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid" ++#define PIDFILE "/var/run/" PACKAGE_NAME ".pid" + #endif + + #ifndef PLUGINDIR Property changes on: head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/collectd5/files/patch-src__dns.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src__dns.c (revision 393929) +++ head/net-mgmt/collectd5/files/patch-src__dns.c (revision 393930) @@ -1,20 +1,18 @@ -diff --git src/dns.c src/dns.c -index fe3b672..0c43985 100644 ---- src/dns.c +--- src/dns.c.orig 2015-03-10 14:14:45 UTC +++ src/dns.c -@@ -223,6 +223,15 @@ static void *dns_child_loop (__attribute__((unused)) void *dummy) +@@ -224,6 +224,15 @@ static int dns_run_pcap_loop (void) pthread_sigmask (SIG_SETMASK, &sigmask, NULL); } + /* Check for pcap_device, if needed */ +#ifdef __sparc64__ + if (pcap_device == NULL) + { + ERROR ("dns plugin: Interface required"); + return (NULL); + } +#endif + /* Passing `pcap_device == NULL' is okay and the same as passign "any" */ DEBUG ("dns plugin: Creating PCAP object.."); pcap_obj = pcap_open_live ((pcap_device != NULL) ? pcap_device : "any", Index: head/net-mgmt/collectd5/files/patch-src__modbus.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src__modbus.c (nonexistent) +++ head/net-mgmt/collectd5/files/patch-src__modbus.c (revision 393930) @@ -0,0 +1,12 @@ +--- src/modbus.c.orig 2015-05-20 12:04:47 UTC ++++ src/modbus.c +@@ -25,6 +25,9 @@ + #include "plugin.h" + #include "configfile.h" + ++/* FreeBSD needs this */ ++#include ++ + #include + + #include Property changes on: head/net-mgmt/collectd5/files/patch-src__modbus.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/collectd5/files/patch-version-gen.sh =================================================================== --- head/net-mgmt/collectd5/files/patch-version-gen.sh (revision 393929) +++ head/net-mgmt/collectd5/files/patch-version-gen.sh (revision 393930) @@ -1,18 +1,17 @@ ---- version-gen.sh.orig 2015-03-02 20:20:43 UTC +--- version-gen.sh.orig 2015-05-26 20:23:28 UTC +++ version-gen.sh @@ -1,13 +1,3 @@ --#!/usr/bin/env bash + #!/bin/sh + +-DEFAULT_VERSION="5.5.0.git" - --DEFAULT_VERSION="5.4.2.git" +-VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`" - --VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`" -- -if test -z "$VERSION"; then - VERSION="$DEFAULT_VERSION" -fi - -VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`" -+#!/bin/sh - --echo -n "$VERSION" -+echo -n "5.4.2.git" +- +-printf "%s" "$VERSION" ++echo -n "5.5.0.git" Index: head/net-mgmt/collectd5/pkg-descr =================================================================== --- head/net-mgmt/collectd5/pkg-descr (revision 393929) +++ head/net-mgmt/collectd5/pkg-descr (revision 393930) @@ -1,6 +1,6 @@ collectd is a small daemon written in C for performance. It reads various system & network statistics along with updating output RRD or CSV files. The daemon is very fast and allows for frequent polling of values, with support for polling as frequent as every 10 seconds. -WWW: http://www.collectd.org/ +WWW: https://www.collectd.org/ Index: head/net-mgmt/collectd5/pkg-plist =================================================================== --- head/net-mgmt/collectd5/pkg-plist (revision 393929) +++ head/net-mgmt/collectd5/pkg-plist (revision 393930) @@ -1,119 +1,128 @@ sbin/collectd sbin/collectdmon @sample etc/collectd.conf.sample %%CGI%%%%WWWDIR%%/collection.cgi %%CGI%%@sample %%WWWDIR%%/collection.conf.sample bin/collectd-nagios bin/collectd-tg bin/collectdctl include/collectd/client.h include/collectd/lcc_features.h include/collectd/network.h include/collectd/network_buffer.h +lib/libcollectdclient.so +lib/libcollectdclient.so.1 +lib/libcollectdclient.so.1.0.0 lib/collectd/aggregation.so %%CURL%%lib/collectd/apache.so lib/collectd/apcups.so %%CURL_XML%%lib/collectd/ascent.so %%CURL_XML%%lib/collectd/bind.so lib/collectd/contextswitch.so lib/collectd/cpu.so lib/collectd/csv.so %%CURL%%lib/collectd/curl.so %%CURL_JSON%%lib/collectd/curl_json.so %%CURL_XML%%lib/collectd/curl_xml.so %%DBI%%lib/collectd/dbi.so lib/collectd/df.so %%STATGRAB%%lib/collectd/disk.so lib/collectd/dns.so lib/collectd/email.so lib/collectd/exec.so +lib/collectd/fhcount.so lib/collectd/filecount.so %%STATGRAB%%lib/collectd/interface.so +%%IPMI%%lib/collectd/ipmi.so lib/collectd/load.so +%%LOGSTASH%%lib/collectd/log_logstash.so lib/collectd/logfile.so lib/collectd/match_empty_counter.so lib/collectd/match_hashed.so lib/collectd/match_regex.so lib/collectd/match_timediff.so lib/collectd/match_value.so lib/collectd/mbmon.so %%MEMCACHEC%%lib/collectd/memcachec.so lib/collectd/memcached.so lib/collectd/memory.so +%%MODBUS%%lib/collectd/modbus.so %%MYSQL%%lib/collectd/mysql.so lib/collectd/network.so %%CURL%%lib/collectd/nginx.so -%%NOTIFYEMAIL%%lib/collectd/notify_email.so %%NOTIFYDESKTOP%%lib/collectd/notify_desktop.so +%%NOTIFYEMAIL%%lib/collectd/notify_email.so lib/collectd/ntpd.so %%NUTUPS%%lib/collectd/nut.so +%%OLSRD%%lib/collectd/olsrd.so +%%ONEWIRE%%lib/collectd/onewire.so +%%OPENLDAP%%lib/collectd/openldap.so lib/collectd/openvpn.so %%PERL%%lib/collectd/perl.so -%%PERL%%%%PERL5_MAN3%%/Collectd::Unixsock.3.gz -%%PERL%%%%SITE_PERL%%/Collectd/Plugins/OpenVZ.pm +lib/collectd/pf.so +%%PINBA%%lib/collectd/pinba.so %%PING%%lib/collectd/ping.so %%PGSQL%%lib/collectd/postgresql.so lib/collectd/powerdns.so -lib/collectd/pf.so lib/collectd/processes.so %%PYTHON%%lib/collectd/python.so %%REDIS%%lib/collectd/redis.so %%ROUTEROS%%lib/collectd/routeros.so %%RRDTOOL%%lib/collectd/rrdcached.so %%RRDTOOL%%lib/collectd/rrdtool.so %%SIGROK%%lib/collectd/sigrok.so %%SNMP%%lib/collectd/snmp.so -lib/collectd/statsd.so +%%STATSD%%lib/collectd/statsd.so lib/collectd/swap.so lib/collectd/syslog.so lib/collectd/table.so lib/collectd/tail.so +lib/collectd/tail_csv.so lib/collectd/target_notification.so lib/collectd/target_replace.so lib/collectd/target_scale.so lib/collectd/target_set.so lib/collectd/target_v5upgrade.so lib/collectd/tcpconns.so lib/collectd/teamspeak2.so lib/collectd/ted.so lib/collectd/threshold.so %%TOKYOTYRANT%%lib/collectd/tokyotyrant.so lib/collectd/unixsock.so lib/collectd/uptime.so %%USERS%%lib/collectd/users.so lib/collectd/uuid.so %%VARNISH%%lib/collectd/varnish.so -%%VIRT%%lib/collectd/libvirt.so +%%VIRT%%lib/collectd/virt.so lib/collectd/write_graphite.so %%CURL%%lib/collectd/write_http.so +lib/collectd/write_log.so %%MONGODB%%lib/collectd/write_mongodb.so %%REDIS%%lib/collectd/write_redis.so %%RIEMANN%%lib/collectd/write_riemann.so %%XMMS%%lib/collectd/xmms.so lib/collectd/zfs_arc.so -lib/libcollectdclient.so -lib/libcollectdclient.so.1 -lib/libcollectdclient.so.1.0.0 +%%ZOOKEEPER%%lib/collectd/zookeeper.so libdata/pkgconfig/libcollectdclient.pc %%DATADIR%%/postgresql_default.conf %%DATADIR%%/types.db +%%PERL%%%%PERL5_MAN3%%/Collectd::Unixsock.3.gz +%%PERL%%%%SITE_PERL%%/Collectd/Plugins/OpenVZ.pm %%PERL%%%%SITE_PERL%%/Collectd.pm %%PERL%%%%SITE_PERL%%/Collectd/Unixsock.pm man/man1/collectd-nagios.1.gz man/man1/collectd-tg.1.gz man/man1/collectd.1.gz man/man1/collectdctl.1.gz man/man1/collectdmon.1.gz man/man5/collectd-email.5.gz man/man5/collectd-exec.5.gz man/man5/collectd-java.5.gz man/man5/collectd-perl.5.gz man/man5/collectd-python.5.gz man/man5/collectd-snmp.5.gz man/man5/collectd-threshold.5.gz man/man5/collectd-unixsock.5.gz man/man5/collectd.conf.5.gz man/man5/types.db.5.gz @dir /var/db/collectd -@dir /var/lib/collectd -@dir /var/lib