Update nagios plugins to 1.4.14. Changes since 1.4.13:

This is a bug fix release, which includes some important fixes to --extra-opts (a way of specifying command line options within files).
* check_http has options to specify the HTTP method (#2155152)
* check_users thresholds were not working exactly as documented (>= rather
  than >)

18 files changed, 88 insertions, 104 deletions

diff --git a/net/nagios-plugin-ldap/distinfo b/net/nagios-plugin-ldap/distinfo
index 3512c6e24d4..30d2cd362ff 100644
--- a/net/nagios-plugin-ldap/distinfo
+++ b/net/nagios-plugin-ldap/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2009/03/24 19:54:53 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2009/12/15 18:59:54 bouyer Exp $
 
-SHA1 (nagios-plugins-1.4.13.tar.gz) = fb22eba22095bdd709a65b1477bfb566aac9077e
-RMD160 (nagios-plugins-1.4.13.tar.gz) = 38de32581581b21e36e047138a94a70a9a031a02
-Size (nagios-plugins-1.4.13.tar.gz) = 2279556 bytes
+SHA1 (nagios-plugins-1.4.14.tar.gz) = b9998231f992c92b9370b62f15ac80323042f22c
+RMD160 (nagios-plugins-1.4.14.tar.gz) = f4e1768d84474fc4fa2b59a52efe320c7cbefb3a
+Size (nagios-plugins-1.4.14.tar.gz) = 1950729 bytes
 SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac
 SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01
 SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436
diff --git a/net/nagios-plugin-mysql/distinfo b/net/nagios-plugin-mysql/distinfo
index 3512c6e24d4..30d2cd362ff 100644
--- a/net/nagios-plugin-mysql/distinfo
+++ b/net/nagios-plugin-mysql/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2009/03/24 19:54:53 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2009/12/15 18:59:54 bouyer Exp $
 
-SHA1 (nagios-plugins-1.4.13.tar.gz) = fb22eba22095bdd709a65b1477bfb566aac9077e
-RMD160 (nagios-plugins-1.4.13.tar.gz) = 38de32581581b21e36e047138a94a70a9a031a02
-Size (nagios-plugins-1.4.13.tar.gz) = 2279556 bytes
+SHA1 (nagios-plugins-1.4.14.tar.gz) = b9998231f992c92b9370b62f15ac80323042f22c
+RMD160 (nagios-plugins-1.4.14.tar.gz) = f4e1768d84474fc4fa2b59a52efe320c7cbefb3a
+Size (nagios-plugins-1.4.14.tar.gz) = 1950729 bytes
 SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac
 SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01
 SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436
diff --git a/net/nagios-plugin-pgsql/Makefile b/net/nagios-plugin-pgsql/Makefile
index 9f08d354945..26985d16469 100644
--- a/net/nagios-plugin-pgsql/Makefile
+++ b/net/nagios-plugin-pgsql/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2008/03/13 17:38:48 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/12/15 18:59:54 bouyer Exp $
 #
 
 PKGNAME=	nagios-plugin-pgsql-${PLUGINSVERSION}
-PKGREVISION=	3
 CATEGORIES=	net sysutils databases
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/net/nagios-plugin-pgsql/distinfo b/net/nagios-plugin-pgsql/distinfo
index 9a703870b3e..2a4146bc7a4 100644
--- a/net/nagios-plugin-pgsql/distinfo
+++ b/net/nagios-plugin-pgsql/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2009/03/24 19:54:53 bouyer Exp $
+$NetBSD: distinfo,v 1.7 2009/12/15 18:59:54 bouyer Exp $
 
-SHA1 (nagios-plugins-1.4.13.tar.gz) = fb22eba22095bdd709a65b1477bfb566aac9077e
-RMD160 (nagios-plugins-1.4.13.tar.gz) = 38de32581581b21e36e047138a94a70a9a031a02
-Size (nagios-plugins-1.4.13.tar.gz) = 2279556 bytes
+SHA1 (nagios-plugins-1.4.14.tar.gz) = b9998231f992c92b9370b62f15ac80323042f22c
+RMD160 (nagios-plugins-1.4.14.tar.gz) = f4e1768d84474fc4fa2b59a52efe320c7cbefb3a
+Size (nagios-plugins-1.4.14.tar.gz) = 1950729 bytes
 SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac
 SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01
 SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436
diff --git a/net/nagios-plugin-radius/distinfo b/net/nagios-plugin-radius/distinfo
index ba8907a803e..68017bf284d 100644
--- a/net/nagios-plugin-radius/distinfo
+++ b/net/nagios-plugin-radius/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2009/03/24 19:54:53 bouyer Exp $
+$NetBSD: distinfo,v 1.4 2009/12/15 18:59:54 bouyer Exp $
 
-SHA1 (nagios-plugins-1.4.13.tar.gz) = fb22eba22095bdd709a65b1477bfb566aac9077e
-RMD160 (nagios-plugins-1.4.13.tar.gz) = 38de32581581b21e36e047138a94a70a9a031a02
-Size (nagios-plugins-1.4.13.tar.gz) = 2279556 bytes
+SHA1 (nagios-plugins-1.4.14.tar.gz) = b9998231f992c92b9370b62f15ac80323042f22c
+RMD160 (nagios-plugins-1.4.14.tar.gz) = f4e1768d84474fc4fa2b59a52efe320c7cbefb3a
+Size (nagios-plugins-1.4.14.tar.gz) = 1950729 bytes
 SHA1 (patch-aa) = eb39ca2fcbe857b48ec6a5a15a097a2e7fd635a2
 SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac
 SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01
diff --git a/net/nagios-plugin-snmp/distinfo b/net/nagios-plugin-snmp/distinfo
index b5ebf65f6d3..2b79e60ae50 100644
--- a/net/nagios-plugin-snmp/distinfo
+++ b/net/nagios-plugin-snmp/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2009/03/24 19:54:53 bouyer Exp $
+$NetBSD: distinfo,v 1.7 2009/12/15 18:59:54 bouyer Exp $
 
-SHA1 (nagios-plugins-1.4.13.tar.gz) = fb22eba22095bdd709a65b1477bfb566aac9077e
-RMD160 (nagios-plugins-1.4.13.tar.gz) = 38de32581581b21e36e047138a94a70a9a031a02
-Size (nagios-plugins-1.4.13.tar.gz) = 2279556 bytes
+SHA1 (nagios-plugins-1.4.14.tar.gz) = b9998231f992c92b9370b62f15ac80323042f22c
+RMD160 (nagios-plugins-1.4.14.tar.gz) = f4e1768d84474fc4fa2b59a52efe320c7cbefb3a
+Size (nagios-plugins-1.4.14.tar.gz) = 1950729 bytes
 SHA1 (patch-aa) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-ad) = 75bb44093f1fe0d18668cb9aec787d760fe16ad4
 SHA1 (patch-ae) = 42a2767b290e4a10c93f170e85138e8c639906dc
diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile
index 7ed9844d67d..9ff3a9763e7 100644
--- a/net/nagios-plugins/Makefile
+++ b/net/nagios-plugins/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2009/11/15 04:47:41 snj Exp $
+# $NetBSD: Makefile,v 1.21 2009/12/15 18:59:54 bouyer Exp $
 #
 
 CATEGORIES=	net sysutils
-PKGREVISION=	2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/nagiosplug/
diff --git a/net/nagios-plugins/Makefile.common b/net/nagios-plugins/Makefile.common
index 61b20101ea7..62147fb7aff 100644
--- a/net/nagios-plugins/Makefile.common
+++ b/net/nagios-plugins/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.6 2009/03/24 19:54:54 bouyer Exp $
+# $NetBSD: Makefile.common,v 1.7 2009/12/15 18:59:54 bouyer Exp $
 #
 
-PLUGINSVERSION=	1.4.13
+PLUGINSVERSION=	1.4.14
 DISTNAME=	nagios-plugins-${PLUGINSVERSION}
 MASTER_SITES?=	${MASTER_SITE_SOURCEFORGE:=nagiosplug/}
 
diff --git a/net/nagios-plugins/PLIST b/net/nagios-plugins/PLIST
index aaf74619bf6..fd09a6d1ae9 100644
--- a/net/nagios-plugins/PLIST
+++ b/net/nagios-plugins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:09:35 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/12/15 18:59:54 bouyer Exp $
 libexec/nagios/check_by_ssh
 libexec/nagios/check_clamd
 libexec/nagios/check_dhcp
