Index: head/net-mgmt/collectd5/Makefile =================================================================== --- head/net-mgmt/collectd5/Makefile (revision 454646) +++ head/net-mgmt/collectd5/Makefile (revision 454647) @@ -1,366 +1,368 @@ # Created by: Matt Peterson # $FreeBSD$ PORTNAME= collectd -PORTVERSION= 5.7.2 -PORTREVISION= 1 +PORTVERSION= 5.8.0 CATEGORIES= net-mgmt -MASTER_SITES= https://collectd.org/files/ \ - http://collectd.org/files/ +MASTER_SITES= https://storage.googleapis.com/collectd-tarballs/ PKGNAMESUFFIX= 5 MAINTAINER= ports@bsdserwis.com COMMENT= Systems & network statistics collection daemon LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= autoreconf gmake libtool pkgconfig shebangfix tar:bzip2 GNU_CONFIGURE= yes -OPTIONS_DEFINE= CGI DEBUG GCRYPT LOGSTASH VIRT +OPTIONS_DEFINE= CGI JAVA LOGGING GCRYPT LOGSTASH VIRT OPTIONS_GROUP= INPUT OUTPUT OPTIONS_GROUP_OUTPUT= KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL RIEMANN RRDTOOL \ TSDB OPTIONS_GROUP_INPUT= CHRONY CURL CURL_JSON CURL_XML DBI IPMI JSON \ MEMCACHEC MODBUS MQTT MYSQL NUTUPS OLSRD ONEWIRE OPENLDAP \ PERL PGSQL PINBA PING PYTHON RABBITMQ REDIS ROUTEROS \ SIGROK SNMP STATSD TOKYOTYRANT VARNISH XML \ XMMS ZOOKEEPER -OPTIONS_DEFAULT= DEBUG GCRYPT PING +OPTIONS_DEFAULT= LOGGING GCRYPT PING CGI_DESC= Install collection.cgi (requires rrdtool) CHRONY_DESC= Enable chronyd plugin CURL_DESC= Enable curl-based plugins (apache, nginx, etc) CURL_JSON_DESC= Enable curl_json plugin (implies curl and json) CURL_XML_DESC= Enable ascent, bind, curl_xml plugins (implies curl and xml) 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 +LOGGING_DESC= Enable debug logging LOGSTASH_DESC= Enable log_logstash plugin (requires json) MEMCACHEC_DESC= Enable memcachec plugin MODBUS_DESC= Enable modbus plugin MONGODB_DESC= Enable write_mongodb plugin (BROKEN) MQTT_DESC= Enable MQTT broker metrics MYSQL_DESC= Enable mysql-based plugins NOTIFYDESKTOP_DESC= Enable desktop notifications NOTIFYEMAIL_DESC= Enable notifications via email 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 riemann-c-client) ROUTEROS_DESC= Enable routeros plugin RRDTOOL_DESC= Enable rrdtool plugin (also rrdcached plugin) SIGROK_DESC= Enable sigrok plugin SNMP_DESC= Enable SNMP plugin STATSD_DESC= Enable statsd plugin TOKYOTYRANT_DESC= Enable tokyotyrant plugin TSDB_DESC= Enable write_tsdb plugin 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 OPTIONS_SUB= yes USE_RC_SUBR= collectd collectdmon USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib # NOTE: Plugins without dependencies are defined further down. CONFIGURE_ARGS= --localstatedir=/var \ --disable-all-plugins \ --disable-static \ --without-amqp \ --disable-ceph \ --disable-cgroups \ --disable-fhcount \ - --without-java \ --without-libaquaero5 \ --without-libganglia \ --without-libiptc \ - --without-libjvm \ --without-liblvm2app \ --without-libkstat \ --without-libldap \ --without-libmnl \ --without-libnetlink \ --without-libnetapp \ --without-libowcapi \ --without-libperfstat \ --without-libsensors \ --without-lvm \ --without-mic \ --without-oracle \ --disable-turbostat \ --enable-disk CGI_RUN_DEPENDS= p5-URI>=0:net/p5-URI \ p5-CGI>=0:www/p5-CGI \ p5-HTML-Parser>=0:www/p5-HTML-Parser CGI_IMPLIES= RRDTOOL CHRONY_CONFIGURE_ENABLE= chrony CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_ENABLE= apache curl nginx write_http CURL_CONFIGURE_WITH= libcurl=${LOCALBASE} CURL_JSON_IMPLIES= CURL JSON CURL_JSON_CONFIGURE_ENABLE= curl_json CURL_XML_IMPLIES= CURL XML CURL_XML_CONFIGURE_ENABLE= ascent bind curl_xml -DEBUG_CONFIGURE_ENABLE= debug +JAVA_USE= java +JAVA_CONFIGURE_ENABLE= java +JAVA_CONFIGURE_WITH= java=${LOCALBASE} libjvm DBI_LIB_DEPENDS= libdbi.so:databases/libdbi DBI_CONFIGURE_WITH= libdbi=${LOCALBASE} DBI_CONFIGURE_ENABLE= dbi DBI_CFLAGS= -Wno-deprecated-declarations GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error GCRYPT_CONFIGURE_WITH= -with-libgcrypt=${LOCALBASE} GCRYPT_LIBS= -lgcrypt IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi IPMI_CONFIGURE_ENABLE= ipmi JSON_LIB_DEPENDS= libyajl.so:devel/yajl JSON_CONFIGURE_WITH= libyajl=${LOCALBASE} KAFKA_LIB_DEPENDS= librdkafka.so:net/librdkafka KAFKA_CONFIGURE_ENABLE= write_kafka +LOGGING_CONFIGURE_ENABLE= debug + LOGSTASH_CONFIGURE_ENABLE= log_logstash LOGSTASH_IMPLIES= JSON MEMCACHEC_LIB_DEPENDS= libmemcached.so:databases/libmemcached MEMCACHEC_CONFIGURE_ENABLE= memcachec MEMCACHEC_CONFIGURE_WITH= libmemcached=${LOCALBASE} MODBUS_LIB_DEPENDS= libmodbus.so:comms/libmodbus MODBUS_CONFIGURE_ENABLE= modbus MODBUS_CONFIGURE_WITH= libmodbus=use_pkgconfig MONGODB_LIB_DEPENDS= libmongoc-1.0.so:devel/mongo-c-driver MONGODB_LIB_DEPENDS+= libbson-1.0.so:devel/libbson MONGODB_CONFIGURE_ENABLE= write_mongodb MONGODB_CONFIGURE_WITH= libmongoc=${LOCALBASE} MONGODB_BROKEN= fails to configure with write_mongodb option MQTT_LIB_DEPENDS= libmosquitto.so:net/mosquitto MQTT_CONFIGURE_ENABLE= mqtt MQTT_CONFIGURE_WITH= libmosquitto=${LOCALBASE} MYSQL_USES= mysql ssl MYSQL_CONFIGURE_ENABLE= mysql MYSQL_CONFIGURE_WITH= libmysql=${LOCALBASE} NOTIFYDESKTOP_LIB_DEPENDS= libnotify.so:devel/libnotify NOTIFYDESKTOP_CONFIGURE_ENABLE= notify_desktop NOTIFYDESKTOP_CONFIGURE_WITH= libnotify=${LOCALBASE} NOTIFYDESKTOP_USE= GNOME=gdkpixbuf2 NOTIFYDESKTOP_USES= gettext-runtime NOTIFYEMAIL_LIB_DEPENDS= libesmtp.so:mail/libesmtp NOTIFYEMAIL_CONFIGURE_ENABLE= notify_email NOTIFYEMAIL_CONFIGURE_WITH= libesmtp=${LOCALBASE} NUTUPS_LIB_DEPENDS= libupsclient.so:sysutils/nut NUTUPS_CONFIGURE_ENABLE= nut NUTUPS_CONFIGURE_WITH= upsclient=${LOCALBASE} OLSRD_CONFIGURE_ENABLE= olsrd ONEWIRE_LIB_DEPENDS= libow.so:comms/owfs ONEWIRE_CONFIGURE_ENABLE= onewire ONEWIRE_CONFIGURE_WITH= libowcapi=${LOCALBASE} OPENLDAP_USE= openldap=yes OPENLDAP_CONFIGURE_ENABLE= openldap OPENLDAP_CONFIGURE_WITH= libldap=${LOCALBASE} PERL_USES= perl5 PERL_CONFIGURE_ENABLE= perl -PERL_CONFIGURE_WITH= perl=${PERL} perl-bindings +PERL_CONFIGURE_DISABLE= perl +PERL_CONFIGURE_WITH= perl=${PERL} perl-bindings libperl PGSQL_USES= pgsql PGSQL_CONFIGURE_ENABLE= postgresql PGSQL_CONFIGURE_WITH= postgresql=${LOCALBASE} libpq PINBA_LIB_DEPENDS= libprotobuf-c.so:devel/protobuf-c PINBA_CONFIGURE_ENABLE= pinba PING_LIB_DEPENDS= liboping.so:net/liboping PING_CONFIGURE_ENABLE= ping PING_CONFIGURE_WITH= liboping=${LOCALBASE} PYTHON_USES= python:2 PYTHON_CONFIGURE_ENABLE= python PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} RABBITMQ_LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c RABBITMQ_CONFIGURE_ENABLE= rabbitmq RABBITMQ_CONFIGURE_WITH= librabbitmq=${LOCALBASE} REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis REDIS_CONFIGURE_ENABLE= redis write_redis REDIS_CONFIGURE_WITH= libhiredis=${LOCALBASE} RIEMANN_LIB_DEPENDS= libriemann-client.so:net-mgmt/riemann-c-client \ libltdl.so:devel/libltdl RIEMANN_CONFIGURE_ENABLE= write_riemann ROUTEROS_LIB_DEPENDS= librouteros.so:net/librouteros \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error ROUTEROS_CONFIGURE_ENABLE= routeros ROUTEROS_CONFIGURE_WITH= librouteros=${LOCALBASE} RRDTOOL_LIB_DEPENDS= librrd.so:databases/rrdtool RRDTOOL_CONFIGURE_ENABLE= rrdcached rrdtool RRDTOOL_CONFIGURE_WITH= librrd=${LOCALBASE} SIGROK_USE= GNOME=glib20 SIGROK_CFLAGS= `pkg-config --cflags glib-2.0` SIGROK_LIB_DEPENDS= libsigrok.so:devel/libsigrok SIGROK_CONFIGURE_ENABLE= sigrok SIGROK_CONFIGURE_WITH= libsigrok SIGROK_USES= gettext-runtime SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_CONFIGURE_ENABLE= snmp SNMP_CONFIGURE_WITH= libnetsnmp STATSD_CONFIGURE_ENABLE= statsd TOKYOTYRANT_LIB_DEPENDS= libtokyotyrant.so:databases/tokyotyrant \ libtokyocabinet.so:databases/tokyocabinet TOKYOTYRANT_CONFIGURE_ENABLE= tokyotyrant TOKYOTYRANT_CONFIGURE_WITH= libtokyotyrant=${LOCALBASE} TSDB_CONFIGURE_ENABLE= write_tsdb VARNISH_LIB_DEPENDS= libvarnishapi.so:www/varnish4 VARNISH_CONFIGURE_ENABLE= varnish VARNISH_CONFIGURE_WITH= libvarnish=${LOCALBASE} VIRT_IMPLIES= XML VIRT_LIB_DEPENDS= libvirt.so:devel/libvirt \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error VIRT_CONFIGURE_ENABLE= virt VIRT_CONFIGURE_WITH= virt=${LOCALBASE} XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 XML_CONFIGURE_WITH= libxml2=${LOCALBASE} XMMS_CFLAGS= `xmms-config --cflags` XMMS_LIB_DEPENDS= libxmms.so:multimedia/xmms XMMS_CONFIGURE_ENABLE= xmms XMMS_CONFIGURE_WITH= libxmms=${LOCALBASE} XMMS_USE= XORG=x11,xext,xi ZOOKEEPER_LIB_DEPENDS= libzookeeper_mt.so:devel/libzookeeper ZOOKEEPER_CONFIGURE_ENABLE= zookeeper ZOOKEEPER_CONFIGURE_WITH= libzookeeper=${LOCALBASE} # 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-filecount \ --enable-interface \ --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-users \ --enable-uuid \ --enable-write_graphite \ --enable-write_log \ --enable-zfs_arc \ 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 + ${WRKSRC}/configure.ac @${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.5 + ${WRKSRC}/src/collectd.conf.5 \ + ${WRKSRC}/src/collectd.conf.pod @${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 post-install-CGI-on: ${MKDIR} ${STAGEDIR}${WWWDIR} ${INSTALL_SCRIPT} ${WRKSRC}/contrib/collection.cgi ${STAGEDIR}${WWWDIR}/ ${INSTALL_DATA} ${WRKSRC}/contrib/collection.conf \ ${STAGEDIR}${WWWDIR}/collection.conf.sample .include Index: head/net-mgmt/collectd5/distinfo =================================================================== --- head/net-mgmt/collectd5/distinfo (revision 454646) +++ head/net-mgmt/collectd5/distinfo (revision 454647) @@ -1,3 +1,3 @@ -TIMESTAMP = 1500286881 -SHA256 (collectd-5.7.2.tar.bz2) = 9d20a0221569a8d6b80bbc52b86e5e84965f5bafdbf5dfc3790e0fed0763e592 -SIZE (collectd-5.7.2.tar.bz2) = 1798777 +TIMESTAMP = 1511130105 +SHA256 (collectd-5.8.0.tar.bz2) = b06ff476bbf05533cb97ae6749262cc3c76c9969f032bd8496690084ddeb15c9 +SIZE (collectd-5.8.0.tar.bz2) = 1686017 Index: head/net-mgmt/collectd5/files/patch-configure.ac =================================================================== --- head/net-mgmt/collectd5/files/patch-configure.ac (revision 454646) +++ head/net-mgmt/collectd5/files/patch-configure.ac (nonexistent) @@ -1,95 +0,0 @@ ---- configure.ac.orig 2016-09-11 08:10:25 UTC -+++ configure.ac -@@ -185,7 +185,7 @@ then - fi - - # Where to install .pc files. --pkgconfigdir="${libdir}/pkgconfig" -+pkgconfigdir="${prefix}/libdata/pkgconfig" - AC_SUBST(pkgconfigdir) - - # Check for standards compliance mode -@@ -841,7 +841,7 @@ SAVE_CFLAGS="$CFLAGS" - # Emulate behavior of src/Makefile.am - if test "x$GCC" = "xyes" - then -- CFLAGS="$CFLAGS -Wall -Werror" -+ CFLAGS="$CFLAGS -Wall " - fi - - AC_CACHE_CHECK([for strtok_r], -@@ -968,7 +968,7 @@ AC_CHECK_FUNCS(getutxent, [have_getutxen - if test "x$GCC" = "xyes" - then - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -Wall -Wextra -Werror" -+ CFLAGS="$CFLAGS -Wall -Wextra " - fi - - AC_CHECK_FUNCS(strptime, [have_strptime="yes"], [have_strptime="no"]) -@@ -1757,6 +1757,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)"], []) -@@ -1766,6 +1767,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") -@@ -3053,8 +3056,8 @@ AC_ARG_WITH(libmongoc, [AS_HELP_STRING([ - with_libmongoc="no" - else - with_libmongoc="yes" -- LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include" -- LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib" -+ LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include/libmongoc-1.0 -I$withval/include/libbson-1.0" -+ LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib -lsasl2 -lssl -lcrypto -lmongoc-1.0 -lbson-1.0" - fi; fi - ], - [with_libmongoc="yes"]) -@@ -3071,7 +3074,7 @@ then - then - AC_MSG_NOTICE([libmongoc CPPFLAGS: $LIBMONGOC_CPPFLAGS]) - fi -- AC_CHECK_HEADERS(mongo.h, -+ AC_CHECK_HEADERS(mongoc.h, - [with_libmongoc="yes"], - [with_libmongoc="no ('mongo.h' not found)"], - [#if HAVE_STDINT_H -@@ -3087,7 +3090,7 @@ then - then - AC_MSG_NOTICE([libmongoc LDFLAGS: $LIBMONGOC_LDFLAGS]) - fi -- AC_CHECK_LIB(mongoc, mongo_run_command, -+ AC_CHECK_LIB(mongoc-1.0, mongoc_client_command, - [with_libmongoc="yes"], - [with_libmongoc="no (symbol 'mongo_run_command' not found)"]) - fi -@@ -3873,7 +3876,7 @@ then - SAVE_LIBS="$LIBS" - # trigger an error if Perl_load_module*() uses __attribute__nonnull__(3) - # (see issues #41 and #42) -- CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror" -+ CFLAGS="$CFLAGS $PERL_CFLAGS -Wall " - LIBS="$LIBS $PERL_LIBS" - - AC_CACHE_CHECK([for broken Perl_load_module()], -@@ -5249,8 +5252,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_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 - ], Property changes on: head/net-mgmt/collectd5/files/patch-configure.ac ___________________________________________________________________ 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__modbus.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src__modbus.c (revision 454646) +++ head/net-mgmt/collectd5/files/patch-src__modbus.c (nonexistent) @@ -1,12 +0,0 @@ ---- src/modbus.c.orig 2017-01-23 07:53:57 UTC -+++ src/modbus.c -@@ -26,6 +26,9 @@ - #include "configfile.h" - #include "plugin.h" - -+/* FreeBSD needs this */ -+#include -+ - #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__dns.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src__dns.c (revision 454646) +++ head/net-mgmt/collectd5/files/patch-src__dns.c (nonexistent) @@ -1,18 +0,0 @@ ---- src/dns.c.orig 2017-01-23 07:53:57 UTC -+++ src/dns.c -@@ -198,6 +198,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", Property changes on: head/net-mgmt/collectd5/files/patch-src__dns.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__daemon__collectd.h =================================================================== --- head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h (revision 454646) +++ head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h (nonexistent) @@ -1,21 +0,0 @@ ---- src/daemon/collectd.h.orig 2017-01-23 07:53:57 UTC -+++ src/daemon/collectd.h -@@ -243,15 +243,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 "/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 ___________________________________________________________________ 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_config.h.in =================================================================== --- head/net-mgmt/collectd5/files/patch-src_config.h.in (revision 454646) +++ head/net-mgmt/collectd5/files/patch-src_config.h.in (nonexistent) @@ -1,40 +0,0 @@ ---- src/config.h.in.orig 2016-09-11 08:10:42 UTC -+++ src/config.h.in -@@ -587,8 +587,8 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_MODBUS_H - --/* Define to 1 if you have the header file. */ --#undef HAVE_MONGO_H -+/* Define to 1 if you have the header file. */ -+#undef HAVE_MONGOC_H - - /* Define to 1 if you have the header file. */ - #undef HAVE_MOSQUITTO_H -@@ -1617,13 +1617,15 @@ - module search path. */ - #undef LT_MODULE_PATH_VAR - --/* Define to the sub-directory in which libtool stores uninstalled libraries. -- */ -+/* Define to the sub-directory where libtool stores uninstalled libraries. */ - #undef LT_OBJDIR - - /* Define to the shared library suffix, say, ".dylib". */ - #undef LT_SHARED_EXT - -+/* Define to the shared archive member specification, say "(shr.o)". */ -+#undef LT_SHARED_LIB_MEMBER -+ - /* Define if NAN is defined by default and can initialize static variables. */ - #undef NAN_STATIC_DEFAULT - -@@ -1715,7 +1717,7 @@ - /* Define to empty if `const' does not conform to ANSI C. */ - #undef const - --/* Define to a type to use for `error_t' if it is not otherwise available. */ -+/* Define to a type to use for 'error_t' if it is not otherwise available. */ - #undef error_t - - /* Define to `int' if doesn't define. */ Property changes on: head/net-mgmt/collectd5/files/patch-src_config.h.in ___________________________________________________________________ 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_write__mongodb.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src_write__mongodb.c (revision 454646) +++ head/net-mgmt/collectd5/files/patch-src_write__mongodb.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/write_mongodb.c.orig 2016-09-11 08:10:25 UTC -+++ src/write_mongodb.c -@@ -39,7 +39,7 @@ - #else - # define MONGO_USE_LONG_LONG_INT 1 - #endif --#include -+#include - - #if (MONGO_MAJOR == 0) && (MONGO_MINOR < 8) - # define bson_alloc() bson_create() Property changes on: head/net-mgmt/collectd5/files/patch-src_write__mongodb.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__Makefile.am =================================================================== --- head/net-mgmt/collectd5/files/patch-src__Makefile.am (revision 454646) +++ head/net-mgmt/collectd5/files/patch-src__Makefile.am (nonexistent) @@ -1,107 +0,0 @@ ---- src/Makefile.am.orig 2016-09-11 08:10:25 UTC -+++ src/Makefile.am -@@ -10,7 +10,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 -@@ -274,7 +274,7 @@ cpu_la_CFLAGS = $(AM_CFLAGS) - cpu_la_LDFLAGS = $(PLUGIN_LDFLAGS) - 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 -@@ -358,7 +358,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 -@@ -381,6 +381,9 @@ endif - if BUILD_WITH_PERFSTAT - disk_la_LIBADD += -lperfstat - endif -+if BUILD_FREEBSD -+disk_la_LIBADD += -ldevstat -lgeom -+endif - endif - - if BUILD_PLUGIN_DNS -@@ -481,7 +484,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 -@@ -669,7 +672,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 -@@ -1034,7 +1037,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 -@@ -1080,7 +1083,7 @@ if BUILD_PLUGIN_TAPE - pkglib_LTLIBRARIES += tape.la - tape_la_SOURCES = tape.c - tape_la_LDFLAGS = $(PLUGIN_LDFLAGS) --tape_la_LIBADD = -lkstat -ldevinfo -+tape_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) -ldevinfo - endif - - if BUILD_PLUGIN_TARGET_NOTIFICATION -@@ -1184,7 +1187,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 -@@ -1340,7 +1343,7 @@ if BUILD_FREEBSD - zfs_arc_la_LIBADD = -lm - endif - if BUILD_SOLARIS --zfs_arc_la_LIBADD = -lkstat -+zfs_arc_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) - endif - endif - -@@ -1433,12 +1436,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 \ Property changes on: head/net-mgmt/collectd5/files/patch-src__Makefile.am ___________________________________________________________________ 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__tcpconns.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src__tcpconns.c (revision 454646) +++ head/net-mgmt/collectd5/files/patch-src__tcpconns.c (nonexistent) @@ -1,18 +0,0 @@ ---- src/tcpconns.c.orig 2017-03-21 00:18:33.371554000 -0700 -+++ src/tcpconns.c 2017-03-21 00:21:09.631089000 -0700 -@@ -745,9 +745,15 @@ - for (in_ptr = (struct xinpgen *)(((char *)in_orig) + in_orig->xig_len); - in_ptr->xig_len > sizeof(struct xinpgen); - in_ptr = (struct xinpgen *)(((char *)in_ptr) + in_ptr->xig_len)) { -+#if __FreeBSD_version >= 1200026 -+ struct xtcpcb *tp = (struct xtcpcb *)in_ptr; -+ struct xinpcb *inp = &tp->xt_inp; -+ struct xsocket *so = &inp->xi_socket; -+#else - struct tcpcb *tp = &((struct xtcpcb *)in_ptr)->xt_tp; - struct inpcb *inp = &((struct xtcpcb *)in_ptr)->xt_inp; - struct xsocket *so = &((struct xtcpcb *)in_ptr)->xt_socket; -+#endif - - /* Ignore non-TCP sockets */ - if (so->xso_protocol != IPPROTO_TCP) Property changes on: head/net-mgmt/collectd5/files/patch-src__tcpconns.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__daemon__Makefile.am =================================================================== --- head/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am (revision 454646) +++ head/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am (nonexistent) @@ -1,11 +0,0 @@ ---- src/daemon/Makefile.am.orig 2016-09-11 08:10:25 UTC -+++ src/daemon/Makefile.am -@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src - 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 Property changes on: head/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am ___________________________________________________________________ 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 (revision 454646) +++ head/net-mgmt/collectd5/files/patch-Makefile.am (revision 454647) @@ -1,10 +1,29 @@ ---- Makefile.am.orig 2016-09-11 08:10:25 UTC +--- Makefile.am.orig 2017-11-18 09:03:27 UTC +++ Makefile.am -@@ -14,7 +14,6 @@ EXTRA_DIST = contrib version-gen.sh test +@@ -165,7 +165,7 @@ AM_CPPFLAGS = \ + -DPREFIX='"${prefix}"' \ + -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ + -DLOCALSTATEDIR='"${localstatedir}"' \ +- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \ ++ -DPKGLOCALSTATEDIR='"/var/db/${PACKAGE_NAME}"' \ + -DPLUGINDIR='"${pkglibdir}"' \ + -DPKGDATADIR='"${pkgdatadir}"' +@@ -1964,15 +1964,10 @@ endif + install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run - $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME) ++ $(mkinstalldirs) $(DESTDIR)/var/db/$(PACKAGE_NAME) $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log - - maintainer-clean-local: + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) +- if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ +- then \ +- $(INSTALL) -m 0640 $(srcdir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \ +- else \ +- $(INSTALL) -m 0640 $(srcdir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \ +- fi; \ ++ $(INSTALL) -m 0640 src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + $(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(pkgdatadir)/types.db; + $(INSTALL) -m 0644 $(srcdir)/src/postgresql_default.conf \ Index: head/net-mgmt/collectd5/files/patch-Makefile.in =================================================================== --- head/net-mgmt/collectd5/files/patch-Makefile.in (nonexistent) +++ head/net-mgmt/collectd5/files/patch-Makefile.in (revision 454647) @@ -0,0 +1,216 @@ +--- Makefile.in.orig 2017-11-18 09:03:50 UTC ++++ Makefile.in +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.14.1 from Makefile.am. ++# Makefile.in generated by automake 1.15.1 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++# Copyright (C) 1994-2017 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -18,7 +18,17 @@ + + + VPATH = @srcdir@ +-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__is_gnu_make = { \ ++ if test -z '$(MAKELEVEL)'; then \ ++ false; \ ++ elif test -n '$(MAKE_HOST)'; then \ ++ true; \ ++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ++ true; \ ++ else \ ++ false; \ ++ fi; \ ++} + am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ +@@ -351,26 +361,6 @@ check_PROGRAMS = test_common$(EXEEXT) te + @BUILD_PLUGIN_WRITE_PROMETHEUS_TRUE@am__append_237 = prometheus.pb-c.c prometheus.pb-c.h + @HAVE_GRPC_CPP_TRUE@@HAVE_PROTOC3_TRUE@am__append_238 = collectd.grpc.pb.cc collectd.pb.cc types.pb.cc + subdir = . +-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ +- $(top_srcdir)/configure $(am__configure_deps) \ +- $(top_srcdir)/src/config.h.in \ +- $(top_srcdir)/src/libcollectdclient/collectd/lcc_features.h.in \ +- $(top_srcdir)/src/collectd.conf.in \ +- $(top_srcdir)/src/libcollectdclient/libcollectdclient.pc.in \ +- src/liboconfig/scanner.c src/liboconfig/parser.h \ +- src/liboconfig/parser.c $(top_srcdir)/build-aux/depcomp \ +- $(top_srcdir)/build-aux/ylwrap $(am__dist_noinst_JAVA_DIST) \ +- $(dist_man_MANS) $(pkginclude_HEADERS) \ +- $(top_srcdir)/build-aux/test-driver AUTHORS COPYING ChangeLog \ +- README build-aux/compile build-aux/config.guess \ +- build-aux/config.sub build-aux/depcomp build-aux/install-sh \ +- build-aux/missing build-aux/ylwrap build-aux/ltmain.sh \ +- $(top_srcdir)/build-aux/compile \ +- $(top_srcdir)/build-aux/config.guess \ +- $(top_srcdir)/build-aux/config.sub \ +- $(top_srcdir)/build-aux/install-sh \ +- $(top_srcdir)/build-aux/ltmain.sh \ +- $(top_srcdir)/build-aux/missing + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \ + $(top_srcdir)/m4/ax_compiler_vendor.m4 \ +@@ -379,6 +369,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) ++DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ ++ $(am__configure_deps) $(am__dist_noinst_JAVA_DIST) \ ++ $(pkginclude_HEADERS) $(am__DIST_COMMON) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno + mkinstalldirs = $(install_sh) -d +@@ -2673,6 +2666,25 @@ TEST_LOGS = $(am__test_logs2:.test.log=. + TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver + TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) ++am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ ++ $(top_srcdir)/build-aux/compile \ ++ $(top_srcdir)/build-aux/config.guess \ ++ $(top_srcdir)/build-aux/config.sub \ ++ $(top_srcdir)/build-aux/depcomp \ ++ $(top_srcdir)/build-aux/install-sh \ ++ $(top_srcdir)/build-aux/ltmain.sh \ ++ $(top_srcdir)/build-aux/missing \ ++ $(top_srcdir)/build-aux/test-driver \ ++ $(top_srcdir)/build-aux/ylwrap \ ++ $(top_srcdir)/src/collectd.conf.in \ ++ $(top_srcdir)/src/config.h.in \ ++ $(top_srcdir)/src/libcollectdclient/collectd/lcc_features.h.in \ ++ $(top_srcdir)/src/libcollectdclient/libcollectdclient.pc.in \ ++ AUTHORS COPYING ChangeLog INSTALL NEWS README \ ++ build-aux/compile build-aux/config.guess build-aux/config.sub \ ++ build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \ ++ build-aux/missing build-aux/ylwrap src/liboconfig/parser.c \ ++ src/liboconfig/parser.h src/liboconfig/scanner.c + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) +@@ -2908,6 +2920,7 @@ LOAD_PLUGIN_NETWORK = @LOAD_PLUGIN_NETWO + LOAD_PLUGIN_RRDTOOL = @LOAD_PLUGIN_RRDTOOL@ + LOAD_PLUGIN_SYSLOG = @LOAD_PLUGIN_SYSLOG@ + LTLIBOBJS = @LTLIBOBJS@ ++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ + LUA_CFLAGS = @LUA_CFLAGS@ + LUA_LIBS = @LUA_LIBS@ + MAKEINFO = @MAKEINFO@ +@@ -3183,7 +3196,7 @@ AM_CPPFLAGS = \ + -DPREFIX='"${prefix}"' \ + -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ + -DLOCALSTATEDIR='"${localstatedir}"' \ +- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \ ++ -DPKGLOCALSTATEDIR='"/var/db/${PACKAGE_NAME}"' \ + -DPLUGINDIR='"${pkglibdir}"' \ + -DPKGDATADIR='"${pkgdatadir}"' + +@@ -4172,7 +4185,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile +-.PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ +@@ -7114,7 +7126,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ +- else \ ++ elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ +@@ -7385,7 +7397,7 @@ distdir: $(DISTFILES) + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" + dist-gzip: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz + $(am__post_remove_distdir) + dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 +@@ -7400,17 +7412,17 @@ dist-xz: distdir + $(am__post_remove_distdir) + + dist-tarZ: distdir +- @echo WARNING: "Support for shar distribution archives is" \ +- "deprecated." >&2 ++ @echo WARNING: "Support for distribution archives compressed with" \ ++ "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__post_remove_distdir) + + dist-shar: distdir +- @echo WARNING: "Support for distribution archives compressed with" \ +- "legacy program 'compress' is deprecated." >&2 ++ @echo WARNING: "Support for shar distribution archives is" \ ++ "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 +- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz ++ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz + $(am__post_remove_distdir) + + dist-zip: distdir +@@ -7428,7 +7440,7 @@ dist dist-all: + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ ++ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lz*) \ +@@ -7438,23 +7450,23 @@ distcheck: dist + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ ++ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir) + chmod u+w $(distdir) +- mkdir $(distdir)/_build $(distdir)/_inst ++ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && am__cwd=`pwd` \ +- && $(am__cd) $(distdir)/_build \ +- && ../configure \ ++ && $(am__cd) $(distdir)/_build/sub \ ++ && ../../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ + $(DISTCHECK_CONFIGURE_FLAGS) \ +- --srcdir=.. --prefix="$$dc_install_base" \ ++ --srcdir=../.. --prefix="$$dc_install_base" \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ +@@ -7686,6 +7698,8 @@ uninstall-man: uninstall-man1 uninstall- + uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES \ + uninstall-sbinPROGRAMS + ++.PRECIOUS: Makefile ++ + + .pod.1: + $(AM_V_POD2MAN_C)pod2man --release=$(VERSION) --center=$(PACKAGE) $< \ +@@ -7721,7 +7735,7 @@ uninstall-man: uninstall-man1 uninstall- + + install-exec-hook: + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run +- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME) ++ $(mkinstalldirs) $(DESTDIR)/var/db/$(PACKAGE_NAME) + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) + if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ Property changes on: head/net-mgmt/collectd5/files/patch-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_collectd.h =================================================================== --- head/net-mgmt/collectd5/files/patch-src_daemon_collectd.h (nonexistent) +++ head/net-mgmt/collectd5/files/patch-src_daemon_collectd.h (revision 454647) @@ -0,0 +1,11 @@ +--- src/daemon/collectd.h.orig 2017-11-18 09:03:27 UTC ++++ src/daemon/collectd.h +@@ -207,7 +207,7 @@ + #endif + + #ifndef PKGLOCALSTATEDIR +-#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME ++#define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME + #endif + + #ifndef PIDFILE 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_zfs__arc.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src_zfs__arc.c (revision 454646) +++ head/net-mgmt/collectd5/files/patch-src_zfs__arc.c (revision 454647) @@ -1,11 +1,11 @@ ---- src/zfs_arc.c.orig 2017-01-23 07:53:57 UTC +--- src/zfs_arc.c.orig 2017-11-18 09:03:27 UTC +++ src/zfs_arc.c -@@ -286,8 +286,6 @@ static int za_read(void) { +@@ -301,8 +301,6 @@ static int za_read(void) { za_read_derive(ksp, "prefetch_metadata_hits", "cache_result", "prefetch_metadata-hit"); za_read_derive(ksp, "demand_data_misses", "cache_result", "demand_data-miss"); - za_read_derive(ksp, "demand_metadata_misses", "cache_result", - "demand_metadata-miss"); za_read_derive(ksp, "prefetch_data_misses", "cache_result", "prefetch_data-miss"); za_read_derive(ksp, "prefetch_metadata_misses", "cache_result", Index: head/net-mgmt/collectd5/files/patch-version-gen.sh =================================================================== --- head/net-mgmt/collectd5/files/patch-version-gen.sh (revision 454646) +++ head/net-mgmt/collectd5/files/patch-version-gen.sh (revision 454647) @@ -1,13 +1,13 @@ ---- version-gen.sh.orig 2017-02-03 20:46:49 UTC +--- version-gen.sh.orig 2017-11-18 09:03:27 UTC +++ version-gen.sh @@ -2,10 +2,6 @@ - DEFAULT_VERSION="5.7.1.git" + DEFAULT_VERSION="5.8.0.git" -if [ -d .git ]; then - VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`" -fi - if test -z "$VERSION"; then VERSION="$DEFAULT_VERSION" fi Index: head/net-mgmt/collectd5/pkg-plist =================================================================== --- head/net-mgmt/collectd5/pkg-plist (revision 454646) +++ head/net-mgmt/collectd5/pkg-plist (revision 454647) @@ -1,132 +1,138 @@ 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 +include/collectd/network_parse.h +include/collectd/server.h +include/collectd/types.h lib/libcollectdclient.so lib/libcollectdclient.so.1 -lib/libcollectdclient.so.1.0.0 +lib/libcollectdclient.so.1.1.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 %%CHRONY%%lib/collectd/chrony.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 lib/collectd/disk.so lib/collectd/dns.so lib/collectd/email.so lib/collectd/exec.so lib/collectd/filecount.so lib/collectd/interface.so %%IPMI%%lib/collectd/ipmi.so +%%JAVA%%lib/collectd/java.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 %%MQTT%%lib/collectd/mqtt.so %%MYSQL%%lib/collectd/mysql.so lib/collectd/network.so %%CURL%%lib/collectd/nginx.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 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/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 %%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 lib/collectd/users.so lib/collectd/uuid.so %%VARNISH%%lib/collectd/varnish.so %%VIRT%%lib/collectd/virt.so 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 %%TSDB%%lib/collectd/write_tsdb.so %%XMMS%%lib/collectd/xmms.so lib/collectd/zfs_arc.so +%%JAVA%%%%DATADIR%%/java/collectd-api.jar +%%JAVA%%%%DATADIR%%/java/generic-jmx.jar %%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-lua.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