Add a plugin for NetBSD which submits the equivalent of the UDP

and UDP6 parts of "netstat -s" output.  Useful for monitoring e.g.
packet discards due to full UDP socket buffers.
Bump PKGREVISION.

9 files changed, 1095 insertions, 84 deletions

diff --git a/sysutils/collectd/Makefile b/sysutils/collectd/Makefile
index ee713170988..10232cd32b4 100644
--- a/sysutils/collectd/Makefile
+++ b/sysutils/collectd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2015/08/26 12:19:27 he Exp $
+# $NetBSD: Makefile,v 1.13 2015/09/12 19:04:56 he Exp $
 
-PKGREVISION= 7
+PKGREVISION= 8
 .include "../../sysutils/collectd/Makefile.common"
 
 COMMENT=	Statistics collection daemon base
diff --git a/sysutils/collectd/PLIST b/sysutils/collectd/PLIST
index f1c1c8dc618..ecdd3c2eca0 100644
--- a/sysutils/collectd/PLIST
+++ b/sysutils/collectd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2015/08/18 07:47:46 he Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/09/12 19:04:56 he Exp $
 bin/collectd-nagios
 bin/collectd-tg
 bin/collectdctl
@@ -31,6 +31,7 @@ lib/collectd/match_timediff.la
 lib/collectd/match_value.la
 lib/collectd/mbmon.la
 ${PLIST.memory}lib/collectd/memory.la
+${PLIST.netstat_udp}lib/collectd/netstat_udp.la
 ${PLIST.nfs}lib/collectd/nfs.la
 lib/collectd/ntpd.la
 lib/collectd/olsrd.la
diff --git a/sysutils/collectd/distinfo b/sysutils/collectd/distinfo
index f80db474ab6..b3ac59c6ee6 100644
--- a/sysutils/collectd/distinfo
+++ b/sysutils/collectd/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.20 2015/09/01 09:31:46 he Exp $
+$NetBSD: distinfo,v 1.21 2015/09/12 19:04:56 he Exp $
 
 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.am) = ed45b75293a4ea2dd577d04eeb3b9017b8f47319
 SHA1 (patch-Makefile.in) = a7cf69ca29c526be643af0ef85544e3a2dc80a77
-SHA1 (patch-configure) = bb7c5db3fed0ff298a243312190c5048de1397a4
-SHA1 (patch-configure.ac) = 9f215b31919426b54d653a79240bae56284c3544
-SHA1 (patch-src_Makefile.am) = 0df5125e05b46fb842d444f94683c4838dfd1f0f
-SHA1 (patch-src_Makefile.in) = bbce87cf8daf2a7d75f81c8019d936cada1191bd
+SHA1 (patch-configure) = c6b41d1ea12c99c7de0607e16c71e4ef9a61b013
+SHA1 (patch-configure.ac) = cb5c3000fdb4636d052d5476f5a678addd8b745b
+SHA1 (patch-src_Makefile.am) = 45930ca400c6c67927020c9a264d3d5adc30ca46
+SHA1 (patch-src_Makefile.in) = 29643e202fafeb5fa4a0b569ee7645d7ac38ff27
 SHA1 (patch-src_collectd-tg.c) = f9f41dfb0b1b55a62202128a165d5c9943faf5bc
 SHA1 (patch-src_collectd.conf.in) = f0b35085cf0ddfd766e140b145177ab1f1326f5f
 SHA1 (patch-src_config.h.in) = be17db23b6ee7a90ba57e73f073ed5be11c369c5
@@ -19,6 +19,7 @@ SHA1 (patch-src_entropy.c) = 46d5357d8407584943e9259325989e64a8710cc0
 SHA1 (patch-src_irq.c) = 6b621474de35a5879105025d1a2848e4896b8479
 SHA1 (patch-src_libcollectclient_network__buffer.c) = e07d403d299613fa0885a0e7285849eb85510253
 SHA1 (patch-src_memory.c) = f48d50245176426e26af7fa1b1f4ff6fbf0b1d95
+SHA1 (patch-src_netstat__udp.c) = 30cb12d25f56c60959658dbd181783212e00cc61
 SHA1 (patch-src_processes.c) = e00d2edf6b4e6bfe3663e34fffb05f40652affe5
 SHA1 (patch-src_swap.c) = e7602eb83eed6b90752b8293b9666b94bdd42493
 SHA1 (patch-src_tcpconns.c) = 712af1b821d62217283df884dd283d5b1218ab7c
diff --git a/sysutils/collectd/options.mk b/sysutils/collectd/options.mk
index 7333ce527ff..465303de59c 100644
--- a/sysutils/collectd/options.mk
+++ b/sysutils/collectd/options.mk
@@ -1,15 +1,15 @@
-# $NetBSD: options.mk,v 1.5 2015/08/18 07:47:46 he Exp $
+# $NetBSD: options.mk,v 1.6 2015/09/12 19:04:56 he Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.collectd
 PKG_SUPPORTED_OPTIONS=	cpu df interface load memory syslog uptime
 PKG_SUGGESTED_OPTIONS+=	cpu df interface load memory syslog uptime
 
 .if ${OPSYS} == "NetBSD"
-PKG_SUPPORTED_OPTIONS+=	contextswitch disk entropy irq pf processes
-PKG_SUPPORTED_OPTIONS+=	swap tcpconns users
+PKG_SUPPORTED_OPTIONS+=	contextswitch disk entropy irq pf netstat_udp
+PKG_SUPPORTED_OPTIONS+= processes swap tcpconns users
 
-PKG_SUGGESTED_OPTIONS+=	contextswitch disk entropy irq pf processes
-PKG_SUGGESTED_OPTIONS+= swap tcpconns users
+PKG_SUGGESTED_OPTIONS+=	contextswitch disk entropy irq pf netstat_udp
+PKG_SUGGESTED_OPTIONS+= processes swap tcpconns users
 .endif
 
 .if ${OPSYS} == "FreeBSD"
@@ -33,7 +33,8 @@ PKG_SUGGESTED_OPTIONS+=	disk nfs swap users zfs-arc
 
 PLIST_VARS+=		apple-sensors battery contextswitch cpu entropy \
 			df disk		\
-			interface irq load memory nfs pf processes swap	\
+			interface irq load netstat_udp \
+			memory nfs pf processes swap	\
 			syslog tcpconns uptime users zfs-arc
 
 .for option in ${PLIST_VARS}
diff --git a/sysutils/collectd/patches/patch-configure b/sysutils/collectd/patches/patch-configure
index a1363e252f5..27c24ec48ed 100644
--- a/sysutils/collectd/patches/patch-configure
+++ b/sysutils/collectd/patches/patch-configure
@@ -1,10 +1,62 @@
-$NetBSD: patch-configure,v 1.8 2015/09/01 09:00:04 he Exp $
+$NetBSD: patch-configure,v 1.9 2015/09/12 19:04:56 he Exp $
 
 Regen from configure.ac.
 
---- configure.orig	2015-05-27 07:51:50.000000000 +0000
+--- configure.orig	2015-09-10 18:56:19.000000000 +0000
 +++ configure
-@@ -3625,8 +3625,8 @@ esac
+@@ -797,6 +797,8 @@ BUILD_PLUGIN_NFS_FALSE
+ BUILD_PLUGIN_NFS_TRUE
+ BUILD_PLUGIN_NETWORK_FALSE
+ BUILD_PLUGIN_NETWORK_TRUE
++BUILD_PLUGIN_NETSTAT_UDP_FALSE
++BUILD_PLUGIN_NETSTAT_UDP_TRUE
+ BUILD_PLUGIN_NETLINK_FALSE
+ BUILD_PLUGIN_NETLINK_TRUE
+ BUILD_PLUGIN_NETAPP_FALSE
+@@ -1083,9 +1085,6 @@ BUILD_WITH_LIBGCRYPT_TRUE
+ GCRYPT_LIBS
+ GCRYPT_LDFLAGS
+ GCRYPT_CPPFLAGS
+-LIBGCRYPT_LIBS
+-LIBGCRYPT_CFLAGS
+-LIBGCRYPT_CONFIG
+ BUILD_WITH_LIBGANGLIA_FALSE
+ BUILD_WITH_LIBGANGLIA_TRUE
+ GANGLIA_LIBS
+@@ -1327,7 +1326,6 @@ with_libdbi
+ with_libesmtp
+ with_libganglia
+ with_libgcrypt
+-with_libgcrypt_prefix
+ with_libiptc
+ with_java
+ with_libldap
+@@ -1431,6 +1429,7 @@ enable_multimeter
+ enable_mysql
+ enable_netapp
+ enable_netlink
++enable_netstat_udp
+ enable_network
+ enable_nfs
+ enable_nginx
+@@ -2230,6 +2229,7 @@ collectd plugins:
+   --enable-mysql          MySQL statistics
+   --enable-netapp         NetApp plugin
+   --enable-netlink        Enhanced Linux network statistics
++  --enable-netstat_udp    UDP network statistics
+   --enable-network        Network communication plugin
+   --enable-nfs            NFS statistics
+   --enable-nginx          nginx statistics
+@@ -2334,8 +2334,6 @@ collectd additional packages:
+                           Path to libganglia.
+   --with-libgcrypt[=PREFIX]
+                           Path to libgcrypt.
+-  --with-libgcrypt-prefix=PFX
+-                          prefix where LIBGCRYPT is installed (optional)
+   --with-libiptc[=PREFIX] Path to libiptc.
+   --with-java[=PREFIX]    Path to Java home.
+   --with-libldap[=PREFIX] Path to libldap.
+@@ -3625,8 +3623,8 @@ esac
  
  
  
@@ -15,7 +67,7 @@ Regen from configure.ac.
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -5196,8 +5196,7 @@ else
+@@ -5196,8 +5194,7 @@ else
      ;;
    *)
      lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
@@ -25,7 +77,7 @@ Regen from configure.ac.
        lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
        lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
      else
-@@ -5598,6 +5597,10 @@ freebsd* | dragonfly*)
+@@ -5598,6 +5595,10 @@ freebsd* | dragonfly*)
    fi
    ;;
  
@@ -36,7 +88,7 @@ Regen from configure.ac.
  haiku*)
    lt_cv_deplibs_check_method=pass_all
    ;;
-@@ -5636,11 +5639,11 @@ irix5* | irix6* | nonstopux*)
+@@ -5636,11 +5637,11 @@ irix5* | irix6* | nonstopux*)
    ;;
  
  # This must be glibc/ELF.
@@ -50,7 +102,7 @@ Regen from configure.ac.
    if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -6760,7 +6763,7 @@ ia64-*-hpux*)
+@@ -6760,7 +6761,7 @@ ia64-*-hpux*)
    rm -rf conftest*
    ;;
  
@@ -59,7 +111,7 @@ Regen from configure.ac.
  s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
-@@ -6776,19 +6779,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -6776,19 +6777,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
  	  x86_64-*linux*)
