7 files changed, 16 insertions, 16 deletions

diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile
index bb67d6e7729a..8ac00a959bad 100644
--- a/net-mgmt/monitoring-plugins/Makefile
+++ b/net-mgmt/monitoring-plugins/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	monitoring-plugins
-PORTVERSION=	2.0
-PORTREVISION=	8
+PORTVERSION=	2.1.1
+PORTREVISION=	0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME}
 
diff --git a/net-mgmt/monitoring-plugins/distinfo b/net-mgmt/monitoring-plugins/distinfo
index 7c1b9da3ac5b..13c0917cbbd4 100644
--- a/net-mgmt/monitoring-plugins/distinfo
+++ b/net-mgmt/monitoring-plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (monitoring-plugins-2.0.tar.gz) = a91b0f68ff00661e0d69f28e3cf577541af98e0f6d09dd014328f132bde6c3fc
-SIZE (monitoring-plugins-2.0.tar.gz) = 2610000
+SHA256 (monitoring-plugins-2.1.1.tar.gz) = 44dbace8033eafb716cc501bfef26ca9071ae3d0329b2c118bd0230fd98dd1d3
+SIZE (monitoring-plugins-2.1.1.tar.gz) = 2612331
diff --git a/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff b/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff
index 1b4f1355f763..8b5633254712 100644
--- a/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff
+++ b/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff
@@ -1,11 +1,11 @@
---- plugins/check_dig.c.orig	2014-06-23 16:01:00 UTC
+--- plugins/check_dig.c.orig	2014-11-30 10:36:26 UTC
 +++ plugins/check_dig.c
 @@ -94,8 +94,8 @@ main (int argc, char **argv)
    timeout_interval_dig = timeout_interval / number_tries + number_tries;
  
    /* get the command to run */
--  xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s +tries=%d +time=%d",
--            PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args, query_transport, number_tries, timeout_interval_dig);
+-  xasprintf (&command_line, "%s %s %s -p %d @%s %s %s +tries=%d +time=%d",
+-            PATH_TO_DIG, dig_args, query_transport, server_port, dns_server, query_address, record_type, number_tries, timeout_interval_dig);
 +  xasprintf (&command_line, "%s %s @%s -z -p %d %s %s %s",
 +            PATH_TO_DIG, dig_args, dns_server, server_port, query_transport, query_address, record_type);
  
diff --git a/net-mgmt/monitoring-plugins/files/patch-configure b/net-mgmt/monitoring-plugins/files/patch-configure
index b995fb7f62f4..591c6525a2c9 100644
--- a/net-mgmt/monitoring-plugins/files/patch-configure
+++ b/net-mgmt/monitoring-plugins/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2014-06-26 16:17:37 UTC
+--- configure.orig	2014-12-01 23:45:00 UTC
 +++ configure
-@@ -21787,7 +21787,7 @@ then
+@@ -16651,7 +16651,7 @@ then
  $as_echo "$ac_cv_ps_command" >&6; }
  
  elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c b/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c
index 047db85a0b97..9f738637297d 100644
--- a/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c
+++ b/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c
@@ -1,4 +1,4 @@
---- plugins-root/check_dhcp.c.orig	2014-07-06 17:55:03 UTC
+--- plugins-root/check_dhcp.c.orig	2014-11-30 10:36:26 UTC
 +++ plugins-root/check_dhcp.c
 @@ -323,7 +323,8 @@ int get_hardware_address(int sock,char *
  #elif defined(__bsd__)
diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl b/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl
index b56cb40f7f5e..46fe0a3aedbb 100644
--- a/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl
+++ b/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl
@@ -1,6 +1,6 @@
---- plugins-scripts/check_ircd.pl.orig	2014-07-06 17:55:03 UTC
+--- plugins-scripts/check_ircd.pl.orig	2014-11-30 10:36:26 UTC
 +++ plugins-scripts/check_ircd.pl
-@@ -66,6 +66,7 @@
+@@ -66,6 +66,7 @@ sub bindRemote ($$);
  $ENV{'PATH'}='@TRUSTED_PATH@';
  $ENV{'BASH_ENV'}=''; 
  $ENV{'ENV'}='';
@@ -8,7 +8,7 @@
  
  # -----------------------------------------------------------------[ Global ]--
  
-@@ -153,7 +154,7 @@
+@@ -153,7 +154,7 @@ sub bindRemote ($$)
  	    print "IRCD UNKNOWN: Could not start socket ($!)\n";
  	    exit $ERRORS{"UNKNOWN"};
  	}
diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c b/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c
index 55e0321b06c7..f6544773faa9 100644
--- a/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c
+++ b/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c
@@ -1,6 +1,6 @@
---- plugins/check_ssh.c.orig	2014-07-06 10:26:39 UTC
+--- plugins/check_ssh.c.orig	2014-11-30 22:28:21 UTC
 +++ plugins/check_ssh.c
-@@ -255,6 +255,7 @@
+@@ -255,6 +255,7 @@ ssh_connect (char *haddr, int hport, cha
  			printf
  				(_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
  				 ssh_server, ssh_proto, remote_version);
@@ -8,7 +8,7 @@
  			close(sd);
  			exit (STATE_WARNING);
  		}
-@@ -273,6 +274,7 @@
+@@ -273,6 +274,7 @@ ssh_connect (char *haddr, int hport, cha
  			(_("SSH OK - %s (protocol %s) | %s\n"),
  			 ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s",
  			 FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout));