Update sysutils/collectd to 5.5.0.

Changes since 5.4.2:
* Build system: Ability to make out-of-tree builds has been fixed.
* Build system, Disk and Users plugins: Detection and use of libstatgrab
  >=0.90 has been added.
* Build system, Memory, CPU, TCPConns and Processes plugins: Numerous
  fixes related to OpenBSD support have been added.
* Build system: Plugins now only export "module_register()".
* Build system: Various cleanups and improvements have been done.
* collectd: Numerous internal changes and improvements to the daemon and
  the plugin API have been make.
* collectd: Numerous spelling mistakes have been corrected in comments
  and documentation and several error messages have been improved.
* collectd: Rules/Targets can now be appended to existing Filter Chains.
* collectd: Failing Filter Chains destinations will now log the list of
  available write targets.
* collectd: Support for process signaling and management by upstart and
  systemd has been implemented for the Linux platform.
* collectd: The "CollectInternalStats" option has been added.
* collectd: The daemon source code and dependencies have moved to the
  "src/daemon/" directory.
* collectd: The new "MaxReadInterval" option allows to cap the
  exponential retry interval of plugins read errors.
* collectd: The "-P" command-line option now has precedence over the
  "PIDFile" option.
* collection.cgi: Various data-source related adjustments have been made.
* libcollectdclient: Now propagates errors when signing / encrypting
  network packets.
* Configuration: Support for unquoted IPv6 addresses has been added.
* Documentation: Various improvements have been done.
* Examples: the sample C plugin has been updated to the current plugin API.
* Licensing: The following components have been relicensed to the MIT
  license: the Apple Sensors, Ascent, DBI, E-Mail, Entropy, GenericJMX,
  gmond, LogFile, nginx, Notify Desktop, NTPd, NUT, olsrd, Perl, Ping,
  PostgreSQL, Protocols, RouterOS, RRDCacheD, SNMP, StatsD, SysLog,
  Table, Tail, UnixSock, vmem, VServer, Wireless, Write Riemann and XMMS
  plugins, the core collectd daemon, the collectdmon, collectd-nagios
  and collectd-tg utilities, all the Targets and Matches, liboconfig,
  most of the "utils_*" files and the plugin API.
* Tests: A test suite has been added.
* Threshold: The hysteresis calculation has been made more reliable.
* Threshold: Various fixes and improvements have been made.
* AMQP plugin: The "ConnectionRetryDelay" option has been added,
  allowing to delay reconnection.
* AMQP plugin: The "QueueDurable" and "QueueAutoDelete" options have
  been added, giving control over queue creation and deletion.
* Apache, Ascent, BIND, cURL, cURL-JSON, cURL-XML, nginx and Write HTTP
  plugins: Customizing the "User-Agent" field is now possible at
  compile-time.
* Apache, Ascent, BIND, cURL, cURL-JSON, cURL-XML, nginx plugins: The
  connection will be reset if it hasn't completed within the configured
  "Interval". The new "Timeout" option gives control over this behavior.
* Apache, Ascent, cURL, cURL-JSON, cURL-XML, nginx, Write HTTP plugins:
  Allow usernames and passwords to contain colons if built against
  libcurl >= 7.19.1.
* Apache plugin: The "SSLCiphers" option gives control over the
  encryption algorithms to use with TLS connections.
* Barometer plugin: This new plugin reads sensor data from various
  Freescale and Bosch digital barometers.
* Battery plugin: Reporting values as percentages and reporting degraded
  batteries has been added.
* Battery plugin: Support for reading values from sysfs on Linux has
  been added.
* Battery plugin: The value for current is no longer supplied unless the
  battery provides this information.
* BIND plugin: Bind's XML v3 API is now supported.
* Ceph plugin: This new plugin collects statistics from the Ceph
  distributed storage system.
* ConnTrack plugin: Support for reporting values as percentages as well
  as legacy conntrack files in "/proc" has been added.
* CPU plugin: The plugin is now able to report values as percentages and
  aggregate values per-state and per-CPU.
* cURL-JSON plugin: Extracting values from complex JSON structures has
  been enhanced.
* cURL-JSON plugin: Intervals can now be configured on a per-URL basis.
* cURL-JSON, cURL-XML, Write HTTP plugins: These plugins now also follow
  HTTP redirects.
* cURL, cURL-JSON, cURL-XML plugins: HTTP Digest authentication has been
  implemented.