@@ -81,7 +133,7 @@ Regen from configure.ac.
  	    LD="${LD-ld} -m elf32ppclinux"
  	    ;;
  	  s390x-*linux*)
-@@ -6807,10 +6800,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -6807,10 +6798,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
  	  x86_64-*linux*)
  	    LD="${LD-ld} -m elf_x86_64"
  	    ;;
@@ -93,7 +145,7 @@ Regen from configure.ac.
  	    LD="${LD-ld} -m elf64ppc"
  	    ;;
  	  s390*-*linux*|s390*-*tpf*)
-@@ -8613,7 +8603,7 @@ lt_prog_compiler_static=
+@@ -8613,7 +8601,7 @@ lt_prog_compiler_static=
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -102,7 +154,7 @@ Regen from configure.ac.
        case $cc_basename in
        # old Intel for x86_64 which still supported -KPIC.
        ecc*)
-@@ -9091,9 +9081,6 @@ $as_echo_n "checking whether the $compil
+@@ -9091,9 +9079,6 @@ $as_echo_n "checking whether the $compil
    openbsd*)
      with_gnu_ld=no
      ;;
@@ -112,7 +164,7 @@ Regen from configure.ac.
    esac
  
    ld_shlibs=yes
-@@ -9315,7 +9302,7 @@ _LT_EOF
+@@ -9315,7 +9300,7 @@ _LT_EOF
        fi
        ;;
  
@@ -121,7 +173,7 @@ Regen from configure.ac.
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -9492,7 +9479,6 @@ _LT_EOF
+@@ -9492,7 +9477,6 @@ _LT_EOF
  	if test "$aix_use_runtimelinking" = yes; then
  	  shared_flag="$shared_flag "'${wl}-G'
  	fi
@@ -129,7 +181,7 @@ Regen from configure.ac.
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9946,7 +9932,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -9946,7 +9930,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        link_all_deplibs=yes
        ;;
  
@@ -138,7 +190,7 @@ Regen from configure.ac.
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10783,6 +10769,17 @@ freebsd* | dragonfly*)
+@@ -10783,6 +10767,17 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -156,7 +208,7 @@ Regen from configure.ac.
  haiku*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -10899,7 +10896,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -10899,7 +10894,7 @@ linux*oldld* | linux*aout* | linux*coff*
    ;;
  
  # This must be glibc/ELF.
@@ -165,7 +217,7 @@ Regen from configure.ac.
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
    need_version=no
-@@ -10963,18 +10960,6 @@ fi
+@@ -10963,18 +10958,6 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -184,7 +236,7 @@ Regen from configure.ac.
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -12555,7 +12540,7 @@ else
+@@ -12555,7 +12538,7 @@ else
      # at 6.2 and later dlopen does load deplibs.
      lt_cv_sys_dlopen_deplibs=yes
      ;;
@@ -193,7 +245,7 @@ Regen from configure.ac.
      lt_cv_sys_dlopen_deplibs=yes
      ;;
    openbsd*)
-@@ -13026,7 +13011,7 @@ $as_echo "#define LIBTOOL_VERSION 2" >>c
+@@ -13026,7 +13009,7 @@ $as_echo "#define LIBTOOL_VERSION 2" >>c
  
  
  
@@ -202,7 +254,7 @@ Regen from configure.ac.
  
  # Find a good install program.  We prefer a C program (faster),
  # so one script is as good as another.  But avoid the broken or
-@@ -13215,7 +13200,7 @@ else
+@@ -13215,7 +13198,7 @@ else
  $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
  fi
  
@@ -211,7 +263,7 @@ Regen from configure.ac.
    case $am_aux_dir in
    *\ * | *\	*)
      install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-@@ -13564,8 +13549,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
+@@ -13564,8 +13547,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
  # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
  mkdir_p='$(MKDIR_P)'
  
@@ -222,7 +274,7 @@ Regen from configure.ac.
  # Always define AMTAR for backward compatibility.  Yes, it's still used
  # in the wild :-(  We should find a proper way to deprecate it ...
  AMTAR='$${TAR-tar}'
-@@ -13835,6 +13820,7 @@ END
+@@ -13835,6 +13818,7 @@ END
      as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
    fi
  fi
@@ -230,7 +282,7 @@ Regen from configure.ac.
  # Check whether --enable-silent-rules was given.
  if test "${enable_silent_rules+set}" = set; then :
    enableval=$enable_silent_rules;
-@@ -13908,7 +13894,7 @@ else
+@@ -13908,7 +13892,7 @@ else
      We can't simply define LARGE_OFF_T to be 9223372036854775807,
      since some C++ compilers masquerading as C compilers
      incorrectly reject 9223372036854775807.  */
@@ -239,7 +291,7 @@ Regen from configure.ac.
    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  		       && LARGE_OFF_T % 2147483647 == 1)
  		      ? 1 : -1];
-@@ -13954,7 +13940,7 @@ else
+@@ -13954,7 +13938,7 @@ else
      We can't simply define LARGE_OFF_T to be 9223372036854775807,
      since some C++ compilers masquerading as C compilers
      incorrectly reject 9223372036854775807.  */
@@ -248,7 +300,7 @@ Regen from configure.ac.
    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  		       && LARGE_OFF_T % 2147483647 == 1)
  		      ? 1 : -1];
-@@ -13978,7 +13964,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -13978,7 +13962,7 @@ rm -f core conftest.err conftest.$ac_obj
      We can't simply define LARGE_OFF_T to be 9223372036854775807,
      since some C++ compilers masquerading as C compilers
      incorrectly reject 9223372036854775807.  */
@@ -257,7 +309,7 @@ Regen from configure.ac.
    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  		       && LARGE_OFF_T % 2147483647 == 1)
  		      ? 1 : -1];
-@@ -14023,7 +14009,7 @@ else
+@@ -14023,7 +14007,7 @@ else
      We can't simply define LARGE_OFF_T to be 9223372036854775807,
      since some C++ compilers masquerading as C compilers
      incorrectly reject 9223372036854775807.  */
@@ -266,7 +318,7 @@ Regen from configure.ac.
    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  		       && LARGE_OFF_T % 2147483647 == 1)
  		      ? 1 : -1];
-@@ -14047,7 +14033,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -14047,7 +14031,7 @@ rm -f core conftest.err conftest.$ac_obj
      We can't simply define LARGE_OFF_T to be 9223372036854775807,
      since some C++ compilers masquerading as C compilers
      incorrectly reject 9223372036854775807.  */
@@ -275,7 +327,7 @@ Regen from configure.ac.
    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  		       && LARGE_OFF_T % 2147483647 == 1)
  		      ? 1 : -1];
-@@ -15319,6 +15305,12 @@ $as_echo "#define KERNEL_OPENBSD 1" >>co
+@@ -15319,6 +15303,12 @@ $as_echo "#define KERNEL_OPENBSD 1" >>co
  
  	ac_system="OpenBSD"
  	;;
@@ -288,7 +340,7 @@ Regen from configure.ac.
  	*aix*)
  
  $as_echo "#define KERNEL_AIX 1" >>confdefs.h
-@@ -15876,6 +15868,29 @@ fi
+@@ -15876,6 +15866,29 @@ fi
  done
  
  
@@ -318,7 +370,7 @@ Regen from configure.ac.
  # For ping library
  for ac_header in netinet/in_systm.h
  do :
-@@ -16215,6 +16230,27 @@ else
+@@ -16215,6 +16228,27 @@ else
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
@@ -346,7 +398,7 @@ Regen from configure.ac.
  
  # For hddtemp module
  for ac_header in linux/major.h
-@@ -19171,6 +19207,54 @@ else
+@@ -19171,6 +19205,54 @@ else
  fi
  
  
@@ -401,37 +453,236 @@ Regen from configure.ac.
  ac_fn_c_check_member "$LINENO" "struct udphdr" "uh_dport" "ac_cv_member_struct_udphdr_uh_dport" "#define _BSD_SOURCE
  #define _DEFAULT_SOURCE
  #if HAVE_STDINT_H
-@@ -20882,6 +20966,7 @@ fi
+@@ -20882,220 +20964,6 @@ fi
  
  	if test "$with_libgcrypt" != "no"; then
  
-+
- # Check whether --with-libgcrypt-prefix was given.
- if test "${with_libgcrypt_prefix+set}" = set; then :
-   withval=$with_libgcrypt_prefix; libgcrypt_config_prefix="$withval"
-@@ -21065,10 +21150,9 @@ $as_echo "does not match. want=$req_libg
-     LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
-     LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
-     :
+-# Check whether --with-libgcrypt-prefix was given.
+-if test "${with_libgcrypt_prefix+set}" = set; then :
+-  withval=$with_libgcrypt_prefix; libgcrypt_config_prefix="$withval"
+-else
+-  libgcrypt_config_prefix=""
+-fi
+-
+-  if test x$libgcrypt_config_prefix != x ; then
+-     if test x${LIBGCRYPT_CONFIG+set} != xset ; then
+-        LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
+-     fi
+-  fi
+-
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}libgcrypt-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}libgcrypt-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_LIBGCRYPT_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $LIBGCRYPT_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_LIBGCRYPT_CONFIG="$LIBGCRYPT_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_LIBGCRYPT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-LIBGCRYPT_CONFIG=$ac_cv_path_LIBGCRYPT_CONFIG
+-if test -n "$LIBGCRYPT_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGCRYPT_CONFIG" >&5
+-$as_echo "$LIBGCRYPT_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_path_LIBGCRYPT_CONFIG"; then
+-  ac_pt_LIBGCRYPT_CONFIG=$LIBGCRYPT_CONFIG
+-  # Extract the first word of "libgcrypt-config", so it can be a program name with args.
+-set dummy libgcrypt-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_ac_pt_LIBGCRYPT_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $ac_pt_LIBGCRYPT_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_ac_pt_LIBGCRYPT_CONFIG="$ac_pt_LIBGCRYPT_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_ac_pt_LIBGCRYPT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-ac_pt_LIBGCRYPT_CONFIG=$ac_cv_path_ac_pt_LIBGCRYPT_CONFIG
+-if test -n "$ac_pt_LIBGCRYPT_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LIBGCRYPT_CONFIG" >&5
+-$as_echo "$ac_pt_LIBGCRYPT_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_pt_LIBGCRYPT_CONFIG" = x; then
+-    LIBGCRYPT_CONFIG="no"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    LIBGCRYPT_CONFIG=$ac_pt_LIBGCRYPT_CONFIG
+-  fi
+-else
+-  LIBGCRYPT_CONFIG="$ac_cv_path_LIBGCRYPT_CONFIG"
+-fi
+-
+-  tmp=1:1.2.0
+-  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+-     req_libgcrypt_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
+-     min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+-  else
+-     req_libgcrypt_api=0
+-     min_libgcrypt_version="$tmp"
+-  fi
+-
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGCRYPT - version >= $min_libgcrypt_version" >&5
+-$as_echo_n "checking for LIBGCRYPT - version >= $min_libgcrypt_version... " >&6; }
+-  ok=no
+-  if test "$LIBGCRYPT_CONFIG" != "no" ; then
+-    req_major=`echo $min_libgcrypt_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
+-    req_minor=`echo $min_libgcrypt_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
+-    req_micro=`echo $min_libgcrypt_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
+-    libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
+-    major=`echo $libgcrypt_config_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
+-    minor=`echo $libgcrypt_config_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
+-    micro=`echo $libgcrypt_config_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
+-    if test "$major" -gt "$req_major"; then
+-        ok=yes
+-    else
+-        if test "$major" -eq "$req_major"; then
+-            if test "$minor" -gt "$req_minor"; then
+-               ok=yes
+-            else
+-               if test "$minor" -eq "$req_minor"; then
+-                   if test "$micro" -ge "$req_micro"; then
+-                     ok=yes
+-                   fi
+-               fi
+-            fi
+-        fi
+-    fi
+-  fi
+-  if test $ok = yes; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($libgcrypt_config_version)" >&5
+-$as_echo "yes ($libgcrypt_config_version)" >&6; }
+-  else
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-  fi
+-  if test $ok = yes; then
+-     # If we have a recent libgcrypt, we should also check that the
+-     # API is compatible
+-     if test "$req_libgcrypt_api" -gt 0 ; then
+-        tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
+-        if test "$tmp" -gt 0 ; then
+-           { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGCRYPT API version" >&5
+-$as_echo_n "checking LIBGCRYPT API version... " >&6; }
+-           if test "$req_libgcrypt_api" -eq "$tmp" ; then
+-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5
+-$as_echo "okay" >&6; }
+-           else
+-             ok=no
+-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: does not match. want=$req_libgcrypt_api got=$tmp" >&5
+-$as_echo "does not match. want=$req_libgcrypt_api got=$tmp" >&6; }
+-           fi
+-        fi
+-     fi
+-  fi
+-  if test $ok = yes; then
+-    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
+-    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
+-    :
 -    if test x"$host" != x ; then
 -      libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
 -      if test x"$libgcrypt_config_host" != xnone ; then
 -        if test x"$libgcrypt_config_host" != x"$host" ; then
