Index: head/net-mgmt/collectd5/Makefile =================================================================== --- head/net-mgmt/collectd5/Makefile (revision 422777) +++ head/net-mgmt/collectd5/Makefile (revision 422778) @@ -1,350 +1,366 @@ # Created by: Matt Peterson # $FreeBSD$ PORTNAME= collectd -PORTVERSION= 5.5.2 +PORTVERSION= 5.6.0 CATEGORIES= net-mgmt 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:devel/glib20 LIB_DEPENDS= libltdl.so:devel/libltdl USES= autoreconf gmake libtool pkgconfig shebangfix tar:bzip2 GNU_CONFIGURE= yes OPTIONS_DEFINE= CGI DEBUG GCRYPT LOGSTASH VIRT OPTIONS_GROUP= INPUT OUTPUT OPTIONS_GROUP_OUTPUT= KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL RIEMANN RRDTOOL \ TSDB -OPTIONS_GROUP_INPUT= CURL CURL_JSON CURL_XML DBI IPMI JSON MEMCACHEC \ - MODBUS MYSQL NUTUPS OLSRD ONEWIRE OPENLDAP \ +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 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 DEBUG_DESC= Enable debugging GCRYPT_DESC= Build with libgcrypt IPMI_DESC= Enable OpenIPMI plugin JSON_DESC= Enable JSON plugins KAFKA_DESC= Enable write_kafka plugin LOGSTASH_DESC= Enable log_logstash plugin (requires json) MEMCACHEC_DESC= Enable memcachec plugin MODBUS_DESC= Enable modbus plugin MONGODB_DESC= Enable 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 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 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 CGI_RUN_DEPENDS= p5-URI>=0:net/p5-URI \ p5-CGI>=0:www/p5-CGI \ p5-Data-Dumper>=0:devel/p5-Data-Dumper \ 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 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 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 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_USE= mysql=yes 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} 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 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= libprotobuf-c.so:devel/protobuf-c RIEMANN_CONFIGURE_ENABLE= write_riemann ROUTEROS_LIB_DEPENDS= librouteros.so:net/librouteros 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 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 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 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} 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-disk \ --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 \ + +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 +PLIST_SUB+= DISK="@comment " +.else +CONFIGURE_ARGS+=--enable-disk +PLIST_SUB+= DISK="@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.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 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 422777) +++ head/net-mgmt/collectd5/distinfo (revision 422778) @@ -1,3 +1,3 @@ -TIMESTAMP = 1469564676 -SHA256 (collectd-5.5.2.tar.bz2) = 017f3a4062187e594d8ab6af685655fb82a8a942dc574668e68242bdb8ba820f -SIZE (collectd-5.5.2.tar.bz2) = 1800476 +TIMESTAMP = 1474290609 +SHA256 (collectd-5.6.0.tar.bz2) = f0ffbbd91fac3682bd324a74b9b4c9eabe781394b303b5cfd457c4cfbe748623 +SIZE (collectd-5.6.0.tar.bz2) = 1818470 Index: head/net-mgmt/collectd5/files/patch-src_zfs__arc.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src_zfs__arc.c (revision 422777) +++ head/net-mgmt/collectd5/files/patch-src_zfs__arc.c (nonexistent) @@ -1,13 +0,0 @@ ---- src/zfs_arc.c.orig 2016-07-26 05:57:19 UTC -+++ src/zfs_arc.c -@@ -270,10 +270,6 @@ static int za_read (void) - za_read_derive (ksp, "deleted", "cache_operation", "deleted"); - #if __FreeBSD__ - za_read_derive (ksp, "allocated","cache_operation", "allocated"); --#if defined(__FreeBSD_version) && (__FreeBSD_version < 1002501) -- /* stolen removed from sysctl kstat.zfs.misc.arcstats on FreeBSD 10.2+ */ -- za_read_derive (ksp, "stolen", "cache_operation", "stolen"); --#endif - #endif - - /* Issue indicators */ Property changes on: head/net-mgmt/collectd5/files/patch-src_zfs__arc.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 422777) +++ head/net-mgmt/collectd5/files/patch-src_disk.c (nonexistent) @@ -1,160 +0,0 @@ ---- src/disk.c.orig 2016-01-22 09:51:17 UTC -+++ src/disk.c -@@ -53,6 +53,10 @@ - #if HAVE_IOKIT_IOBSD_H - # include - #endif -+#if KERNEL_FREEBSD -+#include -+#include -+#endif - - #if HAVE_LIMITS_H - # include -@@ -107,6 +111,9 @@ typedef struct diskstats - - static diskstats_t *disklist; - /* #endif KERNEL_LINUX */ -+#elif KERNEL_FREEBSD -+static struct gmesh geom_tree; -+/* #endif KERNEL_FREEBSD */ - - #elif HAVE_LIBKSTAT - #define MAX_NUMDISK 1024 -@@ -222,6 +229,21 @@ static int disk_init (void) - /* do nothing */ - /* #endif KERNEL_LINUX */ - -+#elif KERNEL_FREEBSD -+ int rv; -+ -+ rv = geom_gettree(&geom_tree); -+ if (rv != 0) { -+ ERROR ("geom_gettree() failed, returned %d", rv); -+ return (-1); -+ } -+ rv = geom_stats_open(); -+ if (rv != 0) { -+ ERROR ("geom_stats_open() failed, returned %d", rv); -+ return (-1); -+ } -+/* #endif KERNEL_FREEBSD */ -+ - #elif HAVE_LIBKSTAT - kstat_t *ksp_chain; - -@@ -505,6 +527,114 @@ static int disk_read (void) - IOObjectRelease (disk_list); - /* #endif HAVE_IOKIT_IOKITLIB_H */ - -+#elif KERNEL_FREEBSD -+ int retry, dirty; -+ -+ void *snap = NULL; -+ struct devstat *snap_iter; -+ -+ struct gident *geom_id; -+ -+ const char *disk_name; -+ long double read_time, write_time; -+ -+ for (retry = 0, dirty = 1; retry < 5 && dirty == 1; retry++) { -+ if (snap != NULL) -+ geom_stats_snapshot_free(snap); -+ -+ /* Get a fresh copy of stats snapshot */ -+ snap = geom_stats_snapshot_get(); -+ if (snap == NULL) { -+ ERROR("disk plugin: geom_stats_snapshot_get() failed."); -+ return (-1); -+ } -+ -+ /* Check if we have dirty read from this snapshot */ -+ dirty = 0; -+ geom_stats_snapshot_reset(snap); -+ while ((snap_iter = geom_stats_snapshot_next(snap)) != NULL) { -+ if (snap_iter->id == NULL) -+ continue; -+ geom_id = geom_lookupid(&geom_tree, snap_iter->id); -+ -+ /* New device? refresh GEOM tree */ -+ if (geom_id == NULL) { -+ geom_deletetree(&geom_tree); -+ if (geom_gettree(&geom_tree) != 0) { -+ ERROR("disk plugin: geom_gettree() failed"); -+ geom_stats_snapshot_free(snap); -+ return (-1); -+ } -+ geom_id = geom_lookupid(&geom_tree, snap_iter->id); -+ } -+ /* -+ * This should be rare: the device come right before we take the -+ * snapshot and went away right after it. We will handle this -+ * case later, so don't mark dirty but silently ignore it. -+ */ -+ if (geom_id == NULL) -+ continue; -+ -+ /* Only collect PROVIDER data */ -+ if (geom_id->lg_what != ISPROVIDER) -+ continue; -+ -+ /* Only collect data when rank is 1 (physical devices) */ -+ if (((struct gprovider *)(geom_id->lg_ptr))->lg_geom->lg_rank != 1) -+ continue; -+ -+ /* Check if this is a dirty read quit for another try */ -+ if (snap_iter->sequence0 != snap_iter->sequence1) { -+ dirty = 1; -+ break; -+ } -+ } -+ } -+ -+ /* Reset iterator */ -+ geom_stats_snapshot_reset(snap); -+ for (;;) { -+ snap_iter = geom_stats_snapshot_next(snap); -+ if (snap_iter == NULL) -+ break; -+ -+ if (snap_iter->id == NULL) -+ continue; -+ geom_id = geom_lookupid(&geom_tree, snap_iter->id); -+ if (geom_id == NULL) -+ continue; -+ if (geom_id->lg_what != ISPROVIDER) -+ continue; -+ if (((struct gprovider *)(geom_id->lg_ptr))->lg_geom->lg_rank != 1) -+ continue; -+ /* Skip dirty reads, if present */ -+ if (dirty && (snap_iter->sequence0 != snap_iter->sequence1)) -+ continue; -+ -+ disk_name = ((struct gprovider *)geom_id->lg_ptr)->lg_name; -+ -+ if ((snap_iter->bytes[1] != 0) || (snap_iter->bytes[2] != 0)) { -+ disk_submit(disk_name, "disk_octets", -+ (derive_t)snap_iter->bytes[1], -+ (derive_t)snap_iter->bytes[2]); -+ } -+ -+ if ((snap_iter->operations[1] != 0) || (snap_iter->operations[2] != 0)) { -+ disk_submit(disk_name, "disk_ops", -+ (derive_t)snap_iter->operations[1], -+ (derive_t)snap_iter->operations[2]); -+ } -+ -+ read_time = devstat_compute_etime(&snap_iter->duration[DEVSTAT_READ], NULL); -+ write_time = devstat_compute_etime(&snap_iter->duration[DEVSTAT_WRITE], NULL); -+ if ((read_time != 0) || (write_time != 0)) { -+ disk_submit (disk_name, "disk_time", -+ (derive_t)(read_time*1000), (derive_t)(write_time*1000)); -+ } -+ } -+ geom_stats_snapshot_free(snap); -+/* #endif KERNEL_FREEBSD */ -+ - #elif KERNEL_LINUX - FILE *fh; - char buffer[1024]; 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-Makefile.am =================================================================== --- head/net-mgmt/collectd5/files/patch-Makefile.am (revision 422777) +++ head/net-mgmt/collectd5/files/patch-Makefile.am (revision 422778) @@ -1,10 +1,10 @@ ---- Makefile.am.orig 2016-01-22 08:33:25 UTC +--- Makefile.am.orig 2016-09-11 08:10:25 UTC +++ Makefile.am -@@ -14,7 +14,6 @@ EXTRA_DIST = contrib version-gen.sh +@@ -14,7 +14,6 @@ EXTRA_DIST = contrib version-gen.sh test install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run - $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME) $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log maintainer-clean-local: Index: head/net-mgmt/collectd5/files/patch-configure.ac =================================================================== --- head/net-mgmt/collectd5/files/patch-configure.ac (revision 422777) +++ head/net-mgmt/collectd5/files/patch-configure.ac (revision 422778) @@ -1,139 +1,95 @@ ---- configure.ac.orig 2016-01-22 09:51:17 UTC +--- configure.ac.orig 2016-09-11 08:10:25 UTC +++ configure.ac -@@ -155,7 +155,7 @@ then +@@ -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 -@@ -715,7 +715,7 @@ SAVE_CFLAGS="$CFLAGS" +@@ -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], -@@ -844,7 +844,7 @@ AC_CHECK_FUNCS(getutxent, [have_getutxen +@@ -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"]) -@@ -1571,6 +1571,7 @@ if test "x$with_kstat" = "xyes" +@@ -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)"], []) -@@ -1580,6 +1581,8 @@ if test "x$with_kstat" = "xyes" +@@ -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") -@@ -2624,8 +2627,8 @@ AC_ARG_WITH(libmongoc, [AS_HELP_STRING([ +@@ -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"]) -@@ -2642,7 +2645,7 @@ then +@@ -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 -@@ -2658,7 +2661,7 @@ then +@@ -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 -@@ -3415,7 +3418,7 @@ then +@@ -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()], -@@ -3645,7 +3648,7 @@ fi - if test "x$with_python" = "xyes" - then - AC_MSG_CHECKING([for Python CPPFLAGS]) -- python_include_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_python_inc())" | "$with_python_prog" 2>&1` -+ python_include_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_python_inc())" | "$with_python_prog" 2>/dev/null` - python_config_status=$? - - if test "$python_config_status" -ne 0 || test "x$python_include_path" = "x" -@@ -3668,7 +3671,7 @@ fi - if test "x$with_python" = "xyes" - then - AC_MSG_CHECKING([for Python LDFLAGS]) -- python_library_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0))" | "$with_python_prog" 2>&1` -+ python_library_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0))" | "$with_python_prog" 2>/dev/null` - python_config_status=$? - - if test "$python_config_status" -ne 0 || test "x$python_library_path" = "x" -@@ -3683,7 +3686,7 @@ fi - if test "x$with_python" = "xyes" - then - AC_MSG_CHECKING([for Python LIBS]) -- python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1` -+ python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>/dev/null` - python_config_status=$? - - if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x" -@@ -3698,7 +3701,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"], -@@ -4761,8 +4764,8 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING( +@@ -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 ], -@@ -5334,6 +5337,7 @@ fi - - if test "x$ac_system" = "xFreeBSD" - then -+ plugin_disk="yes" - plugin_zfs_arc="yes" - fi - Index: head/net-mgmt/collectd5/files/patch-src__Makefile.am =================================================================== --- head/net-mgmt/collectd5/files/patch-src__Makefile.am (revision 422777) +++ head/net-mgmt/collectd5/files/patch-src__Makefile.am (revision 422778) @@ -1,115 +1,107 @@ ---- src/Makefile.am.orig 2016-01-22 09:51:17 UTC +--- src/Makefile.am.orig 2016-09-11 08:10:25 UTC +++ src/Makefile.am -@@ -7,14 +7,14 @@ SUBDIRS += daemon - PLUGIN_LDFLAGS = -module -avoid-version -export-symbols-regex '\' - - if COMPILER_IS_GCC --AM_CFLAGS = -Wall -Werror -+AM_CFLAGS = -Wall - endif - - AM_CPPFLAGS = -I$(srcdir)/daemon +@@ -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 -@@ -218,7 +218,7 @@ cpu_la_CFLAGS = $(AM_CFLAGS) +@@ -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 -@@ -301,7 +301,7 @@ disk_la_CFLAGS = $(AM_CFLAGS) +@@ -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 -@@ -319,6 +319,9 @@ endif +@@ -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 -@@ -405,7 +408,7 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBS +@@ -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 -@@ -584,7 +587,7 @@ memory_la_CFLAGS = $(AM_CFLAGS) +@@ -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 -@@ -951,7 +954,7 @@ swap_la_CFLAGS = $(AM_CFLAGS) +@@ -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 -@@ -997,7 +1000,7 @@ if BUILD_PLUGIN_TAPE +@@ -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 -@@ -1102,7 +1105,7 @@ uptime_la_CFLAGS = $(AM_CFLAGS) +@@ -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 -@@ -1260,7 +1263,7 @@ if BUILD_LINUX - # zfs_arc requires no library on linux - else - # solaris +@@ -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 - endif -@@ -1354,12 +1357,7 @@ 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 \ Index: head/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am =================================================================== --- head/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am (revision 422777) +++ head/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am (revision 422778) @@ -1,11 +1,11 @@ ---- src/daemon/Makefile.am.orig 2016-01-22 09:51:17 UTC +--- src/daemon/Makefile.am.orig 2016-09-11 08:10:25 UTC +++ src/daemon/Makefile.am -@@ -6,7 +6,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src +@@ -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 Index: head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h =================================================================== --- head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h (revision 422777) +++ head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h (revision 422778) @@ -1,21 +1,21 @@ ---- src/daemon/collectd.h.orig 2016-01-22 09:51:17 UTC +--- src/daemon/collectd.h.orig 2016-09-11 08:10:25 UTC +++ src/daemon/collectd.h -@@ -240,15 +240,15 @@ typedef int _Bool; +@@ -243,15 +243,15 @@ typedef int _Bool; #endif #ifndef LOCALSTATEDIR --#define LOCALSTATEDIR PREFIX "/var" -+#define LOCALSTATEDIR "/var" +-# define LOCALSTATEDIR PREFIX "/var" ++# define LOCALSTATEDIR "/var" #endif #ifndef PKGLOCALSTATEDIR --#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME -+#define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME +-# 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" +-# define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid" ++# define PIDFILE "/var/run/" PACKAGE_NAME ".pid" #endif #ifndef PLUGINDIR Index: head/net-mgmt/collectd5/files/patch-src__dns.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src__dns.c (revision 422777) +++ head/net-mgmt/collectd5/files/patch-src__dns.c (revision 422778) @@ -1,18 +1,18 @@ ---- src/dns.c.orig 2016-01-22 09:51:17 UTC +--- src/dns.c.orig 2016-09-11 08:10:25 UTC +++ src/dns.c -@@ -223,6 +223,15 @@ static int dns_run_pcap_loop (void) +@@ -225,6 +225,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 (revision 422777) +++ head/net-mgmt/collectd5/files/patch-src__modbus.c (revision 422778) @@ -1,12 +1,12 @@ ---- src/modbus.c.orig 2016-01-22 09:51:17 UTC +--- src/modbus.c.orig 2016-09-11 08:10:25 UTC +++ src/modbus.c @@ -25,6 +25,9 @@ + #include "common.h" #include "plugin.h" - #include "configfile.h" +/* FreeBSD needs this */ +#include + #include #include Index: head/net-mgmt/collectd5/files/patch-src_config.h.in =================================================================== --- head/net-mgmt/collectd5/files/patch-src_config.h.in (revision 422777) +++ head/net-mgmt/collectd5/files/patch-src_config.h.in (revision 422778) @@ -1,40 +1,40 @@ ---- src/config.h.in.orig 2016-01-22 09:56:33 UTC +--- src/config.h.in.orig 2016-09-11 08:10:42 UTC +++ src/config.h.in -@@ -562,8 +562,8 @@ +@@ -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_MYSQL_H -@@ -1541,13 +1541,15 @@ + /* 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 -@@ -1644,7 +1646,7 @@ +@@ -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. */ Index: head/net-mgmt/collectd5/files/patch-src_write__mongodb.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src_write__mongodb.c (revision 422777) +++ head/net-mgmt/collectd5/files/patch-src_write__mongodb.c (revision 422778) @@ -1,11 +1,11 @@ ---- src/write_mongodb.c.orig 2015-12-01 15:28:11 UTC +--- src/write_mongodb.c.orig 2016-09-11 08:10:25 UTC +++ src/write_mongodb.c -@@ -41,7 +41,7 @@ +@@ -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() Index: head/net-mgmt/collectd5/files/patch-version-gen.sh =================================================================== --- head/net-mgmt/collectd5/files/patch-version-gen.sh (revision 422777) +++ head/net-mgmt/collectd5/files/patch-version-gen.sh (revision 422778) @@ -1,17 +1,17 @@ ---- version-gen.sh.orig 2016-08-05 21:19:57 UTC +--- version-gen.sh.orig 2016-09-11 08:10:25 UTC +++ version-gen.sh -@@ -1,13 +1,3 @@ +@@ -1,13 +1,2 @@ #!/bin/sh - --DEFAULT_VERSION="5.5.2.git" - --VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`" +-DEFAULT_VERSION="5.6.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 - --VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`" -- -printf "%s" "$VERSION" -+echo -n '5.5.2.git' ++echo -n '5.6.0.git' Index: head/net-mgmt/collectd5/pkg-plist =================================================================== --- head/net-mgmt/collectd5/pkg-plist (revision 422777) +++ head/net-mgmt/collectd5/pkg-plist (revision 422778) @@ -1,129 +1,132 @@ 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 +%%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 +%%DISK%%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 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 %%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