* DBI, Oracle, PostgreSQL plugins: A "MetadataFrom" parameter has been
  added which allows to set metadata from database columns.
* DBI plugin: Querying several databases in parallel is now possible.
* Disk plugin: On the Linux platform, disk names can now get looked up
  in udev with the "UdevNameAttr" option.
* Disk plugin: This plugin now collects several additional I/O-related
  metrics on the Linux platform.
* DRBD plugin: This new plugin reads Linux's Distributed Replicated
  Block Device (DRBD) statistics.
* Exec, UnixSock plugins: The "PUTNOTIF" command now allows to set
  metadata on notifications.
* fhcount plugin: This new plugin reports the number of used file handles.
* GenericJMX plugin: A Class Loader for "JMXConnectorFactory" has been
  added, allowing the plugin to work with JBOSS > 7.
* IPC plugin: This new plugin collects information related to shared memory.
* Java plugin: Now uses the hostname defined in the configuration file.
* Load plugin: The plugin is now able to report values as percentages.
* Log Logstash plugin: This new plugin writes collectd logs and events
  as Logstash JSON formatted events.
* LVM plugin: The plugin collects thin pool data volumes size, and no
  longer reports virtual volumes.
* memcached plugin: "listen_disabled_num" are now also reported.
* Memory plugin: Slab memory reporting on the Linux platform has been added.
* Memory plugin: The plugin is now able to report values as percentages.
* Modbus plugin: Selecting between holding and input registers is now
  possible.
* Modbus plugin: Support for accessing devices through an RS-485 serial
  port has been added.
* Multimeter plugin: This plugin isn't built by default on the AIX
  platform anymore.
* MySQL and PostgreSQL plugins: Passing "127.0.0.1" as a host will now
  result in the global Hostname being used in metric names.
* MySQL plugin: InnoDB, Select and Sort statistics collection has been added.
* MySQL plugin: The "Alias" and "ConnectTimeout" options have been added.
* Netlink plugin: Support for 64bit netlink counters has been added.
* Network plugin: The "ReconnectInterval" configuration option has been added.
* NFS plugin: Support for NFSv4.0 has been implemented.
* OneWire plugin: Support for more temperature-providing sensor families
  has been added.
* OneWire plugin: Support for full OWFS path and more device families
  has been implemented.
* OpenLDAP plugin: This new plugin reads monitoring information from
  OpenLDAP's "cn=Monitor" subtree.
* OpenVPN plugin: Support for OpenVPN 2.3.0 has been implemented.
* OpenVZ plugin: Various improvements have been made, making the plugin
  report values like the other collectd plugins do.
* Perl plugin: A new "listval_filter" method has been added, various
  internal cleanups and improvements have been made and a test suite has
  been added.
* PostgreSQL plugin: The new "ExpireDelay" option allows skipping older
  values pending write when the database slows down.
* PowerDNS plugin: The plugin was updated for stats from pdns 3.4.3.
* Processes plugin: A memory-usage related optimization for low-profile
  systems has been added.
* Python plugin: Support for Python3 has been improved, "ModulePath" is
  now prepended to "sys.path", and the "get_dataset()" function has been
  added to the Python API.
* Redis and Write_Redis plugins: The support library has been switched
  from credis to hiredis.
* Redis plugin: Custom commands can now be used to fetch values stored
  in Redis.
* Redis plugin: Support for passwords up to 512 characters long has been added.
* Sensors plugin: Support for lm_sensors' power sensors has been added.
* SMART plugin: This new plugin collects SMART statistics from disk drives.
* SNMP plugin: A blacklist/whitelist feature can now be used to filter
  which OIDs to collect.
* SNMP plugin: SNMPv3 authentication and encryption support has been
  implemented.
* SNMP plugin: Two error messages have been disambiguated.
* Swap plugin: The plugin is now able to report values as percentages.
* Swap plugin: The plugin no longer fails on Linux systems where
  "SwapCached" isn't exposed by the kernel.
* Tail plugin: "GaugeInc" and "GaugeAdd" options have been implemented.
* Tail plugin: Intervals can now be configured on a per-File basis.
* TCPConns plugin: The "AllPortsSummary" option, allowing to summarize
  all connections, has been added.
* TCPConns plugin: Three metrics were renamed on the AIX platform, for
  the sake of consistency.
* Turbostat plugin: This new plugin reads CPU frequency and C-state
  residency on modern Intel turbo-capable processors.