-+    libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
-+    if test x"$libgcrypt_config_host" != xnone ; then
-+      if test x"$libgcrypt_config_host" != x"$host" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
- ***
- *** The config script $LIBGCRYPT_CONFIG was
-@@ -21085,7 +21169,6 @@ $as_echo "$as_me: WARNING:
- *** You may want to use the configure option --with-libgcrypt-prefix
- *** to specify a matching config script.
- ***" >&2;}
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+-***
+-*** The config script $LIBGCRYPT_CONFIG was
+-*** built for $libgcrypt_config_host and thus may not match the
+-*** used host $host.
+-*** You may want to use the configure option --with-libgcrypt-prefix
+-*** to specify a matching config script.
+-***" >&5
+-$as_echo "$as_me: WARNING:
+-***
+-*** The config script $LIBGCRYPT_CONFIG was
+-*** built for $libgcrypt_config_host and thus may not match the
+-*** used host $host.
+-*** You may want to use the configure option --with-libgcrypt-prefix
+-*** to specify a matching config script.
+-***" >&2;}
 -        fi
-       fi
-     fi
-   else
-@@ -27648,6 +27731,14 @@ then
+-      fi
+-    fi
+-  else
+-    LIBGCRYPT_CFLAGS=""
+-    LIBGCRYPT_LIBS=""
+-    with_libgcrypt="no (version 1.2.0+ required)"
+-  fi
+-
+-
+-
+ 		GCRYPT_CPPFLAGS="$LIBGCRYPT_CPPFLAGS $LIBGCRYPT_CFLAGS"
+ 		GCRYPT_LIBS="$LIBGCRYPT_LIBS"
+ 	fi
+@@ -27579,6 +27447,7 @@ plugin_load="no"
+ plugin_log_logstash="no"
+ plugin_memory="no"
+ plugin_multimeter="no"
++plugin_netstat_udp="no"
+ plugin_nfs="no"
+ plugin_numa="no"
+ plugin_perl="no"
+@@ -27648,6 +27517,15 @@ then
  	plugin_tcpconns="yes"
  fi
  
@@ -441,12 +692,13 @@ Regen from configure.ac.
 +	plugin_irq="yes"
 +	plugin_processes="yes"
 +	plugin_disk="yes"
++	plugin_netstat_udp="yes"
 +fi
 +
  # Mac OS X devices
  if test "x$with_libiokit" = "xyes"
  then
-@@ -27890,6 +27981,11 @@ then
+@@ -27890,6 +27768,11 @@ then
  	plugin_swap="yes"
  fi
  
@@ -458,3 +710,89 @@ Regen from configure.ac.
  if test "x$with_kvm_openfiles$with_kvm_nlist" = "xyesyes"
  then
  	plugin_tcpconns="yes"
+@@ -31715,6 +31598,66 @@ fi
+ 
+     enable_plugin="no"
+     force="no"
++    # Check whether --enable-netstat_udp was given.
++if test "${enable_netstat_udp+set}" = set; then :
++  enableval=$enable_netstat_udp;
++     if test "x$enableval" = "xyes"
++     then
++	     enable_plugin="yes"
++     else if test "x$enableval" = "xforce"
++     then
++	     enable_plugin="yes"
++	     force="yes"
++     else
++	     enable_plugin="no (disabled on command line)"
++     fi; fi
++
++else
++
++	 if test "x$enable_all_plugins" = "xauto"
++	 then
++	     if test "x$plugin_netstat_udp" = "xyes"
++	     then
++		     enable_plugin="yes"
++	     else
++		     enable_plugin="no"
++	     fi
++	 else
++	     enable_plugin="$enable_all_plugins"
++	 fi
++
++fi
++
++    if test "x$enable_plugin" = "xyes"
++    then
++	    if test "x$plugin_netstat_udp" = "xyes" || test "x$force" = "xyes"
++	    then
++
++$as_echo "#define HAVE_PLUGIN_NETSTAT_UDP 1" >>confdefs.h
++
++		    if test "x$plugin_netstat_udp" != "xyes"
++		    then
++			    dependency_warning="yes"
++		    fi
++	    else # User passed "yes" but dependency checking yielded "no" => Dependency problem.
++		    dependency_error="yes"
++		    enable_plugin="no (dependency error)"
++	    fi
++    fi
++     if test "x$enable_plugin" = "xyes"; then
++  BUILD_PLUGIN_NETSTAT_UDP_TRUE=
++  BUILD_PLUGIN_NETSTAT_UDP_FALSE='#'
++else
++  BUILD_PLUGIN_NETSTAT_UDP_TRUE='#'
++  BUILD_PLUGIN_NETSTAT_UDP_FALSE=
++fi
++
++    enable_netstat_udp="$enable_plugin"
++
++
++
++    enable_plugin="no"
++    force="no"
+     # Check whether --enable-network was given.
+ if test "${enable_network+set}" = set; then :
+   enableval=$enable_network;
+@@ -36781,6 +36724,10 @@ if test -z "${BUILD_PLUGIN_NETLINK_TRUE}
+   as_fn_error $? "conditional \"BUILD_PLUGIN_NETLINK\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${BUILD_PLUGIN_NETSTAT_UDP_TRUE}" && test -z "${BUILD_PLUGIN_NETSTAT_UDP_FALSE}"; then
++  as_fn_error $? "conditional \"BUILD_PLUGIN_NETSTAT_UDP\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${BUILD_PLUGIN_NETWORK_TRUE}" && test -z "${BUILD_PLUGIN_NETWORK_FALSE}"; then
+   as_fn_error $? "conditional \"BUILD_PLUGIN_NETWORK\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -39602,6 +39549,7 @@ Configuration:
+     mysql . . . . . . . . $enable_mysql
+     netapp  . . . . . . . $enable_netapp
+     netlink . . . . . . . $enable_netlink
++    netstat_udp . . . . . $enable_netstat_udp
+     network . . . . . . . $enable_network
+     nfs . . . . . . . . . $enable_nfs
+     nginx . . . . . . . . $enable_nginx
diff --git a/sysutils/collectd/patches/patch-configure.ac b/sysutils/collectd/patches/patch-configure.ac
index 266977012c2..675870625e2 100644
--- a/sysutils/collectd/patches/patch-configure.ac
+++ b/sysutils/collectd/patches/patch-configure.ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.6 2015/09/01 09:00:04 he Exp $
+$NetBSD: patch-configure.ac,v 1.7 2015/09/12 19:04:56 he Exp $
 
 Add KERNEL_NETBSD, add entry and disk plugins for NetBSD,
 and also do swap for "have_swapctl_three_args" (as for NetBSD).
