Index: head/net-mgmt/monitoring-plugins/Makefile
===================================================================
--- head/net-mgmt/monitoring-plugins/Makefile	(revision 363332)
+++ head/net-mgmt/monitoring-plugins/Makefile	(revision 363333)
@@ -1,172 +1,161 @@
 # Created by: Blaz Zupan <blaz@si.FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	monitoring-plugins
-PORTVERSION=	1.5.99.20140721
-PORTREVISION=	1
+PORTVERSION=	2.0
 CATEGORIES=	net-mgmt
-MASTER_SITES=	LOCAL/mat/${PORTNAME} GH GHC
-		
+MASTER_SITES=	https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Monitoring Plugins for Nagios
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	monitoring-plugins
-GH_COMMIT=	b5611ea
-GH_TAGNAME=	${GH_COMMIT}
-
 CONFLICTS_INSTALL=	nagios-plugins-*
 
 USES=		charsetfix gmake perl5 libtool
 CHARSETFIX_MAKEFILEIN=Makefile.am
 USE_SUBMAKE=	yes
 USE_AUTOTOOLS=	aclocal autoconf automake autoheader
 ACLOCAL_ARGS=	-I m4 -I gl/m4
 AUTOMAKE_ARGS=	--add-missing
 
 OPTIONS_DEFINE=	QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI EXTRAOPTS
 OPTIONS_SINGLE=	DNS
 OPTIONS_SINGLE_DNS=	DNS_BASE DNS_BINDTOOLS DNS_BIND98 DNS_BIND99 DNS_BIND910
 OPTIONS_DEFAULT=IPV6 EXTRAOPTS DNS_BASE
 OPTIONS_SUB=	yes
 
 QSTAT_DESC=	Game server query support (check_game)
 FPING_DESC=	Support for non-flooding fast ping (check_fping)
 NETSNMP_DESC=	SNMP support (check_snmp)
 RADIUS_DESC=	Radius support (check_radius)
 MYSQL_DESC=	MySQL support (check_mysql)
 PGSQL_DESC=	PostgreSQL support (check_pgsql)
 LDAP_DESC=	OpenLDAP support (check_ldap)
 JAIL_DESC=	Compilation within jail(8) (see help)
 DBI_DESC=	Check database using DBI
 EXTRAOPTS_DESC=	Parsing of plugins ini config files for extra options
 
 DNS_DESC=	Configuration of check_dig and check_dns (see help)
 
 DNS_BASE_DESC=	>= 10 means drill for check_dig and no check_dns
 DNS_BINDTOOLS_DESC=	Use dig and nslookup from dns/bind-tools
 DNS_BIND98_DESC=	Use dig and nslookup from dns/bind98
 DNS_BIND99_DESC=	Use dig and nslookup from dns/bind99
 DNS_BIND910_DESC=	Use dig and nslookup from dns/bind910
 
 EXTRAOPTS_CONFIGURE_ENABLE=	extra-opts
 
 GNU_CONFIGURE=	yes
 
-NAGIOSUSER?=	nagios
-NAGIOSGROUP?=	nagios
 NAGIOSDIR?=	/var/spool/nagios
 
 NAGIOSWWWDIR?=	www/nagios
 NAGIOSHTMURL?=	/nagios
 NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
 
 NAGIOSPOLLIP?=	127.0.0.1
 NAGIOSPOLLIP6?=	::1
 
-CONFIGURE_ARGS+=--with-nagios-user=${NAGIOSUSER} \
-		--with-nagios-group=${NAGIOSGROUP} \
-		--with-cgiurl=${NAGIOSCGIURL} \
+CONFIGURE_ARGS+=--with-cgiurl=${NAGIOSCGIURL} \
 		--sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
 		--libexecdir=${PREFIX}/libexec/nagios \
 		--datadir=${PREFIX}/share \
 		--sysconfdir=${PREFIX}/etc/nagios \
 		--localstatedir=${NAGIOSDIR} \
