4 files changed, 25 insertions, 151 deletions

diff --git a/net-mgmt/pnp/Makefile b/net-mgmt/pnp/Makefile
index b7c93a4fa671..c9727feca0e9 100644
--- a/net-mgmt/pnp/Makefile
+++ b/net-mgmt/pnp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pnp
-PORTVERSION=	0.4.12
+PORTVERSION=	0.4.14
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/pnp4nagios
 
@@ -40,7 +40,6 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-share::pnp::include::function.inc.php
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	\
-	--prefix=${LOCALBASE} \
 	--sysconfdir=${PREFIX}/etc/pnp \
 	--datarootdir=${WWWDIR} \
 	--datadir=${WWWDIR} \
diff --git a/net-mgmt/pnp/distinfo b/net-mgmt/pnp/distinfo
index 8bf304b08ce4..0d4c090f7286 100644
--- a/net-mgmt/pnp/distinfo
+++ b/net-mgmt/pnp/distinfo
@@ -1,3 +1,3 @@
-MD5 (pnp-0.4.12.tar.gz) = eb833a4769a5b58aad0ac53cae3e3e9f
-SHA256 (pnp-0.4.12.tar.gz) = 8b74ff0fd32a08e416d0f760c36166aec67bfc1e839dd3c07c1dc08db69d96fb
-SIZE (pnp-0.4.12.tar.gz) = 311844
+MD5 (pnp-0.4.14.tar.gz) = 9dbbf08191a258f6798c9516b3821ff0
+SHA256 (pnp-0.4.14.tar.gz) = e0f1ba160ec5757e130af7c5ad11944766d97bc3c3e93d9bf9b782a05902760f
+SIZE (pnp-0.4.14.tar.gz) = 455593
diff --git a/net-mgmt/pnp/files/extra-patch-share::pnp::include::function.inc.php b/net-mgmt/pnp/files/extra-patch-share::pnp::include::function.inc.php
index c42e389da088..a266517489b8 100644
--- a/net-mgmt/pnp/files/extra-patch-share::pnp::include::function.inc.php
+++ b/net-mgmt/pnp/files/extra-patch-share::pnp::include::function.inc.php
@@ -1,150 +1,18 @@
---- share/pnp/include/function.inc.php.orig	2008-10-11 18:13:34.000000000 +0400
-+++ share/pnp/include/function.inc.php	2008-12-24 01:03:58.000000000 +0300
-@@ -982,123 +982,6 @@
+--- share/pnp/include/function.inc.php.orig	2009-05-02 13:25:24.000000000 +0400
++++ share/pnp/include/function.inc.php	2009-07-02 19:05:07.000000000 +0400
+@@ -999,6 +999,7 @@
  }
  
  function doPDF($display,$data) {
--	require ('fpdi.php');
--	global $NAGIOS;
--	global $conf;
--        if(file_exists($conf['background_pdf'])){
--                $use_bg=1;
--        }
--	class PDF extends FPDI {
--		//Page header
--		function Header() {
--			//Arial bold 10 
--			$this->SetFont('Arial', 'B', 10);
--			//Move to the right
--			$this->Cell(80);
--			//Title
--			$this->Cell(30, 10, _PDFTITLE, 0, 1, 'C');
--			//Line break
--			#$this->Ln(20);
--		}
--
--		//Page footer
--		function Footer() {
--			//Position at 1.5 cm from bottom
--			$this->SetY(-20);
--			//Arial italic 8
--			$this->SetFont('Arial', 'I', 8);
--			//Page number
--			$this->Cell(0, 10, _PDFPAGE . $this->PageNo() . '/{nb}', 0, 0, 'C');
--		}
--	}
--
--	$pdf =& new PDF('P', 'mm', 'A4');
--	$pdf->AliasNbPages();
--        $pdf->SetAutoPageBreak('off');
--	$pdf->SetMargins(12.5,25,10);
--	$pdf->AddPage();
--	if($use_bg){
--		$pdf->setSourceFile($conf['background_pdf']);
--		$tplIdx = $pdf->importPage(1,'/MediaBox');
--		$pdf->useTemplate($tplIdx);
--	}
--	$pdf->SetCreator('Created with PNP');
--	$pdf->SetAuthor($_PHP['REMOTE_USER']);
--	$pdf->SetFont('Arial', '', 10);
--	$pdf->Cell(120, 4, '', 0, 1, 'L');
--	if($display == "service"){
--		foreach($data as $d) {
--			if ($pdf->GetY() > 220) {
--				$pdf->AddPage();
--				if($use_bg){$pdf->useTemplate($tplIdx);}	
--			}
--                        if($d['source'] == 1){
--                            $pdf->SetFont('Arial', '', 10);
--                            $pdf->CELL(120, 5, $d["n_hostname"]." / ".$d["n_servicedesc"] , 0, 1);
--                            $pdf->SetFont('Arial', '', 8);
--                            $pdf->CELL(120, 5, $d["view_title"]. " (" . $d["f_start"]." - ".$d["f_end"].")", 0, 1);
--                            $pdf->CELL(120, 5, _DATASOURCE ." ".$d["ds_name"], 0, 1);
--                        }else{
--                            $pdf->SetFont('Arial', '', 8);
--                            $pdf->CELL(120, 5, _DATASOURCE ." ".$d["ds_name"], 0, 1);
--                        }
--			$img = saveImage($d['rrd_opts']);
--                        $Y = $pdf->GetY();
--			$cell_height = ($img['height'] * 0.23);
--			$cell_width = ($img['width'] * 0.23);
--                        $pdf->Image($img['name'], 12.5, $Y, $cell_width, $cell_height, 'PNG');
--                        $pdf->CELL(120, $cell_height, '', 0, 1);
--			unlink($img['name']);
--		}
--	}
--	if($display == "page"){
--                foreach($data as $d) {
--			if ($pdf->GetY() > 220) {
--				$pdf->AddPage();
--				if($use_bg){$pdf->useTemplate($tplIdx);}
--			}
--
--			$pdf->SetFont('Arial', '', 10);
--			$pdf->CELL(120, 5, $d["hostname"]." / ".$d["servicedesc"] , 0, 1);
--			$pdf->SetFont('Arial', '', 8);
--			$pdf->CELL(120, 5, $d["f_start"]." - ".$d["f_end"], 0, 1);
--
--			$img = saveImage($d['rrd_opts']);
--                        $Y = $pdf->GetY();
--			$cell_height = ($img['height'] * 0.23);
--			$cell_width = ($img['width'] * 0.23);
--                        $pdf->Image($img['name'], 12.5, $Y, $cell_width, $cell_height, 'PNG');
--                        $pdf->CELL(120, $cell_height, '', 0, 1);
--			unlink($img['name']);
--               }
--        }
--        if($display == "host_list"){
--                foreach($data as $d) {
--                        if ($pdf->GetY() > 220) {
--                                $pdf->AddPage();
--				if($use_bg){$pdf->useTemplate($tplIdx);}
--                        }
--                        if($d['source'] == 1){
--                            $pdf->SetFont('Arial', '', 10);
--                            $pdf->CELL(120, 5, $d["n_hostname"]." / ".$d["n_servicedesc"] , 0, 1);
--                            $pdf->SetFont('Arial', '', 8);
--                            $pdf->CELL(120, 5, $d["view_title"]. " (" . $d["f_start"]." - ".$d["f_end"].")", 0, 1);
--                            $pdf->CELL(120, 5, _DATASOURCE ." ".$d["ds_name"], 0, 1);
--                        }else{
--                            $pdf->SetFont('Arial', '', 8);
--                            $pdf->CELL(120, 5, _DATASOURCE ." ".$d["ds_name"], 0, 1);
--                        }
--
--			$img = saveImage($d['rrd_opts']);
--                        $Y = $pdf->GetY();
--			$cell_height = ($img['height'] * 0.23);
--			$cell_width = ($img['width'] * 0.23);
--                        $pdf->Image($img['name'], 12.5, $Y, $cell_width, $cell_height, 'PNG');
--                        $pdf->CELL(120, $cell_height, '', 0, 1);
--			unlink($img['name']);
--                }
--        }
--	$pdf->Output("pnp4nagios.pdf","I");
- 	exit;
- }
- 
-@@ -1350,23 +1233,6 @@
++	exit;
+ 	require ('fpdi.php');
+ 	global $NAGIOS;
+ 	global $conf;
+@@ -1443,6 +1444,7 @@
  }
  
  function doPDFIcon($type){
--	global $hostname;
--	global $servicedesc;
--	global $start;
--	global $end;
--	global $source;
--	global $view;
--	global $display;
--	global $page;
--
--	switch($type){
--		case "PAGE":
--			print "<a href=\"index.php?page=$page&display=$display&view=$view&end=$end&start=$start&do=pdf\"><img src=\"images/pdf.png\" HEIGHT=\"32px\" WIDTH=\"32px\" title=\"Display PDF\" ></a>\n";
--			break;
--		default:
--			print "<a href=\"index.php?host=$hostname&srv=$servicedesc&display=$display&view=$view&source=$source&end=$end&start=$start&do=pdf\"><img src=\"images/pdf.png\" HEIGHT=\"32px\" WIDTH=\"32px\" title=\"Display PDF\" ></a>\n";
--			break;
--	}
- }
- 
- function doXMLIcon(){
++	return;
+ 	global $hostname;
+ 	global $servicedesc;
+ 	global $special;
diff --git a/net-mgmt/pnp/pkg-plist b/net-mgmt/pnp/pkg-plist
index 47772725bdd8..0dbe2f6e12f4 100644
--- a/net-mgmt/pnp/pkg-plist
+++ b/net-mgmt/pnp/pkg-plist
@@ -1,4 +1,5 @@
 bin/npcd
+bin/npcdmod.o
 etc/pnp/pnp4nagios_release
 etc/pnp/config.php-sample
 etc/pnp/background.pdf-sample
@@ -10,9 +11,11 @@ etc/pnp/npcd.cfg-sample
 libexec/process_perfdata.pl
 libexec/check_pnp_rrds.pl
 %%WWWDIR%%/images/ack.png
+%%WWWDIR%%/images/action.gif
 %%WWWDIR%%/images/calendar.png
 %%WWWDIR%%/images/critical.png
 %%WWWDIR%%/images/eps.png
+%%WWWDIR%%/images/graph.gif
 %%WWWDIR%%/images/int.gif
 %%WWWDIR%%/images/int2.gif
 %%WWWDIR%%/images/link.png
@@ -72,11 +75,11 @@ libexec/check_pnp_rrds.pl
 %%WWWDIR%%/include/js/dragdrop.js
 %%WWWDIR%%/include/js/effects.js
 %%WWWDIR%%/include/js/menuarrow.gif
-%%WWWDIR%%/include/js/overlib.js
-%%WWWDIR%%/include/js/overlib_shadow.js
+%%WWWDIR%%/include/js/overlib_mini.js
 %%WWWDIR%%/include/js/prototype.js
 %%WWWDIR%%/include/js/scriptaculous.js
 %%WWWDIR%%/include/js/slider.js
+%%WWWDIR%%/include/js/sound.js
 %%WWWDIR%%/include/js/unittest.js
 %%WWWDIR%%/include/js/zoom.js
 %%WWWDIR%%/include/debug.php
@@ -98,6 +101,7 @@ libexec/check_pnp_rrds.pl
 %%WWWDIR%%/templates.dist/check-host-alive.php
 %%WWWDIR%%/templates.dist/check_disk.php
 %%WWWDIR%%/templates.dist/check_dns.php
+%%WWWDIR%%/templates.dist/check_fping.php
 %%WWWDIR%%/templates.dist/check_http.php
 %%WWWDIR%%/templates.dist/check_http_url.php
 %%WWWDIR%%/templates.dist/check_iftraffic_counter.php
@@ -105,6 +109,7 @@ libexec/check_pnp_rrds.pl
 %%WWWDIR%%/templates.dist/check_load.php
 %%WWWDIR%%/templates.dist/check_messpc_temp.php
 %%WWWDIR%%/templates.dist/check_multi.php
+%%WWWDIR%%/templates.dist/check_mysql_health.php
 %%WWWDIR%%/templates.dist/check_nt_cpu.php
 %%WWWDIR%%/templates.dist/check_nt_disk.php
 %%WWWDIR%%/templates.dist/check_nt_mem.php
@@ -130,10 +135,12 @@ libexec/check_pnp_rrds.pl
 %%WWWDIR%%/templates.dist/check_users.php
 %%WWWDIR%%/templates.dist/default.php
 %%WWWDIR%%/templates.dist/response.php
+%%WWWDIR%%/templates.special/loop.php
 %%WWWDIR%%/ajax.php
 %%WWWDIR%%/index.php
 %%WWWDIR%%/zoom.php
 @dirrmtry %%WWWDIR%%/templates.dist
+@dirrmtry %%WWWDIR%%/templates.special
 @dirrmtry %%WWWDIR%%/templates
 @dirrmtry %%WWWDIR%%/lang
 @dirrmtry %%WWWDIR%%/include/js