Updated to 2.0.3. The NEWS is almost 3000 lines and interested parties may

find it here: https://github.com/nagios-plugins/nagios-plugins/blob/master/NEWS
For pkgsrc, the changes aren't very interesting. Upstream applied a lot of
the patches we had, notably integrating IDE S.M.A.R.T. plugin support for
NetBSD.

19 files changed, 172 insertions, 943 deletions

diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile
index 3cec3e71af0..e6aafbf14ca 100644
--- a/net/nagios-plugins/Makefile
+++ b/net/nagios-plugins/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2015/02/19 14:45:03 taca Exp $
+# $NetBSD: Makefile,v 1.39 2015/04/03 17:50:27 rodent Exp $
 #
 
-PKGREVISION=	10
 CATEGORIES=	net sysutils
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -15,7 +14,7 @@ PKG_DESTDIR_SUPPORT=	destdir
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	msgfmt msgmerge intltool perl:run xgettext
 
 PKG_GROUPS+=	${NAGIOS_GROUP}
 BUILD_DEFS+=	${NAGIOS_GROUP}
@@ -38,7 +37,6 @@ PLIST.NetBSD=	yes
 .endif
 
 .if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	--with-df-command="/bin/df -Pklt nokernfs,procfs,fdesc"
 SPECIAL_PERMS+=	${PREFIX}/libexec/nagios/check_ide_smart \
 		${REAL_ROOT_USER} ${NAGIOS_GROUP} 4551
 .endif