@@ -81,7 +81,15 @@ Also, the start of process support, but that's not yet finished.
  AC_CHECK_MEMBERS([struct udphdr.uh_dport, struct udphdr.uh_sport], [], [],
  [#define _BSD_SOURCE
  #define _DEFAULT_SOURCE
-@@ -5244,6 +5291,14 @@ then
+@@ -5175,6 +5206,7 @@ plugin_load="no"
+ plugin_log_logstash="no"
+ plugin_memory="no"
+ plugin_multimeter="no"
++plugin_netstat_udp="no"
+ plugin_nfs="no"
+ plugin_numa="no"
+ plugin_perl="no"
+@@ -5244,6 +5276,15 @@ then
  	plugin_tcpconns="yes"
  fi
  
@@ -91,6 +99,7 @@ Also, the start of process support, but that's not yet finished.
 +	plugin_irq="yes"
 +	plugin_processes="yes"
 +	plugin_disk="yes"
++	plugin_netstat_udp="yes"
 +fi
 +
  # Mac OS X devices
@@ -108,3 +117,19 @@ Also, the start of process support, but that's not yet finished.
  if test "x$with_kvm_openfiles$with_kvm_nlist" = "xyesyes"
  then
  	plugin_tcpconns="yes"
+@@ -5585,6 +5631,7 @@ AC_PLUGIN([multimeter],  [$plugin_multim
+ AC_PLUGIN([mysql],       [$with_libmysql],     [MySQL statistics])
+ AC_PLUGIN([netapp],      [$with_libnetapp],    [NetApp plugin])
+ AC_PLUGIN([netlink],     [$with_libmnl],       [Enhanced Linux network statistics])
++AC_PLUGIN([netstat_udp], [$plugin_netstat_udp], [UDP network statistics])
+ AC_PLUGIN([network],     [yes],                [Network communication plugin])
+ AC_PLUGIN([nfs],         [$plugin_nfs],        [NFS statistics])
+ AC_PLUGIN([nginx],       [$with_libcurl],      [nginx statistics])
+@@ -5963,6 +6010,7 @@ Configuration:
+     mysql . . . . . . . . $enable_mysql
+     netapp  . . . . . . . $enable_netapp
+     netlink . . . . . . . $enable_netlink
++    netstat_udp . . . . . $enable_netstat_udp
+     network . . . . . . . $enable_network
+     nfs . . . . . . . . . $enable_nfs
+     nginx . . . . . . . . $enable_nginx
diff --git a/sysutils/collectd/patches/patch-src_Makefile.am b/sysutils/collectd/patches/patch-src_Makefile.am
index cdd27c9fa37..daa66c60be1 100644
--- a/sysutils/collectd/patches/patch-src_Makefile.am
+++ b/sysutils/collectd/patches/patch-src_Makefile.am
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Makefile.am,v 1.1 2015/08/18 07:47:46 he Exp $
+$NetBSD: patch-src_Makefile.am,v 1.2 2015/09/12 19:04:56 he Exp $
 
 Install config file in example directory.
 
@@ -21,7 +21,20 @@ Install config file in example directory.
  AUTOMAKE_OPTIONS = subdir-objects
  
  noinst_LTLIBRARIES = libmount.la liblookup.la
-@@ -1363,13 +1365,8 @@ riemann.pb-c.c riemann.pb-c.h: riemann.p
+@@ -657,6 +659,12 @@ netlink_la_CFLAGS = $(AM_CFLAGS) $(BUILD
+ netlink_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS)
+ endif
+ 
++if BUILD_PLUGIN_NETSTAT_UDP
++pkglib_LTLIBRARIES += netstat_udp.la
++netstat_udp_la_SOURCES = netstat_udp.c
++netstat_udp_la_LDFLAGS = $(PLUGIN_LDFLAGS)
++endif
++
+ if BUILD_PLUGIN_NETWORK
+ pkglib_LTLIBRARIES += network.la
+ network_la_SOURCES = network.c network.h \
+@@ -1363,13 +1371,8 @@ riemann.pb-c.c riemann.pb-c.h: riemann.p
  endif
  
  install-exec-hook:
@@ -37,7 +50,7 @@ Install config file in example directory.
  	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
  	$(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db;
  	$(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \
-@@ -1377,7 +1374,7 @@ install-exec-hook:
+@@ -1377,7 +1380,7 @@ install-exec-hook:
  
  uninstall-hook:
  	rm -f $(DESTDIR)$(pkgdatadir)/types.db;
diff --git a/sysutils/collectd/patches/patch-src_Makefile.in b/sysutils/collectd/patches/patch-src_Makefile.in
index dc3c20d4684..bbe7f9b4cfe 100644
--- a/sysutils/collectd/patches/patch-src_Makefile.in
+++ b/sysutils/collectd/patches/patch-src_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Makefile.in,v 1.3 2015/08/18 07:47:46 he Exp $
+$NetBSD: patch-src_Makefile.in,v 1.4 2015/09/12 19:04:56 he Exp $
 
 Use a reasonable db dir.
 Install config file into examples.
@@ -34,7 +34,220 @@ Install config file into examples.
  am__make_running_with_option = \
    case $${target_option-} in \
        ?) ;; \
-@@ -303,14 +313,11 @@ check_PROGRAMS = test_utils_mount$(EXEEX
+@@ -193,124 +203,122 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT) 
+ @BUILD_PLUGIN_MYSQL_TRUE@@BUILD_WITH_LIBMYSQL_TRUE@am__append_109 = $(BUILD_WITH_LIBMYSQL_LIBS)
+ @BUILD_PLUGIN_NETAPP_TRUE@am__append_110 = netapp.la
+ @BUILD_PLUGIN_NETLINK_TRUE@am__append_111 = netlink.la
+-@BUILD_PLUGIN_NETWORK_TRUE@am__append_112 = network.la
+-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_113 = -lsocket
+-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_114 = $(GCRYPT_CPPFLAGS)
+-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_115 = $(GCRYPT_LDFLAGS)
+-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_116 = $(GCRYPT_LIBS)
+-@BUILD_PLUGIN_NFS_TRUE@am__append_117 = nfs.la
+-@BUILD_PLUGIN_FSCACHE_TRUE@am__append_118 = fscache.la
+-@BUILD_PLUGIN_NGINX_TRUE@am__append_119 = nginx.la
+-@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_120 = $(BUILD_WITH_LIBCURL_CFLAGS)
+-@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_121 = $(BUILD_WITH_LIBCURL_LIBS)
+-@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@am__append_122 = notify_desktop.la
+-@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@am__append_123 = notify_email.la
+-@BUILD_PLUGIN_NTPD_TRUE@am__append_124 = ntpd.la
+-@BUILD_PLUGIN_NTPD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_125 = -lsocket
+-@BUILD_PLUGIN_NUMA_TRUE@am__append_126 = numa.la
+-@BUILD_PLUGIN_NUT_TRUE@am__append_127 = nut.la
+-@BUILD_PLUGIN_OLSRD_TRUE@am__append_128 = olsrd.la
+-@BUILD_PLUGIN_OLSRD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_129 = -lsocket
+-@BUILD_PLUGIN_ONEWIRE_TRUE@am__append_130 = onewire.la
+-@BUILD_PLUGIN_OPENLDAP_TRUE@am__append_131 = openldap.la
+-@BUILD_PLUGIN_OPENVPN_TRUE@am__append_132 = openvpn.la
+-@BUILD_PLUGIN_ORACLE_TRUE@am__append_133 = oracle.la
+-@BUILD_PLUGIN_PERL_TRUE@am__append_134 = perl.la
++@BUILD_PLUGIN_NETSTAT_UDP_TRUE@am__append_112 = netstat_udp.la
++@BUILD_PLUGIN_NETWORK_TRUE@am__append_113 = network.la
++@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_114 = -lsocket
++@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_115 = $(GCRYPT_CPPFLAGS)
++@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_116 = $(GCRYPT_LDFLAGS)
++@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_117 = $(GCRYPT_LIBS)
++@BUILD_PLUGIN_NFS_TRUE@am__append_118 = nfs.la
++@BUILD_PLUGIN_FSCACHE_TRUE@am__append_119 = fscache.la
++@BUILD_PLUGIN_NGINX_TRUE@am__append_120 = nginx.la
++@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_121 = $(BUILD_WITH_LIBCURL_CFLAGS)
++@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_122 = $(BUILD_WITH_LIBCURL_LIBS)
++@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@am__append_123 = notify_desktop.la
++@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@am__append_124 = notify_email.la
++@BUILD_PLUGIN_NTPD_TRUE@am__append_125 = ntpd.la
++@BUILD_PLUGIN_NTPD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_126 = -lsocket
++@BUILD_PLUGIN_NUMA_TRUE@am__append_127 = numa.la
++@BUILD_PLUGIN_NUT_TRUE@am__append_128 = nut.la
++@BUILD_PLUGIN_OLSRD_TRUE@am__append_129 = olsrd.la
++@BUILD_PLUGIN_OLSRD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_130 = -lsocket
++@BUILD_PLUGIN_ONEWIRE_TRUE@am__append_131 = onewire.la
++@BUILD_PLUGIN_OPENLDAP_TRUE@am__append_132 = openldap.la
++@BUILD_PLUGIN_OPENVPN_TRUE@am__append_133 = openvpn.la
++@BUILD_PLUGIN_ORACLE_TRUE@am__append_134 = oracle.la
++@BUILD_PLUGIN_PERL_TRUE@am__append_135 = perl.la
+ # Work-around for issues #41 and #42 - Perl 5.10 incorrectly introduced
+ # __attribute__nonnull__(3) for Perl_load_module().
+-@BUILD_PLUGIN_PERL_TRUE@@HAVE_BROKEN_PERL_LOAD_MODULE_TRUE@am__append_135 = -Wno-nonnull
+-@BUILD_PLUGIN_PF_TRUE@am__append_136 = pf.la
+-@BUILD_PLUGIN_PINBA_TRUE@am__append_137 = pinba.la
+-@BUILD_PLUGIN_PING_TRUE@am__append_138 = ping.la
+-@BUILD_PLUGIN_POSTGRESQL_TRUE@am__append_139 = postgresql.la
+-@BUILD_PLUGIN_POWERDNS_TRUE@am__append_140 = powerdns.la
+-@BUILD_PLUGIN_PYTHON_TRUE@am__append_141 = python.la
+-@BUILD_PLUGIN_PYTHON_TRUE@@COMPILER_IS_GCC_TRUE@am__append_142 = -fno-strict-aliasing -Wno-strict-aliasing
+-@BUILD_PLUGIN_PROCESSES_TRUE@am__append_143 = processes.la
+-@BUILD_PLUGIN_PROCESSES_TRUE@@BUILD_WITH_LIBKVM_GETPROCS_TRUE@am__append_144 = -lkvm
+-@BUILD_PLUGIN_PROTOCOLS_TRUE@am__append_145 = protocols.la
+-@BUILD_PLUGIN_REDIS_TRUE@am__append_146 = redis.la
+-@BUILD_PLUGIN_ROUTEROS_TRUE@am__append_147 = routeros.la
+-@BUILD_PLUGIN_RRDCACHED_TRUE@am__append_148 = rrdcached.la
+-@BUILD_PLUGIN_RRDTOOL_TRUE@am__append_149 = rrdtool.la
+-@BUILD_PLUGIN_SENSORS_TRUE@am__append_150 = sensors.la
+-@BUILD_PLUGIN_SERIAL_TRUE@am__append_151 = serial.la
+-@BUILD_PLUGIN_SIGROK_TRUE@am__append_152 = sigrok.la
+-@BUILD_PLUGIN_SMART_TRUE@@BUILD_WITH_LIBUDEV_TRUE@am__append_153 = smart.la
+-@BUILD_PLUGIN_SNMP_TRUE@am__append_154 = snmp.la
+-@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_155 = $(BUILD_WITH_LIBSNMP_CFLAGS)
+-@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_156 = $(BUILD_WITH_LIBSNMP_LIBS)
+-@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBPTHREAD_TRUE@am__append_157 = -lpthread
+-@BUILD_PLUGIN_STATSD_TRUE@am__append_158 = statsd.la
+-@BUILD_PLUGIN_SWAP_TRUE@am__append_159 = swap.la
+-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_160 = -lkstat
+-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_161 = -ldevinfo
+-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKVM_GETSWAPINFO_TRUE@am__append_162 = -lkvm
+-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_163 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
+-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_164 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
+-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_165 = -lperfstat
+-@BUILD_PLUGIN_SYSLOG_TRUE@am__append_166 = syslog.la
+-@BUILD_PLUGIN_TABLE_TRUE@am__append_167 = table.la
+-@BUILD_PLUGIN_TAIL_TRUE@am__append_168 = tail.la
+-@BUILD_PLUGIN_TAIL_CSV_TRUE@am__append_169 = tail_csv.la
+-@BUILD_PLUGIN_TAPE_TRUE@am__append_170 = tape.la
+-@BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@am__append_171 = target_notification.la
+-@BUILD_PLUGIN_TARGET_REPLACE_TRUE@am__append_172 = target_replace.la
+-@BUILD_PLUGIN_TARGET_SCALE_TRUE@am__append_173 = target_scale.la
+-@BUILD_PLUGIN_TARGET_SET_TRUE@am__append_174 = target_set.la
+-@BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@am__append_175 = target_v5upgrade.la
+-@BUILD_PLUGIN_TCPCONNS_TRUE@am__append_176 = tcpconns.la
+-@BUILD_PLUGIN_TCPCONNS_TRUE@@BUILD_WITH_LIBKVM_NLIST_TRUE@am__append_177 = -lkvm
+-@BUILD_PLUGIN_TEAMSPEAK2_TRUE@am__append_178 = teamspeak2.la
+-@BUILD_PLUGIN_TED_TRUE@am__append_179 = ted.la
+-@BUILD_PLUGIN_THERMAL_TRUE@am__append_180 = thermal.la
+-@BUILD_PLUGIN_THRESHOLD_TRUE@am__append_181 = threshold.la
+-@BUILD_PLUGIN_TOKYOTYRANT_TRUE@am__append_182 = tokyotyrant.la
+-@BUILD_PLUGIN_TOKYOTYRANT_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_183 = -lsocket
+-@BUILD_PLUGIN_TURBOSTAT_TRUE@am__append_184 = turbostat.la
+-@BUILD_PLUGIN_UNIXSOCK_TRUE@am__append_185 = unixsock.la
+-@BUILD_PLUGIN_UPTIME_TRUE@am__append_186 = uptime.la
+-@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_187 = -lkstat
+-@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_188 = -lperfstat
+-@BUILD_PLUGIN_USERS_TRUE@am__append_189 = users.la
+-@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_190 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
+-@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_191 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
+-@BUILD_PLUGIN_UUID_TRUE@am__append_192 = uuid.la
+-@BUILD_PLUGIN_VARNISH_TRUE@am__append_193 = varnish.la
+-@BUILD_PLUGIN_VIRT_TRUE@am__append_194 = virt.la
+-@BUILD_PLUGIN_VMEM_TRUE@am__append_195 = vmem.la
+-@BUILD_PLUGIN_VSERVER_TRUE@am__append_196 = vserver.la
+-@BUILD_PLUGIN_WIRELESS_TRUE@am__append_197 = wireless.la
+-@BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@am__append_198 = write_graphite.la
+-@BUILD_PLUGIN_WRITE_HTTP_TRUE@am__append_199 = write_http.la
+-@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_200 = $(BUILD_WITH_LIBCURL_CFLAGS)
+-@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_201 = $(BUILD_WITH_LIBCURL_LIBS)
+-@BUILD_PLUGIN_WRITE_KAFKA_TRUE@am__append_202 = write_kafka.la
+-@BUILD_PLUGIN_WRITE_LOG_TRUE@am__append_203 = write_log.la
+-@BUILD_PLUGIN_WRITE_MONGODB_TRUE@am__append_204 = write_mongodb.la
+-@BUILD_PLUGIN_WRITE_REDIS_TRUE@am__append_205 = write_redis.la
+-@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@am__append_206 = write_riemann.la
+-@BUILD_PLUGIN_WRITE_SENSU_TRUE@am__append_207 = write_sensu.la
+-@BUILD_PLUGIN_WRITE_TSDB_TRUE@am__append_208 = write_tsdb.la
+-@BUILD_PLUGIN_XMMS_TRUE@am__append_209 = xmms.la
+-@BUILD_PLUGIN_ZFS_ARC_TRUE@am__append_210 = zfs_arc.la
+-@BUILD_PLUGIN_ZOOKEEPER_TRUE@am__append_211 = zookeeper.la
+-@HAVE_PROTOC_C_TRUE@am__append_212 = pinba.pb-c.c pinba.pb-c.h \
+-@HAVE_PROTOC_C_TRUE@	riemann.pb-c.c riemann.pb-c.h
++@BUILD_PLUGIN_PERL_TRUE@@HAVE_BROKEN_PERL_LOAD_MODULE_TRUE@am__append_136 = -Wno-nonnull
++@BUILD_PLUGIN_PF_TRUE@am__append_137 = pf.la
++@BUILD_PLUGIN_PINBA_TRUE@am__append_138 = pinba.la
++@BUILD_PLUGIN_PING_TRUE@am__append_139 = ping.la
++@BUILD_PLUGIN_POSTGRESQL_TRUE@am__append_140 = postgresql.la
++@BUILD_PLUGIN_POWERDNS_TRUE@am__append_141 = powerdns.la
++@BUILD_PLUGIN_PYTHON_TRUE@am__append_142 = python.la
++@BUILD_PLUGIN_PYTHON_TRUE@@COMPILER_IS_GCC_TRUE@am__append_143 = -fno-strict-aliasing -Wno-strict-aliasing
++@BUILD_PLUGIN_PROCESSES_TRUE@am__append_144 = processes.la
++@BUILD_PLUGIN_PROCESSES_TRUE@@BUILD_WITH_LIBKVM_GETPROCS_TRUE@am__append_145 = -lkvm
++@BUILD_PLUGIN_PROTOCOLS_TRUE@am__append_146 = protocols.la
++@BUILD_PLUGIN_REDIS_TRUE@am__append_147 = redis.la
++@BUILD_PLUGIN_ROUTEROS_TRUE@am__append_148 = routeros.la
++@BUILD_PLUGIN_RRDCACHED_TRUE@am__append_149 = rrdcached.la
++@BUILD_PLUGIN_RRDTOOL_TRUE@am__append_150 = rrdtool.la
++@BUILD_PLUGIN_SENSORS_TRUE@am__append_151 = sensors.la
++@BUILD_PLUGIN_SERIAL_TRUE@am__append_152 = serial.la
++@BUILD_PLUGIN_SIGROK_TRUE@am__append_153 = sigrok.la
++@BUILD_PLUGIN_SMART_TRUE@@BUILD_WITH_LIBUDEV_TRUE@am__append_154 = smart.la
++@BUILD_PLUGIN_SNMP_TRUE@am__append_155 = snmp.la
++@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_156 = $(BUILD_WITH_LIBSNMP_CFLAGS)
++@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_157 = $(BUILD_WITH_LIBSNMP_LIBS)
++@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBPTHREAD_TRUE@am__append_158 = -lpthread
++@BUILD_PLUGIN_STATSD_TRUE@am__append_159 = statsd.la
++@BUILD_PLUGIN_SWAP_TRUE@am__append_160 = swap.la
++@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_161 = -lkstat
++@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_162 = -ldevinfo
++@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKVM_GETSWAPINFO_TRUE@am__append_163 = -lkvm
++@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_164 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
++@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_165 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
++@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_166 = -lperfstat
++@BUILD_PLUGIN_SYSLOG_TRUE@am__append_167 = syslog.la
++@BUILD_PLUGIN_TABLE_TRUE@am__append_168 = table.la
++@BUILD_PLUGIN_TAIL_TRUE@am__append_169 = tail.la
++@BUILD_PLUGIN_TAIL_CSV_TRUE@am__append_170 = tail_csv.la
++@BUILD_PLUGIN_TAPE_TRUE@am__append_171 = tape.la
++@BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@am__append_172 = target_notification.la
++@BUILD_PLUGIN_TARGET_REPLACE_TRUE@am__append_173 = target_replace.la
++@BUILD_PLUGIN_TARGET_SCALE_TRUE@am__append_174 = target_scale.la
++@BUILD_PLUGIN_TARGET_SET_TRUE@am__append_175 = target_set.la
++@BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@am__append_176 = target_v5upgrade.la
++@BUILD_PLUGIN_TCPCONNS_TRUE@am__append_177 = tcpconns.la
++@BUILD_PLUGIN_TCPCONNS_TRUE@@BUILD_WITH_LIBKVM_NLIST_TRUE@am__append_178 = -lkvm
++@BUILD_PLUGIN_TEAMSPEAK2_TRUE@am__append_179 = teamspeak2.la
++@BUILD_PLUGIN_TED_TRUE@am__append_180 = ted.la
++@BUILD_PLUGIN_THERMAL_TRUE@am__append_181 = thermal.la
++@BUILD_PLUGIN_THRESHOLD_TRUE@am__append_182 = threshold.la
++@BUILD_PLUGIN_TOKYOTYRANT_TRUE@am__append_183 = tokyotyrant.la
++@BUILD_PLUGIN_TOKYOTYRANT_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_184 = -lsocket
++@BUILD_PLUGIN_TURBOSTAT_TRUE@am__append_185 = turbostat.la
++@BUILD_PLUGIN_UNIXSOCK_TRUE@am__append_186 = unixsock.la
++@BUILD_PLUGIN_UPTIME_TRUE@am__append_187 = uptime.la
++@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_188 = -lkstat
++@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_189 = -lperfstat
++@BUILD_PLUGIN_USERS_TRUE@am__append_190 = users.la
++@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_191 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
++@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_192 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
++@BUILD_PLUGIN_UUID_TRUE@am__append_193 = uuid.la
++@BUILD_PLUGIN_VARNISH_TRUE@am__append_194 = varnish.la
++@BUILD_PLUGIN_VIRT_TRUE@am__append_195 = virt.la
++@BUILD_PLUGIN_VMEM_TRUE@am__append_196 = vmem.la
++@BUILD_PLUGIN_VSERVER_TRUE@am__append_197 = vserver.la
++@BUILD_PLUGIN_WIRELESS_TRUE@am__append_198 = wireless.la
++@BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@am__append_199 = write_graphite.la
++@BUILD_PLUGIN_WRITE_HTTP_TRUE@am__append_200 = write_http.la
++@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_201 = $(BUILD_WITH_LIBCURL_CFLAGS)
++@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_202 = $(BUILD_WITH_LIBCURL_LIBS)
++@BUILD_PLUGIN_WRITE_KAFKA_TRUE@am__append_203 = write_kafka.la
++@BUILD_PLUGIN_WRITE_LOG_TRUE@am__append_204 = write_log.la
++@BUILD_PLUGIN_WRITE_MONGODB_TRUE@am__append_205 = write_mongodb.la
++@BUILD_PLUGIN_WRITE_REDIS_TRUE@am__append_206 = write_redis.la
++@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@am__append_207 = write_riemann.la
++@BUILD_PLUGIN_WRITE_SENSU_TRUE@am__append_208 = write_sensu.la
++@BUILD_PLUGIN_WRITE_TSDB_TRUE@am__append_209 = write_tsdb.la
++@BUILD_PLUGIN_XMMS_TRUE@am__append_210 = xmms.la
++@BUILD_PLUGIN_ZFS_ARC_TRUE@am__append_211 = zfs_arc.la
++@BUILD_PLUGIN_ZOOKEEPER_TRUE@am__append_212 = zookeeper.la
+ @HAVE_PROTOC_C_TRUE@am__append_213 = pinba.pb-c.c pinba.pb-c.h \
+ @HAVE_PROTOC_C_TRUE@	riemann.pb-c.c riemann.pb-c.h
++@HAVE_PROTOC_C_TRUE@am__append_214 = pinba.pb-c.c pinba.pb-c.h \
++@HAVE_PROTOC_C_TRUE@	riemann.pb-c.c riemann.pb-c.h
+ check_PROGRAMS = test_utils_mount$(EXEEXT) \
  	test_utils_vl_lookup$(EXEEXT)
  TESTS = test_utils_mount$(EXEEXT) test_utils_vl_lookup$(EXEEXT)
  subdir = src
@@ -50,7 +263,43 @@ Install config file into examples.
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES = collectd.conf
-@@ -2132,6 +2139,10 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)
+@@ -977,6 +985,17 @@ netlink_la_LINK = $(LIBTOOL) $(AM_V_lt) 
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(netlink_la_CFLAGS) \
+ 	$(CFLAGS) $(netlink_la_LDFLAGS) $(LDFLAGS) -o $@
+ @BUILD_PLUGIN_NETLINK_TRUE@am_netlink_la_rpath = -rpath $(pkglibdir)
++netstat_udp_la_LIBADD =
++am__netstat_udp_la_SOURCES_DIST = netstat_udp.c
++@BUILD_PLUGIN_NETSTAT_UDP_TRUE@am_netstat_udp_la_OBJECTS =  \
++@BUILD_PLUGIN_NETSTAT_UDP_TRUE@	netstat_udp.lo
++netstat_udp_la_OBJECTS = $(am_netstat_udp_la_OBJECTS)
++netstat_udp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
++	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
++	$(AM_CFLAGS) $(CFLAGS) $(netstat_udp_la_LDFLAGS) $(LDFLAGS) -o \
++	$@
++@BUILD_PLUGIN_NETSTAT_UDP_TRUE@am_netstat_udp_la_rpath = -rpath \
++@BUILD_PLUGIN_NETSTAT_UDP_TRUE@	$(pkglibdir)
+ @BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1)
+ @BUILD_PLUGIN_NETWORK_TRUE@network_la_DEPENDENCIES =  \
+ @BUILD_PLUGIN_NETWORK_TRUE@	$(am__DEPENDENCIES_1) \
+@@ -1780,7 +1799,8 @@ SOURCES = $(aggregation_la_SOURCES) $(am
+ 	$(memcached_la_SOURCES) $(memory_la_SOURCES) $(mic_la_SOURCES) \
+ 	$(modbus_la_SOURCES) $(multimeter_la_SOURCES) \
+ 	$(mysql_la_SOURCES) $(netapp_la_SOURCES) $(netlink_la_SOURCES) \
+-	$(network_la_SOURCES) $(nfs_la_SOURCES) $(nginx_la_SOURCES) \
++	$(netstat_udp_la_SOURCES) $(network_la_SOURCES) \
++	$(nfs_la_SOURCES) $(nginx_la_SOURCES) \
+ 	$(notify_desktop_la_SOURCES) $(notify_email_la_SOURCES) \
+ 	$(ntpd_la_SOURCES) $(numa_la_SOURCES) $(nut_la_SOURCES) \
+ 	$(olsrd_la_SOURCES) $(onewire_la_SOURCES) \
+@@ -1857,6 +1877,7 @@ DIST_SOURCES = $(am__aggregation_la_SOUR
+ 	$(am__mic_la_SOURCES_DIST) $(am__modbus_la_SOURCES_DIST) \
+ 	$(am__multimeter_la_SOURCES_DIST) $(am__mysql_la_SOURCES_DIST) \
+ 	$(am__netapp_la_SOURCES_DIST) $(am__netlink_la_SOURCES_DIST) \
++	$(am__netstat_udp_la_SOURCES_DIST) \
+ 	$(am__network_la_SOURCES_DIST) $(am__nfs_la_SOURCES_DIST) \
+ 	$(am__nginx_la_SOURCES_DIST) \
+ 	$(am__notify_desktop_la_SOURCES_DIST) \
+@@ -2132,6 +2153,10 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)
  TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
  	$(TEST_LOG_FLAGS)
  DIST_SUBDIRS = libcollectdclient liboconfig daemon
@@ -61,7 +310,7 @@ Install config file into examples.
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
-@@ -2310,9 +2321,6 @@ LIBADD_DL = @LIBADD_DL@
+@@ -2310,9 +2335,6 @@ LIBADD_DL = @LIBADD_DL@
  LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
  LIBADD_DLOPEN = @LIBADD_DLOPEN@
  LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
@@ -71,7 +320,7 @@ Install config file into examples.
  LIBLTDL = @LIBLTDL@
  LIBNETAPP_CPPFLAGS = @LIBNETAPP_CPPFLAGS@
  LIBNETAPP_LDFLAGS = @LIBNETAPP_LDFLAGS@
-@@ -2434,9 +2442,10 @@ PLUGIN_LDFLAGS = -module -avoid-version 
+@@ -2434,9 +2456,10 @@ PLUGIN_LDFLAGS = -module -avoid-version 
  AM_CPPFLAGS = -I$(srcdir)/daemon -DPREFIX='"${prefix}"' \
  	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
  	-DLOCALSTATEDIR='"${localstatedir}"' \
@@ -83,7 +332,207 @@ Install config file into examples.
  AUTOMAKE_OPTIONS = subdir-objects
  noinst_LTLIBRARIES = libmount.la liblookup.la
  libmount_la_SOURCES = utils_mount.c utils_mount.h
-@@ -3108,7 +3117,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
+@@ -2482,32 +2505,33 @@ pkglib_LTLIBRARIES = $(am__append_11) $(
+ 	$(am__append_95) $(am__append_96) $(am__append_98) \
+ 	$(am__append_104) $(am__append_105) $(am__append_106) \
+ 	$(am__append_107) $(am__append_110) $(am__append_111) \
+-	$(am__append_112) $(am__append_117) $(am__append_118) \
+-	$(am__append_119) $(am__append_122) $(am__append_123) \
+-	$(am__append_124) $(am__append_126) $(am__append_127) \
+-	$(am__append_128) $(am__append_130) $(am__append_131) \
++	$(am__append_112) $(am__append_113) $(am__append_118) \
++	$(am__append_119) $(am__append_120) $(am__append_123) \
++	$(am__append_124) $(am__append_125) $(am__append_127) \
++	$(am__append_128) $(am__append_129) $(am__append_131) \
+ 	$(am__append_132) $(am__append_133) $(am__append_134) \
+-	$(am__append_136) $(am__append_137) $(am__append_138) \
++	$(am__append_135) $(am__append_137) $(am__append_138) \
+ 	$(am__append_139) $(am__append_140) $(am__append_141) \
+-	$(am__append_143) $(am__append_145) $(am__append_146) \
++	$(am__append_142) $(am__append_144) $(am__append_146) \
+ 	$(am__append_147) $(am__append_148) $(am__append_149) \
+ 	$(am__append_150) $(am__append_151) $(am__append_152) \
+-	$(am__append_153) $(am__append_154) $(am__append_158) \
+-	$(am__append_159) $(am__append_166) $(am__append_167) \
++	$(am__append_153) $(am__append_154) $(am__append_155) \
++	$(am__append_159) $(am__append_160) $(am__append_167) \
+ 	$(am__append_168) $(am__append_169) $(am__append_170) \
+ 	$(am__append_171) $(am__append_172) $(am__append_173) \
+ 	$(am__append_174) $(am__append_175) $(am__append_176) \
+-	$(am__append_178) $(am__append_179) $(am__append_180) \
+-	$(am__append_181) $(am__append_182) $(am__append_184) \
+-	$(am__append_185) $(am__append_186) $(am__append_189) \
+-	$(am__append_192) $(am__append_193) $(am__append_194) \
++	$(am__append_177) $(am__append_179) $(am__append_180) \
++	$(am__append_181) $(am__append_182) $(am__append_183) \
++	$(am__append_185) $(am__append_186) $(am__append_187) \
++	$(am__append_190) $(am__append_193) $(am__append_194) \
+ 	$(am__append_195) $(am__append_196) $(am__append_197) \
+-	$(am__append_198) $(am__append_199) $(am__append_202) \
++	$(am__append_198) $(am__append_199) $(am__append_200) \
+ 	$(am__append_203) $(am__append_204) $(am__append_205) \
+ 	$(am__append_206) $(am__append_207) $(am__append_208) \
+-	$(am__append_209) $(am__append_210) $(am__append_211)
+-BUILT_SOURCES = $(dist_man_MANS) $(am__append_213)
+-CLEANFILES = $(am__append_212)
++	$(am__append_209) $(am__append_210) $(am__append_211) \
++	$(am__append_212)
++BUILT_SOURCES = $(dist_man_MANS) $(am__append_214)
++CLEANFILES = $(am__append_213)
+ @BUILD_PLUGIN_AGGREGATION_TRUE@aggregation_la_SOURCES = aggregation.c \
+ @BUILD_PLUGIN_AGGREGATION_TRUE@                         utils_vl_lookup.c utils_vl_lookup.h
+ 
+@@ -2765,23 +2789,25 @@ CLEANFILES = $(am__append_212)
+ @BUILD_PLUGIN_NETLINK_TRUE@netlink_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ @BUILD_PLUGIN_NETLINK_TRUE@netlink_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMNL_CFLAGS)
+ @BUILD_PLUGIN_NETLINK_TRUE@netlink_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS)
++@BUILD_PLUGIN_NETSTAT_UDP_TRUE@netstat_udp_la_SOURCES = netstat_udp.c
++@BUILD_PLUGIN_NETSTAT_UDP_TRUE@netstat_udp_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ @BUILD_PLUGIN_NETWORK_TRUE@network_la_SOURCES = network.c network.h \
+ @BUILD_PLUGIN_NETWORK_TRUE@		     utils_fbhash.c utils_fbhash.h
+ 
+ @BUILD_PLUGIN_NETWORK_TRUE@network_la_CPPFLAGS = $(AM_CPPFLAGS) \
+-@BUILD_PLUGIN_NETWORK_TRUE@	$(am__append_114)
+-@BUILD_PLUGIN_NETWORK_TRUE@network_la_LDFLAGS = $(PLUGIN_LDFLAGS) \
+ @BUILD_PLUGIN_NETWORK_TRUE@	$(am__append_115)
++@BUILD_PLUGIN_NETWORK_TRUE@network_la_LDFLAGS = $(PLUGIN_LDFLAGS) \
++@BUILD_PLUGIN_NETWORK_TRUE@	$(am__append_116)
+ @BUILD_PLUGIN_NETWORK_TRUE@network_la_LIBADD = -lpthread \
+-@BUILD_PLUGIN_NETWORK_TRUE@	$(am__append_113) $(am__append_116)
++@BUILD_PLUGIN_NETWORK_TRUE@	$(am__append_114) $(am__append_117)
+ @BUILD_PLUGIN_NFS_TRUE@nfs_la_SOURCES = nfs.c
+ @BUILD_PLUGIN_NFS_TRUE@nfs_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ @BUILD_PLUGIN_FSCACHE_TRUE@fscache_la_SOURCES = fscache.c
+ @BUILD_PLUGIN_FSCACHE_TRUE@fscache_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ @BUILD_PLUGIN_NGINX_TRUE@nginx_la_SOURCES = nginx.c
+ @BUILD_PLUGIN_NGINX_TRUE@nginx_la_CFLAGS = $(AM_CFLAGS) \
+-@BUILD_PLUGIN_NGINX_TRUE@	$(am__append_120)
+-@BUILD_PLUGIN_NGINX_TRUE@nginx_la_LIBADD = $(am__append_121)
++@BUILD_PLUGIN_NGINX_TRUE@	$(am__append_121)
++@BUILD_PLUGIN_NGINX_TRUE@nginx_la_LIBADD = $(am__append_122)
+ @BUILD_PLUGIN_NGINX_TRUE@nginx_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ @BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@notify_desktop_la_SOURCES = notify_desktop.c
+ @BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@notify_desktop_la_CFLAGS = $(AM_CFLAGS) $(LIBNOTIFY_CFLAGS)
+@@ -2792,7 +2818,7 @@ CLEANFILES = $(am__append_212)
+ @BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread
+ @BUILD_PLUGIN_NTPD_TRUE@ntpd_la_SOURCES = ntpd.c
+ @BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+-@BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LIBADD = $(am__append_125)
++@BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LIBADD = $(am__append_126)
+ @BUILD_PLUGIN_NUMA_TRUE@numa_la_SOURCES = numa.c
+ @BUILD_PLUGIN_NUMA_TRUE@numa_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ @BUILD_PLUGIN_NUT_TRUE@nut_la_SOURCES = nut.c
+@@ -2801,7 +2827,7 @@ CLEANFILES = $(am__append_212)
+ @BUILD_PLUGIN_NUT_TRUE@nut_la_LIBADD = -lpthread $(BUILD_WITH_LIBUPSCLIENT_LIBS)
+ @BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_SOURCES = olsrd.c
+ @BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+-@BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LIBADD = $(am__append_129)
++@BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LIBADD = $(am__append_130)
+ @BUILD_PLUGIN_ONEWIRE_TRUE@onewire_la_SOURCES = onewire.c \
+ @BUILD_PLUGIN_ONEWIRE_TRUE@		     utils_ignorelist.c utils_ignorelist.h
+ 
+@@ -2830,7 +2856,7 @@ CLEANFILES = $(am__append_212)
+ @BUILD_PLUGIN_PERL_TRUE@perl_la_CFLAGS = $(AM_CFLAGS) $(PERL_CFLAGS) \
+ @BUILD_PLUGIN_PERL_TRUE@	-DXS_VERSION=\"$(VERSION)\" \
+ @BUILD_PLUGIN_PERL_TRUE@	-DVERSION=\"$(VERSION)\" \
+-@BUILD_PLUGIN_PERL_TRUE@	$(am__append_135)
++@BUILD_PLUGIN_PERL_TRUE@	$(am__append_136)
+ @BUILD_PLUGIN_PERL_TRUE@perl_la_LDFLAGS = $(PLUGIN_LDFLAGS) \
+ @BUILD_PLUGIN_PERL_TRUE@		$(PERL_LDFLAGS)
+ 
+@@ -2858,12 +2884,12 @@ CLEANFILES = $(am__append_212)
+ @BUILD_PLUGIN_PYTHON_TRUE@python_la_SOURCES = python.c pyconfig.c pyvalues.c cpython.h
+ @BUILD_PLUGIN_PYTHON_TRUE@python_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_PYTHON_CPPFLAGS)
+ @BUILD_PLUGIN_PYTHON_TRUE@python_la_CFLAGS = $(AM_CFLAGS) \
+-@BUILD_PLUGIN_PYTHON_TRUE@	$(am__append_142)
++@BUILD_PLUGIN_PYTHON_TRUE@	$(am__append_143)
+ @BUILD_PLUGIN_PYTHON_TRUE@python_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_PYTHON_LDFLAGS)
+ @BUILD_PLUGIN_PYTHON_TRUE@python_la_LIBADD = $(BUILD_WITH_PYTHON_LIBS)
+ @BUILD_PLUGIN_PROCESSES_TRUE@processes_la_SOURCES = processes.c
+ @BUILD_PLUGIN_PROCESSES_TRUE@processes_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+-@BUILD_PLUGIN_PROCESSES_TRUE@processes_la_LIBADD = $(am__append_144)
++@BUILD_PLUGIN_PROCESSES_TRUE@processes_la_LIBADD = $(am__append_145)
+ @BUILD_PLUGIN_PROTOCOLS_TRUE@protocols_la_SOURCES = protocols.c \
+ @BUILD_PLUGIN_PROTOCOLS_TRUE@		       utils_ignorelist.c utils_ignorelist.h
+ 
+@@ -2905,9 +2931,9 @@ CLEANFILES = $(am__append_212)
+ @BUILD_PLUGIN_SNMP_TRUE@snmp_la_SOURCES = snmp.c
+ @BUILD_PLUGIN_SNMP_TRUE@snmp_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ @BUILD_PLUGIN_SNMP_TRUE@snmp_la_CFLAGS = $(AM_CFLAGS) \
+-@BUILD_PLUGIN_SNMP_TRUE@	$(am__append_155)
+-@BUILD_PLUGIN_SNMP_TRUE@snmp_la_LIBADD = $(am__append_156) \
+-@BUILD_PLUGIN_SNMP_TRUE@	$(am__append_157)
++@BUILD_PLUGIN_SNMP_TRUE@	$(am__append_156)
++@BUILD_PLUGIN_SNMP_TRUE@snmp_la_LIBADD = $(am__append_157) \
++@BUILD_PLUGIN_SNMP_TRUE@	$(am__append_158)
+ @BUILD_PLUGIN_STATSD_TRUE@statsd_la_SOURCES = statsd.c \
+ @BUILD_PLUGIN_STATSD_TRUE@                    utils_latency.h utils_latency.c
+ 
+@@ -2915,11 +2941,11 @@ CLEANFILES = $(am__append_212)
+ @BUILD_PLUGIN_STATSD_TRUE@statsd_la_LIBADD = -lpthread
+ @BUILD_PLUGIN_SWAP_TRUE@swap_la_SOURCES = swap.c
+ @BUILD_PLUGIN_SWAP_TRUE@swap_la_CFLAGS = $(AM_CFLAGS) \
+-@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_163)
++@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_164)
+ @BUILD_PLUGIN_SWAP_TRUE@swap_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+-@BUILD_PLUGIN_SWAP_TRUE@swap_la_LIBADD = $(am__append_160) \
+-@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_161) $(am__append_162) \
+-@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_164) $(am__append_165)
++@BUILD_PLUGIN_SWAP_TRUE@swap_la_LIBADD = $(am__append_161) \
++@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_162) $(am__append_163) \
++@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_165) $(am__append_166)
+ @BUILD_PLUGIN_SYSLOG_TRUE@syslog_la_SOURCES = syslog.c
+ @BUILD_PLUGIN_SYSLOG_TRUE@syslog_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ @BUILD_PLUGIN_TABLE_TRUE@table_la_SOURCES = table.c
+@@ -2943,7 +2969,7 @@ CLEANFILES = $(am__append_212)
+ @BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@target_v5upgrade_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ @BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_SOURCES = tcpconns.c
+ @BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+-@BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_LIBADD = $(am__append_177)
++@BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_LIBADD = $(am__append_178)
+ @BUILD_PLUGIN_TEAMSPEAK2_TRUE@teamspeak2_la_SOURCES = teamspeak2.c
+ @BUILD_PLUGIN_TEAMSPEAK2_TRUE@teamspeak2_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ @BUILD_PLUGIN_TED_TRUE@ted_la_SOURCES = ted.c
+@@ -2958,7 +2984,7 @@ CLEANFILES = $(am__append_212)
+ @BUILD_PLUGIN_TOKYOTYRANT_TRUE@tokyotyrant_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBTOKYOTYRANT_CPPFLAGS)
+ @BUILD_PLUGIN_TOKYOTYRANT_TRUE@tokyotyrant_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBTOKYOTYRANT_LDFLAGS)
+ @BUILD_PLUGIN_TOKYOTYRANT_TRUE@tokyotyrant_la_LIBADD = $(BUILD_WITH_LIBTOKYOTYRANT_LIBS) \
+-@BUILD_PLUGIN_TOKYOTYRANT_TRUE@	$(am__append_183)
++@BUILD_PLUGIN_TOKYOTYRANT_TRUE@	$(am__append_184)
+ @BUILD_PLUGIN_TURBOSTAT_TRUE@turbostat_la_SOURCES = turbostat.c
+ @BUILD_PLUGIN_TURBOSTAT_TRUE@turbostat_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ @BUILD_PLUGIN_UNIXSOCK_TRUE@unixsock_la_SOURCES = unixsock.c \
+@@ -2975,13 +3001,13 @@ CLEANFILES = $(am__append_212)
+ @BUILD_PLUGIN_UPTIME_TRUE@uptime_la_SOURCES = uptime.c
+ @BUILD_PLUGIN_UPTIME_TRUE@uptime_la_CFLAGS = $(AM_CFLAGS)
+ @BUILD_PLUGIN_UPTIME_TRUE@uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+-@BUILD_PLUGIN_UPTIME_TRUE@uptime_la_LIBADD = $(am__append_187) \
+-@BUILD_PLUGIN_UPTIME_TRUE@	$(am__append_188)
++@BUILD_PLUGIN_UPTIME_TRUE@uptime_la_LIBADD = $(am__append_188) \
++@BUILD_PLUGIN_UPTIME_TRUE@	$(am__append_189)
+ @BUILD_PLUGIN_USERS_TRUE@users_la_SOURCES = users.c
+ @BUILD_PLUGIN_USERS_TRUE@users_la_CFLAGS = $(AM_CFLAGS) \
+-@BUILD_PLUGIN_USERS_TRUE@	$(am__append_190)
++@BUILD_PLUGIN_USERS_TRUE@	$(am__append_191)
+ @BUILD_PLUGIN_USERS_TRUE@users_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+-@BUILD_PLUGIN_USERS_TRUE@users_la_LIBADD = $(am__append_191)
++@BUILD_PLUGIN_USERS_TRUE@users_la_LIBADD = $(am__append_192)
+ @BUILD_PLUGIN_UUID_TRUE@uuid_la_SOURCES = uuid.c
+ @BUILD_PLUGIN_UUID_TRUE@uuid_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBHAL_CFLAGS)
+ @BUILD_PLUGIN_UUID_TRUE@uuid_la_LIBADD = $(BUILD_WITH_LIBHAL_LIBS)
+@@ -3014,9 +3040,9 @@ CLEANFILES = $(am__append_212)
+ 
+ @BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ @BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_CFLAGS = $(AM_CFLAGS) \
+-@BUILD_PLUGIN_WRITE_HTTP_TRUE@	$(am__append_200)
+-@BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_LIBADD =  \
+ @BUILD_PLUGIN_WRITE_HTTP_TRUE@	$(am__append_201)
++@BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_LIBADD =  \
++@BUILD_PLUGIN_WRITE_HTTP_TRUE@	$(am__append_202)
+ @BUILD_PLUGIN_WRITE_KAFKA_TRUE@write_kafka_la_SOURCES = write_kafka.c \
+ @BUILD_PLUGIN_WRITE_KAFKA_TRUE@                        utils_format_graphite.c utils_format_graphite.h \
+ @BUILD_PLUGIN_WRITE_KAFKA_TRUE@                        utils_format_json.c utils_format_json.h \
+@@ -3108,7 +3134,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
  	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
  	$(am__cd) $(top_srcdir) && \
  	  $(AUTOMAKE) --foreign src/Makefile
