1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-21 04:06:46 +00:00

net-mgmt/pnp:

- Update to 0.6.26
- Remove upstreamed patches
This commit is contained in:
Lars Engels 2017-08-23 10:46:51 +00:00
parent 8eabbb9cea
commit ffd84b65e8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=448595
8 changed files with 8 additions and 74 deletions

View File

@ -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}

View File

@ -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

View File

@ -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 " ;

View File

@ -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 " ;

View File

@ -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]) ;

View File

@ -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 " ;

View File

@ -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'];

View File

@ -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