Attachment 106579 Details for Bug 147199 – patch_pnp.txt

patch_pnp.txt

patch_pnp.txt (text/plain), 18.23 KB, created by Olli Hauer on 2010-05-29 23:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Hauer

Created: 2010-05-29 23:40:01 UTC

Size: 18.23 KB

patch

obsolete

>Index: files/patch-share__pnp__include__function.inc.php
>===================================================================
>--- files/patch-share__pnp__include__function.inc.php	(revision 0)
>+++ files/patch-share__pnp__include__function.inc.php	(revision 2)
>@@ -0,0 +1,29 @@
>+--- ./share/pnp/include/function.inc.php.orig	2010-05-29 21:26:22.000000000 +0200
>++++ ./share/pnp/include/function.inc.php	2010-05-29 21:32:24.000000000 +0200
>+@@ -1030,7 +1030,7 @@
>+ 		}
>+ 	}
>+ 
>+-	$pdf =& new PDF('P', 'mm', 'A4');
>++	$pdf = new PDF('P', 'mm', 'A4');
>+ 	$pdf->AliasNbPages();
>+         $pdf->SetAutoPageBreak('off');
>+ 	$pdf->SetMargins(12.5,25,10);
>+@@ -1540,7 +1540,7 @@
>+                 $NAGIOS['RRD'][$tag][$dsl] = urldecode($value);
>+             }
>+ 
>+-            if($level == 2 && $type == "complete" && eregi("^NAGIOS_",$tag)){
>++            if($level == 2 && $type == "complete" && preg_match("/^NAGIOS_/i",$tag)){
>+                 if(isset($xml_elem['value'])){
>+                     $value = $xml_elem['value'];
>+                 }else{
>+@@ -1571,7 +1571,7 @@
>+ 	$PAGE="";
>+ 	$allowed_tags = array("page", "graph");
>+ 	foreach($data as $line){
>+-		if(ereg('(^#|^;)',$line)) {
>++		if(preg_match('/(^#|^;)/',$line)) {
>+ 			continue;
>+ 		}
>+ 
>
>Property changes on: files/patch-share__pnp__include__function.inc.php
>___________________________________________________________________
>Added: svn:mime-type
>   + text/plain
>Added: svn:eol-style
>   + native
>
>Index: files/patch-sample-config__Makefile.in
>===================================================================
>--- files/patch-sample-config__Makefile.in	(revision 0)
>+++ files/patch-sample-config__Makefile.in	(revision 2)
>@@ -0,0 +1,29 @@
>+--- ./sample-config/Makefile.in.orig	2010-05-29 23:27:44.000000000 +0200
>++++ ./sample-config/Makefile.in	2010-05-29 23:27:44.000000000 +0200
>+@@ -27,23 +27,19 @@
>+ devclean: distclean
>+ 
>+ install:
>+-	-rm -f $(DESTDIR)$(HTMLDIR)/conf/config.php
>+-
>+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)
>+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands
>+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages
>+ 	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/pnp4nagios_release $(DESTDIR)$(SYSCONFDIR)
>+-	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)
>+-	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/background.pdf $(DESTDIR)$(SYSCONFDIR)
>++	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php-sample
>++	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/background.pdf $(DESTDIR)$(SYSCONFDIR)/background.pdf-sample
>+ 
>+ install-config: 
>+-	-rm -f $(DESTDIR)$(HTMLDIR)/conf/config.php
>+-
>+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)
>+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands
>+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages
>+ 	
>+-	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)
>++	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php-sample
>+ 	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/process_perfdata.cfg-sample $(DESTDIR)$(SYSCONFDIR)
>+ 	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/rra.cfg-sample $(DESTDIR)$(SYSCONFDIR)
>+ 	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/check_commands/check_nwstat.cfg-sample $(DESTDIR)$(SYSCONFDIR)/check_commands
>
>Property changes on: files/patch-sample-config__Makefile.in
>___________________________________________________________________
>Added: svn:mime-type
>   + text/plain
>
>Index: files/patch-src__Makefile.in
>===================================================================
>--- files/patch-src__Makefile.in	(revision 0)
>+++ files/patch-src__Makefile.in	(revision 2)
>@@ -0,0 +1,11 @@
>+--- ./src/Makefile.in.orig	2010-05-29 23:27:44.000000000 +0200
>++++ ./src/Makefile.in	2010-05-29 23:27:44.000000000 +0200
>+@@ -121,8 +121,6 @@
>+ 	$(MAKE) install-basic
>+ 
>+ install-basic:
>+-	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
>+-	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_SPOOL_DIR)
>+ 	$(INSTALL) -m 754 $(INSTALL_OPTS) @npcd_name@ $(DESTDIR)$(BINDIR)
>+ 	$(INSTALL) -m 754 $(INSTALL_OPTS) npcdmod.o $(DESTDIR)$(BINDIR)
>+ 
>
>Property changes on: files/patch-src__Makefile.in
>___________________________________________________________________
>Added: svn:mime-type
>   + text/plain
>
>Index: files/patch-scripts__Makefile.in
>===================================================================
>--- files/patch-scripts__Makefile.in	(revision 0)
>+++ files/patch-scripts__Makefile.in	(revision 2)
>@@ -0,0 +1,23 @@
>+--- ./scripts/Makefile.in.orig	2010-05-29 23:27:44.000000000 +0200
>++++ ./scripts/Makefile.in	2010-05-29 23:27:44.000000000 +0200
>+@@ -25,7 +25,6 @@
>+ devclean: distclean
>+ 
>+ install-init: 
>+-	$(INSTALL) -m 755 $(INIT_OPTS) -d $(DESTDIR)$(INIT_DIR)
>+ 	$(INSTALL) -m 755 $(INIT_OPTS) rc.npcd $(DESTDIR)$(INIT_DIR)/npcd
>+ 
>+ install-processperfdata: 
>+@@ -35,12 +34,9 @@
>+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) check_pnp_rrds.pl $(DESTDIR)$(LIBEXECDIR)
>+ 
>+ install-net2pnp:
>+-	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
>+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) net2pnp.pl $(DESTDIR)$(BINDIR)
>+ 
>+ install: 
>+-	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATADIR)
>+-	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
>+ 	$(MAKE) install-processperfdata
>+ 	$(MAKE) install-plugins
>+ 	
>
>Property changes on: files/patch-scripts__Makefile.in
>___________________________________________________________________
>Added: svn:mime-type
>   + text/plain
>
>Index: files/patch-share__pnp__include__site.php
>===================================================================
>--- files/patch-share__pnp__include__site.php	(revision 0)
>+++ files/patch-share__pnp__include__site.php	(revision 2)
>@@ -0,0 +1,11 @@
>+--- ./share/pnp/include/site.php.orig	2010-05-29 23:27:44.000000000 +0200
>++++ ./share/pnp/include/site.php	2010-05-29 23:27:44.000000000 +0200
>+@@ -30,7 +30,7 @@
>+ 				$a = 0;
>+ 						
>+ 				while (isset($file[$l]) && $file[$l] != "") {
>+-					if(!ereg("^#",$file[$l]) && !ereg("^;",$file[$l])) {
>++					if(!preg_match("/^#/",$file[$l]) && !preg_match("/^;/",$file[$l])) {
>+ 						$defineCln = explode("{", $file[$l]);
>+ 						$define = explode(" ",$defineCln[0]);
>+ 						if (isset($define[1]) && in_array(trim($define[1]),$type)) {
>
>Property changes on: files/patch-share__pnp__include__site.php
>___________________________________________________________________
>Added: svn:mime-type
>   + text/plain
>Added: svn:eol-style
>   + native
>
>Index: files/patch-share__pnp__include__font__makefont__makefont.php
>===================================================================
>--- files/patch-share__pnp__include__font__makefont__makefont.php	(revision 0)
>+++ files/patch-share__pnp__include__font__makefont__makefont.php	(revision 2)
>@@ -0,0 +1,11 @@
>+--- ./share/pnp/include/font/makefont/makefont.php.orig	2010-05-29 23:27:44.000000000 +0200
>++++ ./share/pnp/include/font/makefont/makefont.php	2010-05-29 23:30:23.000000000 +0200
>+@@ -171,7 +171,7 @@
>+ 	//StemV
>+ 	if(isset($fm['StdVW']))
>+ 		$stemv=$fm['StdVW'];
>+-	elseif(isset($fm['Weight']) and eregi('(bold|black)',$fm['Weight']))
>++	elseif(isset($fm['Weight']) and preg_match('/(bold|black)/i',$fm['Weight']))
>+ 		$stemv=120;
>+ 	else
>+ 		$stemv=70;
>
>Property changes on: files/patch-share__pnp__include__font__makefont__makefont.php
>___________________________________________________________________
>Added: svn:mime-type
>   + text/plain
>Added: svn:eol-style
>   + native
>
>Index: files/extra-patch-share__pnp__include__function.inc.php
>===================================================================
>--- files/extra-patch-share__pnp__include__function.inc.php	(revision 0)
>+++ files/extra-patch-share__pnp__include__function.inc.php	(revision 2)
>@@ -0,0 +1,18 @@
>+--- 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) {
>++	exit;
>+ 	require ('fpdi.php');
>+ 	global $NAGIOS;
>+ 	global $conf;
>+@@ -1443,6 +1444,7 @@
>+ }
>+ 
>+ function doPDFIcon($type){
>++	return;
>+ 	global $hostname;
>+ 	global $servicedesc;
>+ 	global $special;
>
>Property changes on: files/extra-patch-share__pnp__include__function.inc.php
>___________________________________________________________________
>Added: svn:mime-type
>   + text/plain
>Added: svn:eol-style
>   + native
>
>Index: files/patch-share__pnp__include__fpdi.php
>===================================================================
>--- files/patch-share__pnp__include__fpdi.php	(revision 0)
>+++ files/patch-share__pnp__include__fpdi.php	(revision 2)
>@@ -0,0 +1,11 @@
>+--- ./share/pnp/include/fpdi.php.orig	2010-05-29 23:27:44.000000000 +0200
>++++ ./share/pnp/include/fpdi.php	2010-05-29 23:27:44.000000000 +0200
>+@@ -93,7 +93,7 @@
>+         $fn =& $this->current_filename;
>+ 
>+         if (!isset($this->parsers[$fn]))
>+-            $this->parsers[$fn] =& new fpdi_pdf_parser($fn,$this);
>++            $this->parsers[$fn] = new fpdi_pdf_parser($fn,$this);
>+         $this->current_parser =& $this->parsers[$fn];
>+         
>+         return $this->parsers[$fn]->getPageCount();
>
>Property changes on: files/patch-share__pnp__include__fpdi.php
>___________________________________________________________________
>Added: svn:mime-type
>   + text/plain
>Added: svn:eol-style
>   + native
>
>Index: files/patch-share__pnp__include__pdf_parser.php
>===================================================================
>--- files/patch-share__pnp__include__pdf_parser.php	(revision 0)
>+++ files/patch-share__pnp__include__pdf_parser.php	(revision 2)
>@@ -0,0 +1,29 @@
>+--- ./share/pnp/include/pdf_parser.php.orig	2010-05-29 23:27:44.000000000 +0200
>++++ ./share/pnp/include/pdf_parser.php	2010-05-29 23:31:23.000000000 +0200
>+@@ -91,7 +91,7 @@
>+ 
>+         $this->getPDFVersion();
>+ 
>+-        $this->c =& new pdf_context($this->f);
>++        $this->c = new pdf_context($this->f);
>+         // Read xref-Data
>+         $this->pdf_read_xref($this->xref, $this->pdf_find_xref());
>+ 
>+@@ -257,7 +257,7 @@
>+             	fseek($this->f, $o_pos+strlen($m[1]));
>+     		}
>+     		
>+-			$c =&  new pdf_context($this->f);
>++			$c = new pdf_context($this->f);
>+     	    $trailer = $this->pdf_read_value($c);
>+     	    
>+     	    if (isset($trailer[1]['/Prev'])) {
>+@@ -423,7 +423,7 @@
>+ 		        	$e++;
>+ 		        
>+ 		        if ($this->actual_obj[1][1]['/Length'][0] == PDF_TYPE_OBJREF) {
>+-		        	$tmp_c =& new pdf_context($this->f);
>++		        	$tmp_c = new pdf_context($this->f);
>+ 		        	$tmp_length = $this->pdf_resolve_object($tmp_c,$this->actual_obj[1][1]['/Length']);
>+ 		        	$length = $tmp_length[1][1];
>+ 		        } else {
>
>Property changes on: files/patch-share__pnp__include__pdf_parser.php
>___________________________________________________________________
>Added: svn:mime-type
>   + text/plain
>Added: svn:eol-style
>   + native
>
>Index: files/patch-share__pnp__include__fpdi_pdf_parser.php
>===================================================================
>--- files/patch-share__pnp__include__fpdi_pdf_parser.php	(revision 0)
>+++ files/patch-share__pnp__include__fpdi_pdf_parser.php	(revision 2)
>@@ -0,0 +1,11 @@
>+--- ./share/pnp/include/fpdi_pdf_parser.php.orig	2010-05-29 23:27:44.000000000 +0200
>++++ ./share/pnp/include/fpdi_pdf_parser.php	2010-05-29 23:27:44.000000000 +0200
>+@@ -242,7 +242,7 @@
>+                     if (preg_match("/^\/[a-z85]*$/i", $_filter[1], $filterName) && @include_once('decoders'.$_filter[1].'.php')) {
>+                         $filterName = substr($_filter[1],1);
>+                         if (class_exists($filterName)) {
>+-    	                	$decoder =& new $filterName($this->fpdi);
>++    	                	$decoder = new $filterName($this->fpdi);
>+     	                    $stream = $decoder->decode(trim($stream));
>+                         } else {
>+                         	$this->fpdi->error(sprintf("Unsupported Filter: %s",$_filter[1]));
>
>Property changes on: files/patch-share__pnp__include__fpdi_pdf_parser.php
>___________________________________________________________________
>Added: svn:mime-type
>   + text/plain
>Added: svn:eol-style
>   + native
>
>Index: files/patch-man__Makefile.in
>===================================================================
>--- files/patch-man__Makefile.in	(revision 0)
>+++ files/patch-man__Makefile.in	(revision 2)
>@@ -0,0 +1,10 @@
>+--- ./man/Makefile.in.orig	2010-05-29 23:27:44.000000000 +0200
>++++ ./man/Makefile.in	2010-05-29 23:27:44.000000000 +0200
>+@@ -36,7 +36,6 @@
>+ devclean: distclean
>+ 
>+ install:
>+-	$(MAKE) install-basic
>+ 
>+ install-basic:
>+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(MANDIR)/man1/
>
>Property changes on: files/patch-man__Makefile.in
>___________________________________________________________________
>Added: svn:mime-type
>   + text/plain
>
>Index: files/patch-man::Makefile.in
>===================================================================
>--- files/patch-man::Makefile.in	(revision 1)
>+++ files/patch-man::Makefile.in	(working copy)
>@@ -1,10 +0,0 @@
>---- man/Makefile.in.orig	2008-08-18 18:45:56.000000000 +0400
>-+++ man/Makefile.in	2008-08-18 18:48:41.000000000 +0400
>-@@ -36,7 +36,6 @@
>- devclean: distclean
>- 
>- install:
>--	$(MAKE) install-basic
>- 
>- install-basic:
>- 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(MANDIR)/man1/
>Index: files/extra-patch-share::pnp::include::function.inc.php
>===================================================================
>--- files/extra-patch-share::pnp::include::function.inc.php	(revision 1)
>+++ files/extra-patch-share::pnp::include::function.inc.php	(working copy)
>@@ -1,18 +0,0 @@
>---- 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) {
>-+	exit;
>- 	require ('fpdi.php');
>- 	global $NAGIOS;
>- 	global $conf;
>-@@ -1443,6 +1444,7 @@
>- }
>- 
>- function doPDFIcon($type){
>-+	return;
>- 	global $hostname;
>- 	global $servicedesc;
>- 	global $special;
>Index: files/patch-sample-config::Makefile.in
>===================================================================
>--- files/patch-sample-config::Makefile.in	(revision 1)
>+++ files/patch-sample-config::Makefile.in	(working copy)
>@@ -1,29 +0,0 @@
>---- sample-config/Makefile.in.orig	2008-10-11 18:13:17.000000000 +0400
>-+++ sample-config/Makefile.in	2008-12-24 17:33:32.000000000 +0300
>-@@ -27,23 +27,19 @@
>- devclean: distclean
>- 
>- install:
>--	-rm -f $(DESTDIR)$(HTMLDIR)/conf/config.php
>--
>- 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)
>- 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands
>- 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages
>- 	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/pnp4nagios_release $(DESTDIR)$(SYSCONFDIR)
>--	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)
>--	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/background.pdf $(DESTDIR)$(SYSCONFDIR)
>-+	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php-sample
>-+	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/background.pdf $(DESTDIR)$(SYSCONFDIR)/background.pdf-sample
>- 
>- install-config: 
>--	-rm -f $(DESTDIR)$(HTMLDIR)/conf/config.php
>--
>- 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)
>- 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands
>- 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages
>- 	
>--	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)
>-+	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php-sample
>- 	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/process_perfdata.cfg-sample $(DESTDIR)$(SYSCONFDIR)
>- 	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/rra.cfg-sample $(DESTDIR)$(SYSCONFDIR)
>- 	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/check_commands/check_nwstat.cfg-sample $(DESTDIR)$(SYSCONFDIR)/check_commands
>Index: files/patch-scripts::Makefile.in
>===================================================================
>--- files/patch-scripts::Makefile.in	(revision 1)
>+++ files/patch-scripts::Makefile.in	(working copy)
>@@ -1,23 +0,0 @@
>---- scripts/Makefile.in.orig	2008-12-24 01:11:40.000000000 +0300
>-+++ scripts/Makefile.in	2008-12-24 01:12:25.000000000 +0300
>-@@ -25,7 +25,6 @@
>- devclean: distclean
>- 
>- install-init: 
>--	$(INSTALL) -m 755 $(INIT_OPTS) -d $(DESTDIR)$(INIT_DIR)
>- 	$(INSTALL) -m 755 $(INIT_OPTS) rc.npcd $(DESTDIR)$(INIT_DIR)/npcd
>- 
>- install-processperfdata: 
>-@@ -35,12 +34,9 @@
>- 	$(INSTALL) -m 755 $(INSTALL_OPTS) check_pnp_rrds.pl $(DESTDIR)$(LIBEXECDIR)
>- 
>- install-net2pnp:
>--	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
>- 	$(INSTALL) -m 755 $(INSTALL_OPTS) net2pnp.pl $(DESTDIR)$(BINDIR)
>- 
>- install: 
>--	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATADIR)
>--	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
>- 	$(MAKE) install-processperfdata
>- 	$(MAKE) install-plugins
>- 	
>Index: files/patch-src::Makefile.in
>===================================================================
>--- files/patch-src::Makefile.in	(revision 1)
>+++ files/patch-src::Makefile.in	(working copy)
>@@ -1,11 +0,0 @@
>---- src/Makefile.in.orig	2008-12-24 01:12:54.000000000 +0300
>-+++ src/Makefile.in	2008-12-24 01:13:31.000000000 +0300
>-@@ -88,8 +88,6 @@
>- 	$(MAKE) install-basic
>- 
>- install-basic:
>--	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
>--	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_SPOOL_DIR)
>- 	$(INSTALL) -m 754 $(INSTALL_OPTS) @npcd_name@ $(DESTDIR)$(BINDIR)
>- 
>- strip-post-install:
>Index: Makefile
>===================================================================
>--- Makefile	(revision 1)
>+++ Makefile	(working copy)
>@@ -7,8 +7,10 @@
> 
> PORTNAME=	pnp
> PORTVERSION=	0.4.14
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/${PORTNAME}4nagios/PNP/${PORTNAME}-${PORTVERSION}
>+LICENSE=	GPLv2
> 
> MAINTAINER=	rea-fbsd@codelabs.ru
> COMMENT=	Nagios performance data collector and grapher
>@@ -19,7 +21,10 @@
> 
> OPTIONS=	PDF "Use built-in fpdf library to produce PDF views" ON
> 
>+.include <bsd.port.options.mk>
>+
> USE_PHP=	zlib gd xml pcre
>+USE_DOS2UNIX=	yes
> WANT_PHP_WEB=	yes
> USE_RC_SUBR=	npcd.sh
> MAN1=		pnpsender.1
>@@ -33,9 +38,8 @@
> PNP_SPOOL=	${PNP_STATE}/perfspool
> FPDF_DIR?=	share/fpdf
> 
>-.if defined(WITH_PDF)
>-.else
>-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-share::pnp::include::function.inc.php
>+.if !defined(WITH_PDF)
>+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-share__pnp__include__function.inc.php
> .endif
> 
> GNU_CONFIGURE=	yes

Actions: View

Attachments on bug 147199: 106579