* UnixSock plugin: The "GETTHRESHOLD" command has been re-added.
* Varnish plugin: Varnish 4 support has been added, as well as as
  monitoring metrics only available in Varnish 4.
* virt plugin: Guests memory usage is now also collected.
* virt plugin: It is now possible to chose between using guests' name or
  UUID as plugin_instance.
* virt plugin: The libvirt plugin has been renamed to virt.
* Write Graphite plugin: When the connection to graphite fails,
  reconnection attempts are now limited to once per second.
* Write HTTP plugin: Multi-instance support of this plugin has been
  improved. The "<URL "url">" block has been deprecated in favor of
  "<Node "identifier">".
* Write HTTP plugin: Several TLS-related configuration options have been
  added.
* Write HTTP plugin: The "LowSpeedLimit" and "Timeout" options allow to
  reset slow/stalled network connections.
* Write HTTP plugin: The size of the payload posted to the HTTP server
  can now be controlled with the "BufferSize" option.
* Write Kafka plugin: This new plugin sends data to Apache Kafka, a
  distributed messaging queue.
  ciomaire, Vincent Bernat, Marc Fournier. #670, #694, #794, #853, #014
* Write Log plugin: This new plugin dispatches collected values to the
  configured log destination(s).
* Write Riemann plugin: Extra meta strings are now added as attributes
  in notifications.
* Write Riemann plugin: Notification message are now sent to the Riemann
  server via the description field.
* Write Riemann plugin: Support for custom attributes has been added.
* Write Riemann plugin: Support had been implemented for sending events
  to Riemann in batches (when using TCP), and is enabled by default.
* Write Riemann plugin: The "EventServicePrefix" option has been added,
  which adds a prefix to event service names.
* Write Riemann plugin: Threshold checks can now be passed down to the
  Riemann server.
* Write Sensu plugin: This new plugin submits values to Sensu, a stream
  processing and monitoring system.
* Write TSDB plugin: This new plugin sends data to OpenTSDB, a scalable
  time series database.
* ZFS ARC plugin: Support for ZFS-on-Linux has been added.
* Zookeeper plugin: This new plugin reads data from the Apache Zookeeper
  "MNTR" command.

20 files changed, 65 insertions, 184 deletions

diff --git a/sysutils/collectd-amqp/DESCR b/sysutils/collectd-amqp/DESCR
index cbe65e7c90d..a68f324e2c5 100644
--- a/sysutils/collectd-amqp/DESCR
+++ b/sysutils/collectd-amqp/DESCR
@@ -1 +1 @@
-rrdtool plugin for collectd
+amqp plugin for collectd
diff --git a/sysutils/collectd-dbi/DESCR b/sysutils/collectd-dbi/DESCR
index cbe65e7c90d..952e6168017 100644
--- a/sysutils/collectd-dbi/DESCR
+++ b/sysutils/collectd-dbi/DESCR
@@ -1 +1 @@
-rrdtool plugin for collectd
+dbi plugin for collectd
diff --git a/sysutils/collectd-dns/DESCR b/sysutils/collectd-dns/DESCR
index cbe65e7c90d..70169d1b9fe 100644
--- a/sysutils/collectd-dns/DESCR
+++ b/sysutils/collectd-dns/DESCR
@@ -1 +1 @@
-rrdtool plugin for collectd
+dns plugin for collectd
diff --git a/sysutils/collectd-memcached/DESCR b/sysutils/collectd-memcached/DESCR
index cbe65e7c90d..94f6c5c92df 100644
--- a/sysutils/collectd-memcached/DESCR
+++ b/sysutils/collectd-memcached/DESCR
@@ -1 +1 @@
-rrdtool plugin for collectd
+memcached plugin for collectd
diff --git a/sysutils/collectd-mysql/DESCR b/sysutils/collectd-mysql/DESCR
index cbe65e7c90d..c2c6232d036 100644
--- a/sysutils/collectd-mysql/DESCR
+++ b/sysutils/collectd-mysql/DESCR
@@ -1 +1 @@
-rrdtool plugin for collectd
+mysql plugin for collectd
diff --git a/sysutils/collectd-network/DESCR b/sysutils/collectd-network/DESCR
index cbe65e7c90d..796cb01cbae 100644
--- a/sysutils/collectd-network/DESCR
+++ b/sysutils/collectd-network/DESCR
@@ -1 +1 @@
-rrdtool plugin for collectd
+network plugin for collectd
diff --git a/sysutils/collectd-notify-email/DESCR b/sysutils/collectd-notify-email/DESCR
index cbe65e7c90d..05cd73581a9 100644
--- a/sysutils/collectd-notify-email/DESCR
+++ b/sysutils/collectd-notify-email/DESCR
@@ -1 +1 @@
-rrdtool plugin for collectd
+notify-email plugin for collectd
diff --git a/sysutils/collectd-postgresql/DESCR b/sysutils/collectd-postgresql/DESCR
index cbe65e7c90d..cd20e2db832 100644
--- a/sysutils/collectd-postgresql/DESCR
+++ b/sysutils/collectd-postgresql/DESCR
@@ -1 +1 @@
-rrdtool plugin for collectd
+postgresql plugin for collectd
diff --git a/sysutils/collectd-postgresql/Makefile b/sysutils/collectd-postgresql/Makefile
index 53b2fb247c5..7086c527063 100644
--- a/sysutils/collectd-postgresql/Makefile
+++ b/sysutils/collectd-postgresql/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2014/06/10 14:21:37 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2015/06/10 20:05:26 fhajny Exp $
 
 COLLECTD_PACKAGE=	postgresql
 
 PKGNAME=		${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}${PGSQL_VERSION}/}
