8 files changed, 44 insertions, 20 deletions

diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 0e6faeebf81d..90517d38a43c 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	collectd
-PORTVERSION=	5.10.0
-PORTREVISION=	1
+PORTVERSION=	5.11.0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://storage.googleapis.com/collectd-tarballs/
 PKGNAMESUFFIX=	5
@@ -20,12 +19,12 @@ GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=		CGI GCRYPT JAVA LOGGING LOGSTASH VIRT
 OPTIONS_GROUP=		INPUT OUTPUT
-OPTIONS_GROUP_OUTPUT=	KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL PROMETHEUS \
+OPTIONS_GROUP_OUTPUT=	INFLUXDB KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL PROMETHEUS \
 			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 SIGROK \
-			SNMP STATSD TOKYOTYRANT VARNISH XML ZOOKEEPER
+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 SIGROK \
+			SLURM SNMP STATSD TOKYOTYRANT VARNISH XML ZOOKEEPER
 
 OPTIONS_DEFAULT=	GCRYPT LOGGING PING
 
@@ -36,6 +35,7 @@ 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
+INFLUXDB_DESC=		Enable write_influxdb_udp plugin
 IPMI_DESC=		Enable OpenIPMI plugin
 JSON_DESC=		Enable JSON plugins
 KAFKA_DESC=		Enable write_kafka plugin
@@ -63,6 +63,7 @@ REDIS_DESC=		Enable redis-based plugins
 RIEMANN_DESC=		Enable write_riemann plugin (via riemann-c-client)
 RRDTOOL_DESC=		Enable rrdtool plugin (also rrdcached plugin)
 SIGROK_DESC=		Enable sigrok plugin
+SLURM_DESC=		Enable slurm plugin
 SNMP_DESC=		Enable SNMP plugin
 STATSD_DESC=		Enable statsd plugin
 TOKYOTYRANT_DESC=	Enable tokyotyrant plugin
@@ -134,6 +135,8 @@ GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 GCRYPT_CONFIGURE_WITH=	libgcrypt=${LOCALBASE}
 GCRYPT_LIBS=		-lgcrypt
 
+INFLUXDB_CONFIGURE_ENABLE=	write_influxdb_udp
+
 IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
 IPMI_CONFIGURE_ENABLE=	ipmi
 
@@ -243,6 +246,10 @@ SIGROK_CONFIGURE_WITH=		libsigrok=${LOCALBASE}
 SIGROK_USES=			gettext-runtime
 SIGROK_BROKEN=			fails to configure with sigrok option
 
+SLURM_LIB_DEPENDS=		libslurm.so:sysutils/slurm-wlm
+SLURM_CONFIGURE_ENABLE=		slurm
+SLURM_CONFIGURE_WITH=		libslurm=${LOCALBASE}
+
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ENABLE=	snmp
 SNMP_CONFIGURE_WITH=	libnetsnmp
@@ -286,8 +293,10 @@ CONFIGURE_ARGS+=	--enable-aggregation \
 			--enable-exec \
 			--enable-filecount \
 			--enable-interface \
+			--enable-ipstats \
 			--enable-load \
 			--enable-logfile \
+			--enable-logparser \
 			--enable-match_empty_counter \
 			--enable-match_hashed \
 			--enable-match_regex \
diff --git a/net-mgmt/collectd5/distinfo b/net-mgmt/collectd5/distinfo
index 6d1029a32283..9aa499faf34a 100644
--- a/net-mgmt/collectd5/distinfo
+++ b/net-mgmt/collectd5/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1575665579
-SHA256 (collectd-5.10.0.tar.bz2) = a03359f563023e744c2dc743008a00a848f4cd506e072621d86b6d8313c0375b
-SIZE (collectd-5.10.0.tar.bz2) = 1856377
+SHA256 (collectd-5.11.0.tar.bz2) = 37b10a806e34aa8570c1cafa6006c604796fae13cc2e1b3e630d33dcba9e5db2
+SIZE (collectd-5.11.0.tar.bz2) = 1851663
diff --git a/net-mgmt/collectd5/files/patch-Makefile.am b/net-mgmt/collectd5/files/patch-Makefile.am
index 499a88fa3610..e4a986fa2ee8 100644
--- a/net-mgmt/collectd5/files/patch-Makefile.am
+++ b/net-mgmt/collectd5/files/patch-Makefile.am
@@ -1,6 +1,6 @@
---- Makefile.am.orig	2019-06-13 09:13:42 UTC
+--- Makefile.am.orig	2020-03-08 15:57:09 UTC
 +++ Makefile.am
-@@ -187,7 +187,7 @@ AM_CPPFLAGS = \
+@@ -188,7 +188,7 @@ AM_CPPFLAGS = \
  	-DPREFIX='"${prefix}"' \
  	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
  	-DLOCALSTATEDIR='"${localstatedir}"' \
@@ -9,7 +9,7 @@
  	-DPLUGINDIR='"${cpkglibdir}"' \
  	-DPKGDATADIR='"${cpkgdatadir}"'
  if BUILD_WIN32