+		--with-perl=${PERL} \
 		--prefix=${PREFIX}
 
 # Also, force some commands with their expected paths so that they don't get
 # disabled.
 CONFIGURE_ARGS+=--with-qmail-qstat-command=/var/qmail/bin/qmail-qstat
 
-CONFIGURE_ENV=	PERL=${PERL}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 
 QSTAT_BUILD_DEPENDS=	qstat:${PORTSDIR}/games/qstat
 QSTAT_RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
 QSTAT_CONFIGURE_ENABLE=	qstat
 
 IPV6_CONFIGURE_WITH=	ipv6
 
 FPING_BUILD_DEPENDS=	fping:${PORTSDIR}/net/fping
 FPING_RUN_DEPENDS=	fping:${PORTSDIR}/net/fping
 FPING_CONFIGURE_ENABLE=	fping
 
 NETSNMP_BUILD_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
 		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
 NETSNMP_RUN_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
 		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
 NETSNMP_CONFIGURE_ENABLE=	snmp
 
 RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
 RADIUS_CONFIGURE_WITH=	radius
 
 MYSQL_USE=	mysql=yes
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
 MYSQL_CONFIGURE_OFF=	--without-mysql
 
 PGSQL_USE=	pgsql=yes
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-pgsql
 
 LDAP_USE=	openldap=yes
 LDAP_CONFIGURE_WITH=	ldap
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 DBI_LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi
 DBI_CONFIGURE_WITH=	dbi
 
 DNS_BINDTOOLS_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind-tools
 DNS_BINDTOOLS_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
 DNS_BIND98_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind98
 DNS_BIND98_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
 DNS_BIND99_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind99
 DNS_BIND99_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
 DNS_BIND910_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind910
 DNS_BIND910_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
 
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} > 1000055 && ${PORT_OPTIONS:MDNS_BASE}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-dig-to-drill.diff
 CONFIGURE_ARGS+=--with-dig-command=/usr/bin/drill
 PLIST_SUB+=	CHECK_DNS="@comment "
 .else
 .  if ${PORT_OPTIONS:MDNS_BASE}
 CONFIGURE_ARGS+=	--with-dig-command=/usr/bin/dig \
 			--with-nslookup-command=/usr/bin/nslookup
 .  endif
 PLIST_SUB+=	CHECK_DNS=""
 .endif
 
 .if !exists(/usr/bin/ssh)
 PLIST_SUB+=	SSH="@comment "
 .else
 PLIST_SUB+=	SSH=""
 .endif
 
 post-patch:
 .for file in check_by_ssh.c check_disk.c check_http.c check_mrtgtraf.c \
 	check_nagios.c check_ntp.c check_ntp_peer.c check_ntp_time.c \
 	check_pgsql.c check_snmp.c check_ssh.c check_swap.c check_time.c \
 	check_users.c
 	@${REINPLACE_CMD} -e 's|setlocale (LC_ALL, "");|setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");|g' ${WRKSRC}/plugins/${file}
 .endfor
 	@${REINPLACE_CMD} -e 's|chown root|${TRUE}|g' ${WRKSRC}/plugins-root/Makefile.am
 .if ${PORT_OPTIONS:MJAIL}
 	@${REINPLACE_CMD} -e 's# 127.0.0.1 # ${NAGIOSPOLLIP} #g' ${WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e 's# ::1 # ${NAGIOSPOLLIP6} #g' ${WRKSRC}/configure.ac
 .endif
 
 .include <bsd.port.mk>
Index: head/net-mgmt/monitoring-plugins/distinfo
===================================================================
--- head/net-mgmt/monitoring-plugins/distinfo	(revision 363332)
+++ head/net-mgmt/monitoring-plugins/distinfo	(revision 363333)
@@ -1,2 +1,2 @@
-SHA256 (monitoring-plugins-1.5.99.20140721.tar.gz) = bc82a96d8384ec006d3a8f961e60582af87cc2d0a385d02769e73994af31ea50
-SIZE (monitoring-plugins-1.5.99.20140721.tar.gz) = 2051048
+SHA256 (monitoring-plugins-2.0.tar.gz) = a91b0f68ff00661e0d69f28e3cf577541af98e0f6d09dd014328f132bde6c3fc
+SIZE (monitoring-plugins-2.0.tar.gz) = 2610000
Index: head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ntp.pl
===================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ntp.pl	(revision 363332)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ntp.pl	(nonexistent)
@@ -1,19 +0,0 @@
---- ./plugins-scripts/check_ntp.pl.orig	2014-03-04 20:21:36.000000000 +0100
-+++ ./plugins-scripts/check_ntp.pl	2014-04-14 10:22:50.000000000 +0200
-@@ -313,7 +313,6 @@
- 				}
- 			} else {
- 				print "No match!\n" if $verbose;
--				$jitter = '(not parsed)';
- 			}
- 			
- 		}
-@@ -427,7 +426,7 @@
- foreach my $key (keys %ERRORS) {
- 	if ($state==$ERRORS{$key}) {
- #		print ("NTP $key: $answer");
--		print ("NTP $key: $answer|offset=$offset, jitter=" . $jitter/1000 .	",peer_stratum=$stratum\n");
-+		print ("NTP $key: $answer|offset=$offset, jitter=" . ($jitter || 0)/1000 .	",peer_stratum=$stratum\n");
- 		last;
- 	}
- }

