The pnp4nagios 0.6.x branch is out and stable for a quite long time now. I was wondering if there is some work (and I'll be glad to contribute) to bump the version of the current port or to create a new one with the official name of the project (pnp4nagios) How-To-Repeat: Look at http://docs.pnp4nagios.org/pnp-0.6/dwnld
Maintainer of net-mgmt/pnp, Please note that PR ports/151118 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/151118 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Responsible Changed From-To: freebsd-ports-bugs->rea I have an update in progress, but still not all issues on the 0.6 line are fixed.
My update to 0.6.7 is on review of my mentors and hopefully I'll commit it Soon(TM). Here is the diff -- testing is welcome! --- update-to-0.6.7.diff begins here --- =46rom 34b3ebe89a2e1d94432472b769d438d525f9ba5c Mon Sep 17 00:00:00 2001 =46rom: Eygene Ryabinkin <rea-fbsd@codelabs.ru> Date: Sun, 21 Nov 2010 01:09:51 +0300 Subject: [PATCH] net-mgmt/pnp: update to 0.6.7 * update of the sources to the 0.6.x series; * reworked patches and grouped them by-commit rather than by-file; * excluded removal of .orig files -- all files aren't installed anymore. Signed-off-by: Eygene Ryabinkin <rea-fbsd@codelabs.ru> --- net-mgmt/pnp/Makefile | 49 +- net-mgmt/pnp/distinfo | 5 +- net-mgmt/pnp/files/extra-patch-disable-pdf | 86 +++ ...tra-patch-share__pnp__include__function.inc.php | 18 - .../pnp/files/patch-0010-dont-overwrite-configs | 45 ++ net-mgmt/pnp/files/patch-0020-directory-creation | 124 ++++ net-mgmt/pnp/files/patch-man__Makefile.in | 10 - .../pnp/files/patch-sample-config__Makefile.in | 29 - net-mgmt/pnp/files/patch-scripts__Makefile.in | 23 - ...are__pnp__include__font__makefont__makefont.php | 11 - .../pnp/files/patch-share__pnp__include__fpdi.php | 11 - .../patch-share__pnp__include__fpdi_pdf_parser.php | 11 - .../patch-share__pnp__include__function.inc.php | 29 - .../patch-share__pnp__include__pdf_parser.php | 29 - .../pnp/files/patch-share__pnp__include__site.php | 11 - net-mgmt/pnp/files/patch-src__Makefile.in | 11 - net-mgmt/pnp/files/pkg-deinstall.in | 41 +- net-mgmt/pnp/files/pkg-install.in | 21 +- net-mgmt/pnp/files/pkg-message.in | 56 +- net-mgmt/pnp/pkg-plist | 689 ++++++++++++++++= +--- 20 files changed, 926 insertions(+), 383 deletions(-) create mode 100644 net-mgmt/pnp/files/extra-patch-disable-pdf delete mode 100644 net-mgmt/pnp/files/extra-patch-share__pnp__include__fun= ction.inc.php create mode 100644 net-mgmt/pnp/files/patch-0010-dont-overwrite-configs create mode 100644 net-mgmt/pnp/files/patch-0020-directory-creation delete mode 100644 net-mgmt/pnp/files/patch-man__Makefile.in delete mode 100644 net-mgmt/pnp/files/patch-sample-config__Makefile.in delete mode 100644 net-mgmt/pnp/files/patch-scripts__Makefile.in delete mode 100644 net-mgmt/pnp/files/patch-share__pnp__include__font__mak= efont__makefont.php delete mode 100644 net-mgmt/pnp/files/patch-share__pnp__include__fpdi.php delete mode 100644 net-mgmt/pnp/files/patch-share__pnp__include__fpdi_pdf_= parser.php delete mode 100644 net-mgmt/pnp/files/patch-share__pnp__include__function.= inc.php delete mode 100644 net-mgmt/pnp/files/patch-share__pnp__include__pdf_parse= r.php delete mode 100644 net-mgmt/pnp/files/patch-share__pnp__include__site.php delete mode 100644 net-mgmt/pnp/files/patch-src__Makefile.in diff --git a/net-mgmt/pnp/Makefile b/net-mgmt/pnp/Makefile index efb76ec..73ac627 100644 --- a/net-mgmt/pnp/Makefile +++ b/net-mgmt/pnp/Makefile @@ -6,30 +6,32 @@ # =20 PORTNAME=3D pnp -PORTVERSION=3D 0.4.14 -PORTREVISION=3D 2 +PORTVERSION=3D 0.6.7 CATEGORIES=3D net-mgmt -MASTER_SITES=3D SF/${PORTNAME}4nagios/PNP/${PORTNAME}-${PORTVERSION} +MASTER_SITES=3D SF +MASTER_SITE_SUBDIR=3Dpnp4nagios/PNP-0.6 +DISTNAME=3D pnp4nagios-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFF= IX} =20 -MAINTAINER=3D rea-fbsd@codelabs.ru +MAINTAINER=3D rea@FreeBSD.org COMMENT=3D Nagios performance data collector and grapher =20 BUILD_DEPENDS=3D ${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool RUN_DEPENDS=3D ${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool \ nagios:${PORTSDIR}/net-mgmt/nagios =20 -LICENSE=3D GPLv2 - OPTIONS=3D PDF "Use built-in fpdf library to produce PDF views" ON =20 .include <bsd.port.options.mk> =20 -USE_PHP=3D zlib gd xml pcre -USE_DOS2UNIX=3D yes -DOS2UNIX_REGEX=3D '.*\.\(php\|js\|txt\)$$' +LICENSE=3D GPLv2 +PATCH_STRIP=3D -p1 +USE_PERL5=3D yes +USE_PHP=3D zlib gd xml pcre filter iconv json simplexml WANT_PHP_WEB=3D yes USE_RC_SUBR=3D npcd.sh -MAN1=3D pnpsender.1 +MAN8=3D npcd.8 +USE_DOS2UNIX=3D yes +DOS2UNIX_REGEX=3D '.*\.\(php\|js\|txt\)$$' =20 NAGIOSDIR?=3D /var/spool/nagios NAGIOSHTMURL?=3D /nagios @@ -39,9 +41,10 @@ PNP_STATE=3D ${NAGIOSDIR}/pnp PNP_RRDS=3D ${PNP_STATE}/rrd PNP_SPOOL=3D ${PNP_STATE}/perfspool FPDF_DIR?=3D share/fpdf +SPOOL_DIRS=3D ${PNP_STATE}:${NAGIOSUSER}:${NAGIOSGROUP}:0750%${PNP_RRDS}:$= {NAGIOSUSER}:${NAGIOSGROUP}:0750%${PNP_SPOOL}:${NAGIOSUSER}:${NAGIOSGROUP}:= 0750 =20 .if !defined(WITH_PDF) -EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-share__pnp__include__function.in= c.php +EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-disable-pdf .endif =20 GNU_CONFIGURE=3D yes @@ -64,22 +67,11 @@ INSTALL_TARGET=3D install install-config SUB_FILES=3D pkg-install \ pkg-deinstall \ pkg-message -SUB_LIST=3D PNP_STATE=3D${PNP_STATE} \ +SUB_LIST=3D SPOOL_DIRS=3D${SPOOL_DIRS} \ PNP_RRDS=3D${PNP_RRDS} \ - PNP_SPOOL=3D${PNP_SPOOL} \ NAGIOSUSER=3D${NAGIOSUSER} \ NAGIOSGROUP=3D${NAGIOSGROUP} =20 -# All files in share/pnp/include/ are installed, so if we patched something -# in that directory, we must clean the '.orig' files -- they shouldn't be -# installed. -PNP_CLEAN_PATCHED=3D share/pnp/include/font/makefont/makefont.php.orig \ - share/pnp/include/fpdi.php.orig \ - share/pnp/include/fpdi_pdf_parser.php.orig \ - share/pnp/include/function.inc.php.orig \ - share/pnp/include/pdf_parser.php.orig \ - share/pnp/include/site.php.orig - .if defined(WITH_PDF) PNP_USE_FPDF=3D 1 .else @@ -90,15 +82,14 @@ post-patch: -e's|^\$$conf\['\''use_fpdf'\''\] =3D [[:digit:]];|$$conf['\''use_fpdf'\= ''] =3D ${PNP_USE_FPDF};|' \ -e's|^\$$conf\['\''nagios_base'\''\] =3D "/nagios/cgi-bin";|$$conf\['\''= nagios_base'\''\] =3D "${NAGIOSHTMURL}/cgi-bin";|' \ "${WRKSRC}/sample-config/pnp/config.php.in" -.for pch in ${PNP_CLEAN_PATCHED} - @${RM} -f "${WRKSRC}/${pch}" -.endfor + +pre-install: + @PKG_PREFIX=3D${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL =20 post-install: -.for m in ${MAN1} - ${INSTALL_MAN} ${WRKSRC}/man/man1/${m} ${MAN1PREFIX}/man/man1/${m} +.for m in ${MAN8} + ${INSTALL_MAN} ${WRKSRC}/man/${m} ${MAN1PREFIX}/man/man8/${m} .endfor - @PKG_PREFIX=3D${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} =20 .include <bsd.port.mk> diff --git a/net-mgmt/pnp/distinfo b/net-mgmt/pnp/distinfo index 0d4c090..8994d71 100644 --- a/net-mgmt/pnp/distinfo +++ b/net-mgmt/pnp/distinfo @@ -1,3 +1,2 @@ -MD5 (pnp-0.4.14.tar.gz) =3D 9dbbf08191a258f6798c9516b3821ff0 -SHA256 (pnp-0.4.14.tar.gz) =3D e0f1ba160ec5757e130af7c5ad11944766d97bc3c3e= 93d9bf9b782a05902760f -SIZE (pnp-0.4.14.tar.gz) =3D 455593 +SHA256 (pnp4nagios-0.6.7.tar.gz) =3D 010128d1ed13afed1cc313264b10807b60b7d= c596d0e9e86c0ac7208d0df5878 +SIZE (pnp4nagios-0.6.7.tar.gz) =3D 1874012 diff --git a/net-mgmt/pnp/files/extra-patch-disable-pdf b/net-mgmt/pnp/file= s/extra-patch-disable-pdf new file mode 100644 index 0000000..9c4fc3c --- /dev/null +++ b/net-mgmt/pnp/files/extra-patch-disable-pdf @@ -0,0 +1,86 @@ +From 9c588aefedcdcd15a4bc61bf6a33c10818107390 Mon Sep 17 00:00:00 2001 +From: Eygene Ryabinkin <rea-fbsd@codelabs.ru> +Date: Thu, 18 Nov 2010 15:47:59 +0300 +Subject: [PATCH 3/3] Disable PDF generation + +This patch allows to completely disable generation of PDF files +via any means. It used to support WITHOUT_PDF knob of FreeBSD port. + +Signed-off-by: Eygene Ryabinkin <rea-fbsd@codelabs.ru> +--- + share/pnp/application/controllers/pdf.php | 4 ++++ + share/pnp/application/models/rrdtool.php | 1 + + share/pnp/application/views/icon_box.php | 9 --------- + 3 files changed, 5 insertions(+), 9 deletions(-) + +diff --git a/share/pnp/application/controllers/pdf.php b/share/pnp/applica= tion/controllers/pdf.php +index 36ef2a7..aa48d1f 100644 +--- a/share/pnp/application/controllers/pdf.php ++++ b/share/pnp/application/controllers/pdf.php +@@ -13,6 +13,7 @@ class Pdf_Controller extends System_Controller { +=20 + public function __construct(){ + parent::__construct(); ++ exit; +=20 + $this->use_bg =3D 0; + $this->bg =3D $this->config->conf['background_pdf']; +@@ -33,6 +34,7 @@ class Pdf_Controller extends System_Controller { + } +=20 + public function index(){ ++ exit; +=20 + $this->host =3D $this->input->get('host'); + $this->service =3D $this->input->get('srv'); +@@ -144,6 +146,7 @@ class Pdf_Controller extends System_Controller { + } +=20 + public function page($page){ ++ exit; + $this->start =3D $this->input->get('start'); + $this->end =3D $this->input->get('end'); + $this->view =3D ""; +@@ -206,6 +209,7 @@ class Pdf_Controller extends System_Controller { + } +=20 + public function basket(){ ++ exit; + $this->start =3D $this->input->get('start'); + $this->end =3D $this->input->get('end'); + $this->view =3D ""; +diff --git a/share/pnp/application/models/rrdtool.php b/share/pnp/applicat= ion/models/rrdtool.php +index 2c18b4e..2a24996 100644 +--- a/share/pnp/application/models/rrdtool.php ++++ b/share/pnp/application/models/rrdtool.php +@@ -79,6 +79,7 @@ class Rrdtool_Model extends Model + $width =3D 0; + $height =3D 0; + if ($out =3D=3D 'PDF'){ ++ exit; + if($conf['pdf_graph_opt']){ + $command .=3D $conf['pdf_graph_opt']; + } +diff --git a/share/pnp/application/views/icon_box.php b/share/pnp/applicat= ion/views/icon_box.php +index 7ce5301..838b474 100644 +--- a/share/pnp/application/views/icon_box.php ++++ b/share/pnp/application/views/icon_box.php +@@ -9,15 +9,6 @@ $qsa =3D pnp::addToUri(array('start' =3D> $this->start,'= end' =3D> $this->end, 'view' + if($this->config->conf['use_calendar']){ + echo "<a title=3D\"".Kohana::lang('common.title-calendar-link')."\" href= =3D\"#\" id=3D\"button\"><img class=3D\"icon\" src=3D\"".url::base()."media= /images/calendar.png\"></a>";=20 + } +-if($this->config->conf['use_fpdf'] =3D=3D 1 && ( $position =3D=3D "graph"= || $position =3D=3D "special") ){ +- echo "<a title=3D\"".Kohana::lang('common.title-pdf-link')."\" href=3D\"= ".url::base(TRUE)."pdf".$qsa."\"><img class=3D\"icon\" src=3D\"".url::base(= )."media/images/pdf.png\"></a>\n"; +-} +-if($this->config->conf['use_fpdf'] =3D=3D 1 && $position =3D=3D "basket"){ +- echo "<a title=3D\"".Kohana::lang('common.title-pdf-link')."\" href=3D\"= ".url::base(TRUE)."pdf/basket/".$qsa."\"><img class=3D\"icon\" src=3D\"".ur= l::base()."media/images/pdf.png\"></a>\n"; +-} +-if($this->config->conf['use_fpdf'] =3D=3D 1 && $position =3D=3D "page"){ +- echo "<a title=3D\"".Kohana::lang('common.title-pdf-link')."\" href=3D\"= ".url::base(TRUE)."pdf/page/".$this->page.$qsa."\"><img class=3D\"icon\" sr= c=3D\"".url::base()."media/images/pdf.png\"></a>\n"; +-} + if($this->config->conf['show_xml_icon'] =3D=3D 1 && $position =3D=3D "gra= ph"){ + $qsa =3D pnp::addToUri(array(), False); + echo "<a title=3D\"".Kohana::lang('common.title-xml-link')."\" href=3D\"= ".url::base(TRUE)."xml".$qsa."\"><img class=3D\"icon\" src=3D\"".url::base(= )."media/images/xml.png\"></a>\n"; +--=20 +1.7.2.1 + diff --git a/net-mgmt/pnp/files/extra-patch-share__pnp__include__function.i= nc.php b/net-mgmt/pnp/files/extra-patch-share__pnp__include__function.inc.p= hp deleted file mode 100644 index a266517..0000000 --- a/net-mgmt/pnp/files/extra-patch-share__pnp__include__function.inc.php +++ /dev/null @@ -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 @@ - } -=20 - function doPDF($display,$data) { -+ exit; - require ('fpdi.php'); - global $NAGIOS; - global $conf; -@@ -1443,6 +1444,7 @@ - } -=20 - function doPDFIcon($type){ -+ return; - global $hostname; - global $servicedesc; - global $special; diff --git a/net-mgmt/pnp/files/patch-0010-dont-overwrite-configs b/net-mgm= t/pnp/files/patch-0010-dont-overwrite-configs new file mode 100644 index 0000000..f48cd2b --- /dev/null +++ b/net-mgmt/pnp/files/patch-0010-dont-overwrite-configs @@ -0,0 +1,45 @@ +From cccbb033458f205ac74e11babe5021bc7a3ade3c Mon Sep 17 00:00:00 2001 +From: Eygene Ryabinkin <rea-fbsd@codelabs.ru> +Date: Wed, 17 Nov 2010 19:47:16 +0300 +Subject: [PATCH 1/3] Do not overwrite configuration files + +Install all configuration files as *-sample. + +Signed-off-by: Eygene Ryabinkin <rea-fbsd@codelabs.ru> +--- + sample-config/Makefile.in | 8 +++----- + 1 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/sample-config/Makefile.in b/sample-config/Makefile.in +index 883345c..1eac2c1 100644 +--- a/sample-config/Makefile.in ++++ b/sample-config/Makefile.in +@@ -31,14 +31,12 @@ distclean: clean + devclean: distclean +=20 + 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_comma= nds + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages + $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/pnp4nagios_release $(DESTDIR)$(SY= SCONFDIR) +- $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR) +- $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/background.pdf $(DESTDIR)$(SYSCON= FDIR) ++ $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR= )/config.php-sample ++ $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/background.pdf $(DESTDIR)$(SYSCON= FDIR)/background.pdf-sample +=20 + install-config:=20 +=20 +@@ -46,7 +44,7 @@ install-config: + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_comma= nds + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages + =09 +- $(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 $(DES= TDIR)$(SYSCONFDIR) + $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/rra.cfg-sample $(DESTDIR)$(SYSCON= FDIR) + $(INSTALL) -m 644 $(INSTALL_OPTS) misccommands.cfg-sample $(DESTDIR)$(S= YSCONFDIR) +--=20 +1.7.2.1 + diff --git a/net-mgmt/pnp/files/patch-0020-directory-creation b/net-mgmt/pn= p/files/patch-0020-directory-creation new file mode 100644 index 0000000..46c9410 --- /dev/null +++ b/net-mgmt/pnp/files/patch-0020-directory-creation @@ -0,0 +1,124 @@ +From 0f6181db74e4a2f53837c5e9b5639cdfb63ee2e1 Mon Sep 17 00:00:00 2001 +From: Eygene Ryabinkin <rea-fbsd@codelabs.ru> +Date: Thu, 18 Nov 2010 15:22:03 +0300 +Subject: [PATCH 2/3] Rework directory creation during install phase + +Don't create existing system and log-like directories to avoid +changing their permissions. + +Signed-off-by: Eygene Ryabinkin <rea-fbsd@codelabs.ru> +--- + lib/Makefile.in | 2 +- + sample-config/Makefile.in | 14 +++++++------- + scripts/Makefile.in | 8 ++++---- + share/Makefile.in | 2 +- + src/Makefile.in | 10 +++++----- + 5 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/lib/Makefile.in b/lib/Makefile.in +index b103bc8..0e0f8d8 100644 +--- a/lib/Makefile.in ++++ b/lib/Makefile.in +@@ -22,7 +22,7 @@ devclean: distclean +=20 + install: +=20 +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR) =20 ++ [ -d "$(DESTDIR)$(LIBDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(D= ESTDIR)$(LIBDIR) + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)/kohana + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)/kohana/system + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)/kohana/system/c= ontrollers +diff --git a/sample-config/Makefile.in b/sample-config/Makefile.in +index 1eac2c1..a841fbb 100644 +--- a/sample-config/Makefile.in ++++ b/sample-config/Makefile.in +@@ -31,19 +31,19 @@ distclean: clean + devclean: distclean +=20 + install: +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_comma= nds +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages ++ [ -d "$(DESTDIR)$(SYSCONFDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d= $(DESTDIR)$(SYSCONFDIR) ++ [ -d "$(DESTDIR)$(SYSCONFDIR)"/check_commands ] || $(INSTALL) -m 755 $(I= NSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands ++ [ -d "$(DESTDIR)$(SYSCONFDIR)"/pages ] || $(INSTALL) -m 755 $(INSTALL_OP= TS) -d $(DESTDIR)$(SYSCONFDIR)/pages + $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/pnp4nagios_release $(DESTDIR)$(SY= SCONFDIR) + $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR= )/config.php-sample + $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/background.pdf $(DESTDIR)$(SYSCON= FDIR)/background.pdf-sample +=20 + install-config:=20 +=20 +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_comma= nds +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages +-=09 ++ [ -d "$(DESTDIR)$(SYSCONFDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d= $(DESTDIR)$(SYSCONFDIR) ++ [ -d "$(DESTDIR)$(SYSCONFDIR)"/check_commands ] || $(INSTALL) -m 755 $(I= NSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands ++ [ -d "$(DESTDIR)$(SYSCONFDIR)"/pages ] || $(INSTALL) -m 755 $(INSTALL_OP= TS) -d $(DESTDIR)$(SYSCONFDIR)/pages ++ + $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR= )/config.php-sample + $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/process_perfdata.cfg-sample $(DES= TDIR)$(SYSCONFDIR) + $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/rra.cfg-sample $(DESTDIR)$(SYSCON= FDIR) +diff --git a/scripts/Makefile.in b/scripts/Makefile.in +index 44f0506..8addf27 100644 +--- a/scripts/Makefile.in ++++ b/scripts/Makefile.in +@@ -25,7 +25,7 @@ distclean: clean + devclean: distclean +=20 + install-init:=20 +- $(INSTALL) -m 755 $(INIT_OPTS) -d $(DESTDIR)$(INIT_DIR) ++ [ -d "$(DESTDIR)$(INIT_DIR)" ] || $(INSTALL) -m 755 $(INIT_OPTS) -d $(DE= STDIR)$(INIT_DIR) + $(INSTALL) -m 755 $(INIT_OPTS) rc.npcd $(DESTDIR)$(INIT_DIR)/npcd +=20 + install-processperfdata:=20 +@@ -41,9 +41,9 @@ install-rrdconvert: + $(INSTALL) -m 755 $(INSTALL_OPTS) rrd_convert.pl $(DESTDIR)$(LIBEXECDIR) +=20 + install:=20 +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATADIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/stats ++ [ -d "$(DESTDIR)$(PERFDATADIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -= d $(DESTDIR)$(PERFDATADIR) ++ [ -d "$(DESTDIR)$(LIBEXECDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d= $(DESTDIR)$(LIBEXECDIR) ++ [ -d "$(DESTDIR)$(LOGDIR)"/stats ] || $(INSTALL) -m 755 $(INSTALL_OPTS) = -d $(DESTDIR)$(LOGDIR)/stats + $(MAKE) install-processperfdata + $(MAKE) install-plugins + $(MAKE) install-verifyconfig +diff --git a/share/Makefile.in b/share/Makefile.in +index 2c4c55d..fd6713d 100644 +--- a/share/Makefile.in ++++ b/share/Makefile.in +@@ -22,7 +22,7 @@ distclean: clean + devclean: distclean +=20 + install: +- $(INSTALL) -m 777 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/kohana ++ [ -d "$(DESTDIR)$(LOGDIR)"/kohana ] || $(INSTALL) -m 777 $(INSTALL_OPTS)= -d $(DESTDIR)$(LOGDIR)/kohana + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR) + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/documents + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/documents/= _media +diff --git a/src/Makefile.in b/src/Makefile.in +index b4323b4..9439f25 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -124,11 +124,11 @@ install-unstripped: + $(MAKE) install-basic +=20 + install-basic: +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_DIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_SPOOL_DIR) ++ [ -d "$(DESTDIR)$(BINDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(D= ESTDIR)$(BINDIR) ++ [ -d "$(DESTDIR)$(LIBDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(D= ESTDIR)$(LIBDIR) ++ [ -d "$(DESTDIR)$(LOGDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(D= ESTDIR)$(LOGDIR) ++ [ -d "$(DESTDIR)$(PERFDATA_DIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) = -d $(DESTDIR)$(PERFDATA_DIR) ++ [ -d "$(DESTDIR)$(PERFDATA_SPOOL_DIR)" ] || $(INSTALL) -m 775 $(INSTALL_= OPTS) -d $(DESTDIR)$(PERFDATA_SPOOL_DIR) + $(INSTALL) -m 754 $(INSTALL_OPTS) @npcd_name@ $(DESTDIR)$(BINDIR) + $(INSTALL) -m 754 $(INSTALL_OPTS) npcdmod.o $(DESTDIR)$(LIBDIR) +=20 +--=20 +1.7.2.1 + diff --git a/net-mgmt/pnp/files/patch-man__Makefile.in b/net-mgmt/pnp/files= /patch-man__Makefile.in deleted file mode 100644 index 6585064..0000000 --- a/net-mgmt/pnp/files/patch-man__Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- ./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 -=20 - install: -- $(MAKE) install-basic -=20 - install-basic: - $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(MANDIR)/man1/ diff --git a/net-mgmt/pnp/files/patch-sample-config__Makefile.in b/net-mgmt= /pnp/files/patch-sample-config__Makefile.in deleted file mode 100644 index bd4fb23..0000000 --- a/net-mgmt/pnp/files/patch-sample-config__Makefile.in +++ /dev/null @@ -1,29 +0,0 @@ ---- ./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 -=20 - 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_comma= nds - $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/pnp4nagios_release $(DESTDIR)$(SY= SCONFDIR) -- $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR) -- $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/background.pdf $(DESTDIR)$(SYSCON= FDIR) -+ $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR= )/config.php-sample -+ $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/background.pdf $(DESTDIR)$(SYSCON= FDIR)/background.pdf-sample -=20 - install-config:=20 -- -rm -f $(DESTDIR)$(HTMLDIR)/conf/config.php -- - $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR) - $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_comma= nds - $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages - =09 -- $(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 $(DES= TDIR)$(SYSCONFDIR) - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/rra.cfg-sample $(DESTDIR)$(SYSCON= FDIR) - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/check_commands/check_nwstat.cfg-s= ample $(DESTDIR)$(SYSCONFDIR)/check_commands diff --git a/net-mgmt/pnp/files/patch-scripts__Makefile.in b/net-mgmt/pnp/f= iles/patch-scripts__Makefile.in deleted file mode 100644 index 03f3d0d..0000000 --- a/net-mgmt/pnp/files/patch-scripts__Makefile.in +++ /dev/null @@ -1,23 +0,0 @@ ---- ./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 -=20 - install-init:=20 -- $(INSTALL) -m 755 $(INIT_OPTS) -d $(DESTDIR)$(INIT_DIR) - $(INSTALL) -m 755 $(INIT_OPTS) rc.npcd $(DESTDIR)$(INIT_DIR)/npcd -=20 - install-processperfdata:=20 -@@ -35,12 +34,9 @@ - $(INSTALL) -m 755 $(INSTALL_OPTS) check_pnp_rrds.pl $(DESTDIR)$(LIBEXECD= IR) -=20 - install-net2pnp: -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) - $(INSTALL) -m 755 $(INSTALL_OPTS) net2pnp.pl $(DESTDIR)$(BINDIR) -=20 - install:=20 -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATADIR) -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR) - $(MAKE) install-processperfdata - $(MAKE) install-plugins - =09 diff --git a/net-mgmt/pnp/files/patch-share__pnp__include__font__makefont__= makefont.php b/net-mgmt/pnp/files/patch-share__pnp__include__font__makefont= __makefont.php deleted file mode 100644 index 0b9769c..0000000 --- a/net-mgmt/pnp/files/patch-share__pnp__include__font__makefont__makefon= t.php +++ /dev/null @@ -1,11 +0,0 @@ ---- ./share/pnp/include/font/makefont/makefont.php.orig 2010-05-29 23:27:4= 4.000000000 +0200 -+++ ./share/pnp/include/font/makefont/makefont.php 2010-05-29 23:30:23.000= 000000 +0200 -@@ -171,7 +171,7 @@ - //StemV - if(isset($fm['StdVW'])) - $stemv=3D$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=3D120; - else - $stemv=3D70; diff --git a/net-mgmt/pnp/files/patch-share__pnp__include__fpdi.php b/net-m= gmt/pnp/files/patch-share__pnp__include__fpdi.php deleted file mode 100644 index dc3061f..0000000 --- a/net-mgmt/pnp/files/patch-share__pnp__include__fpdi.php +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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 =3D& $this->current_filename; -=20 - if (!isset($this->parsers[$fn])) -- $this->parsers[$fn] =3D& new fpdi_pdf_parser($fn,$this); -+ $this->parsers[$fn] =3D new fpdi_pdf_parser($fn,$this); - $this->current_parser =3D& $this->parsers[$fn]; - =20 - return $this->parsers[$fn]->getPageCount(); diff --git a/net-mgmt/pnp/files/patch-share__pnp__include__fpdi_pdf_parser.= php b/net-mgmt/pnp/files/patch-share__pnp__include__fpdi_pdf_parser.php deleted file mode 100644 index d1ff1c1..0000000 --- a/net-mgmt/pnp/files/patch-share__pnp__include__fpdi_pdf_parser.php +++ /dev/null @@ -1,11 +0,0 @@ ---- ./share/pnp/include/fpdi_pdf_parser.php.orig 2010-05-29 23:27:44.00000= 0000 +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], $filte= rName) && @include_once('decoders'.$_filter[1].'.php')) { - $filterName =3D substr($_filter[1],1); - if (class_exists($filterName)) { -- $decoder =3D& new $filterName($this->fpdi); -+ $decoder =3D new $filterName($this->fpdi); - $stream =3D $decoder->decode(trim($stream)); - } else { - $this->fpdi->error(sprintf("Unsupported Filter: = %s",$_filter[1])); diff --git a/net-mgmt/pnp/files/patch-share__pnp__include__function.inc.php= b/net-mgmt/pnp/files/patch-share__pnp__include__function.inc.php deleted file mode 100644 index 04b7b06..0000000 --- a/net-mgmt/pnp/files/patch-share__pnp__include__function.inc.php +++ /dev/null @@ -1,29 +0,0 @@ ---- ./share/pnp/include/function.inc.php.orig 2010-05-29 21:26:22.00000000= 0 +0200 -+++ ./share/pnp/include/function.inc.php 2010-05-29 21:32:24.000000000 +02= 00 -@@ -1030,7 +1030,7 @@ - } - } -=20 -- $pdf =3D& new PDF('P', 'mm', 'A4'); -+ $pdf =3D new PDF('P', 'mm', 'A4'); - $pdf->AliasNbPages(); - $pdf->SetAutoPageBreak('off'); - $pdf->SetMargins(12.5,25,10); -@@ -1540,7 +1540,7 @@ - $NAGIOS['RRD'][$tag][$dsl] =3D urldecode($value); - } -=20 -- if($level =3D=3D 2 && $type =3D=3D "complete" && eregi("^NAGI= OS_",$tag)){ -+ if($level =3D=3D 2 && $type =3D=3D "complete" && preg_match("= /^NAGIOS_/i",$tag)){ - if(isset($xml_elem['value'])){ - $value =3D $xml_elem['value']; - }else{ -@@ -1571,7 +1571,7 @@ - $PAGE=3D""; - $allowed_tags =3D array("page", "graph"); - foreach($data as $line){ -- if(ereg('(^#|^;)',$line)) { -+ if(preg_match('/(^#|^;)/',$line)) { - continue; - } -=20 diff --git a/net-mgmt/pnp/files/patch-share__pnp__include__pdf_parser.php b= /net-mgmt/pnp/files/patch-share__pnp__include__pdf_parser.php deleted file mode 100644 index e622887..0000000 --- a/net-mgmt/pnp/files/patch-share__pnp__include__pdf_parser.php +++ /dev/null @@ -1,29 +0,0 @@ ---- ./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 @@ -=20 - $this->getPDFVersion(); -=20 -- $this->c =3D& new pdf_context($this->f); -+ $this->c =3D new pdf_context($this->f); - // Read xref-Data - $this->pdf_read_xref($this->xref, $this->pdf_find_xref()); -=20 -@@ -257,7 +257,7 @@ - fseek($this->f, $o_pos+strlen($m[1])); - } - =09 -- $c =3D& new pdf_context($this->f); -+ $c =3D new pdf_context($this->f); - $trailer =3D $this->pdf_read_value($c); - =20 - if (isset($trailer[1]['/Prev'])) { -@@ -423,7 +423,7 @@ - $e++; - =20 - if ($this->actual_obj[1][1]['/Length'][0] =3D=3D PDF_TYPE_OBJRE= F) { -- $tmp_c =3D& new pdf_context($this->f); -+ $tmp_c =3D new pdf_context($this->f); - $tmp_length =3D $this->pdf_resolve_object($tmp_c,$this->actual= _obj[1][1]['/Length']); - $length =3D $tmp_length[1][1]; - } else { diff --git a/net-mgmt/pnp/files/patch-share__pnp__include__site.php b/net-m= gmt/pnp/files/patch-share__pnp__include__site.php deleted file mode 100644 index 9e6be31..0000000 --- a/net-mgmt/pnp/files/patch-share__pnp__include__site.php +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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 =3D 0; - =09 - while (isset($file[$l]) && $file[$l] !=3D "") { -- if(!ereg("^#",$file[$l]) && !ereg("^;",$file[$l])) { -+ if(!preg_match("/^#/",$file[$l]) && !preg_match("/^;/",$file[$l])) { - $defineCln =3D explode("{", $file[$l]); - $define =3D explode(" ",$defineCln[0]); - if (isset($define[1]) && in_array(trim($define[1]),$type)) { diff --git a/net-mgmt/pnp/files/patch-src__Makefile.in b/net-mgmt/pnp/files= /patch-src__Makefile.in deleted file mode 100644 index 13b3997..0000000 --- a/net-mgmt/pnp/files/patch-src__Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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 -=20 - 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) -=20 diff --git a/net-mgmt/pnp/files/pkg-deinstall.in b/net-mgmt/pnp/files/pkg-d= einstall.in index 987ac45..ba82231 100644 --- a/net-mgmt/pnp/files/pkg-deinstall.in +++ b/net-mgmt/pnp/files/pkg-deinstall.in @@ -3,28 +3,47 @@ # $FreeBSD: ports/net-mgmt/pnp/files/pkg-deinstall.in,v 1.2 2008/08/18 15:= 42:50 pav Exp $ # =20 -PNP_RRDS=3D%%PNP_RRDS%% -PNP_SPOOL=3D%%PNP_SPOOL%% -PNP_STATE=3D%%PNP_STATE%% +SPOOL_DIRS=3D%%SPOOL_DIRS%% NAGIOSUSER=3D%%NAGIOSUSER%% NAGIOSGROUP=3D%%NAGIOSGROUP%% =20 dirs () { - local notempty + local kept spool_dirs_rev =20 - for i in "$PNP_RRDS" "$PNP_SPOOL" "$PNP_STATE"; do - if ! [ -d "$i" ]; then + IFS=3D% + for i in $SPOOL_DIRS; do + if [ -z "$spool_dirs_rev" ]; then + spool_dirs_rev=3D"$i" + else + spool_dirs_rev=3D"$i$IFS$spool_dirs_rev" + fi + done + for i in $spool_dirs_rev; do + d=3D"${i%%:*}" + if ! [ -d "$d" ]; then continue fi - if ! rmdir "$i" > /dev/null 2>&1; then - notempty=3D"$notempty $i" + gom_std=3D"${i#*:}" + go_cur=3D`stat -f %Su:%Sg "$d"` + m_cur=3D`stat -f %Op "$d" | sed -e's/^.*\(....\)$/\1/'` + if [ "$gom_std" !=3D "$go_cur:$m_cur" ]; then + kept=3D"$kept $d" + continue + fi + if ! rmdir "$d" > /dev/null 2>&1; then + kept=3D"$kept $d" + continue fi done =20 - if [ -n "$notempty" ]; then + if [ -n "$kept" ]; then echo - echo "The following directories were not removed:" - for i in $notempty; do + cat << EOF +The following directories were not removed, because they are either +have non-default permissions or not empty: +EOF + IFS=3D" " + for i in $kept; do echo " $i" done echo diff --git a/net-mgmt/pnp/files/pkg-install.in b/net-mgmt/pnp/files/pkg-ins= tall.in index 6f65cb4..f0e60ff 100644 --- a/net-mgmt/pnp/files/pkg-install.in +++ b/net-mgmt/pnp/files/pkg-install.in @@ -3,17 +3,22 @@ # $FreeBSD: ports/net-mgmt/pnp/files/pkg-install.in,v 1.1 2008/08/17 06:49= :35 edwin Exp $ # =20 -PNP_RRDS=3D%%PNP_RRDS%% -PNP_SPOOL=3D%%PNP_SPOOL%% +SPOOL_DIRS=3D%%SPOOL_DIRS%% NAGIOSUSER=3D%%NAGIOSUSER%% NAGIOSGROUP=3D%%NAGIOSGROUP%% =20 +# Create directories with mode and ownership specified in SPOOL_DIRS +# as strings separated by '%' of format DIR:OWNER:GROUP:MODE dirs () { - for i in "$PNP_RRDS" "$PNP_SPOOL"; do - if ! [ -d "$i" ]; then - mkdir -p "$i" - chmod 750 "$i" - chown "$NAGIOSUSER":"$NAGIOSGROUP" "$i" + IFS=3D% + for i in $SPOOL_DIRS; do + d=3D"${i%%:*}" + if ! [ -d "$d" ]; then + go=3D`echo "$i" | cut -f 2-3 -d :` + m=3D"${i##*:}" + mkdir -p "$d" + chown "$go" "$d" + chmod "$m" "$d" fi done } @@ -29,7 +34,7 @@ check_sanity () { fi } =20 -if [ "x$2" =3D "xPOST-INSTALL" ]; then +if [ "x$2" =3D "xPRE-INSTALL" ]; then check_sanity dirs fi diff --git a/net-mgmt/pnp/files/pkg-message.in b/net-mgmt/pnp/files/pkg-mes= sage.in index 6603c57..fa22554 100644 --- a/net-mgmt/pnp/files/pkg-message.in +++ b/net-mgmt/pnp/files/pkg-message.in @@ -2,51 +2,39 @@ =20 You just installed/upgraded PNP graphing tool for Nagios. =20 -For tool configuration tasks read - http://www.pnp4nagios.org/pnp/config - -For Web-frontend configuration tasks read - http://www.pnp4nagios.org/pnp/webfe +You will need to read the documentation at + http://docs.pnp4nagios.org/pnp-0.6/doc_complete +both for new installations and upgrades from 0.4, since you will +need to tweak your Nagios and PNP configuration according to the +0.6.x recipes. =20 We recommend to start with the following restrictive Apache configuration for the PNP area: - +{{{ +# PNP graphing tool +Alias /nagios/pnp %%WWWDIR%% <Directory "%%WWWDIR%%/"> Order deny,allow Allow from all Deny from all - DirectoryIndex index.php + AddHandler application/x-httpd-php .php -</Directory> + DirectoryIndex index.php =20 -<Directory "%%WWWDIR%%/include/"> - Options None - Order allow,deny - Deny from all - <FilesMatch ".css$"> - Order deny,allow - Allow from all - Deny from all - </FilesMatch> + RewriteEngine on + RewriteBase /nagios/pnp/ + # Protect application and system files from being viewed + RewriteRule ^(application|modules|system) - [F,L] + # Allow any files or directories that exist to be displayed directly + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + # Rewrite all other URLs to index.php/URL + RewriteRule .* index.php/$0 [PT,L] </Directory> +}}} =20 -<Directory "%%WWWDIR%%/include/js/"> - Order deny,allow - Allow from all - Deny from all -</Directory> -<Directory "%%WWWDIR%%/lang/"> - Order allow,deny - Deny from all -</Directory> -<Directory "%%WWWDIR%%/templates/"> - Order allow,deny - Deny from all -</Directory> -<Directory "%%WWWDIR%%/templates.dist/"> - Order allow,deny - Deny from all -</Directory> +Create %%WWWDIR%%/install.ignore to disable sanity check +and start using PNP. =20 Please, note that user who runs Apache processes should be able to read PNP RRD spool files from diff --git a/net-mgmt/pnp/pkg-plist b/net-mgmt/pnp/pkg-plist index 0dbe2f6..0026489 100644 --- a/net-mgmt/pnp/pkg-plist +++ b/net-mgmt/pnp/pkg-plist @@ -1,131 +1,550 @@ bin/npcd -bin/npcdmod.o +etc/pnp/check_commands/check_nwstat.cfg-sample +etc/pnp/check_commands/check_nrpe.cfg-sample +etc/pnp/check_commands/check_all_local_disks.cfg-sample +etc/pnp/pages/web_traffic.cfg-sample etc/pnp/pnp4nagios_release etc/pnp/config.php-sample etc/pnp/background.pdf-sample -etc/pnp/check_commands/check_nwstat.cfg-sample -etc/pnp/pages/web_traffic.cfg-sample etc/pnp/process_perfdata.cfg-sample etc/pnp/rra.cfg-sample +etc/pnp/misccommands.cfg-sample +etc/pnp/nagios.cfg-sample etc/pnp/npcd.cfg-sample +lib/npcdmod.o +lib/kohana/system/controllers/captcha.php +lib/kohana/system/controllers/template.php +lib/kohana/system/i18n/de_DE/validation.php +lib/kohana/system/i18n/de_DE/core.php +lib/kohana/system/i18n/de_DE/pagination.php +lib/kohana/system/i18n/de_DE/captcha.php +lib/kohana/system/i18n/de_DE/encrypt.php +lib/kohana/system/i18n/de_DE/orm.php +lib/kohana/system/i18n/de_DE/image.php +lib/kohana/system/i18n/de_DE/session.php +lib/kohana/system/i18n/de_DE/database.php +lib/kohana/system/i18n/de_DE/calendar.php +lib/kohana/system/i18n/de_DE/profiler.php +lib/kohana/system/i18n/de_DE/cache.php +lib/kohana/system/i18n/de_DE/upload.php +lib/kohana/system/i18n/de_DE/event.php +lib/kohana/system/i18n/de_DE/errors.php +lib/kohana/system/i18n/de_DE/swift.php +lib/kohana/system/i18n/nl_NL/validation.php +lib/kohana/system/i18n/nl_NL/core.php +lib/kohana/system/i18n/nl_NL/pagination.php +lib/kohana/system/i18n/nl_NL/captcha.php +lib/kohana/system/i18n/nl_NL/encrypt.php +lib/kohana/system/i18n/nl_NL/orm.php +lib/kohana/system/i18n/nl_NL/image.php +lib/kohana/system/i18n/nl_NL/session.php +lib/kohana/system/i18n/nl_NL/database.php +lib/kohana/system/i18n/nl_NL/calendar.php +lib/kohana/system/i18n/nl_NL/profiler.php +lib/kohana/system/i18n/nl_NL/cache.php +lib/kohana/system/i18n/nl_NL/upload.php +lib/kohana/system/i18n/nl_NL/event.php +lib/kohana/system/i18n/nl_NL/errors.php +lib/kohana/system/i18n/nl_NL/swift.php +lib/kohana/system/i18n/es_ES/validation.php +lib/kohana/system/i18n/es_ES/core.php +lib/kohana/system/i18n/es_ES/pagination.php +lib/kohana/system/i18n/es_ES/captcha.php +lib/kohana/system/i18n/es_ES/encrypt.php +lib/kohana/system/i18n/es_ES/orm.php +lib/kohana/system/i18n/es_ES/image.php +lib/kohana/system/i18n/es_ES/session.php +lib/kohana/system/i18n/es_ES/database.php +lib/kohana/system/i18n/es_ES/calendar.php +lib/kohana/system/i18n/es_ES/profiler.php +lib/kohana/system/i18n/es_ES/cache.php +lib/kohana/system/i18n/es_ES/upload.php +lib/kohana/system/i18n/es_ES/event.php +lib/kohana/system/i18n/es_ES/errors.php +lib/kohana/system/i18n/es_ES/swift.php +lib/kohana/system/i18n/ru_RU/validation.php +lib/kohana/system/i18n/ru_RU/core.php +lib/kohana/system/i18n/ru_RU/pagination.php +lib/kohana/system/i18n/ru_RU/captcha.php +lib/kohana/system/i18n/ru_RU/encrypt.php +lib/kohana/system/i18n/ru_RU/orm.php +lib/kohana/system/i18n/ru_RU/image.php +lib/kohana/system/i18n/ru_RU/session.php +lib/kohana/system/i18n/ru_RU/database.php +lib/kohana/system/i18n/ru_RU/calendar.php +lib/kohana/system/i18n/ru_RU/profiler.php +lib/kohana/system/i18n/ru_RU/cache.php +lib/kohana/system/i18n/ru_RU/upload.php +lib/kohana/system/i18n/ru_RU/event.php +lib/kohana/system/i18n/ru_RU/errors.php +lib/kohana/system/i18n/ru_RU/swift.php +lib/kohana/system/i18n/en_US/validation.php +lib/kohana/system/i18n/en_US/core.php +lib/kohana/system/i18n/en_US/pagination.php +lib/kohana/system/i18n/en_US/captcha.php +lib/kohana/system/i18n/en_US/encrypt.php +lib/kohana/system/i18n/en_US/orm.php +lib/kohana/system/i18n/en_US/image.php +lib/kohana/system/i18n/en_US/session.php +lib/kohana/system/i18n/en_US/database.php +lib/kohana/system/i18n/en_US/calendar.php +lib/kohana/system/i18n/en_US/profiler.php +lib/kohana/system/i18n/en_US/cache.php +lib/kohana/system/i18n/en_US/upload.php +lib/kohana/system/i18n/en_US/event.php +lib/kohana/system/i18n/en_US/errors.php +lib/kohana/system/i18n/en_US/swift.php +lib/kohana/system/i18n/fr_FR/validation.php +lib/kohana/system/i18n/fr_FR/core.php +lib/kohana/system/i18n/fr_FR/pagination.php +lib/kohana/system/i18n/fr_FR/captcha.php +lib/kohana/system/i18n/fr_FR/encrypt.php +lib/kohana/system/i18n/fr_FR/orm.php +lib/kohana/system/i18n/fr_FR/image.php +lib/kohana/system/i18n/fr_FR/session.php +lib/kohana/system/i18n/fr_FR/database.php +lib/kohana/system/i18n/fr_FR/calendar.php +lib/kohana/system/i18n/fr_FR/profiler.php +lib/kohana/system/i18n/fr_FR/cache.php +lib/kohana/system/i18n/fr_FR/upload.php +lib/kohana/system/i18n/fr_FR/event.php +lib/kohana/system/i18n/fr_FR/errors.php +lib/kohana/system/i18n/fr_FR/swift.php +lib/kohana/system/i18n/it_IT/validation.php +lib/kohana/system/i18n/it_IT/core.php +lib/kohana/system/i18n/it_IT/pagination.php +lib/kohana/system/i18n/it_IT/captcha.php +lib/kohana/system/i18n/it_IT/encrypt.php +lib/kohana/system/i18n/it_IT/orm.php +lib/kohana/system/i18n/it_IT/image.php +lib/kohana/system/i18n/it_IT/session.php +lib/kohana/system/i18n/it_IT/database.php +lib/kohana/system/i18n/it_IT/calendar.php +lib/kohana/system/i18n/it_IT/profiler.php +lib/kohana/system/i18n/it_IT/cache.php +lib/kohana/system/i18n/it_IT/upload.php +lib/kohana/system/i18n/it_IT/event.php +lib/kohana/system/i18n/it_IT/errors.php +lib/kohana/system/i18n/it_IT/swift.php +lib/kohana/system/helpers/remote.php +lib/kohana/system/helpers/url.php +lib/kohana/system/helpers/feed.php +lib/kohana/system/helpers/expires.php +lib/kohana/system/helpers/text.php +lib/kohana/system/helpers/email.php +lib/kohana/system/helpers/download.php +lib/kohana/system/helpers/format.php +lib/kohana/system/helpers/form.php +lib/kohana/system/helpers/arr.php +lib/kohana/system/helpers/html.php +lib/kohana/system/helpers/valid.php +lib/kohana/system/helpers/date.php +lib/kohana/system/helpers/file.php +lib/kohana/system/helpers/request.php +lib/kohana/system/helpers/upload.php +lib/kohana/system/helpers/cookie.php +lib/kohana/system/helpers/security.php +lib/kohana/system/helpers/num.php +lib/kohana/system/helpers/inflector.php +lib/kohana/system/libraries/drivers/Database/Mssql.php +lib/kohana/system/libraries/drivers/Database/Pdosqlite.php +lib/kohana/system/libraries/drivers/Database/Mysqli.php +lib/kohana/system/libraries/drivers/Database/Pgsql.php +lib/kohana/system/libraries/drivers/Database/Mysql.php +lib/kohana/system/libraries/drivers/Captcha/Alpha.php +lib/kohana/system/libraries/drivers/Captcha/Math.php +lib/kohana/system/libraries/drivers/Captcha/Word.php +lib/kohana/system/libraries/drivers/Captcha/Riddle.php +lib/kohana/system/libraries/drivers/Captcha/Basic.php +lib/kohana/system/libraries/drivers/Captcha/Black.php +lib/kohana/system/libraries/drivers/Cache/Eaccelerator.php +lib/kohana/system/libraries/drivers/Cache/Apc.php +lib/kohana/system/libraries/drivers/Cache/Memcache.php +lib/kohana/system/libraries/drivers/Cache/Xcache.php +lib/kohana/system/libraries/drivers/Cache/File.php +lib/kohana/system/libraries/drivers/Cache/Sqlite.php +lib/kohana/system/libraries/drivers/Image/GraphicsMagick.php +lib/kohana/system/libraries/drivers/Image/GD.php +lib/kohana/system/libraries/drivers/Image/ImageMagick.php +lib/kohana/system/libraries/drivers/Session/Cookie.php +lib/kohana/system/libraries/drivers/Session/Cache.php +lib/kohana/system/libraries/drivers/Session/Database.php +lib/kohana/system/libraries/drivers/Captcha.php +lib/kohana/system/libraries/drivers/Cache.php +lib/kohana/system/libraries/drivers/Session.php +lib/kohana/system/libraries/drivers/Image.php +lib/kohana/system/libraries/drivers/Database.php +lib/kohana/system/libraries/Pagination.php +lib/kohana/system/libraries/ORM_Tree.php +lib/kohana/system/libraries/Encrypt.php +lib/kohana/system/libraries/Calendar.php +lib/kohana/system/libraries/Database_Expression.php +lib/kohana/system/libraries/Event_Observer.php +lib/kohana/system/libraries/Event_Subject.php +lib/kohana/system/libraries/Captcha.php +lib/kohana/system/libraries/Cache.php +lib/kohana/system/libraries/Session.php +lib/kohana/system/libraries/Image.php +lib/kohana/system/libraries/Validation.php +lib/kohana/system/libraries/ORM_Versioned.php +lib/kohana/system/libraries/Controller.php +lib/kohana/system/libraries/Profiler.php +lib/kohana/system/libraries/Model.php +lib/kohana/system/libraries/View.php +lib/kohana/system/libraries/Router.php +lib/kohana/system/libraries/ORM_Iterator.php +lib/kohana/system/libraries/URI.php +lib/kohana/system/libraries/Profiler_Table.php +lib/kohana/system/libraries/ORM.php +lib/kohana/system/libraries/Calendar_Event.php +lib/kohana/system/libraries/Tagcloud.php +lib/kohana/system/libraries/Input.php +lib/kohana/system/libraries/Database.php +lib/kohana/system/config/locale.php +lib/kohana/system/config/routes.php +lib/kohana/system/config/pagination.php +lib/kohana/system/config/sql_types.php +lib/kohana/system/config/captcha.php +lib/kohana/system/config/email.php +lib/kohana/system/config/image.php +lib/kohana/system/config/cache_sqlite.php +lib/kohana/system/config/cache_memcache.php +lib/kohana/system/config/session.php +lib/kohana/system/config/database.php +lib/kohana/system/config/credit_cards.php +lib/kohana/system/config/http.php +lib/kohana/system/config/mimes.php +lib/kohana/system/config/profiler.php +lib/kohana/system/config/view.php +lib/kohana/system/config/cache.php +lib/kohana/system/config/encryption.php +lib/kohana/system/config/upload.php +lib/kohana/system/config/cookie.php +lib/kohana/system/config/user_agents.php +lib/kohana/system/config/inflector.php +lib/kohana/system/config/cache_xcache.php +lib/kohana/system/core/utf8/transliterate_to_ascii.php +lib/kohana/system/core/utf8/ucfirst.php +lib/kohana/system/core/utf8/ord.php +lib/kohana/system/core/utf8/strrpos.php +lib/kohana/system/core/utf8/strtolower.php +lib/kohana/system/core/utf8/substr.php +lib/kohana/system/core/utf8/str_pad.php +lib/kohana/system/core/utf8/strcspn.php +lib/kohana/system/core/utf8/trim.php +lib/kohana/system/core/utf8/rtrim.php +lib/kohana/system/core/utf8/strcasecmp.php +lib/kohana/system/core/utf8/strtoupper.php +lib/kohana/system/core/utf8/str_split.php +lib/kohana/system/core/utf8/strpos.php +lib/kohana/system/core/utf8/stristr.php +lib/kohana/system/core/utf8/ucwords.php +lib/kohana/system/core/utf8/str_ireplace.php +lib/kohana/system/core/utf8/strlen.php +lib/kohana/system/core/utf8/to_unicode.php +lib/kohana/system/core/utf8/substr_replace.php +lib/kohana/system/core/utf8/from_unicode.php +lib/kohana/system/core/utf8/strrev.php +lib/kohana/system/core/utf8/strspn.php +lib/kohana/system/core/utf8/ltrim.php +lib/kohana/system/core/Event.php +lib/kohana/system/core/Benchmark.php +lib/kohana/system/core/Bootstrap.php +lib/kohana/system/core/Kohana.php +lib/kohana/system/core/utf8.php +lib/kohana/system/views/kohana/template.php +lib/kohana/system/views/pagination/digg.php +lib/kohana/system/views/pagination/punbb.php +lib/kohana/system/views/pagination/extended.php +lib/kohana/system/views/pagination/classic.php +lib/kohana/system/views/kohana_profiler_table.php +lib/kohana/system/views/kohana_error_page.php +lib/kohana/system/views/kohana_calendar.php +lib/kohana/system/views/kohana_profiler_table.css +lib/kohana/system/views/kohana_profiler.php +lib/kohana/system/views/kohana_error_disabled.php +lib/kohana/system/views/kohana_errors.css +lib/kohana/system/fonts/LICENSE +lib/kohana/system/fonts/DejaVuSerif.ttf 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 -%%WWWDIR%%/images/noack.png -%%WWWDIR%%/images/notify.gif -%%WWWDIR%%/images/ok.png -%%WWWDIR%%/images/pages.png -%%WWWDIR%%/images/pdf.png -%%WWWDIR%%/images/pnp.png -%%WWWDIR%%/images/recovery.png -%%WWWDIR%%/images/rrdtool.png -%%WWWDIR%%/images/svg.png -%%WWWDIR%%/images/trends.gif -%%WWWDIR%%/images/warning.png -%%WWWDIR%%/images/xml.png -%%WWWDIR%%/images/zoom.png -%%WWWDIR%%/include/tpl_function.inc.php -%%WWWDIR%%/include/font/makefont/cp1250.map -%%WWWDIR%%/include/font/makefont/cp1251.map -%%WWWDIR%%/include/font/makefont/cp1252.map -%%WWWDIR%%/include/font/makefont/cp1253.map -%%WWWDIR%%/include/font/makefont/cp1254.map -%%WWWDIR%%/include/font/makefont/cp1255.map -%%WWWDIR%%/include/font/makefont/cp1257.map -%%WWWDIR%%/include/font/makefont/cp1258.map -%%WWWDIR%%/include/font/makefont/cp874.map -%%WWWDIR%%/include/font/makefont/iso-8859-1.map -%%WWWDIR%%/include/font/makefont/iso-8859-11.map -%%WWWDIR%%/include/font/makefont/iso-8859-15.map -%%WWWDIR%%/include/font/makefont/iso-8859-16.map -%%WWWDIR%%/include/font/makefont/iso-8859-2.map -%%WWWDIR%%/include/font/makefont/iso-8859-4.map -%%WWWDIR%%/include/font/makefont/iso-8859-5.map -%%WWWDIR%%/include/font/makefont/iso-8859-7.map -%%WWWDIR%%/include/font/makefont/iso-8859-9.map -%%WWWDIR%%/include/font/makefont/koi8-r.map -%%WWWDIR%%/include/font/makefont/koi8-u.map -%%WWWDIR%%/include/font/makefont/makefont.php -%%WWWDIR%%/include/font/courier.php -%%WWWDIR%%/include/font/helvetica.php -%%WWWDIR%%/include/font/helveticab.php -%%WWWDIR%%/include/font/helveticabi.php -%%WWWDIR%%/include/font/helveticai.php -%%WWWDIR%%/include/font/symbol.php -%%WWWDIR%%/include/font/times.php -%%WWWDIR%%/include/font/timesb.php -%%WWWDIR%%/include/font/timesbi.php -%%WWWDIR%%/include/font/timesi.php -%%WWWDIR%%/include/font/zapfdingbats.php -%%WWWDIR%%/include/js/builder.js -%%WWWDIR%%/include/js/calendar-blue.css -%%WWWDIR%%/include/js/calendar-de.js -%%WWWDIR%%/include/js/calendar-en.js -%%WWWDIR%%/include/js/calendar-setup.js -%%WWWDIR%%/include/js/calendar.js -%%WWWDIR%%/include/js/controls.js -%%WWWDIR%%/include/js/dragdrop.js -%%WWWDIR%%/include/js/effects.js -%%WWWDIR%%/include/js/menuarrow.gif -%%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 -%%WWWDIR%%/include/fpdf.php -%%WWWDIR%%/include/fpdf_tpl.php -%%WWWDIR%%/include/fpdi.php -%%WWWDIR%%/include/fpdi_pdf_parser.php -%%WWWDIR%%/include/function.inc.php -%%WWWDIR%%/include/pdf_context.php -%%WWWDIR%%/include/pdf_parser.php -%%WWWDIR%%/include/site.php -%%WWWDIR%%/include/style.css -%%WWWDIR%%/include/wrapper_functions.php -%%WWWDIR%%/lang/lang_de.php -%%WWWDIR%%/lang/lang_en.php -%%WWWDIR%%/lang/lang_fr.php -%%WWWDIR%%/lang/lang_nl.php -%%WWWDIR%%/lang/lang_se.php +libexec/verify_pnp_config.pl +libexec/rrd_convert.pl +%%WWWDIR%%/documents/_media/bulk-npcd.png +%%WWWDIR%%/documents/_media/bulk-npcdmod.png +%%WWWDIR%%/documents/_media/bulk.png +%%WWWDIR%%/documents/_media/nagiospowered-72x72.png +%%WWWDIR%%/documents/_media/pnp-preview-05-08-2009.png +%%WWWDIR%%/documents/_media/popup.png +%%WWWDIR%%/documents/_media/srv_info.png +%%WWWDIR%%/documents/_media/synchronous.png +%%WWWDIR%%/documents/en_US/about.html +%%WWWDIR%%/documents/en_US/advanced.html +%%WWWDIR%%/documents/en_US/config.html +%%WWWDIR%%/documents/en_US/doc_complete.html +%%WWWDIR%%/documents/en_US/dwnld.html +%%WWWDIR%%/documents/en_US/install.html +%%WWWDIR%%/documents/en_US/modes.html +%%WWWDIR%%/documents/en_US/new-features.html +%%WWWDIR%%/documents/en_US/npcd.html +%%WWWDIR%%/documents/en_US/pages.html +%%WWWDIR%%/documents/en_US/perfdata_format.html +%%WWWDIR%%/documents/en_US/rrd_convert.html +%%WWWDIR%%/documents/en_US/rrdcached.html +%%WWWDIR%%/documents/en_US/start.html +%%WWWDIR%%/documents/en_US/timeranges.html +%%WWWDIR%%/documents/en_US/tpl.html +%%WWWDIR%%/documents/en_US/tpl_custom.html +%%WWWDIR%%/documents/en_US/tpl_helper.html +%%WWWDIR%%/documents/en_US/tpl_special.html +%%WWWDIR%%/documents/en_US/upgrade.html +%%WWWDIR%%/documents/en_US/verify.html +%%WWWDIR%%/documents/en_US/verify_pnp_config.html +%%WWWDIR%%/documents/en_US/webfe.html +%%WWWDIR%%/documents/en_US/webfe_cfg.html +%%WWWDIR%%/documents/en_US/wrapper.html +%%WWWDIR%%/documents/en_US/xport.html +%%WWWDIR%%/documents/de_DE/about.html +%%WWWDIR%%/documents/de_DE/advanced.html +%%WWWDIR%%/documents/de_DE/config.html +%%WWWDIR%%/documents/de_DE/doc_complete.html +%%WWWDIR%%/documents/de_DE/dwnld.html +%%WWWDIR%%/documents/de_DE/install.html +%%WWWDIR%%/documents/de_DE/modes.html +%%WWWDIR%%/documents/de_DE/new-features.html +%%WWWDIR%%/documents/de_DE/npcd.html +%%WWWDIR%%/documents/de_DE/pages.html +%%WWWDIR%%/documents/de_DE/perfdata_format.html +%%WWWDIR%%/documents/de_DE/rrd_convert.html +%%WWWDIR%%/documents/de_DE/rrdcached.html +%%WWWDIR%%/documents/de_DE/start.html +%%WWWDIR%%/documents/de_DE/timeranges.html +%%WWWDIR%%/documents/de_DE/tpl.html +%%WWWDIR%%/documents/de_DE/tpl_custom.html +%%WWWDIR%%/documents/de_DE/tpl_helper.html +%%WWWDIR%%/documents/de_DE/tpl_special.html +%%WWWDIR%%/documents/de_DE/upgrade.html +%%WWWDIR%%/documents/de_DE/verify.html +%%WWWDIR%%/documents/de_DE/verify_pnp_config.html +%%WWWDIR%%/documents/de_DE/webfe.html +%%WWWDIR%%/documents/de_DE/webfe_cfg.html +%%WWWDIR%%/documents/de_DE/wrapper.html +%%WWWDIR%%/documents/de_DE/xport.html +%%WWWDIR%%/application/controllers/ajax.php +%%WWWDIR%%/application/controllers/debug.php +%%WWWDIR%%/application/controllers/docs.php +%%WWWDIR%%/application/controllers/graph.php +%%WWWDIR%%/application/controllers/image.php +%%WWWDIR%%/application/controllers/json.php +%%WWWDIR%%/application/controllers/page.php +%%WWWDIR%%/application/controllers/pdf.php +%%WWWDIR%%/application/controllers/popup.php +%%WWWDIR%%/application/controllers/special.php +%%WWWDIR%%/application/controllers/start.php +%%WWWDIR%%/application/controllers/system.php +%%WWWDIR%%/application/controllers/xml.php +%%WWWDIR%%/application/controllers/xport.php +%%WWWDIR%%/application/controllers/zoom.php +%%WWWDIR%%/application/config/config.php +%%WWWDIR%%/application/config/locale.php +%%WWWDIR%%/application/config/routes.php +%%WWWDIR%%/application/config/session.php +%%WWWDIR%%/application/helpers/nagios.php +%%WWWDIR%%/application/helpers/pnp.php +%%WWWDIR%%/application/helpers/rrd.php +%%WWWDIR%%/application/i18n/de_DE/common.php +%%WWWDIR%%/application/i18n/de_DE/error.php +%%WWWDIR%%/application/i18n/en_US/common.php +%%WWWDIR%%/application/i18n/en_US/error.php +%%WWWDIR%%/application/i18n/es_ES/common.php +%%WWWDIR%%/application/i18n/es_ES/error.php +%%WWWDIR%%/application/i18n/ru_RU/common.php +%%WWWDIR%%/application/i18n/ru_RU/error.php +%%WWWDIR%%/application/i18n/fr_FR/common.php +%%WWWDIR%%/application/i18n/fr_FR/error.php +%%WWWDIR%%/application/models/config.php +%%WWWDIR%%/application/models/data.php +%%WWWDIR%%/application/models/rrdtool.php +%%WWWDIR%%/application/views/basket_box.php +%%WWWDIR%%/application/views/debug.php +%%WWWDIR%%/application/views/docs.php +%%WWWDIR%%/application/views/docs_box.php +%%WWWDIR%%/application/views/graph.php +%%WWWDIR%%/application/views/graph_content.php +%%WWWDIR%%/application/views/graph_content_special.php +%%WWWDIR%%/application/views/header.php +%%WWWDIR%%/application/views/host_box.php +%%WWWDIR%%/application/views/icon_box.php +%%WWWDIR%%/application/views/kohana_error_page.php +%%WWWDIR%%/application/views/logo_box.php +%%WWWDIR%%/application/views/multisite_box.php +%%WWWDIR%%/application/views/page.php +%%WWWDIR%%/application/views/pages_box.php +%%WWWDIR%%/application/views/popup.php +%%WWWDIR%%/application/views/search_box.php +%%WWWDIR%%/application/views/service_box.php +%%WWWDIR%%/application/views/special_templates_box.php +%%WWWDIR%%/application/views/status_box.php +%%WWWDIR%%/application/views/template.php +%%WWWDIR%%/application/views/timerange_box.php +%%WWWDIR%%/application/views/timerange_select.php +%%WWWDIR%%/application/views/widget_graph.sample.php +%%WWWDIR%%/application/views/widget_menu.sample.php +%%WWWDIR%%/application/views/zoom.php +%%WWWDIR%%/application/views/zoom_header.php +%%WWWDIR%%/application/vendor/fpdf/filters/FilterASCII85.php +%%WWWDIR%%/application/vendor/fpdf/filters/FilterASCII85_FPDI.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/helvetica.php +%%WWWDIR%%/application/vendor/fpdf/font/helveticab.php +%%WWWDIR%%/application/vendor/fpdf/font/helveticabi.php +%%WWWDIR%%/application/vendor/fpdf/font/helveticai.php +%%WWWDIR%%/application/vendor/fpdf/font/symbol.php +%%WWWDIR%%/application/vendor/fpdf/font/times.php +%%WWWDIR%%/application/vendor/fpdf/font/timesb.php +%%WWWDIR%%/application/vendor/fpdf/font/timesbi.php +%%WWWDIR%%/application/vendor/fpdf/font/timesi.php +%%WWWDIR%%/application/vendor/fpdf/font/zapfdingbats.php +%%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_pdf_parser.php +%%WWWDIR%%/application/vendor/fpdf/pdf_context.php +%%WWWDIR%%/application/vendor/fpdf/pdf_parser.php +%%WWWDIR%%/media/js/jquery-min.js +%%WWWDIR%%/media/js/jquery-ui.min.js +%%WWWDIR%%/media/js/jquery.cluetip.js +%%WWWDIR%%/media/js/zoom.js +%%WWWDIR%%/media/css/ui-lightness/images/ui-anim_basic_16x16.gif +%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_4= 0x40.png +%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_4= 0x40.png +%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png +%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png +%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png +%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png +%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x10= 0.png +%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1= x100.png +%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x= 100.png +%%WWWDIR%%/media/css/ui-lightness/images/ui-icons_222222_256x240.png +%%WWWDIR%%/media/css/ui-lightness/images/ui-icons_228ef1_256x240.png +%%WWWDIR%%/media/css/ui-lightness/images/ui-icons_ef8c08_256x240.png +%%WWWDIR%%/media/css/ui-lightness/images/ui-icons_ffd27a_256x240.png +%%WWWDIR%%/media/css/ui-lightness/images/ui-icons_ffffff_256x240.png +%%WWWDIR%%/media/css/ui-lightness/jquery-ui.css +%%WWWDIR%%/media/css/ui-smoothness/images/ui-anim_basic_16x16.gif +%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_flat_75_ffffff_40x100.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_65_ffffff_1x400.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_75_dadada_1x400.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_95_fef1ec_1x400.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_highlight-soft_75_cccccc_1= x100.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_222222_256x240.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_2e83ff_256x240.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_454545_256x240.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_888888_256x240.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_cd0a0a_256x240.png +%%WWWDIR%%/media/css/ui-smoothness/jquery-ui.css +%%WWWDIR%%/media/css/ui-redmond/images/ui-anim_basic_16x16.gif +%%WWWDIR%%/media/css/ui-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png +%%WWWDIR%%/media/css/ui-redmond/images/ui-bg_flat_55_fbec88_40x100.png +%%WWWDIR%%/media/css/ui-redmond/images/ui-bg_glass_75_d0e5f5_1x400.png +%%WWWDIR%%/media/css/ui-redmond/images/ui-bg_glass_85_dfeffc_1x400.png +%%WWWDIR%%/media/css/ui-redmond/images/ui-bg_glass_95_fef1ec_1x400.png +%%WWWDIR%%/media/css/ui-redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.= png +%%WWWDIR%%/media/css/ui-redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.p= ng +%%WWWDIR%%/media/css/ui-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.p= ng +%%WWWDIR%%/media/css/ui-redmond/images/ui-icons_217bc0_256x240.png +%%WWWDIR%%/media/css/ui-redmond/images/ui-icons_2e83ff_256x240.png +%%WWWDIR%%/media/css/ui-redmond/images/ui-icons_469bdd_256x240.png +%%WWWDIR%%/media/css/ui-redmond/images/ui-icons_6da8d5_256x240.png +%%WWWDIR%%/media/css/ui-redmond/images/ui-icons_cd0a0a_256x240.png +%%WWWDIR%%/media/css/ui-redmond/images/ui-icons_d8e7f3_256x240.png +%%WWWDIR%%/media/css/ui-redmond/images/ui-icons_f9bd01_256x240.png +%%WWWDIR%%/media/css/ui-redmond/jquery-ui.css +%%WWWDIR%%/media/css/ui-multisite/images/contentframe_background.jpg +%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_flat_0_aaaaaa_40x100.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_flat_75_709aa5_40x100.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_55_fbf9ee_1x400.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_65_709aa5_1x400.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_75_709aa5_1x400.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_highlight-soft_75_8eaeb8_1x= 100.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_inset-soft_95_fef1ec_1x100.= png +%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_222222_256x240.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_2e83ff_256x240.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_454545_256x240.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_888888_256x240.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_cd0a0a_256x240.png +%%WWWDIR%%/media/css/ui-multisite/jquery-ui.css +%%WWWDIR%%/media/css/autocomplete.css +%%WWWDIR%%/media/css/common.css +%%WWWDIR%%/media/css/shadow.png +%%WWWDIR%%/media/images/add.png +%%WWWDIR%%/media/images/calendar.gif +%%WWWDIR%%/media/images/calendar.png +%%WWWDIR%%/media/images/de_DE.png +%%WWWDIR%%/media/images/docs.png +%%WWWDIR%%/media/images/en_US.png +%%WWWDIR%%/media/images/favicon.ico +%%WWWDIR%%/media/images/graph.png +%%WWWDIR%%/media/images/home.png +%%WWWDIR%%/media/images/int.gif +%%WWWDIR%%/media/images/int2.gif +%%WWWDIR%%/media/images/loader.gif +%%WWWDIR%%/media/images/notify.gif +%%WWWDIR%%/media/images/pages.png +%%WWWDIR%%/media/images/pdf.png +%%WWWDIR%%/media/images/pnp.png +%%WWWDIR%%/media/images/remove.png +%%WWWDIR%%/media/images/rrdtool.png +%%WWWDIR%%/media/images/special.png +%%WWWDIR%%/media/images/stats.png +%%WWWDIR%%/media/images/trends.gif +%%WWWDIR%%/media/images/xml.png +%%WWWDIR%%/media/images/zoom.png %%WWWDIR%%/templates.dist/check-host-alive.php +%%WWWDIR%%/templates.dist/check_dell_bladechassis.php %%WWWDIR%%/templates.dist/check_disk.php %%WWWDIR%%/templates.dist/check_dns.php +%%WWWDIR%%/templates.dist/check_esx3.php %%WWWDIR%%/templates.dist/check_fping.php +%%WWWDIR%%/templates.dist/check_hp_bladechassis.php +%%WWWDIR%%/templates.dist/check_hpasm.php %%WWWDIR%%/templates.dist/check_http.php -%%WWWDIR%%/templates.dist/check_http_url.php +%%WWWDIR%%/templates.dist/check_icmp.php %%WWWDIR%%/templates.dist/check_iftraffic_counter.php %%WWWDIR%%/templates.dist/check_iftraffic_pct.php %%WWWDIR%%/templates.dist/check_load.php +%%WWWDIR%%/templates.dist/check_local_disk.php +%%WWWDIR%%/templates.dist/check_local_load.php %%WWWDIR%%/templates.dist/check_messpc_temp.php %%WWWDIR%%/templates.dist/check_multi.php +%%WWWDIR%%/templates.dist/check_multi_nagiostats.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 +%%WWWDIR%%/templates.dist/check_ntp_time.php %%WWWDIR%%/templates.dist/check_nwstat_CONNS.php %%WWWDIR%%/templates.dist/check_nwstat_LOAD.php %%WWWDIR%%/templates.dist/check_nwstat_LOAD1.php -%%WWWDIR%%/templates.dist/check_ping.php %%WWWDIR%%/templates.dist/check_nwstat_LOAD15.php %%WWWDIR%%/templates.dist/check_nwstat_LOAD5.php %%WWWDIR%%/templates.dist/check_nwstat_ofiles.php +%%WWWDIR%%/templates.dist/check_openmanage.php %%WWWDIR%%/templates.dist/check_oracle_connection-time.php +%%WWWDIR%%/templates.dist/check_oracle_health.php +%%WWWDIR%%/templates.dist/check_ping.php %%WWWDIR%%/templates.dist/check_oracle_health_connection-time.php %%WWWDIR%%/templates.dist/check_oracle_health_pga-in-memory-sort-ratio.php %%WWWDIR%%/templates.dist/check_oracle_health_redo-io-traffic.php %%WWWDIR%%/templates.dist/check_oracle_health_switch-interval.php %%WWWDIR%%/templates.dist/check_oracle_health_tablespace-usage.php +%%WWWDIR%%/templates.dist/check_ping_tick.php %%WWWDIR%%/templates.dist/check_pnp_rrds.php %%WWWDIR%%/templates.dist/check_smtp.php %%WWWDIR%%/templates.dist/check_snmp_int-bits.php @@ -134,21 +553,81 @@ libexec/check_pnp_rrds.pl %%WWWDIR%%/templates.dist/check_tcp.php %%WWWDIR%%/templates.dist/check_users.php %%WWWDIR%%/templates.dist/default.php +%%WWWDIR%%/templates.dist/integer.php +%%WWWDIR%%/templates.dist/nagiostats.php +%%WWWDIR%%/templates.dist/pnp-runtime.php %%WWWDIR%%/templates.dist/response.php -%%WWWDIR%%/templates.special/loop.php -%%WWWDIR%%/ajax.php +%%WWWDIR%%/templates.special/README +%%WWWDIR%%/templates.special/advanced_loop.php-sample +%%WWWDIR%%/templates.special/loop.php-sample +%%WWWDIR%%/templates.special/static.php-sample %%WWWDIR%%/index.php -%%WWWDIR%%/zoom.php -@dirrmtry %%WWWDIR%%/templates.dist -@dirrmtry %%WWWDIR%%/templates.special +%%WWWDIR%%/install.php +@dirrm %%WWWDIR%%/media/js +@dirrm %%WWWDIR%%/media/images +@dirrm %%WWWDIR%%/media/css/ui-smoothness/images +@dirrm %%WWWDIR%%/media/css/ui-smoothness +@dirrm %%WWWDIR%%/media/css/ui-redmond/images +@dirrm %%WWWDIR%%/media/css/ui-redmond +@dirrm %%WWWDIR%%/media/css/ui-multisite/images +@dirrm %%WWWDIR%%/media/css/ui-multisite +@dirrm %%WWWDIR%%/media/css/ui-lightness/images +@dirrm %%WWWDIR%%/media/css/ui-lightness +@dirrm %%WWWDIR%%/media/css +@dirrm %%WWWDIR%%/media +@dirrm %%WWWDIR%%/documents/en_US +@dirrm %%WWWDIR%%/documents/de_DE +@dirrm %%WWWDIR%%/documents/_media +@dirrm %%WWWDIR%%/documents +@dirrm %%WWWDIR%%/application/views +@dirrm %%WWWDIR%%/application/vendor/fpdf/font +@dirrm %%WWWDIR%%/application/vendor/fpdf/filters +@dirrm %%WWWDIR%%/application/vendor/fpdf +@dirrm %%WWWDIR%%/application/vendor +@dirrm %%WWWDIR%%/application/models +@dirrm %%WWWDIR%%/application/libraries +@dirrm %%WWWDIR%%/application/i18n/ru_RU +@dirrm %%WWWDIR%%/application/i18n/fr_FR +@dirrm %%WWWDIR%%/application/i18n/es_ES +@dirrm %%WWWDIR%%/application/i18n/en_US +@dirrm %%WWWDIR%%/application/i18n/de_DE +@dirrm %%WWWDIR%%/application/i18n +@dirrm %%WWWDIR%%/application/hooks +@dirrm %%WWWDIR%%/application/helpers +@dirrm %%WWWDIR%%/application/controllers +@dirrm %%WWWDIR%%/application/config +@dirrm %%WWWDIR%%/application/cache +@dirrm %%WWWDIR%%/application @dirrmtry %%WWWDIR%%/templates -@dirrmtry %%WWWDIR%%/lang -@dirrmtry %%WWWDIR%%/include/js -@dirrmtry %%WWWDIR%%/include/font/makefont -@dirrmtry %%WWWDIR%%/include/font -@dirrmtry %%WWWDIR%%/include -@dirrmtry %%WWWDIR%%/images +@dirrm %%WWWDIR%%/templates.dist +@dirrm %%WWWDIR%%/templates.special @dirrmtry %%WWWDIR%% -@dirrmtry etc/pnp/pages +@dirrm lib/kohana/system/views/pagination +@dirrm lib/kohana/system/views/kohana +@dirrm lib/kohana/system/views +@dirrm lib/kohana/system/libraries/drivers/Session +@dirrm lib/kohana/system/libraries/drivers/Image +@dirrm lib/kohana/system/libraries/drivers/Database +@dirrm lib/kohana/system/libraries/drivers/Captcha +@dirrm lib/kohana/system/libraries/drivers/Cache +@dirrm lib/kohana/system/libraries/drivers +@dirrm lib/kohana/system/libraries +@dirrm lib/kohana/system/i18n/ru_RU +@dirrm lib/kohana/system/i18n/nl_NL +@dirrm lib/kohana/system/i18n/it_IT +@dirrm lib/kohana/system/i18n/fr_FR +@dirrm lib/kohana/system/i18n/es_ES +@dirrm lib/kohana/system/i18n/en_US +@dirrm lib/kohana/system/i18n/de_DE +@dirrm lib/kohana/system/i18n +@dirrm lib/kohana/system/helpers +@dirrm lib/kohana/system/fonts +@dirrm lib/kohana/system/core/utf8 +@dirrm lib/kohana/system/core +@dirrm lib/kohana/system/controllers +@dirrm lib/kohana/system/config +@dirrm lib/kohana/system +@dirrm lib/kohana @dirrmtry etc/pnp/check_commands +@dirrmtry etc/pnp/pages @dirrmtry etc/pnp --=20 1.7.2.1 --- update-to-0.6.7.diff ends here --- --=20 Eygene Ryabinkin ,,,^..^,,, [ Life's unfair - but root password helps! | codelabs.ru ] [ 82FE 06BC D497 C0DE 49EC 4FF0 16AF 9EAE 8152 ECFB | freebsd.org ]
rea 2010-11-23 22:10:20 UTC FreeBSD ports repository Modified files: net-mgmt/pnp Makefile distinfo pkg-plist net-mgmt/pnp/files pkg-deinstall.in pkg-install.in pkg-message.in Added files: net-mgmt/pnp/files extra-patch-disable-pdf patch-0010-dont-overwrite-configs patch-0020-directory-creation Removed files: net-mgmt/pnp/files extra-patch-share__pnp__include__function.inc.php patch-man__Makefile.in patch-sample-config__Makefile.in patch-scripts__Makefile.in patch-share__pnp__include__font__makefont__makefont.php patch-share__pnp__include__fpdi.php patch-share__pnp__include__fpdi_pdf_parser.php patch-share__pnp__include__function.inc.php patch-share__pnp__include__pdf_parser.php patch-share__pnp__include__site.php patch-src__Makefile.in Log: net-mgmt/pnp: update to 0.6.7 - update sources to 0.6.7 -- the tip of 0.6-series; - reworked patches and grouped them by-commit rather than by-file; - excluded removal of .orig files -- all files aren't installed anymore; - changed maintainer (my) e-mail. Approved by: garga (mentor) PR: ports/151118 Revision Changes Path 1.10 +20 -29 ports/net-mgmt/pnp/Makefile 1.4 +2 -3 ports/net-mgmt/pnp/distinfo 1.1 +86 -0 ports/net-mgmt/pnp/files/extra-patch-disable-pdf (new) 1.2 +0 -18 ports/net-mgmt/pnp/files/extra-patch-share__pnp__include__function.inc.php (dead) 1.1 +45 -0 ports/net-mgmt/pnp/files/patch-0010-dont-overwrite-configs (new) 1.1 +124 -0 ports/net-mgmt/pnp/files/patch-0020-directory-creation (new) 1.2 +0 -10 ports/net-mgmt/pnp/files/patch-man__Makefile.in (dead) 1.2 +0 -29 ports/net-mgmt/pnp/files/patch-sample-config__Makefile.in (dead) 1.2 +0 -23 ports/net-mgmt/pnp/files/patch-scripts__Makefile.in (dead) 1.2 +0 -11 ports/net-mgmt/pnp/files/patch-share__pnp__include__font__makefont__makefont.php (dead) 1.2 +0 -11 ports/net-mgmt/pnp/files/patch-share__pnp__include__fpdi.php (dead) 1.2 +0 -11 ports/net-mgmt/pnp/files/patch-share__pnp__include__fpdi_pdf_parser.php (dead) 1.2 +0 -29 ports/net-mgmt/pnp/files/patch-share__pnp__include__function.inc.php (dead) 1.2 +0 -29 ports/net-mgmt/pnp/files/patch-share__pnp__include__pdf_parser.php (dead) 1.2 +0 -11 ports/net-mgmt/pnp/files/patch-share__pnp__include__site.php (dead) 1.2 +0 -11 ports/net-mgmt/pnp/files/patch-src__Makefile.in (dead) 1.3 +31 -12 ports/net-mgmt/pnp/files/pkg-deinstall.in 1.2 +14 -9 ports/net-mgmt/pnp/files/pkg-install.in 1.3 +22 -34 ports/net-mgmt/pnp/files/pkg-message.in 1.4 +584 -105 ports/net-mgmt/pnp/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: feedback->closed Port updated to 0.6.7. Thanks for pushing me!