@@ -47,5 +47,5 @@ libexec/nagios/negate
 libexec/nagios/urlize
 libexec/nagios/utils.pm
 libexec/nagios/utils.sh
-share/nagios/locale/de/LC_MESSAGES/nagios-plugins.mo
-share/nagios/locale/fr/LC_MESSAGES/nagios-plugins.mo
+share/nagios/nagios/locale/de/LC_MESSAGES/nagios-plugins.mo
+share/nagios/nagios/locale/fr/LC_MESSAGES/nagios-plugins.mo
diff --git a/net/nagios-plugins/distinfo b/net/nagios-plugins/distinfo
index 38cf1a0842a..81d4b637b06 100644
--- a/net/nagios-plugins/distinfo
+++ b/net/nagios-plugins/distinfo
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.8 2009/03/24 19:54:54 bouyer Exp $
+$NetBSD: distinfo,v 1.9 2009/12/15 18:59:54 bouyer Exp $
 
-SHA1 (nagios-plugins-1.4.13.tar.gz) = fb22eba22095bdd709a65b1477bfb566aac9077e
-RMD160 (nagios-plugins-1.4.13.tar.gz) = 38de32581581b21e36e047138a94a70a9a031a02
-Size (nagios-plugins-1.4.13.tar.gz) = 2279556 bytes
-SHA1 (patch-aa) = 021c2dbcd2ff0404a44cbbf3ccd42bd7400646bb
-SHA1 (patch-ab) = 44d127ac3571614642f8523a210c33b04a95e5de
-SHA1 (patch-ad) = edf12abc20e8dfe4095e4515c27046579639d1ae
-SHA1 (patch-ae) = 775fc9d8c25eec6050d709e8a377c8deb17bcf66
-SHA1 (patch-af) = 186eec6496ea2659756897e5833510cb6a39009f
-SHA1 (patch-ah) = b9f9f36d2c77ac08213dfea4df443872230f8099
+SHA1 (nagios-plugins-1.4.14.tar.gz) = b9998231f992c92b9370b62f15ac80323042f22c
+RMD160 (nagios-plugins-1.4.14.tar.gz) = f4e1768d84474fc4fa2b59a52efe320c7cbefb3a
+Size (nagios-plugins-1.4.14.tar.gz) = 1950729 bytes
+SHA1 (patch-ab) = 0932ae4b165aee175f1bf268d369e71b53c54b8e
+SHA1 (patch-ad) = edd4b7312f21b7bea1b8e74d7739de684aa266ad
+SHA1 (patch-ae) = 0b850f7e35ceceb32597e15b2c7de10abe99a5ba
+SHA1 (patch-af) = 62d8c6aee75a0cefd06af98f88033f13c109fbe0
+SHA1 (patch-ah) = c3ffc39ddcad231a225852e89aa309c039e18919
 SHA1 (patch-ai) = 383f5b19466c82454e198e1b9cdbec2dcfd04047
-SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac
+SHA1 (patch-ak) = 48f56dd7b8e2c5480ef2e19e2535e4abf6a83472
 SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01
 SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436