-@@ -2184,15 +2184,10 @@ endif
+@@ -2377,15 +2377,10 @@ endif
  
  install-exec-hook:
  	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
diff --git a/net-mgmt/collectd5/files/patch-configure.ac b/net-mgmt/collectd5/files/patch-configure.ac
new file mode 100644
index 000000000000..870fc672c5ee
--- /dev/null
+++ b/net-mgmt/collectd5/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2020-03-19 09:52:56.280271200 +0100
++++ configure.ac	2020-03-27 19:05:05.205060000 +0100
+@@ -6475,7 +6475,7 @@ AC_ARG_WITH([libslurm],
+     else if test -d "$with_libslurm/lib"; then
+       AC_MSG_NOTICE([Not checking for libslurm: Manually configured])
+       with_libslurm_cflags="-I$withval/include"
+-      with_libslurm_libs="-L$withval/lib -llibslurm"
++      with_libslurm_libs="-L$withval/lib -lslurm"
+       with_libslurm="yes"
+     fi; fi; fi
+   ],
diff --git a/net-mgmt/collectd5/files/patch-src_network.c b/net-mgmt/collectd5/files/patch-src_network.c
index 49e7e892c78b..994eb7431b81 100644
--- a/net-mgmt/collectd5/files/patch-src_network.c
+++ b/net-mgmt/collectd5/files/patch-src_network.c
@@ -1,6 +1,6 @@
---- src/network.c.orig	2019-06-13 09:13:42 UTC
+--- src/network.c.orig	2020-03-08 15:57:09 UTC
 +++ src/network.c
-@@ -2013,6 +2013,13 @@ static int sockent_client_connect(socken
+@@ -2045,6 +2045,13 @@ static int sockent_client_connect(sockent_t *se) /* {{
        continue;
      }
  
diff --git a/net-mgmt/collectd5/files/patch-src_zfs__arc.c b/net-mgmt/collectd5/files/patch-src_zfs__arc.c
index bb6e79b7fb68..50a21e0c9589 100644
--- a/net-mgmt/collectd5/files/patch-src_zfs__arc.c
+++ b/net-mgmt/collectd5/files/patch-src_zfs__arc.c
@@ -1,6 +1,6 @@
---- src/zfs_arc.c.orig	2019-06-13 09:13:42 UTC
+--- src/zfs_arc.c.orig	2020-03-08 15:57:09 UTC
 +++ src/zfs_arc.c
-@@ -322,8 +322,6 @@ static int za_read(void) {
+@@ -312,8 +312,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");
diff --git a/net-mgmt/collectd5/files/patch-version-gen.sh b/net-mgmt/collectd5/files/patch-version-gen.sh
index bc0475c41e17..e99fccaccb16 100644
--- a/net-mgmt/collectd5/files/patch-version-gen.sh
+++ b/net-mgmt/collectd5/files/patch-version-gen.sh
@@ -1,11 +1,11 @@
---- version-gen.sh.orig	2019-06-13 09:32:35 UTC
-+++ version-gen.sh
+--- version-gen.sh.orig	2020-03-19 09:52:56.313967100 +0100
++++ version-gen.sh	2020-03-27 19:15:53.407855000 +0100
 @@ -2,10 +2,6 @@
  
- DEFAULT_VERSION="5.9.0.git"
+ DEFAULT_VERSION="5.11.0.git"
  
 -if [ -d .git ]; then
--	VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"
+-	VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | sed -e '/^collectd-/!d' -e 's///' -e 'y/-/./'`"
 -fi
 -
  if test -z "$VERSION"; then
diff --git a/net-mgmt/collectd5/pkg-plist b/net-mgmt/collectd5/pkg-plist
index 1c298fe8485e..0802e2a119ad 100644
--- a/net-mgmt/collectd5/pkg-plist
+++ b/net-mgmt/collectd5/pkg-plist
@@ -36,11 +36,13 @@ lib/collectd/email.so
 lib/collectd/exec.so
 lib/collectd/filecount.so
 lib/collectd/interface.so
+lib/collectd/ipstats.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/logparser.so
 lib/collectd/match_empty_counter.so
 lib/collectd/match_hashed.so
 lib/collectd/match_regex.so
@@ -75,6 +77,7 @@ lib/collectd/processes.so
 %%RRDTOOL%%lib/collectd/rrdcached.so
 %%RRDTOOL%%lib/collectd/rrdtool.so
 %%SIGROK%%lib/collectd/sigrok.so
+%%SLURM%%lib/collectd/slurm.so
 %%SNMP%%lib/collectd/snmp.so
 %%STATSD%%lib/collectd/statsd.so
 lib/collectd/swap.so
@@ -101,6 +104,7 @@ lib/collectd/uuid.so
 lib/collectd/write_graphite.so
 %%CURL%%lib/collectd/write_http.so
 lib/collectd/write_log.so
+%%INFLUXDB%%lib/collectd/write_influxdb_udp.so
 %%KAFKA%%lib/collectd/write_kafka.so
 %%MONGODB%%lib/collectd/write_mongodb.so
 %%PROMETHEUS%%lib/collectd/write_prometheus.so