Property changes on: head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ntp.pl
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl
===================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl	(revision 363332)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl	(revision 363333)
@@ -1,19 +1,19 @@
---- ./plugins-scripts/check_ircd.pl.orig	2014-04-27 19:59:06.000000000 +0200
-+++ ./plugins-scripts/check_ircd.pl	2014-05-09 18:45:31.000000000 +0200
-@@ -65,6 +65,7 @@
+--- ./plugins-scripts/check_ircd.pl.orig	2014-07-06 19:55:03.000000000 +0200
++++ ./plugins-scripts/check_ircd.pl	2014-07-29 15:15:32.000000000 +0200
+@@ -66,6 +66,7 @@
  $ENV{'PATH'}='@TRUSTED_PATH@';
  $ENV{'BASH_ENV'}=''; 
  $ENV{'ENV'}='';
 +$ENV{CDPATH} = "";
  
  # -----------------------------------------------------------------[ Global ]--
  
-@@ -152,7 +153,7 @@
+@@ -153,7 +154,7 @@
  	    print "IRCD UNKNOWN: Could not start socket ($!)\n";
  	    exit $ERRORS{"UNKNOWN"};
  	}
 -	$sockaddr = 'S n a4 x8';
 +	$sockaddr = 'x C n a4 x8';
  	$that = pack($sockaddr, AF_INET, $in_remoteport, $thataddr);
  	if (!connect(ClientSocket, $that)) { 
  	    print "IRCD UNKNOWN: Could not connect socket ($!)\n";
Index: head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c
===================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c	(revision 363332)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c	(revision 363333)
@@ -1,18 +1,18 @@
---- ./plugins/check_ssh.c.orig	2014-04-27 19:59:06.000000000 +0200
-+++ ./plugins/check_ssh.c	2014-05-09 18:45:31.000000000 +0200
-@@ -250,6 +250,7 @@
+--- ./plugins/check_ssh.c.orig	2014-07-06 12:26:39.000000000 +0200
++++ ./plugins/check_ssh.c	2014-07-29 15:15:33.000000000 +0200
+@@ -255,6 +255,7 @@
  			printf
  				(_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
  				 ssh_server, ssh_proto, remote_version);
 +			recv (sd, output, BUFF_SZ, 0);
  			close(sd);
  			exit (STATE_WARNING);
  		}
-@@ -260,6 +261,7 @@
+@@ -273,6 +274,7 @@
  			(_("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));
 +		recv (sd, output, BUFF_SZ, 0);
  		close(sd);
  		exit (STATE_OK);
  	}