-PKGREVISION=		1
 COMMENT=		Statistics collection daemon - postgresql plugin
 
 .include "../../sysutils/collectd/Makefile.common"
diff --git a/sysutils/collectd-rrdtool/Makefile b/sysutils/collectd-rrdtool/Makefile
index f485e711298..6104c6d83ac 100644
--- a/sysutils/collectd-rrdtool/Makefile
+++ b/sysutils/collectd-rrdtool/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/04/25 14:24:51 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2015/06/10 20:05:26 fhajny Exp $
 
 COLLECTD_PACKAGE=	rrdtool
 COLLECTD_PLUGINS=	rrdtool rrdcached
 
 COMMENT=		Statistics collection daemon - rrdtool plugins
-PKGREVISION=		1
 
 .include "../../sysutils/collectd/Makefile.common"
 
diff --git a/sysutils/collectd-snmp/DESCR b/sysutils/collectd-snmp/DESCR
index cbe65e7c90d..455fd44e66a 100644
--- a/sysutils/collectd-snmp/DESCR
+++ b/sysutils/collectd-snmp/DESCR
@@ -1 +1 @@
-rrdtool plugin for collectd
+snmp plugin for collectd
diff --git a/sysutils/collectd/Makefile b/sysutils/collectd/Makefile
index a064b4d673e..a0f75f81aae 100644
--- a/sysutils/collectd/Makefile
+++ b/sysutils/collectd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/04/07 13:20:41 fhajny Exp $
+# $NetBSD: Makefile,v 1.5 2015/06/10 20:05:26 fhajny Exp $
 
 .include "../../sysutils/collectd/Makefile.common"
 
@@ -21,6 +21,9 @@ DEFAULT_PLUGINS+=	aggregation apcups csv email exec filecount	\
 CONFIGURE_ARGS+=	--enable-${option}
 .endfor
 
+# Several libs not generated in time for linking collectd
+MAKE_JOBS_SAFE=		no
+
 .include "options.mk"
 
 CONF_FILES+=		share/examples/collectd/collectd.conf 		\
diff --git a/sysutils/collectd/Makefile.common b/sysutils/collectd/Makefile.common
index 708fe893b41..f46983f76ae 100644
--- a/sysutils/collectd/Makefile.common
+++ b/sysutils/collectd/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2015/04/27 16:07:00 joerg Exp $
+# $NetBSD: Makefile.common,v 1.9 2015/06/10 20:05:26 fhajny Exp $
 #
 # used by sysutils/collectd/Makefile
 # used by sysutils/collectd-amqp/Makefile
@@ -15,7 +15,7 @@
 # used by sysutils/p5-collectd/Makefile
 # used by sysutils/py-collectd/Makefile
 
-DISTNAME=	collectd-5.4.2
+DISTNAME=	collectd-5.5.0
 MASTER_SITES=	http://collectd.org/files/
 CATEGORIES=	sysutils
 
diff --git a/sysutils/collectd/distinfo b/sysutils/collectd/distinfo
index de5ec256193..6cfe8190dee 100644
--- a/sysutils/collectd/distinfo
+++ b/sysutils/collectd/distinfo
@@ -1,16 +1,13 @@
-$NetBSD: distinfo,v 1.7 2015/04/14 11:27:30 fhajny Exp $
+$NetBSD: distinfo,v 1.8 2015/06/10 20:05:26 fhajny Exp $
 
-SHA1 (collectd-5.4.2.tar.gz) = 2664808997dd186609ee542895c37bb692d557b6
-RMD160 (collectd-5.4.2.tar.gz) = 5ee7af2d88699d70e57f5106e22e02d6d5479ea2
-Size (collectd-5.4.2.tar.gz) = 2024679 bytes
+SHA1 (collectd-5.5.0.tar.gz) = d24e284c1eae20c5e75b846c8b2612ab65bd5565
+RMD160 (collectd-5.5.0.tar.gz) = 2197758942a5fe56e4eabda3786f09d4138e943a
+Size (collectd-5.5.0.tar.gz) = 2244454 bytes
 SHA1 (patch-Makefile.in) = 197307399312fa26c71ca168b92bbe41d31d556d
-SHA1 (patch-src_Makefile.in) = 3d227fa1c483944f44b11e49cabb6390ab3b8338
+SHA1 (patch-src_Makefile.in) = f94d046ee323fdb9251ad49cf383b3a61df5dcaa
 SHA1 (patch-src_collectd-tg.c) = f9f41dfb0b1b55a62202128a165d5c9943faf5bc
-SHA1 (patch-src_collectd.c) = 31106ca27dd4911c40285fece48f76a1c36e2407
-SHA1 (patch-src_collectd.conf.in) = 97400dbc16a31a440750beed0bc16927afdcb570
+SHA1 (patch-src_collectd.conf.in) = f0b35085cf0ddfd766e140b145177ab1f1326f5f
 SHA1 (patch-src_df.c) = 19cca888b183a90759b359702e4d65c8afa6e58d
 SHA1 (patch-src_libcollectclient_network__buffer.c) = e07d403d299613fa0885a0e7285849eb85510253
-SHA1 (patch-src_network.c) = ba4a1083bd3dd6ac4cf94e95c24833125fc8c5f0
-SHA1 (patch-src_python.c) = 5be972dd0ec6f80b07bf7da8545e8aca03a19356
-SHA1 (patch-src_tcpconns.c) = a1ad8fa2eb9e899375b7b99d12becb4e98ac4e10
+SHA1 (patch-src_tcpconns.c) = fdc160087231a4aee2c405b8ed07791e90b20fd0
 SHA1 (patch-src_utils__dns.c) = c3782dc9127f42da30e3142b853aa2cb2259af94
diff --git a/sysutils/collectd/patches/patch-src_Makefile.in b/sysutils/collectd/patches/patch-src_Makefile.in
index b82d90e8564..2cc95f0414c 100644
--- a/sysutils/collectd/patches/patch-src_Makefile.in
+++ b/sysutils/collectd/patches/patch-src_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2014/02/17 11:21:55 fhajny Exp $
+$NetBSD: patch-src_Makefile.in,v 1.2 2015/06/10 20:05:26 fhajny Exp $
 
 Use a reasonable db dir.
 Install config file into examples.
---- src/Makefile.in.orig	2014-01-26 08:09:56.685201776 +0000
+--- src/Makefile.in.orig	2015-05-27 07:51:49.001922959 +0000
 +++ src/Makefile.in
-@@ -2230,6 +2230,7 @@ srcdir = @srcdir@
+@@ -2424,6 +2424,7 @@ srcdir = @srcdir@
  subdirs = @subdirs@
  sys_symbol_underscore = @sys_symbol_underscore@
  sysconfdir = @sysconfdir@
@@ -12,16 +12,16 @@ Install config file into examples.
  target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