@@ -91,7 +540,25 @@ Install config file into examples.
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
  	  *config.status*) \
-@@ -4821,7 +4829,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
+@@ -3385,6 +3410,9 @@ netapp.la: $(netapp_la_OBJECTS) $(netapp
+ netlink.la: $(netlink_la_OBJECTS) $(netlink_la_DEPENDENCIES) $(EXTRA_netlink_la_DEPENDENCIES) 
+ 	$(AM_V_CCLD)$(netlink_la_LINK) $(am_netlink_la_rpath) $(netlink_la_OBJECTS) $(netlink_la_LIBADD) $(LIBS)
+ 
++netstat_udp.la: $(netstat_udp_la_OBJECTS) $(netstat_udp_la_DEPENDENCIES) $(EXTRA_netstat_udp_la_DEPENDENCIES) 
++	$(AM_V_CCLD)$(netstat_udp_la_LINK) $(am_netstat_udp_la_rpath) $(netstat_udp_la_OBJECTS) $(netstat_udp_la_LIBADD) $(LIBS)
++
+ network.la: $(network_la_OBJECTS) $(network_la_DEPENDENCIES) $(EXTRA_network_la_DEPENDENCIES) 
+ 	$(AM_V_CCLD)$(network_la_LINK) $(am_network_la_rpath) $(network_la_OBJECTS) $(network_la_LIBADD) $(LIBS)
+ 
+@@ -3811,6 +3839,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netapp_la-netapp.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netapp_la-utils_ignorelist.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlink_la-netlink.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netstat_udp.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_la-network.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_la-utils_fbhash.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nfs.Plo@am__quote@
+@@ -4821,7 +4850,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
  	if test -n "$$am__remaking_logs"; then \
  	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
  	       "recursion detected" >&2; \
@@ -100,7 +567,7 @@ Install config file into examples.
  	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
  	fi; \
  	if $(am__make_dryrun); then :; else \
-@@ -5166,6 +5174,8 @@ uninstall-man: uninstall-man1 uninstall-
+@@ -5166,6 +5195,8 @@ uninstall-man: uninstall-man1 uninstall-
  	uninstall-man1 uninstall-man5 uninstall-pkglibLTLIBRARIES \
  	uninstall-sbinPROGRAMS
  
@@ -109,7 +576,7 @@ Install config file into examples.
  
  .pod.1:
  	pod2man --release=$(VERSION) --center=$(PACKAGE) $< \
-@@ -5190,13 +5200,8 @@ uninstall-man: uninstall-man1 uninstall-
+@@ -5190,13 +5221,8 @@ uninstall-man: uninstall-man1 uninstall-
  @HAVE_PROTOC_C_TRUE@	protoc-c -I$(srcdir) --c_out . $(srcdir)/riemann.proto
  
  install-exec-hook:
@@ -125,7 +592,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 \
-@@ -5204,7 +5209,7 @@ install-exec-hook:
+@@ -5204,7 +5230,7 @@ install-exec-hook:
  
  uninstall-hook:
  	rm -f $(DESTDIR)$(pkgdatadir)/types.db;
diff --git a/sysutils/collectd/patches/patch-src_netstat__udp.c b/sysutils/collectd/patches/patch-src_netstat__udp.c
new file mode 100644
index 00000000000..e65c4f904af
--- /dev/null
+++ b/sysutils/collectd/patches/patch-src_netstat__udp.c
@@ -0,0 +1,165 @@
+$NetBSD: patch-src_netstat__udp.c,v 1.1 2015/09/12 19:04:56 he Exp $
+
+Add a plugin which reports the UDP summary statistics.
+Useful for busyish DNS name servers.
+
+--- src/netstat_udp.c.orig	2015-09-11 16:55:05.000000000 +0000
++++ src/netstat_udp.c
+@@ -0,0 +1,157 @@
++/**
++ * collectd - src/netstat-udp.c
++ * Copyright (C) 2015  Håvard Eidnes
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; only version 2 of the License is applicable.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
++ *
++ * Authors:
++ *   Håvard Eidnes <he at NetBSD.org>
++ **/
++
++#include "collectd.h"
++#include "common.h"
++#include "plugin.h"
++
++#if !defined(KERNEL_NETBSD)
++# error "No applicable input method."
++#endif
++
++#include <sys/cdefs.h>
++#include <sys/types.h>
++#include <sys/sysctl.h>
++
++#include <netinet/in.h>
++#include <netinet/ip_var.h>
++#include <netinet/udp.h>
++#include <netinet/udp_var.h>
++#include <netinet6/udp6_var.h>
++
++static int
++netstat_udp_init (void)
++{
++	return (0);
++} /* int netstat_udp_init */
++
++#define SUBMIT_VARS(...) \
++   plugin_dispatch_multivalue (vl, 0, DS_TYPE_DERIVE, __VA_ARGS__, NULL)
++
++static int
++netstat_udp_internal (value_list_t *vl)
++{
++	uint64_t udpstat[UDP_NSTATS];
++	uint64_t udp6stat[UDP6_NSTATS];
++	size_t size;
++	uint64_t delivered, delivered6;
++	int err;
++
++	size = sizeof(udpstat);
++	if (sysctlbyname("net.inet.udp.stats", udpstat, &size, NULL, 0) == -1) {
++		ERROR("netstat-udp plugin: could not get udp stats");
++		return -1;
++	}
++
++	delivered = udpstat[UDP_STAT_IPACKETS] -
++		udpstat[UDP_STAT_HDROPS] -
++		udpstat[UDP_STAT_BADLEN] -
++		udpstat[UDP_STAT_BADSUM] -
++		udpstat[UDP_STAT_NOPORT] -
++		udpstat[UDP_STAT_NOPORTBCAST] -
++		udpstat[UDP_STAT_FULLSOCK];
++
++	err = SUBMIT_VARS ("udp-received",
++		     (derive_t) udpstat[UDP_STAT_IPACKETS],
++		     "udp-bad-header",
++		     (derive_t) udpstat[UDP_STAT_HDROPS],
++		     "udp-bad-length",
++		     (derive_t) udpstat[UDP_STAT_BADLEN],
++		     "udp-bad-checksum",
++		     (derive_t) udpstat[UDP_STAT_BADSUM],
++		     "udp-no-port",
++		     (derive_t) udpstat[UDP_STAT_NOPORT],
++		     "udp-no-port-broadcast",
++		     (derive_t) udpstat[UDP_STAT_NOPORTBCAST],
++		     "udp-full-socket",
++		     (derive_t) udpstat[UDP_STAT_FULLSOCK],
++		     "udp-delivered",
++		     (derive_t) delivered
++		);
++	if (err != 0) {
++		ERROR("netstat-udp plugin: could not submit, err=%d\n", err);
++	}
++
++	size = sizeof(udp6stat);
++	if (sysctlbyname("net.inet6.udp6.stats", udp6stat, &size,
++			 NULL, 0) == -1) {
++		ERROR("netstat-udp plugin: could not get udp6 stats");
++		return -1;
++	}
++
++	delivered6 = udp6stat[UDP6_STAT_IPACKETS] -
++		udp6stat[UDP6_STAT_HDROPS] -
++		udp6stat[UDP6_STAT_BADLEN] -
++		udp6stat[UDP6_STAT_BADSUM] -
++		udp6stat[UDP6_STAT_NOSUM] -
++		udp6stat[UDP6_STAT_NOPORT] -
++		udp6stat[UDP6_STAT_NOPORTMCAST] -
++		udp6stat[UDP6_STAT_FULLSOCK];
++
++	err = SUBMIT_VARS ("udp6-received",
++		     (derive_t) udp6stat[UDP6_STAT_IPACKETS],
++		     "udp6-bad-header",
++		     (derive_t) udp6stat[UDP6_STAT_HDROPS],
++		     "udp6-bad-length",
++		     (derive_t) udp6stat[UDP6_STAT_BADLEN],
++		     "udp6-bad-checksum",
++		     (derive_t) udp6stat[UDP6_STAT_BADSUM],
++		     "udp6-no-checksum",
++		     (derive_t) udp6stat[UDP6_STAT_NOSUM],
++		     "udp6-no-port",
++		     (derive_t) udp6stat[UDP6_STAT_NOPORT],
++		     "udp6-no-port-multicast",
++		     (derive_t) udp6stat[UDP6_STAT_NOPORTMCAST],
++		     "udp6-full-socket",
++		     (derive_t) udp6stat[UDP6_STAT_FULLSOCK],
++		     "udp6-delivered",
++		     (derive_t) delivered6
++		);
++	if (err != 0) {
++		ERROR("netstat-udp plugin ipv6: could not submit, err=%d\n",
++		      err);
++	}
++
++	return (0);
++} /* }}} int netstat_udp_internal */
++
++static int
++netstat_udp_read (void) /* {{{ */
++{
++	value_t v[1];
++	value_list_t vl = VALUE_LIST_INIT;
++
++	vl.values = v;
++	vl.values_len = STATIC_ARRAY_SIZE (v);
++	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
++	sstrncpy (vl.plugin, "netstat_udp", sizeof (vl.plugin));
++	sstrncpy (vl.type, "packets", sizeof (vl.type));
++	vl.time = cdtime ();
++
++	return (netstat_udp_internal (&vl));
++} /* }}} int netstat_udp_read */
++
++void
++module_register (void)
++{
++	plugin_register_init ("netstat_udp", netstat_udp_init);
++	plugin_register_read ("netstat_udp", netstat_udp_read);
++} /* void module_register */