@@ -61,6 +59,10 @@ DEPENDS+=	{ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/openssh
 DEPENDS+=	bind-[0-9]*:../../net/bind910
 .endif
 
+post-install:
+	${CHMOD} -x ${DESTDIR}${PREFIX}/libexec/nagios/utils.pm
+
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/nagios-plugins/Makefile.common b/net/nagios-plugins/Makefile.common
index 21de39375a7..d80412b9761 100644
--- a/net/nagios-plugins/Makefile.common
+++ b/net/nagios-plugins/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2012/07/25 12:01:54 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.11 2015/04/03 17:50:27 rodent Exp $
 #
 # used by net/nagios-plugin-mysql/Makefile
 # used by net/nagios-plugin-pgsql/Makefile
@@ -6,9 +6,9 @@
 # used by net/nagios-plugin-snmp/Makefile
 # used by net/nagios-plugins/Makefile
 
-PLUGINSVERSION=	1.4.15
+PLUGINSVERSION=	2.0.3
 DISTNAME=	nagios-plugins-${PLUGINSVERSION}
-MASTER_SITES?=	${MASTER_SITE_SOURCEFORGE:=nagiosplug/}
+MASTER_SITES?=	http://nagios-plugins.org/download/
 
 .include "../../net/nagios-base/Makefile.common"
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/nagios-plugins/PLIST b/net/nagios-plugins/PLIST
index a8a628ffd33..001d58479ca 100644
--- a/net/nagios-plugins/PLIST
+++ b/net/nagios-plugins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2013/01/19 09:59:12 manu Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/04/03 17:50:27 rodent Exp $
 libexec/nagios/check_by_ssh
 libexec/nagios/check_clamd
 libexec/nagios/check_dhcp
@@ -7,6 +7,7 @@ libexec/nagios/check_disk
 libexec/nagios/check_dns
 libexec/nagios/check_dummy
 libexec/nagios/check_file_age
+libexec/nagios/check_fping
 libexec/nagios/check_ftp
 libexec/nagios/check_http
 libexec/nagios/check_icmp
@@ -23,6 +24,7 @@ libexec/nagios/check_mrtgtraf
 libexec/nagios/check_nagios
 libexec/nagios/check_nntp
 libexec/nagios/check_nntps
+libexec/nagios/check_nt
 libexec/nagios/check_ntp
 libexec/nagios/check_ntp_peer
 libexec/nagios/check_ntp_time
diff --git a/net/nagios-plugins/distinfo b/net/nagios-plugins/distinfo
index e59cd4a86f4..578b2b9ddd1 100644
--- a/net/nagios-plugins/distinfo
+++ b/net/nagios-plugins/distinfo
@@ -1,20 +1,13 @@
-$NetBSD: distinfo,v 1.15 2015/02/27 20:14:07 tnn Exp $
+$NetBSD: distinfo,v 1.16 2015/04/03 17:50:27 rodent Exp $
 
-SHA1 (nagios-plugins-1.4.15.tar.gz) = 1faab309c06d37e559490fd852ecb0dc8a8ab610
-RMD160 (nagios-plugins-1.4.15.tar.gz) = c2780a3523cf4eaaed34a94c07f5f6bd6fb1f736
-Size (nagios-plugins-1.4.15.tar.gz) = 2095419 bytes
-SHA1 (patch-913085) = bf8d28555f50c24d12a67bbecdf7e44a404a5a89
-SHA1 (patch-ab) = fdde9e8e98f222ab7e24adea205ce402bd64342d
-SHA1 (patch-ad) = 1418682ff599f91aa01a1eeb90f11c9e571212c8
-SHA1 (patch-ae) = 9975dfe9e7a1e448fe273ccb8427dcf3a74e195f
-SHA1 (patch-af) = c63176a78c7f73730c9f2ef3877b274f99be5dfa
-SHA1 (patch-ah) = c4f579b9f9971c44252eaea9a40775a2fcf23638
-SHA1 (patch-ai) = 2e045b6c10b06703772d0b9156b2e2f81aa4402b
-SHA1 (patch-ak) = 64f067ad6b136048feb75932572e25b2fbaaa699
-SHA1 (patch-al) = 63e28ae36d671e773acfe6aeb45ab7603c112594
-SHA1 (patch-am) = adc95ba1037a7d7caab6dde6ca1e27e47754db62
-SHA1 (patch-an) = 372a111ed040114479e363e42d66e2281d0d629f
-SHA1 (patch-configure) = 16eec1d6b42401184ef4892a68353c476cc63cc5
-SHA1 (patch-configure.in) = 7db3d0ac3bbb6c1f6b05a5a3e9e4813a9635aecf
-SHA1 (patch-plugins__check_swap.c) = d7557d1e6823e8bfeb02706ba914685c564bfdea
-SHA1 (patch-plugins_check_ide_smart.c) = 9eccab59931bbfe102f1166be36c6939a6e3a1ae
+SHA1 (nagios-plugins-2.0.3.tar.gz) = 29b6183ab9d796299dc17c395eef493415d1e9d6
+RMD160 (nagios-plugins-2.0.3.tar.gz) = b682b126c78df51f64d9cb8599d2f9dfd411d5f4
+Size (nagios-plugins-2.0.3.tar.gz) = 2659772 bytes
+SHA1 (patch-ad) = 7dc748ce7815f3f90212815a9fe9a9a7db961617
+SHA1 (patch-af) = 8fd2e50ca63f014f88195552884913c7383cb6a1
+SHA1 (patch-ah) = f884e80c1e09fefd5e37f087d95d3b76b9d44ab6
+SHA1 (patch-ai) = 645ebd4ac16a71bd5944fe3850c809cb45bf6a4c
+SHA1 (patch-ak) = cd052cfbe669cd64038ae23c624761dd3a7da188
+SHA1 (patch-an) = 6ba8dec0eb62cd0097809daf8075248afd448695
+SHA1 (patch-configure) = 8a06bbd0fa0649625ffb1c8e2f4b667714a40fe4
+SHA1 (patch-plugins__check_swap.c) = 4a32398b3e8e596b9f67b3ea95a3acce37287b0b
diff --git a/net/nagios-plugins/patches/patch-913085 b/net/nagios-plugins/patches/patch-913085
deleted file mode 100644
index 48796885e04..00000000000
--- a/net/nagios-plugins/patches/patch-913085
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-913085,v 1.1 2013/08/28 12:14:49 manu Exp $
-
-Bugfix from upstream: do not send error when value is just on limit
-https://bugzilla.redhat.com/show_bug.cgi?id=913085
-
---- plugins/check_ide_smart.c.orig	2013-08-28 14:05:08.000000000 +0200
-+++ plugins/check_ide_smart.c	2013-08-28 14:05:15.000000000 +0200
-@@ -361,9 +361,9 @@
- 	int passed = 0;
- 	int i;
- 	for (i = 0; i < NR_ATTRIBUTES; i++) {
- 		if (value->id && threshold->id && value->id == threshold->id) {
--			if (value->value <= threshold->threshold) {
-+			if (value->value < threshold->threshold) {
- 				++failed;
- 			}
- 			else {
- 				++passed;
-@@ -390,9 +390,9 @@
- 	int total = 0;
- 	int i;
- 	for (i = 0; i < NR_ATTRIBUTES; i++) {
- 		if (value->id && threshold->id && value->id == threshold->id) {
--			if (value->value <= threshold->threshold) {
-+			if (value->value < threshold->threshold) {
- 				++failed;
- 				if (value->status & 1) {
- 					status = PREFAILURE;
- 					++prefailure;
-@@ -447,9 +447,9 @@
- {
- 	printf ("Id=%3d, Status=%2d {%s , %s}, Value=%3d, Threshold=%3d, %s\n",
- 					p->id, p->status, p->status & 1 ? "PreFailure" : "Advisory   ",
- 					p->status & 2 ? "OnLine " : "OffLine", p->value, t->threshold,
--					p->value > t->threshold ? "Passed" : "Failed");
-+					p->value >= t->threshold ? "Passed" : "Failed");
- }
- 
- 
- 
diff --git a/net/nagios-plugins/patches/patch-ab b/net/nagios-plugins/patches/patch-ab
deleted file mode 100644
index 3c213aaa33e..00000000000
--- a/net/nagios-plugins/patches/patch-ab
+++ /dev/null
@@ -1,160 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2012/07/25 12:01:55 fhajny Exp $
-
---- configure.orig	2010-07-27 20:48:13.000000000 +0000
-+++ configure
-@@ -14688,7 +14688,7 @@ _ACEOF
- 
- fi
- 
--if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
-+if false; then
-   EXTRAS="$EXTRAS check_radius"
- 	RADIUSLIBS="-lradiusclient"
- 
-@@ -14843,7 +14843,7 @@ _ACEOF
- 
- fi
- 
--if test "$ac_cv_lib_ldap_main" = "yes"; then
-+if false; then
-   LDAPLIBS="-lldap -llber"\
-   LDAPINCLUDE="-I/usr/include/ldap"
- 
-@@ -18068,7 +18068,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; th
-         ac_cv_ps_cols=9
-         { echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5
- echo "${ECHO_T}using nagios-plugins internal ps command (pst3) for solaris" >&6; }
--	if test `isainfo -b` = 64 ; then
-+	if test "$MACHINE_ARCH" = "x86_64" ; then
- 		pst3_use_64bit=1
- 		{ echo "$as_me:$LINENO: using 64bit pst3" >&5
- echo "$as_me: using 64bit pst3" >&6;}
-@@ -19037,7 +19037,7 @@ fi
- 	then
- 		{ echo "$as_me:$LINENO: checking for nslookup syntax" >&5
- echo $ECHO_N "checking for nslookup syntax... $ECHO_C" >&6; }
--		if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep "Invalid option: sil" >/dev/null
-+		if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | fgrep "Invalid option: sil" >/dev/null
- 		then
- 			ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
- 			{ echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5
-@@ -19260,7 +19260,7 @@ echo "${ECHO_T}no" >&6; }
- fi
- 
- 
--if test -x "$PATH_TO_LMSTAT"
-+if false
- then
- 
- cat >>confdefs.h <<_ACEOF
-@@ -19431,7 +19431,7 @@ if test "${with_snmpget_command+set}" =
-   withval=$with_snmpget_command; PATH_TO_SNMPGET=$withval
- fi
- 
--if test -n "$PATH_TO_SNMPGET"
-+if test -n "$PATH_TO_SNMPGET" -a "$PATH_TO_SNMPGET" != "no"
- then
- 
- cat >>confdefs.h <<_ACEOF
-@@ -19490,7 +19490,7 @@ if test "${with_snmpgetnext_command+set}
-   withval=$with_snmpgetnext_command; PATH_TO_SNMPGETNEXT=$withval
- fi
- 
--if test -n "$PATH_TO_SNMPGETNEXT"
-+if test -n "$PATH_TO_SNMPGETNEXT" -a "$PATH_TO_SNMPGETNEXT" != "no"
- then
- 
- cat >>confdefs.h <<_ACEOF
-@@ -19499,7 +19499,7 @@ _ACEOF
- 
- fi
- 
--if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null  )
-+if false
- then
- 	{ echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5
- echo $ECHO_N "checking for Net::SNMP perl module... $ECHO_C" >&6; }
-@@ -19666,7 +19666,7 @@ if test "${with_fping_command+set}" = se
-   withval=$with_fping_command; PATH_TO_FPING=$withval
- fi
- 
--if test -n "$PATH_TO_FPING"
-+if test -n "$PATH_TO_FPING" -a "$PATH_TO_FPING" != "no"
- then
- 
- cat >>confdefs.h <<_ACEOF
-@@ -20200,6 +20200,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
-+#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
-+#undef _FILE_OFFSET_BITS
-+#endif
-+
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
-@@ -20258,6 +20262,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
-+#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
-+#undef _FILE_OFFSET_BITS
-+#endif
-+
-                #include <unistd.h>
-                #include <sys/types.h>
-                #include <sys/param.h>
-@@ -20333,6 +20341,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
-+#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
-+#undef _FILE_OFFSET_BITS
-+#endif
-+
-                #include <sys/types.h>
-                #include <sys/param.h>
-                #include <sys/stat.h>
-@@ -20400,6 +20412,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
-+#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
-+#undef _FILE_OFFSET_BITS
-+#endif
-+
-                #include <sys/types.h>
-                #include <sys/param.h>
-                #include <sys/stat.h>
-@@ -20468,6 +20484,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
-+#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
-+#undef _FILE_OFFSET_BITS
-+#endif
-+
-                  #include <unistd.h>
-                  #include <sys/types.h>
-                  #include <sys/param.h>
-@@ -20514,6 +20534,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
-+#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
-+#undef _FILE_OFFSET_BITS
-+#endif
-+
-                  #include <unistd.h>
-                  #include <sys/types.h>
-                  #include <sys/param.h>
-@@ -20882,7 +20906,7 @@ if test -n "$PATH_TO_APTGET" ; then
- fi
- 
- 
--if test -f $srcdir/plugins/check_nt.c ; then
-+if false ; then
-   EXTRAS="$EXTRAS check_nt"
- fi
- 
diff --git a/net/nagios-plugins/patches/patch-ad b/net/nagios-plugins/patches/patch-ad
index e348206edcb..9686e540697 100644
--- a/net/nagios-plugins/patches/patch-ad
+++ b/net/nagios-plugins/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2011/04/08 22:56:12 morr Exp $
+$NetBSD: patch-ad,v 1.5 2015/04/03 17:50:27 rodent Exp $
 
---- plugins-scripts/Makefile.in.orig	2010-07-27 20:48:10.000000000 +0000
+--- plugins-scripts/Makefile.in.orig	2014-06-26 16:17:33.000000000 +0000
 +++ plugins-scripts/Makefile.in
-@@ -963,15 +963,11 @@ top_srcdir = @top_srcdir@
+@@ -1288,15 +1288,11 @@ top_srcdir = @top_srcdir@
  with_trusted_path = @with_trusted_path@
  @RELEASE_PRESENT_TRUE@NP_VERSION = @NP_RELEASE@
  SUFFIXES = .pl .sh
diff --git a/net/nagios-plugins/patches/patch-ae b/net/nagios-plugins/patches/patch-ae
deleted file mode 100644
index ff160bb69a6..00000000000
--- a/net/nagios-plugins/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2011/04/08 22:56:12 morr Exp $
-
---- plugins/Makefile.am.orig	2010-07-27 20:47:16.000000000 +0000
-+++ plugins/Makefile.am
-@@ -170,7 +170,7 @@ install-exec-hook:
- 	cd $(DESTDIR)$(libexecdir) && \
- 	for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\
- 	if [ -x check_ldap ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi
--	
-+
- clean-local:
- 	rm -f $(check_tcp_programs)
- 	rm -f NP-VERSION-FILE
diff --git a/net/nagios-plugins/patches/patch-af b/net/nagios-plugins/patches/patch-af
index b3141bbabbb..d60ed67f23d 100644
--- a/net/nagios-plugins/patches/patch-af
+++ b/net/nagios-plugins/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2011/04/08 22:56:12 morr Exp $
+$NetBSD: patch-af,v 1.6 2015/04/03 17:50:27 rodent Exp $
 
---- plugins/Makefile.in.orig	2010-07-27 20:48:10.000000000 +0000
+--- plugins/Makefile.in.orig	2014-06-26 16:17:33.000000000 +0000
 +++ plugins/Makefile.in
-@@ -31,7 +31,7 @@ PRE_UNINSTALL = :
+@@ -33,7 +33,7 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.5 2011/04/08 22:56:12 morr Exp $
  	check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \
  	check_load$(EXEEXT) check_mrtg$(EXEEXT) \
  	check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \
-@@ -1778,7 +1778,7 @@ $(check_tcp_programs): check_tcp
+@@ -2193,7 +2193,7 @@ $(check_tcp_programs): check_tcp
  install-exec-hook:
  	cd $(DESTDIR)$(libexecdir) && \
  	for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\
diff --git a/net/nagios-plugins/patches/patch-ah b/net/nagios-plugins/patches/patch-ah
index 7ce9db5d811..15a663dad3d 100644
--- a/net/nagios-plugins/patches/patch-ah
+++ b/net/nagios-plugins/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.3 2011/04/08 22:56:12 morr Exp $
+$NetBSD: patch-ah,v 1.4 2015/04/03 17:50:27 rodent Exp $
 
---- plugins-scripts/check_ntp.pl.orig	2010-07-27 20:47:16.000000000 +0000
+--- plugins-scripts/check_ntp.pl.orig	2014-03-04 21:41:57.000000000 +0000
 +++ plugins-scripts/check_ntp.pl
 @@ -311,6 +311,7 @@ if ($have_ntpq) {
  				} else {
diff --git a/net/nagios-plugins/patches/patch-ai b/net/nagios-plugins/patches/patch-ai
index 6dc9dc9a392..63e4dc1b335 100644
--- a/net/nagios-plugins/patches/patch-ai
+++ b/net/nagios-plugins/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.2 2011/04/08 22:56:12 morr Exp $
+$NetBSD: patch-ai,v 1.3 2015/04/03 17:50:27 rodent Exp $
 
---- plugins-scripts/subst.in.orig	2010-07-27 20:47:16.000000000 +0000
+--- plugins-scripts/subst.in.orig	2014-03-04 21:41:57.000000000 +0000
 +++ plugins-scripts/subst.in
 @@ -9,13 +9,14 @@ function which(c,path) {
  
diff --git a/net/nagios-plugins/patches/patch-ak b/net/nagios-plugins/patches/patch-ak
index 85ad19dffee..166f4eade80 100644
--- a/net/nagios-plugins/patches/patch-ak
+++ b/net/nagios-plugins/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.5 2015/02/27 20:14:07 tnn Exp $
+$NetBSD: patch-ak,v 1.6 2015/04/03 17:50:27 rodent Exp $
 
---- gl/mountlist.c.orig	2010-07-27 20:47:15.000000000 +0000
+--- gl/mountlist.c.orig	2014-03-04 21:41:56.000000000 +0000
 +++ gl/mountlist.c
 @@ -52,7 +52,11 @@
  # if HAVE_STRUCT_FSSTAT_F_FSTYPENAME
@@ -26,7 +26,7 @@ $NetBSD: patch-ak,v 1.5 2015/02/27 20:14:07 tnn Exp $
  #ifdef MOUNTED_LISTMNTENT
  # include <mntent.h>
  #endif
-@@ -169,7 +177,7 @@
+@@ -223,7 +231,7 @@ me_remote (char const *fs_name, char con
  
  #if MOUNTED_GETMNTINFO
  
@@ -35,11 +35,11 @@ $NetBSD: patch-ak,v 1.5 2015/02/27 20:14:07 tnn Exp $
  static char *
  fstype_to_string (short int t)
  {
-@@ -266,9 +274,13 @@ fstype_to_string (short int t)
+@@ -320,9 +328,13 @@ fstype_to_string (short int t)
  # endif
  
  static char *
-+#if defined(STAT_STATVFS) && !defined(__FreeBSD__)
++#ifdef STAT_STATVFS
 +fsp_to_string (const struct statvfs *fsp)
 +#else
  fsp_to_string (const struct statfs *fsp)
@@ -50,21 +50,27 @@ $NetBSD: patch-ak,v 1.5 2015/02/27 20:14:07 tnn Exp $
    return (char *) (fsp->f_fstypename);
  # else
    return fstype_to_string (fsp->f_type);
-@@ -592,9 +604,17 @@ read_file_system_list (bool need_fs_type
+@@ -648,7 +660,11 @@ read_file_system_list (bool need_fs_type
    {
      int numsys, counter;
      size_t bufsize;
-+#if defined(STAT_STATVFS) && !defined(__FreeBSD__)
++#ifdef STAT_STATVFS
 +    struct statvfs *stats;
 +#else
      struct statfs *stats;
 +#endif
  
+     numsys = getfsstat (NULL, 0L, MNT_NOWAIT);
+     if (numsys < 0)
+@@ -658,7 +674,11 @@ read_file_system_list (bool need_fs_type
+ 
+     bufsize = (1 + numsys) * sizeof *stats;
+     stats = xmalloc (bufsize);
 +#ifdef STAT_STATVFS
-+    numsys = getfsstat ((struct statvfs *)0, 0L, MNT_NOWAIT);
++    numsys = getfsstat ((struct statvfs *)stats, bufsize, MNT_NOWAIT);
 +#else
-     numsys = getfsstat ((struct statfs *)0, 0L, MNT_NOWAIT);
+     numsys = getfsstat (stats, bufsize, MNT_NOWAIT);
 +#endif
+ 
      if (numsys < 0)
-       return (NULL);
-     if (SIZE_MAX / sizeof *stats <= numsys)
+       {
diff --git a/net/nagios-plugins/patches/patch-al b/net/nagios-plugins/patches/patch-al
deleted file mode 100644
index a9061f9b1d7..00000000000
--- a/net/nagios-plugins/patches/patch-al
+++ /dev/null
@@ -1,92 +0,0 @@
-$NetBSD: patch-al,v 1.3 2011/04/08 22:56:12 morr Exp $
-
---- contrib/check_axis.sh.orig	2010-07-27 20:47:15.000000000 +0000
-+++ contrib/check_axis.sh
-@@ -5,7 +5,7 @@ port=$2
- usr=$3
- pass=$4
- 
--if [ ! "$#" == "4" ]; then
-+if [ ! "$#" = "4" ]; then
- 	echo -e "\nYou did not supply enough command line arguments. \nUsage: ./check_axis.sh <host> <port> <username> <password> \n \nCheck_axis.sh checks the status of LPT ports on Axis print servers. \nIt was written by Tom De Blende (tom.deblende@village.uunet.be) in 2002. \n" && exit "3"
- fi
- 
-@@ -27,7 +27,7 @@ fi
- 
- lines=`cat $tempfile | grep -i $port`
- status=`echo $lines | awk '{ print $3 }'`
--if [ "$status" == "Printing" ]; then
-+if [ "$status" = "Printing" ]; then
- 	bytes=`echo $lines | awk '{ print $4 }'`;
- 	comments=`echo $lines | tr -d "
- " | awk '{ print $5 " " $6 }'`;
-@@ -42,48 +42,48 @@ if [ "$comma" -eq "1" ]; then
- fi
- 	
- 
--if [ "$status" == "Available" ]; then
--	if [ "$comments" == "Paper out" ]; then
-+if [ "$status" = "Available" ]; then
-+	if [ "$comments" = "Paper out" ]; then
- 		exit="1" && stdio="WARNING - Out of paper.";
--        elif [ "$comments" == " " ]; then
-+        elif [ "$comments" = " " ]; then
-                 exit="0" && stdio="OK - Printer is available but returns no comments.";
--	elif [ "$comments" == "No error" ]; then
-+	elif [ "$comments" = "No error" ]; then
- 		exit="0" && stdio="OK - No error.";
--        elif [ "$comments" == "Ready " ]; then
-+        elif [ "$comments" = "Ready " ]; then
-                 exit="0" && stdio="OK - Ready.";
--        elif [ "$comments" == "Off line" ]; then
-+        elif [ "$comments" = "Off line" ]; then
-                 exit="1" && stdio="WARNING - Printer is off line.";        
--        elif [ "$comments" == "Out of" ]; then
-+        elif [ "$comments" = "Out of" ]; then
-                 exit="1" && stdio="WARNING - Out of paper.";	
--	elif [ "$comments" == "Busy Out" ]; then
-+	elif [ "$comments" = "Busy Out" ]; then
-                 exit="1" && stdio="WARNING - Busy, out of paper.";
--        elif [ "$comments" == "Printer off-line" ]; then
-+        elif [ "$comments" = "Printer off-line" ]; then
-                 exit="1" && stdio="WARNING - Printer is off line.";	
--        elif [ "$comments" == "Printer fault" ]; then
-+        elif [ "$comments" = "Printer fault" ]; then
-                 exit="2" && stdio="CRITICAL - Printer fault.";
- 	else
- 		exit="3" && stdio="Comments: $comments";
- 	fi
--elif [ "$status" == "Printing" ]; then
--	if [ "$comments" == "Printer busy" ]; then
-+elif [ "$status" = "Printing" ]; then
-+	if [ "$comments" = "Printer busy" ]; then
- 		exit="0" && stdio="OK - PRINTING. Bytes printed: $bytes.";
--        elif [ "$comments" == "No error" ]; then
-+        elif [ "$comments" = "No error" ]; then
-                 exit="0" && stdio="OK - PRINTING. Bytes printed: $bytes.";        
--	elif [ "$comments" == "Paper out" ]; then
-+	elif [ "$comments" = "Paper out" ]; then
-                 exit="1" && stdio="WARNING - PRINTING. Out of paper.";
--        elif [ "$comments" == "Out of" ]; then
-+        elif [ "$comments" = "Out of" ]; then
-                 exit="1" && stdio="WARNING - PRINTING. Out of paper. Bytes printed: $bytes.";        
--        elif [ "$comments" == "Busy Out" ]; then
-+        elif [ "$comments" = "Busy Out" ]; then
-                 exit="1" && stdio="WARNING - Busy, out of paper.";
--	elif [ "$comments" == "Ready " ]; then
-+	elif [ "$comments" = "Ready " ]; then
-                 exit="0" && stdio="OK - PRINTING. Bytes printed: $bytes.";        
--        elif [ "$comments" == "Printer off-line" ]; then
-+        elif [ "$comments" = "Printer off-line" ]; then
-                 exit="1" && stdio="WARNING - PRINTING. Printer is off line.";
--        elif [ "$comments" == "Busy " ]; then
-+        elif [ "$comments" = "Busy " ]; then
-                 exit="0" && stdio="OK - PRINTING. Busy. Bytes printed: $bytes.";	
--	elif [ "$comments" == "Off line" ]; then
-+	elif [ "$comments" = "Off line" ]; then
-                 exit="1" && stdio="WARNING - PRINTING. Printer is off line.";
--        elif [ "$comments" == "Printer fault" ]; then
-+        elif [ "$comments" = "Printer fault" ]; then
-                 exit="2" && stdio="CRITICAL - PRINTING. Printer fault. Bytes printed: $bytes.";        
- 	else
-                 exit="3" && stdio="Comments: $comments.";
diff --git a/net/nagios-plugins/patches/patch-am b/net/nagios-plugins/patches/patch-am
deleted file mode 100644
index 38dfaa7fbe1..00000000000
--- a/net/nagios-plugins/patches/patch-am
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-am,v 1.2 2011/04/08 22:56:12 morr Exp $
-
---- contrib/check_mssql.sh.orig	2010-07-27 20:47:15.000000000 +0000
-+++ contrib/check_mssql.sh
-@@ -35,10 +35,10 @@ pswd=$3
- srv=$4
- 
- 
--if [ ! "$#" == "4" ]; then
-+if [ ! "$#" = "4" ]; then
-         echo -e "\nYou did not supply enough arguments. \nUsage: $0 <host> <username> <password> <version> \n \n$0 checks Microsoft SQL Server connectivity. It works with versions 7 and 2000.\n\nYou need a working version of FreeTDS (http://www.freetds.org/) and tsql (included in FreeTDS 6.0+) to connect to the SQL server. \nIt was written by Tom De Blende (tom.deblende@village.uunet.be) in 2003. \n\nExample:\n $0 dbserver sa f00bar 2000\n" && exit "3"
- 
--elif [ $tsqlcmd == "" ]; then
-+elif [ $tsqlcmd = "" ]; then
- 	echo -e "tsql not found! Please verify you have a working version of tsql (included in the FreeTDS version 6.0+) and enter the full path in the script." && exit "3"
- 
- fi
-@@ -50,9 +50,9 @@ exit="3"
- 
- tmpfile=`$mktempcmd /tmp/$hostname.XXXXXX`
- 
--if [ $srv == "7" ]; then
-+if [ $srv = "7" ]; then
-         spid=7
--elif [ $srv == "2000" ]; then
-+elif [ $srv = "2000" ]; then
-         spid=50
- else
- 	echo -e "$srv is not a supported MS SQL Server version!" && exit "3"
-@@ -69,7 +69,7 @@ $tsqlcmd -S $hostname -U $usr -P $pswd <
- 
- $grepcmd -q "Login failed for user" $errorfile
- 
--if [ "$?" == "0" ]; then
-+if [ "$?" = "0" ]; then
- 	$rmcmd -f $tmpfile $resultfile $errorfile;
-         echo CRITICAL - Could not make connection to SQL server. Login failed.;
-         exit 2;
-@@ -77,7 +77,7 @@ fi
- 
- $grepcmd -q "There was a problem connecting to the server" $errorfile
- 
--if [ "$?" == "0" ]; then
-+if [ "$?" = "0" ]; then
-         $rmcmd -f $tmpfile $resultfile $errorfile;
-         echo CRITICAL - Could not make connection to SQL server. Incorrect server name or SQL service not running.;
-         exit 2;
-@@ -85,7 +85,7 @@ fi
- 
- resultfileln=`$catcmd $resultfile | $wccmd -l | $sedcmd 's/  //g'`
- 
--if [ "$resultfileln" == "2" ]; then
-+if [ "$resultfileln" = "2" ]; then
- 	$rmcmd -f $tmpfile $resultfile $errorfile;
-         echo CRITICAL - Could not make connection to SQL server. No data received from host.;
-         exit 2;
diff --git a/net/nagios-plugins/patches/patch-an b/net/nagios-plugins/patches/patch-an
index f690be14c7b..12c5ade34a8 100644
--- a/net/nagios-plugins/patches/patch-an
+++ b/net/nagios-plugins/patches/patch-an
@@ -1,10 +1,10 @@
-$NetBSD: patch-an,v 1.4 2011/04/08 22:56:12 morr Exp $
+$NetBSD: patch-an,v 1.5 2015/04/03 17:50:27 rodent Exp $
 
---- lib/Makefile.in.orig	2010-07-27 20:48:09.000000000 +0000
+--- lib/Makefile.in.orig	2014-06-26 16:17:32.000000000 +0000
 +++ lib/Makefile.in
-@@ -146,7 +146,7 @@ DEFAULT_INCLUDES = -I. -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+@@ -153,7 +153,7 @@ depcomp = $(SHELL) $(top_srcdir)/build-a
  am__depfiles_maybe = depfiles
+ am__mv = mv -f
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 -	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 +	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS_LFS)
diff --git a/net/nagios-plugins/patches/patch-configure b/net/nagios-plugins/patches/patch-configure
index 02e292c0c79..0a90b859eb2 100644
--- a/net/nagios-plugins/patches/patch-configure
+++ b/net/nagios-plugins/patches/patch-configure
@@ -1,336 +1,130 @@
-$NetBSD: patch-configure,v 1.1 2013/01/19 09:59:12 manu Exp $
+$NetBSD: patch-configure,v 1.2 2015/04/03 17:50:27 rodent Exp $
 
-Enable check_smart_ide for NetBSD
+Disable all the plugins which are installed by the nagios-plugin-* packages.
 
---- configure.orig	2013-01-03 05:43:34.000000000 +0100
-+++ configure	2013-01-03 06:02:14.000000000 +0100
-@@ -15047,9 +15047,11 @@
- echo "$as_me: WARNING: install LDAP libs to compile this plugin (see REQUIREMENTS)." >&2;}
+--- configure.orig	2014-06-26 16:17:37.000000000 +0000
++++ configure
+@@ -17188,7 +17188,7 @@ _ACEOF
+ 
  fi
- LIBS="$_SAVEDLIBS"
  
--if test "${ac_cv_header_linux_hdreg_h+set}" = set; then
-+case $host in
-+  *linux*)
-+    if test "${ac_cv_header_linux_hdreg_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for linux/hdreg.h" >&5
- echo $ECHO_N "checking for linux/hdreg.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_linux_hdreg_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15179,10 +15181,10 @@
-   FOUNDINCLUDE=no
+-  if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
++  if false; then
+     EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
+   	RADIUSLIBS="-lradiusclient"
+ 
+@@ -17363,7 +17363,7 @@ _ACEOF
+ 
  fi
  
+-  if test "$ac_cv_lib_ldap_main" = "yes"; then
++  if false; then
+     LDAPLIBS="-lldap -llber"\
+     LDAPINCLUDE="-I/usr/include/ldap"
+ 
+@@ -18791,6 +18791,9 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #ifdef HAVE_UNISTD_H
++#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
++#undef _FILE_OFFSET_BITS
++#endif
+ 			#include <unistd.h>
+ 			#endif
+ 			#include <netinet/in.h>
+@@ -21524,7 +21527,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; th
+         ac_cv_ps_cols=9
+         { $as_echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5
+ $as_echo "using nagios-plugins internal ps command (pst3) for solaris" >&6; }
+-	if test `isainfo -b` = 64 ; then
++	if test "$MACHINE_ARCH" = "x86_64" ; then
+ 		pst3_use_64bit=1
+ 		{ $as_echo "$as_me:$LINENO: using 64bit pst3" >&5
+ $as_echo "$as_me: using 64bit pst3" >&6;}
+@@ -22521,7 +22524,7 @@ fi
+ 	then
+ 		{ $as_echo "$as_me:$LINENO: checking for nslookup syntax" >&5
+ $as_echo_n "checking for nslookup syntax... " >&6; }
+-		if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep "Invalid option: sil" >/dev/null
++		if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep -F "Invalid option: sil" >/dev/null
+ 		then
+ 			ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
+ 			{ $as_echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5
+@@ -22910,7 +22913,7 @@ fi
  
--if test "$FOUNDINCLUDE" = "yes" ; then
--	if test "${ac_cv_header_linux_types_h+set}" = set; then
-+    if test "$FOUNDINCLUDE" = "yes" ; then
-+    	if test "${ac_cv_header_linux_types_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for linux/types.h" >&5
- echo $ECHO_N "checking for linux/types.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_linux_types_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15312,17 +15314,299 @@
-   FOUNDINCLUDE=no
+ 
+ # Check whether --with-snmpget_command was given.
+-if test "${with_snmpget_command+set}" = set; then
++if false; then
+   withval=$with_snmpget_command; PATH_TO_SNMPGET=$withval
  fi
  
+@@ -22921,7 +22924,7 @@ cat >>confdefs.h <<_ACEOF
+ #define PATH_TO_SNMPGET "$PATH_TO_SNMPGET"
+ _ACEOF
+ 
+-	EXTRAS="$EXTRAS check_hpjd check_snmp\$(EXEEXT)"
++	#EXTRAS="$EXTRAS check_hpjd check_snmp\$(EXEEXT)"
+ else
+ 	{ $as_echo "$as_me:$LINENO: WARNING: Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins" >&5
+ $as_echo "$as_me: WARNING: Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins" >&2;}
+@@ -22982,7 +22985,7 @@ _ACEOF
  
-+    fi
-+    if test "$FOUNDINCLUDE" = "no" ; then
-+	{ echo "$as_me:$LINENO: WARNING: Skipping check_ide_smart plugin." >&5
-+echo "$as_me: WARNING: Skipping check_ide_smart plugin." >&2;}
-+	{ echo "$as_me:$LINENO: WARNING: check_ide_smart requires linux/hdreg.h and linux/types.h." >&5
-+echo "$as_me: WARNING: check_ide_smart requires linux/hdreg.h and linux/types.h." >&2;}
-+    fi
-+  ;;
-+  *netbsd*)
-+    if test "${ac_cv_header_dev_ata_atareg_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for dev/ata/atareg.h" >&5
-+echo $ECHO_N "checking for dev/ata/atareg.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_dev_ata_atareg_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_dev_ata_atareg_h" >&5
-+echo "${ECHO_T}$ac_cv_header_dev_ata_atareg_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking dev/ata/atareg.h usability" >&5
-+echo $ECHO_N "checking dev/ata/atareg.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <dev/ata/atareg.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
--if test "$FOUNDINCLUDE" = "yes" ; then
--	EXTRAS="$EXTRAS check_ide_smart"
-+	ac_header_compiler=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking dev/ata/atareg.h presence" >&5
-+echo $ECHO_N "checking dev/ata/atareg.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <dev/ata/atareg.h>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: dev/ata/atareg.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: dev/ata/atareg.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/ata/atareg.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: dev/ata/atareg.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: dev/ata/atareg.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: dev/ata/atareg.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/ata/atareg.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: dev/ata/atareg.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/ata/atareg.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: dev/ata/atareg.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/ata/atareg.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: dev/ata/atareg.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/ata/atareg.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: dev/ata/atareg.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/ata/atareg.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: dev/ata/atareg.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for dev/ata/atareg.h" >&5
-+echo $ECHO_N "checking for dev/ata/atareg.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_dev_ata_atareg_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_dev_ata_atareg_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_dev_ata_atareg_h" >&5
-+echo "${ECHO_T}$ac_cv_header_dev_ata_atareg_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_dev_ata_atareg_h = yes; then
-+  FOUNDINCLUDE=yes
-+else
-+  FOUNDINCLUDE=no
-+fi
-+
-+
-+    if test "$FOUNDINCLUDE" = "yes" ; then
-+    	if test "${ac_cv_header_dev_ic_wdcreg_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for dev/ic/wdcreg.h" >&5
-+echo $ECHO_N "checking for dev/ic/wdcreg.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_dev_ic_wdcreg_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_dev_ic_wdcreg_h" >&5
-+echo "${ECHO_T}$ac_cv_header_dev_ic_wdcreg_h" >&6; }
+-if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null  )
++if false
+ then
+ 	{ $as_echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5
+ $as_echo_n "checking for Net::SNMP perl module... " >&6; }
+@@ -23134,7 +23137,7 @@ IFS=$as_save_IFS
+ esac
+ fi
+ PATH_TO_FPING=$ac_cv_path_PATH_TO_FPING
+-if test -n "$PATH_TO_FPING"; then
++if test -n "$PATH_TO_FPING" -a "$PATH_TO_FPING" != "no"; then
+   { $as_echo "$as_me:$LINENO: result: $PATH_TO_FPING" >&5
+ $as_echo "$PATH_TO_FPING" >&6; }
  else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking dev/ic/wdcreg.h usability" >&5
-+echo $ECHO_N "checking dev/ic/wdcreg.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <dev/ic/wdcreg.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking dev/ic/wdcreg.h presence" >&5
-+echo $ECHO_N "checking dev/ic/wdcreg.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <dev/ic/wdcreg.h>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: dev/ic/wdcreg.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: dev/ic/wdcreg.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/ic/wdcreg.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: dev/ic/wdcreg.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: dev/ic/wdcreg.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: dev/ic/wdcreg.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/ic/wdcreg.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: dev/ic/wdcreg.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/ic/wdcreg.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: dev/ic/wdcreg.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/ic/wdcreg.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: dev/ic/wdcreg.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/ic/wdcreg.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: dev/ic/wdcreg.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/ic/wdcreg.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: dev/ic/wdcreg.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for dev/ic/wdcreg.h" >&5
-+echo $ECHO_N "checking for dev/ic/wdcreg.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_dev_ic_wdcreg_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_dev_ic_wdcreg_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_dev_ic_wdcreg_h" >&5
-+echo "${ECHO_T}$ac_cv_header_dev_ic_wdcreg_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_dev_ic_wdcreg_h = yes; then
-+  FOUNDINCLUDE=yes
-+else
-+  FOUNDINCLUDE=no
-+fi
-+
-+
-+    fi
-+    if test "$FOUNDINCLUDE" = "no" ; then
- 	{ echo "$as_me:$LINENO: WARNING: Skipping check_ide_smart plugin." >&5
- echo "$as_me: WARNING: Skipping check_ide_smart plugin." >&2;}
--	{ echo "$as_me:$LINENO: WARNING: check_ide_smart is linux specific. It requires linux/hdreg.h and linux/types.h." >&5
--echo "$as_me: WARNING: check_ide_smart is linux specific. It requires linux/hdreg.h and linux/types.h." >&2;}
-+	{ echo "$as_me:$LINENO: WARNING: check_ide_smart requires dev/ata/atareg.h and dev/ic/wdcreg.h" >&5
-+echo "$as_me: WARNING: check_ide_smart requires dev/ata/atareg.h and dev/ic/wdcreg.h" >&2;}
-+    fi
-+  ;;
-+  *)
-+    { echo "$as_me:$LINENO: WARNING: Skipping check_ide_smart plugin." >&5
-+echo "$as_me: WARNING: Skipping check_ide_smart plugin." >&2;}
-+    { echo "$as_me:$LINENO: WARNING: check_ide_smart works only on Linux and NetBSD" >&5
-+echo "$as_me: WARNING: check_ide_smart works only on Linux and NetBSD" >&2;}
-+esac
-+
-+if test "$FOUNDINCLUDE" = "yes" ; then
-+	EXTRAS="$EXTRAS check_ide_smart"
+@@ -23174,7 +23177,7 @@ IFS=$as_save_IFS
+ esac
  fi
+ PATH_TO_FPING6=$ac_cv_path_PATH_TO_FPING6
+-if test -n "$PATH_TO_FPING6"; then
++if test -n "$PATH_TO_FPING6" -a "$PATH_TO_FPING6" != "no"; then
+   { $as_echo "$as_me:$LINENO: result: $PATH_TO_FPING6" >&5
+ $as_echo "$PATH_TO_FPING6" >&6; }
+ else
+@@ -23750,6 +23753,10 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
  
++#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
++#undef _FILE_OFFSET_BITS
++#endif
++
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
+@@ -23812,6 +23819,10 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
  
++#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
++#undef _FILE_OFFSET_BITS
++#endif
++
+                #include <unistd.h>
+                #include <sys/types.h>
+                #include <sys/param.h>
+@@ -24003,6 +24014,10 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
  
++#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
++#undef _FILE_OFFSET_BITS
++#endif
++
+                #include <sys/types.h>
+                #include <sys/param.h>
+                #include <sys/stat.h>
diff --git a/net/nagios-plugins/patches/patch-configure.in b/net/nagios-plugins/patches/patch-configure.in
deleted file mode 100644
index a8c2a832663..00000000000
--- a/net/nagios-plugins/patches/patch-configure.in
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-configure.in,v 1.1 2013/01/19 09:59:12 manu Exp $
-
-Enable check_smart_ide for NetBSD
-
---- configure.in.orig	2013-01-03 05:43:46.000000000 +0100
-+++ configure.in	2013-01-03 05:50:57.000000000 +0100
-@@ -289,18 +289,36 @@
- fi
- LIBS="$_SAVEDLIBS"
- 
- dnl Check for headers used by check_ide_smart
--AC_CHECK_HEADER(linux/hdreg.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no)
--if test "$FOUNDINCLUDE" = "yes" ; then
--	AC_CHECK_HEADER(linux/types.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no)
--fi
-+case $host in
-+  *linux*)
-+    AC_CHECK_HEADER(linux/hdreg.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no)
-+    if test "$FOUNDINCLUDE" = "yes" ; then
-+    	AC_CHECK_HEADER(linux/types.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no)
-+    fi
-+    if test "$FOUNDINCLUDE" = "no" ; then
-+	AC_MSG_WARN([Skipping check_ide_smart plugin.])
-+	AC_MSG_WARN([check_ide_smart requires linux/hdreg.h and linux/types.h.])
-+    fi
-+  ;;
-+  *netbsd*)
-+    AC_CHECK_HEADER(dev/ata/atareg.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no)
-+    if test "$FOUNDINCLUDE" = "yes" ; then
-+    	AC_CHECK_HEADER(dev/ic/wdcreg.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no)
-+    fi
-+    if test "$FOUNDINCLUDE" = "no" ; then
-+	AC_MSG_WARN([Skipping check_ide_smart plugin.])
-+	AC_MSG_WARN([check_ide_smart requires dev/ata/atareg.h and dev/ic/wdcreg.h])
-+    fi
-+  ;;
-+  *)
-+    AC_MSG_WARN([Skipping check_ide_smart plugin.])
-+    AC_MSG_WARN([check_ide_smart works only on Linux and NetBSD])
-+esac
- 
- if test "$FOUNDINCLUDE" = "yes" ; then
- 	EXTRAS="$EXTRAS check_ide_smart"
--else
--	AC_MSG_WARN([Skipping check_ide_smart plugin.])
--	AC_MSG_WARN([check_ide_smart is linux specific. It requires linux/hdreg.h and linux/types.h.])
- fi
- 
- dnl Check for mysql libraries
- np_mysqlclient
diff --git a/net/nagios-plugins/patches/patch-plugins__check_swap.c b/net/nagios-plugins/patches/patch-plugins__check_swap.c
index c6fbdcfb29d..56e1db9be7b 100644
--- a/net/nagios-plugins/patches/patch-plugins__check_swap.c
+++ b/net/nagios-plugins/patches/patch-plugins__check_swap.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-plugins__check_swap.c,v 1.1 2012/07/25 12:01:55 fhajny Exp $
+$NetBSD: patch-plugins__check_swap.c,v 1.2 2015/04/03 17:50:27 rodent Exp $
 
 Disable large file support when building 32bit on SunOS.
---- plugins/check_swap.c.orig	2010-07-27 20:47:16.000000000 +0000
+--- plugins/check_swap.c.orig	2014-04-15 22:19:03.000000000 +0000
 +++ plugins/check_swap.c
-@@ -35,6 +35,10 @@ const char *email = "nagiosplug-devel@li
+@@ -35,6 +35,10 @@ const char *email = "devel@nagios-plugin
  #include "popen.h"
  #include "utils.h"
  
diff --git a/net/nagios-plugins/patches/patch-plugins_check_ide_smart.c b/net/nagios-plugins/patches/patch-plugins_check_ide_smart.c
deleted file mode 100644
index 5a10cbda729..00000000000
--- a/net/nagios-plugins/patches/patch-plugins_check_ide_smart.c
+++ /dev/null
@@ -1,157 +0,0 @@
-$NetBSD: patch-plugins_check_ide_smart.c,v 1.1 2013/01/19 09:59:12 manu Exp $
-
-NetBSD support for SMART checks
-
---- plugins/check_ide_smart.c.orig	2012-12-27 09:37:31.000000000 +0100
-+++ plugins/check_ide_smart.c	2012-12-27 09:37:31.000000000 +0100
-@@ -47,6 +47,27 @@
- #include <sys/ioctl.h>
- #include <fcntl.h>
-+#ifdef linux
- #include <linux/hdreg.h>
- #include <linux/types.h>
-+
-+#define OPEN_MODE O_RDONLY
-+#endif /* linux */
-+#ifdef __NetBSD__
-+#include <sys/device.h>
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <sys/videoio.h> /* for __u8 and friends */
-+#include <sys/scsiio.h>
-+#include <sys/ataio.h>
-+#include <dev/ata/atareg.h>
-+#include <dev/ic/wdcreg.h>
-+
-+#define SMART_ENABLE WDSM_ENABLE_OPS
-+#define SMART_DISABLE WDSM_DISABLE_OPS
-+#define SMART_IMMEDIATE_OFFLINE WDSM_EXEC_OFFL_IMM
-+#define SMART_AUTO_OFFLINE 0xdb /* undefined in NetBSD headers */
-+
-+#define OPEN_MODE O_RDWR
-+#endif /* __NetBSD__ */
- #include <errno.h>
- 	
-@@ -224,5 +245,5 @@
- 	}
- 
--	fd = open (device, O_RDONLY);
-+	fd = open (device, OPEN_MODE);
- 
- 	if (fd < 0) {
-@@ -285,4 +306,5 @@
- smart_read_values (int fd, values_t * values) 
- {
-+#ifdef linux
- 	int e;
- 	__u8 args[4 + 512];
-@@ -297,4 +319,33 @@
- 	}
- 	memcpy (values, args + 4, 512);
-+#endif /* linux */
-+#ifdef __NetBSD__
-+	struct atareq req;
-+	unsigned char inbuf[DEV_BSIZE];
-+
-+	memset(&req, 0, sizeof(req));
-+	req.timeout = 1000;
-+	memset(&inbuf, 0, sizeof(inbuf));
-+
-+	req.flags = ATACMD_READ;
-+	req.features = WDSM_RD_DATA;
-+	req.command = WDCC_SMART;
-+ 	req.databuf = (char *)inbuf;
-+ 	req.datalen = sizeof(inbuf);
-+	req.cylinder = WDSMART_CYL;
-+
-+	if (ioctl(fd, ATAIOCCOMMAND, &req) == 0) {
-+		if (req.retsts != ATACMD_OK)
-+			errno = ENODEV;
-+	}
-+
-+	if (errno != 0) {
-+		int e = errno;
-+		printf (_("CRITICAL - SMART_READ_VALUES: %s\n"), strerror (errno));
-+		return e;
-+	}
-+	
-+	(void)memcpy(values, inbuf, 512);
-+#endif /* __NetBSD__ */
- 	return 0;
- }
-@@ -440,4 +491,5 @@
- {
- 	int e = 0;
-+#ifdef linux
- 	__u8 args[4];
- 	args[0] = WIN_SMART;
-@@ -451,4 +503,29 @@
- 		}
- 	}
-+#endif /* linux */
-+#ifdef __NetBSD__
-+	struct atareq req;
-+
-+	memset(&req, 0, sizeof(req));
-+	req.timeout = 1000;
-+	req.flags = ATACMD_READREG;
-+	req.features = smart_command[command].value;
-+	req.command = WDCC_SMART;
-+	req.cylinder = WDSMART_CYL;
-+	req.sec_count = val0;
-+
-+	if (ioctl(fd, ATAIOCCOMMAND, &req) == 0) {
-+		if (req.retsts != ATACMD_OK)
-+			errno = ENODEV;
-+		if (req.cylinder != WDSMART_CYL)
-+			errno = ENODEV;
-+	}
-+
-+	if (errno != 0) {
-+		e = errno;
-+		printf (_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror (errno));
-+		return e;
-+	}
-+#endif /* __NetBSD__ */
- 	return e;
- }
-@@ -459,4 +536,5 @@
- smart_read_thresholds (int fd, thresholds_t * thresholds) 
- {
-+#ifdef linux
- 	int e;
- 	__u8 args[4 + 512];
-@@ -471,4 +549,33 @@
- 	}
- 	memcpy (thresholds, args + 4, 512);
-+#endif /* linux */
-+#ifdef __NetBSD__
-+	struct atareq req;
-+	unsigned char inbuf[DEV_BSIZE];
-+
-+	memset(&req, 0, sizeof(req));
-+	req.timeout = 1000;
-+	memset(&inbuf, 0, sizeof(inbuf));
-+
-+	req.flags = ATACMD_READ;
-+	req.features = WDSM_RD_THRESHOLDS;
-+	req.command = WDCC_SMART;
-+ 	req.databuf = (char *)inbuf;
-+ 	req.datalen = sizeof(inbuf);
-+	req.cylinder = WDSMART_CYL;
-+
-+	if (ioctl(fd, ATAIOCCOMMAND, &req) == 0) {
-+		if (req.retsts != ATACMD_OK)
-+			errno = ENODEV;
-+	}
-+
-+	if (errno != 0) {
-+		int e = errno;
-+		printf (_("CRITICAL - SMART_READ_THRESHOLDS: %s\n"), strerror (errno));
-+		return e;
-+	}
-+	
-+	(void)memcpy(thresholds, inbuf, 512);
-+#endif /* __NetBSD__ */
- 	return 0;
- }