-@@ -2239,7 +2240,7 @@ SUBDIRS = libcollectdclient $(am__append
- AM_CPPFLAGS = -DPREFIX='"${prefix}"' \
+@@ -2434,7 +2435,7 @@ PLUGIN_LDFLAGS = -module -avoid-version
+ AM_CPPFLAGS = -I$(srcdir)/daemon -DPREFIX='"${prefix}"' \
  	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
  	-DLOCALSTATEDIR='"${localstatedir}"' \
 -	-DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \
 +	-DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' \
  	$(am__append_2) -DPLUGINDIR='"${pkglibdir}"' \
  	-DPKGDATADIR='"${pkgdatadir}"'
- collectd_SOURCES = collectd.c collectd.h \
-@@ -4856,13 +4857,8 @@ uninstall-man: uninstall-man1 uninstall-
+ AUTOMAKE_OPTIONS = subdir-objects
+@@ -5190,13 +5191,8 @@ uninstall-man: uninstall-man1 uninstall-
  @HAVE_PROTOC_C_TRUE@	protoc-c -I$(srcdir) --c_out . $(srcdir)/riemann.proto
  
  install-exec-hook:
@@ -37,7 +37,7 @@ Install config file into examples.
  	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
  	$(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db;
  	$(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \
-@@ -4870,7 +4866,7 @@ install-exec-hook:
+@@ -5204,7 +5200,7 @@ install-exec-hook:
  
  uninstall-hook:
  	rm -f $(DESTDIR)$(pkgdatadir)/types.db;
diff --git a/sysutils/collectd/patches/patch-src_collectd.c b/sysutils/collectd/patches/patch-src_collectd.c
deleted file mode 100644
index 9bd9829e545..00000000000
--- a/sysutils/collectd/patches/patch-src_collectd.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_collectd.c,v 1.1 2014/02/17 11:21:55 fhajny Exp $
-
-sg_init() expects an arg.
---- src/collectd.c.orig	2014-01-26 08:09:14.840391576 +0000
-+++ src/collectd.c
-@@ -288,7 +288,7 @@ static int do_init (void)
- #endif
- 
- #if HAVE_LIBSTATGRAB
--	if (sg_init ())
-+	if (sg_init (0))
- 	{
- 		ERROR ("sg_init: %s", sg_str_error (sg_get_error ()));
- 		return (-1);
diff --git a/sysutils/collectd/patches/patch-src_collectd.conf.in b/sysutils/collectd/patches/patch-src_collectd.conf.in
index c76ec07cf23..8081b1e0514 100644
--- a/sysutils/collectd/patches/patch-src_collectd.conf.in
+++ b/sysutils/collectd/patches/patch-src_collectd.conf.in
@@ -1,7 +1,7 @@
-$NetBSD: patch-src_collectd.conf.in,v 1.1 2014/02/17 11:21:55 fhajny Exp $
+$NetBSD: patch-src_collectd.conf.in,v 1.2 2015/06/10 20:05:26 fhajny Exp $
 
 Fix default dirs.
---- src/collectd.conf.in.orig	2014-01-26 08:09:23.516559631 +0000
+--- src/collectd.conf.in.orig	2015-05-20 12:05:42.672060002 +0000
 +++ src/collectd.conf.in
 @@ -12,7 +12,7 @@
  
@@ -12,25 +12,46 @@ Fix default dirs.
  #PIDFile     "@localstatedir@/run/@PACKAGE_NAME@.pid"
  #PluginDir   "@libdir@/@PACKAGE_NAME@"
  #TypesDB     "@prefix@/share/@PACKAGE_NAME@/types.db"
-@@ -278,7 +278,7 @@
+@@ -315,16 +315,16 @@
+ #  LongRunAvgLatency false
+ #  ConvertSpecialMetricTypes true
+ #  <Daemon "osd.0">
+-#    SocketPath "/var/run/ceph/ceph-osd.0.asok"
++#    SocketPath "@localstatedir@/run/ceph/ceph-osd.0.asok"
+ #  </Daemon>
+ #  <Daemon "osd.1">
+-#    SocketPath "/var/run/ceph/ceph-osd.1.asok"
++#    SocketPath "@localstatedir@/run/ceph/ceph-osd.1.asok"
+ #  </Daemon>
+ #  <Daemon "mon.a">
+-#    SocketPath "/var/run/ceph/ceph-mon.ceph1.asok"
++#    SocketPath "@localstatedir@/run/ceph/ceph-mon.ceph1.asok"
+ #  </Daemon>
+ #  <Daemon "mds.a">
+-#    SocketPath "/var/run/ceph/ceph-mds.ceph1.asok"
++#    SocketPath "@localstatedir@/run/ceph/ceph-mds.ceph1.asok"
+ #  </Daemon>
  #</Plugin>
  
+@@ -340,7 +340,7 @@
+ #</Plugin>
+ #
  #<Plugin csv>
 -#	DataDir "@localstatedir@/lib/@PACKAGE_NAME@/csv"
 +#	DataDir "@localstatedir@/db/@PACKAGE_NAME@/csv"
  #	StoreRates false
  #</Plugin>
  
-@@ -566,7 +566,7 @@
- #
+@@ -683,7 +683,7 @@
  #	<Database db_name2>
+ #		Alias "squeeze"
  #		Host "localhost"
 -#		Socket "/var/run/mysql/mysqld.sock"
 +#		Socket "@localstatedir@/run/mysql/mysqld.sock"
  #		SlaveStats true
  #		SlaveNotifications true
  #	</Database>
-@@ -827,14 +827,14 @@
+@@ -956,14 +956,14 @@
  #  <Server "server_name">
  #    Collect "latency"
  #    Collect "udp-answers" "udp-queries"
@@ -48,7 +69,7 @@ Fix default dirs.
  #</Plugin>
  
  #<Plugin processes>
-@@ -882,14 +882,14 @@
+@@ -1011,14 +1011,14 @@
  
  #<Plugin rrdcached>
  #	DaemonAddress "unix:/tmp/rrdcached.sock"
@@ -65,16 +86,7 @@ Fix default dirs.
  #	CreateFilesAsync false
  #	CacheTimeout 120
  #	CacheFlush   900
-@@ -994,7 +994,7 @@
- #</Plugin>
- 
- #<Plugin "tail">
--#  <File "/var/log/exim4/mainlog">
-+#  <File "@localstatedir@/log/exim4/mainlog">
- #    Instance "exim"
- #    <Match>
- #      Regex "S=([1-9][0-9]*)"
-@@ -1031,7 +1031,7 @@
+@@ -1174,7 +1174,7 @@
  #       Type "kpackets_wire_per_sec.realtime"
  #       ValueFrom 4
  #   </Metric>
@@ -83,7 +95,7 @@ Fix default dirs.
  #       Instance "snort-eth0"
  #       Interval 600
  #       Collect "dropped" "mbps" "alerts" "kpps"
-@@ -1068,7 +1068,7 @@
+@@ -1231,7 +1231,7 @@
  #</Plugin>
  
  #<Plugin unixsock>
diff --git a/sysutils/collectd/patches/patch-src_network.c b/sysutils/collectd/patches/patch-src_network.c
deleted file mode 100644
index 8e7f5aa60e3..00000000000
--- a/sysutils/collectd/patches/patch-src_network.c
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-src_network.c,v 1.3 2015/04/07 13:20:41 fhajny Exp $
-
-Remove libgcrypt deprecation logic. Patch by joerg.
---- src/network.c.orig	2015-02-26 11:49:16.681659031 +0000
-+++ src/network.c
-@@ -58,27 +58,7 @@
- #endif
- 
- #if HAVE_LIBGCRYPT
--# include <pthread.h>
--# if defined __APPLE__
--/* default xcode compiler throws warnings even when deprecated functionality
-- * is not used. -Werror breaks the build because of erroneous warnings.
-- * http://stackoverflow.com/questions/10556299/compiler-warnings-with-libgcrypt-v1-5-0/12830209#12830209
-- */
--#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
--# endif
--/* FreeBSD's copy of libgcrypt extends the existing GCRYPT_NO_DEPRECATED
-- * to properly hide all deprecated functionality.
-- * http://svnweb.freebsd.org/ports/head/security/libgcrypt/files/patch-src__gcrypt.h.in
-- */
--# define GCRYPT_NO_DEPRECATED
- # include <gcrypt.h>
--# if defined __APPLE__
--/* Re enable deprecation warnings */
--#  pragma GCC diagnostic warning "-Wdeprecated-declarations"
--# endif
--# if GCRYPT_VERSION_NUMBER < 0x010600
--GCRY_THREAD_OPTION_PTHREAD_IMPL;
--# endif
- #endif
- 
- #ifndef IPV6_ADD_MEMBERSHIP
-@@ -503,19 +483,9 @@ static void network_init_gcrypt (void) /
-   if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P))
-     return;
- 
-- /* http://www.gnupg.org/documentation/manuals/gcrypt/Multi_002dThreading.html
--  * To ensure thread-safety, it's important to set GCRYCTL_SET_THREAD_CBS
--  * *before* initalizing Libgcrypt with gcry_check_version(), which itself must
--  * be called before any other gcry_* function. GCRYCTL_ANY_INITIALIZATION_P
--  * above doesn't count, as it doesn't implicitly initalize Libgcrypt.
--  *
--  * tl;dr: keep all these gry_* statements in this exact order please. */
--# if GCRYPT_VERSION_NUMBER < 0x010600
--  gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
--# endif
-   gcry_check_version (NULL);
-   gcry_control (GCRYCTL_INIT_SECMEM, 32768);
--  gcry_control (GCRYCTL_INITIALIZATION_FINISHED);
-+  gcry_control (GCRYCTL_INITIALIZATION_FINISHED,NULL,0);
- } /* }}} void network_init_gcrypt */
- 
- static gcry_cipher_hd_t network_get_aes256_cypher (sockent_t *se, /* {{{ */
diff --git a/sysutils/collectd/patches/patch-src_python.c b/sysutils/collectd/patches/patch-src_python.c
deleted file mode 100644
index e117bcda604..00000000000
--- a/sysutils/collectd/patches/patch-src_python.c
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-src_python.c,v 1.1 2015/04/14 11:27:30 fhajny Exp $
-
-Backport Python 3 fixes from upstream trunk.
-https://github.com/collectd/collectd/pull/890
---- src/python.c.orig	2015-02-26 10:43:48.488180825 +0000
-+++ src/python.c
-@@ -988,13 +988,15 @@ PyMODINIT_FUNC PyInit_collectd(void) {
- #endif
- 
- static int cpy_init_python() {
--	char *argv = "";
- 	PyObject *sys;
- 	PyObject *module;
- 
- #ifdef IS_PY3K
-+	wchar_t *argv = L"";
- 	/* Add a builtin module, before Py_Initialize */
- 	PyImport_AppendInittab("collectd", PyInit_collectd);
-+#else
-+	char *argv = "";
- #endif
- 	
- 	Py_Initialize();
-@@ -1067,9 +1069,13 @@ static int cpy_config(oconfig_item_t *ci
- 		} else if (strcasecmp(item->key, "Encoding") == 0) {
- 			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_STRING)
- 				continue;
-+#ifdef IS_PY3K
-+			NOTICE("python: \"Encoding\" was used in the config file but Python3 was used, which does not support changing encodings. Ignoring this.");
-+#else
- 			/* Why is this even necessary? And undocumented? */
- 			if (PyUnicode_SetDefaultEncoding(item->values[0].value.string))
- 				cpy_log_exception("setting default encoding");
-+#endif
- 		} else if (strcasecmp(item->key, "LogTraces") == 0) {
- 			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN)
- 				continue;
diff --git a/sysutils/collectd/patches/patch-src_tcpconns.c b/sysutils/collectd/patches/patch-src_tcpconns.c
index 90d38c9f104..44a98d4a50d 100644
--- a/sysutils/collectd/patches/patch-src_tcpconns.c
+++ b/sysutils/collectd/patches/patch-src_tcpconns.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_tcpconns.c,v 1.3 2014/06/29 18:01:06 dholland Exp $
+$NetBSD: patch-src_tcpconns.c,v 1.4 2015/06/10 20:05:26 fhajny Exp $
 
---- src/tcpconns.c.orig	2014-01-26 08:09:14.000000000 +0000
+--- src/tcpconns.c.orig	2015-05-20 12:04:47.191035542 +0000
 +++ src/tcpconns.c
-@@ -893,6 +893,7 @@ static int conn_init (void)
+@@ -948,6 +948,7 @@ static int conn_init (void)
    return (0);
  } /* int conn_init */
  
@@ -10,27 +10,3 @@ $NetBSD: patch-src_tcpconns.c,v 1.3 2014/06/29 18:01:06 dholland Exp $
  static int conn_read (void)
  {
    struct inpcbtable table;
-@@ -912,7 +913,11 @@ static int conn_read (void)
-   /* Get the `head' pcb */
-   head = (struct inpcb *) &(inpcbtable_ptr->inpt_queue);
-   /* Get the first pcb */
-+#if __NetBSD_Version__ > 699002700
-+  next = (struct inpcb *)TAILQ_FIRST (&table.inpt_queue);
-+#else
-   next = (struct inpcb *)CIRCLEQ_FIRST (&table.inpt_queue);
-+#endif
- 
-   while (next != head)
-   {
-@@ -920,7 +925,11 @@ static int conn_read (void)
-     kread ((u_long) next, &inpcb, sizeof (inpcb));
- 
-     /* Advance `next' */
-+#if __NetBSD_Version__ > 699002700
-+    next = (struct inpcb *)TAILQ_NEXT (&inpcb, inp_queue);
-+#else
-     next = (struct inpcb *)CIRCLEQ_NEXT (&inpcb, inp_queue);
-+#endif
- 
-     /* Ignore sockets, that are not connected. */
- #ifdef __NetBSD__