-SHA1 (patch-an) = da7addcb3b9aaac0422ae7fa29afb26fe8bbd6a1
+SHA1 (patch-an) = d7dc45376eca1ea0ed5ba2abc6244c7d52f840a4
diff --git a/net/nagios-plugins/patches/patch-aa b/net/nagios-plugins/patches/patch-aa
deleted file mode 100644
index a05b0157cb9..00000000000
--- a/net/nagios-plugins/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2009/03/24 19:54:54 bouyer Exp $
-
---- lib/utils_base.c.orig	2008-03-11 01:10:23.000000000 +0100
-+++ lib/utils_base.c	2009-03-23 12:39:57.000000000 +0100
-@@ -104,7 +104,7 @@
- {
- 	thresholds *temp_thresholds = NULL;
- 
--	temp_thresholds = malloc(sizeof(temp_thresholds));
-+	temp_thresholds = malloc(sizeof(*temp_thresholds));
- 
- 	temp_thresholds->warning = NULL;
- 	temp_thresholds->critical = NULL;
diff --git a/net/nagios-plugins/patches/patch-ab b/net/nagios-plugins/patches/patch-ab
index ce3af6f5c48..87b66fe033d 100644
--- a/net/nagios-plugins/patches/patch-ab
+++ b/net/nagios-plugins/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2009/03/24 19:54:54 bouyer Exp $
+$NetBSD: patch-ab,v 1.5 2009/12/15 18:59:54 bouyer Exp $
 
---- configure.orig	2008-09-25 10:33:24.000000000 +0200
-+++ configure	2009-03-23 12:39:57.000000000 +0100
-@@ -1268,7 +1268,7 @@
+--- configure.orig	2009-09-16 10:38:03.000000000 +0200
++++ configure	2009-12-15 17:29:32.000000000 +0100
+@@ -1443,7 +1443,7 @@
  pdfdir='${docdir}'
  psdir='${docdir}'
  libdir='${exec_prefix}/lib'
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.4 2009/03/24 19:54:54 bouyer Exp $
  mandir='${datarootdir}/man'
  
  ac_prev=
-@@ -22225,7 +22225,7 @@
+@@ -22562,7 +22562,7 @@
  
  fi
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.4 2009/03/24 19:54:54 bouyer Exp $
    EXTRAS="$EXTRAS check_radius"
  	RADIUSLIBS="-lradiusclient"
  
-@@ -22380,7 +22380,7 @@
+@@ -22717,7 +22717,7 @@
  
  fi
  
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.4 2009/03/24 19:54:54 bouyer Exp $
    LDAPLIBS="-lldap -llber"\
    LDAPINCLUDE="-I/usr/include/ldap"
  
-@@ -26397,7 +26397,7 @@
+@@ -26671,7 +26671,7 @@
  	then
  		{ echo "$as_me:$LINENO: checking for nslookup syntax" >&5
  echo $ECHO_N "checking for nslookup syntax... $ECHO_C" >&6; }
@@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.4 2009/03/24 19:54:54 bouyer Exp $
  		then
  			ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
  			{ echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5
-@@ -26620,7 +26620,7 @@
+@@ -26894,7 +26894,7 @@
  fi
  
  
@@ -47,7 +47,7 @@ $NetBSD: patch-ab,v 1.4 2009/03/24 19:54:54 bouyer Exp $
  then
  
  cat >>confdefs.h <<_ACEOF
-@@ -26791,7 +26791,7 @@
+@@ -27065,7 +27065,7 @@
    withval=$with_snmpget_command; PATH_TO_SNMPGET=$withval
  fi
  
@@ -56,7 +56,7 @@ $NetBSD: patch-ab,v 1.4 2009/03/24 19:54:54 bouyer Exp $
  then
  
  cat >>confdefs.h <<_ACEOF
-@@ -26850,7 +26850,7 @@
+@@ -27124,7 +27124,7 @@
    withval=$with_snmpgetnext_command; PATH_TO_SNMPGETNEXT=$withval
  fi
  
@@ -65,7 +65,7 @@ $NetBSD: patch-ab,v 1.4 2009/03/24 19:54:54 bouyer Exp $
  then
  
  cat >>confdefs.h <<_ACEOF
-@@ -26859,7 +26859,7 @@
+@@ -27133,7 +27133,7 @@
  
  fi
  
@@ -74,7 +74,7 @@ $NetBSD: patch-ab,v 1.4 2009/03/24 19:54:54 bouyer Exp $
  then
  	{ echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5
  echo $ECHO_N "checking for Net::SNMP perl module... $ECHO_C" >&6; }
-@@ -27026,7 +27026,7 @@
+@@ -27300,7 +27300,7 @@
    withval=$with_fping_command; PATH_TO_FPING=$withval
  fi
  
@@ -83,7 +83,7 @@ $NetBSD: patch-ab,v 1.4 2009/03/24 19:54:54 bouyer Exp $
  then
  
  cat >>confdefs.h <<_ACEOF
-@@ -28242,7 +28242,7 @@
+@@ -28516,7 +28516,7 @@
  fi
  
  
@@ -92,7 +92,7 @@ $NetBSD: patch-ab,v 1.4 2009/03/24 19:54:54 bouyer Exp $
    EXTRAS="$EXTRAS check_nt"
  elif test -f ../plugins/check_nt.c ; then
    EXTRAS="$EXTRAS check_nt"
-@@ -47646,6 +47646,10 @@
+@@ -56260,6 +56260,10 @@
    case $ac_option in
    # Handling of the options.
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
diff --git a/net/nagios-plugins/patches/patch-ad b/net/nagios-plugins/patches/patch-ad
index da7ff080cc0..22ecace710b 100644
--- a/net/nagios-plugins/patches/patch-ad
+++ b/net/nagios-plugins/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.2 2008/05/27 21:22:03 tonnerre Exp $
+$NetBSD: patch-ad,v 1.3 2009/12/15 18:59:54 bouyer Exp $
 
---- plugins-scripts/Makefile.in.orig	2007-12-13 23:42:35.000000000 +0100
-+++ plugins-scripts/Makefile.in
-@@ -330,15 +330,11 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- plugins-scripts/Makefile.in.orig	2009-09-16 10:38:00.000000000 +0200
++++ plugins-scripts/Makefile.in	2009-12-15 17:30:07.000000000 +0100
+@@ -724,15 +724,11 @@
  with_trusted_path = @with_trusted_path@
+ @RELEASE_PRESENT_TRUE@NP_VERSION = $(PACKAGE_VERSION)
  SUFFIXES = .pl .sh
 -libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \
 -	check_log check_oracle check_rpc check_sensors check_wave \
diff --git a/net/nagios-plugins/patches/patch-ae b/net/nagios-plugins/patches/patch-ae
index 3bf889914e8..017bbebe147 100644
--- a/net/nagios-plugins/patches/patch-ae
+++ b/net/nagios-plugins/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2008/05/27 21:22:03 tonnerre Exp $
+$NetBSD: patch-ae,v 1.4 2009/12/15 18:59:54 bouyer Exp $
 
---- plugins/Makefile.am.orig	2007-12-12 02:27:48.000000000 +0100
-+++ plugins/Makefile.am
-@@ -162,7 +162,7 @@ install-exec-hook:
+--- plugins/Makefile.am.orig	2009-06-06 09:04:48.000000000 +0200
++++ plugins/Makefile.am	2009-12-15 17:30:29.000000000 +0100
+@@ -170,7 +170,7 @@
  	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
@@ -10,4 +10,4 @@ $NetBSD: patch-ae,v 1.3 2008/05/27 21:22:03 tonnerre Exp $
 +
  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 74343954641..f21b56f5b0a 100644
--- a/net/nagios-plugins/patches/patch-af
+++ b/net/nagios-plugins/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2008/05/27 21:22:03 tonnerre Exp $
+$NetBSD: patch-af,v 1.4 2009/12/15 18:59:54 bouyer Exp $
 
---- plugins/Makefile.in.orig	2007-12-13 23:42:36.000000000 +0100
-+++ plugins/Makefile.in
-@@ -34,7 +34,7 @@ PRE_UNINSTALL = :
+--- plugins/Makefile.in.orig	2009-09-16 10:38:00.000000000 +0200
++++ plugins/Makefile.in	2009-12-15 17:30:49.000000000 +0100
+@@ -31,7 +31,7 @@
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.3 2008/05/27 21:22:03 tonnerre Exp $
  	check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \
  	check_load$(EXEEXT) check_mrtg$(EXEEXT) \
  	check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \
-@@ -1131,7 +1131,7 @@ $(check_tcp_programs): check_tcp
+@@ -1539,7 +1539,7 @@
  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 e5e0d4ce770..8ac326a86ec 100644
--- a/net/nagios-plugins/patches/patch-ah
+++ b/net/nagios-plugins/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $
+$NetBSD: patch-ah,v 1.2 2009/12/15 18:59:54 bouyer Exp $
 
---- plugins-scripts/check_ntp.pl.orig	2005-08-04 08:07:01.000000000 -0700
-+++ plugins-scripts/check_ntp.pl	2005-08-04 08:08:39.000000000 -0700
-@@ -307,6 +307,7 @@
+--- plugins-scripts/check_ntp.pl.orig	2008-11-30 22:23:18.000000000 +0100
++++ plugins-scripts/check_ntp.pl	2009-12-15 17:31:18.000000000 +0100
+@@ -311,6 +311,7 @@
  				} else {
  					$jitter_error = $ERRORS{'OK'};
  				}
diff --git a/net/nagios-plugins/patches/patch-ak b/net/nagios-plugins/patches/patch-ak
index 6f30cf339ed..51affb7a505 100644
--- a/net/nagios-plugins/patches/patch-ak
+++ b/net/nagios-plugins/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.2 2008/05/27 21:22:03 tonnerre Exp $
+$NetBSD: patch-ak,v 1.3 2009/12/15 18:59:54 bouyer Exp $
 
---- gl/mountlist.c.orig	2007-01-24 23:47:25.000000000 +0100
-+++ gl/mountlist.c
-@@ -57,7 +57,11 @@ char *strstr ();
+--- gl/mountlist.c.orig	2009-05-21 23:11:51.000000000 +0200
++++ gl/mountlist.c	2009-12-15 17:31:57.000000000 +0100
+@@ -52,7 +52,11 @@
  # if HAVE_STRUCT_FSSTAT_F_FSTYPENAME
  #  define FS_TYPE(Ent) ((Ent).f_fstypename)
  # else
@@ -15,7 +15,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:03 tonnerre Exp $
  # endif
  #endif /* MOUNTED_GETFSSTAT */
  
-@@ -104,6 +108,10 @@ char *strstr ();
+@@ -99,6 +103,10 @@
  # include <sys/statfs.h>
  #endif
  
@@ -26,7 +26,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:03 tonnerre Exp $
  #ifdef MOUNTED_LISTMNTENT
  # include <mntent.h>
  #endif
-@@ -178,7 +186,7 @@ char *strstr ();
+@@ -169,7 +177,7 @@
  
  #if MOUNTED_GETMNTINFO
  
@@ -35,7 +35,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:03 tonnerre Exp $
  static char *
  fstype_to_string (short int t)
  {
-@@ -275,9 +283,13 @@ fstype_to_string (short int t)
+@@ -266,9 +274,13 @@
  # endif
  
  static char *
@@ -50,7 +50,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:03 tonnerre Exp $
    return (char *) (fsp->f_fstypename);
  # else
    return fstype_to_string (fsp->f_type);
-@@ -413,7 +425,11 @@ read_file_system_list (bool need_fs_type
+@@ -404,7 +416,11 @@
  
  #ifdef MOUNTED_GETMNTINFO	/* 4.4BSD.  */
    {
@@ -62,7 +62,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:03 tonnerre Exp $
      int entries;
  
      entries = getmntinfo (&fsp, MNT_NOWAIT);
-@@ -601,9 +617,17 @@ read_file_system_list (bool need_fs_type
+@@ -592,9 +608,17 @@
    {
      int numsys, counter;
      size_t bufsize;
@@ -80,7 +80,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:03 tonnerre Exp $
      if (numsys < 0)
        return (NULL);
      if (SIZE_MAX / sizeof *stats <= numsys)
-@@ -666,10 +690,18 @@ read_file_system_list (bool need_fs_type
+@@ -657,10 +681,18 @@
  # ifdef GETFSTYP			/* SVR3.  */
  	if (need_fs_type)
  	  {
diff --git a/net/nagios-plugins/patches/patch-an b/net/nagios-plugins/patches/patch-an
index 7395db12b39..52e9ea688bc 100644
--- a/net/nagios-plugins/patches/patch-an
+++ b/net/nagios-plugins/patches/patch-an
@@ -1,13 +1,13 @@
-$NetBSD: patch-an,v 1.2 2008/05/27 21:22:03 tonnerre Exp $
+$NetBSD: patch-an,v 1.3 2009/12/15 18:59:54 bouyer Exp $
 
---- lib/Makefile.in.orig	2007-12-13 23:42:34.000000000 +0100
-+++ lib/Makefile.in
-@@ -109,7 +109,7 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(t
+--- lib/Makefile.in.orig	2009-09-16 10:37:59.000000000 +0200
++++ lib/Makefile.in	2009-12-15 17:33:17.000000000 +0100
+@@ -127,7 +127,7 @@
  depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
  am__depfiles_maybe = depfiles
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 -	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 +	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS_LFS)
- LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)