6 files changed, 8 insertions, 42 deletions

diff --git a/net-mgmt/check_mysql_health/Makefile b/net-mgmt/check_mysql_health/Makefile
index 8ce292a80690..d64cf6718dff 100644
--- a/net-mgmt/check_mysql_health/Makefile
+++ b/net-mgmt/check_mysql_health/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	check_mysql_health
-PORTVERSION=	2.1.5.1
-PORTREVISION=	1
+PORTVERSION=	2.2.1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	http://labs.consol.de/wp-content/uploads/2011/04/
+MASTER_SITES=	https://labs.consol.de/assets/downloads/nagios/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nagios plugin to check various parameters of a MySQL database
diff --git a/net-mgmt/check_mysql_health/distinfo b/net-mgmt/check_mysql_health/distinfo
index a5a2849ef321..678091d552d1 100644
--- a/net-mgmt/check_mysql_health/distinfo
+++ b/net-mgmt/check_mysql_health/distinfo
@@ -1,2 +1,2 @@
-SHA256 (check_mysql_health-2.1.5.1.tar.gz) = dc6c6019ac318cc8e74a6065f16ccf3b93bb2c3b35aa47054dcf24803a967a0c
-SIZE (check_mysql_health-2.1.5.1.tar.gz) = 118408
+SHA256 (check_mysql_health-2.2.1.tar.gz) = a88aabe7bd9ead97998e2d4dd4d41c2ddfd4373d759b4312dc92ce18fc983b55
+SIZE (check_mysql_health-2.2.1.tar.gz) = 140160
diff --git a/net-mgmt/check_mysql_health/files/patch-plugins-scripts_Nagios_DBD_MySQL_Cluster.pm b/net-mgmt/check_mysql_health/files/patch-plugins-scripts_Nagios_DBD_MySQL_Cluster.pm
deleted file mode 100644
index 7a37177d0103..000000000000
--- a/net-mgmt/check_mysql_health/files/patch-plugins-scripts_Nagios_DBD_MySQL_Cluster.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins-scripts/Nagios/DBD/MySQL/Cluster.pm.orig	2014-12-07 18:40:22.318185465 +0000
-+++ plugins-scripts/Nagios/DBD/MySQL/Cluster.pm	2014-12-07 18:41:15.780179599 +0000
-@@ -192,7 +192,7 @@
-   my $message = shift;
-   push(@{$self->{nagios}->{messages}->{$level}}, $message);
-   # recalc current level
--  foreach my $llevel qw(CRITICAL WARNING UNKNOWN OK) {
-+  foreach my $llevel (qw(CRITICAL WARNING UNKNOWN OK)) {
-     if (scalar(@{$self->{nagios}->{messages}->{$ERRORS{$llevel}}})) {
-       $self->{nagios_level} = $ERRORS{$llevel};
-     }
diff --git a/net-mgmt/check_mysql_health/files/patch-plugins-scripts_Nagios_DBD_MySQL_Server.pm b/net-mgmt/check_mysql_health/files/patch-plugins-scripts_Nagios_DBD_MySQL_Server.pm
deleted file mode 100644
index 932bb90ed2b4..000000000000
--- a/net-mgmt/check_mysql_health/files/patch-plugins-scripts_Nagios_DBD_MySQL_Server.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins-scripts/Nagios/DBD/MySQL/Server.pm.orig	2014-12-07 18:56:47.435107795 +0000
-+++ plugins-scripts/Nagios/DBD/MySQL/Server.pm	2014-12-07 18:57:22.394116542 +0000
-@@ -310,7 +310,7 @@
-   my $message = shift;
-   push(@{$self->{nagios}->{messages}->{$level}}, $message);
-   # recalc current level
--  foreach my $llevel qw(CRITICAL WARNING UNKNOWN OK) {
-+  foreach my $llevel (qw(CRITICAL WARNING UNKNOWN OK)) {
-     if (scalar(@{$self->{nagios}->{messages}->{$ERRORS{$llevel}}})) {
-       $self->{nagios_level} = $ERRORS{$llevel};
-     }
diff --git a/net-mgmt/check_mysql_health/files/patch-plugins-scripts_check_mysql_health.pl b/net-mgmt/check_mysql_health/files/patch-plugins-scripts_check_mysql_health.pl
deleted file mode 100644
index 3d8a91cd8354..000000000000
--- a/net-mgmt/check_mysql_health/files/patch-plugins-scripts_check_mysql_health.pl
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins-scripts/check_mysql_health.pl.orig	2014-12-07 18:44:47.220159275 +0000
-+++ plugins-scripts/check_mysql_health.pl	2014-12-07 18:51:34.356136684 +0000
-@@ -353,8 +353,8 @@
-   $needs_restart = 1;
-   # if the calling script has a path for shared libs and there is no --environment
-   # parameter then the called script surely needs the variable too.
--  foreach my $important_env qw(LD_LIBRARY_PATH SHLIB_PATH 
--      ORACLE_HOME TNS_ADMIN ORA_NLS ORA_NLS33 ORA_NLS10) {
-+  foreach my $important_env (qw(LD_LIBRARY_PATH SHLIB_PATH 
-+      ORACLE_HOME TNS_ADMIN ORA_NLS ORA_NLS33 ORA_NLS10)) {
-     if ($ENV{$important_env} && ! scalar(grep { /^$important_env=/ } 
-         keys %{$commandline{environment}})) {
-       $commandline{environment}->{$important_env} = $ENV{$important_env};
diff --git a/net-mgmt/check_mysql_health/pkg-descr b/net-mgmt/check_mysql_health/pkg-descr
index d14b473f3e27..007061b312c1 100644
--- a/net-mgmt/check_mysql_health/pkg-descr
+++ b/net-mgmt/check_mysql_health/pkg-descr
@@ -1,3 +1,5 @@
-a plugin to check various parameters of a MySQL database
+Plugin to check various parameters of a MySQL database.
 
-WWW: http://labs.consol.de/lang/en/nagios/check_mysql_health/
+The english site is at /en/, but not as up2date.
+
+WWW: https://labs.consol.de/de/nagios/check_mysql_health/