net-mgmt/pnp:

- Update to 0.6.26
- Remove upstreamed patches

8 files changed, 8 insertions, 74 deletions

diff --git a/net-mgmt/pnp/Makefile b/net-mgmt/pnp/Makefile
index daee33535dfb..ffdfe8e3de8c 100644
--- a/net-mgmt/pnp/Makefile
+++ b/net-mgmt/pnp/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pnp
-PORTVERSION=	0.6.25
-PORTREVISION=	6
+PORTVERSION=	0.6.26
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/pnp4nagios/PNP-0.6
 DISTNAME=	pnp4nagios-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
diff --git a/net-mgmt/pnp/distinfo b/net-mgmt/pnp/distinfo
index 317cbc500979..d59347496e3f 100644
--- a/net-mgmt/pnp/distinfo
+++ b/net-mgmt/pnp/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pnp4nagios-0.6.25.tar.gz) = 62d9cdcb132326753373b18fafebd716ec27dc5cbe1ef42204440fca21ca7a0c
-SIZE (pnp4nagios-0.6.25.tar.gz) = 2921068
+TIMESTAMP = 1503401418
+SHA256 (pnp4nagios-0.6.26.tar.gz) = ab59a8a02d0f70de3cf89b12fe1e9216e4b1127bc29c04a036cd06dde72ee8fb
+SIZE (pnp4nagios-0.6.26.tar.gz) = 3039265
diff --git a/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__dns.php b/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__dns.php
deleted file mode 100644
index 8abf3b70d5d9..000000000000
--- a/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__dns.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- share/pnp/templates.dist/check_dns.php.orig	2017-03-21 13:39:01 UTC
-+++ share/pnp/templates.dist/check_dns.php
-@@ -4,7 +4,7 @@
- # Template for check_dns
- #
- 
--$opt[1] = "--lower=$MIN[1] --vertical-label $UNIT[1]  --title \"DNS Response Time\" ";
-+$opt[1] = "--lower-limit=$MIN[1] --vertical-label $UNIT[1]  --title \"DNS Response Time\" ";
- 
- 
- $def[1] =  "DEF:var1=$RRDFILE[1]:$DS[1]:AVERAGE " ;
diff --git a/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__multi.php b/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__multi.php
deleted file mode 100644
index c0162093e75c..000000000000
--- a/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__multi.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- share/pnp/templates.dist/check_multi.php.orig	2017-03-21 13:39:07 UTC
-+++ share/pnp/templates.dist/check_multi.php
-@@ -4,7 +4,7 @@
- # Template for check_multi
- # 
- 
--$opt[1] = "--lower=$MIN[1] --vertical-label num  --title \"Number of Checks\" ";
-+$opt[1] = "--lower-limit=$MIN[1] --vertical-label num  --title \"Number of Checks\" ";
- $ds_name[1] = "Executed Plugins";
- 
- $def[1] =  "DEF:var1=$RRDFILE[1]:$DS[1]:AVERAGE " ;
diff --git a/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__ping__tick.php b/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__ping__tick.php
deleted file mode 100644
index 46160479719d..000000000000
--- a/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__ping__tick.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- share/pnp/templates.dist/check_ping_tick.php.orig	2017-03-21 13:39:12 UTC
-+++ share/pnp/templates.dist/check_ping_tick.php
-@@ -6,7 +6,7 @@
- # RTA
- #
- $ds_name[1] = "Round Trip Times";
--$opt[1]  = "--lower=0 --vertical-label \"RTA\" --title \"Ping times\" ";
-+$opt[1]  = "--lower-limit=0 --vertical-label \"RTA\" --title \"Ping times\" ";
- $opt[1] .=  rrd::darkteint();
- $def[1]  =  rrd::def("var1", $RRDFILE[1], $DS[1], "AVERAGE") ;
- $def[1] .=  rrd::ticker("var1", $WARN[1], $CRIT[1]) ;
diff --git a/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__users.php b/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__users.php
deleted file mode 100644
index 94b21602e503..000000000000
--- a/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__users.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- share/pnp/templates.dist/check_users.php.orig	2017-03-21 13:39:19 UTC
-+++ share/pnp/templates.dist/check_users.php
-@@ -4,7 +4,7 @@
- # Template for check_users
- #
- 
--$opt[1] = "--lower=$MIN[1] --vertical-label \"Users\"  --title \"Users\" ";
-+$opt[1] = "--lower-limit=$MIN[1] --vertical-label \"Users\"  --title \"Users\" ";
- 
- 
- $def[1] =  "DEF:var1=$RRDFILE[1]:$DS[1]:MAX " ;
diff --git a/net-mgmt/pnp/files/patch-share_pnp_templates.dist_default.php b/net-mgmt/pnp/files/patch-share_pnp_templates.dist_default.php
deleted file mode 100644
index 58e6d32fd4d4..000000000000
--- a/net-mgmt/pnp/files/patch-share_pnp_templates.dist_default.php
+++ /dev/null
@@ -1,22 +0,0 @@
---- share/pnp/templates.dist/default.php.orig	2017-03-21 13:39:25 UTC
-+++ share/pnp/templates.dist/default.php
-@@ -47,7 +47,7 @@ foreach ($this->DS as $KEY=>$VAL) {
- 		$crit_min = $VAL['CRIT_MIN'];
- 	}
- 	if ( $VAL['MIN'] != "" && is_numeric($VAL['MIN']) ) {
--		$lower = " --lower=" . $VAL['MIN'];
-+		$lower = " --lower-limit=" . $VAL['MIN'];
- 		$minimum = $VAL['MIN'];
- 	}
- 	if ( $VAL['MAX'] != "" && is_numeric($VAL['MAX']) ) {
-@@ -55,8 +55,8 @@ foreach ($this->DS as $KEY=>$VAL) {
- 	}
- 	if ($VAL['UNIT'] == "%%") {
- 		$vlabel = "%";
--		$upper = " --upper=101 ";
--		$lower = " --lower=0 ";
-+		$upper = " --upper-limit=101 ";
-+		$lower = " --lower-limit=0 ";
- 	}
- 	else {
- 		$vlabel = $VAL['UNIT'];
diff --git a/net-mgmt/pnp/pkg-plist b/net-mgmt/pnp/pkg-plist
index 93a416ae88be..336b458d670a 100644
--- a/net-mgmt/pnp/pkg-plist
+++ b/net-mgmt/pnp/pkg-plist
@@ -319,9 +319,8 @@ man/man8/npcd.8.gz
 %%WWWDIR%%/application/models/rrdtool.php
 %%WWWDIR%%/application/models/system.php
 %%WWWDIR%%/application/vendor/fpdf/filters/FilterASCII85.php
-%%WWWDIR%%/application/vendor/fpdf/filters/FilterASCII85_FPDI.php
+%%WWWDIR%%/application/vendor/fpdf/filters/FilterASCIIHexDecode.php
 %%WWWDIR%%/application/vendor/fpdf/filters/FilterLZW.php
-%%WWWDIR%%/application/vendor/fpdf/filters/FilterLZW_FPDI.php
 %%WWWDIR%%/application/vendor/fpdf/font/courier.php
 %%WWWDIR%%/application/vendor/fpdf/font/courierb.php
 %%WWWDIR%%/application/vendor/fpdf/font/courierbi.php
@@ -339,7 +338,7 @@ man/man8/npcd.8.gz
 %%WWWDIR%%/application/vendor/fpdf/fpdf.php
 %%WWWDIR%%/application/vendor/fpdf/fpdf_tpl.php
 %%WWWDIR%%/application/vendor/fpdf/fpdi.php
-%%WWWDIR%%/application/vendor/fpdf/fpdi2tcpdf_bridge.php
+%%WWWDIR%%/application/vendor/fpdf/fpdi_bridge.php
 %%WWWDIR%%/application/vendor/fpdf/fpdi_pdf_parser.php
 %%WWWDIR%%/application/vendor/fpdf/pdf_context.php
 %%WWWDIR%%/application/vendor/fpdf/pdf_parser.php
@@ -654,6 +653,7 @@ man/man8/npcd.8.gz
 %%WWWDIR%%/templates.dist/check_tcp.php
 %%WWWDIR%%/templates.dist/check_users.php
 %%WWWDIR%%/templates.dist/default.php
+%%WWWDIR%%/templates.dist/icinga.php
 %%WWWDIR%%/templates.dist/integer.php
 %%WWWDIR%%/templates.dist/nagiostats.php
 %%WWWDIR%%/templates.dist/pnp-runtime.php
@@ -662,9 +662,9 @@ man/man8/npcd.8.gz
 %%WWWDIR%%/templates.special/advanced_loop.php-sample
 %%WWWDIR%%/templates.special/loop.php-sample
 %%WWWDIR%%/templates.special/static.php-sample
+@dir %%ETCDIR%%/config.d
 @dir %%WWWDIR%%/application/cache
 @dir %%WWWDIR%%/application/hooks
-@dir %%ETCDIR%%/config.d
 @dir %%WWWDIR%%/templates
 @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,755) /var/log/kohana
 @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,755) /var/log/stats