13 files changed, 227 insertions, 258 deletions

diff --git a/net-mgmt/pnp/Makefile b/net-mgmt/pnp/Makefile
index 03aebad99742..09fa1f2c56f4 100644
--- a/net-mgmt/pnp/Makefile
+++ b/net-mgmt/pnp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pnp
-PORTVERSION=	0.6.10
-PORTREVISION=	2
+PORTVERSION=	0.6.18
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=pnp4nagios/PNP-0.6
@@ -16,6 +15,8 @@ DISTNAME=	pnp4nagios-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Nagios performance data collector and grapher
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool
 RUN_DEPENDS=	${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool \
 		nagios:${PORTSDIR}/net-mgmt/nagios
@@ -26,8 +27,6 @@ OPTIONS=	PDF "Use built-in fpdf library to produce PDF views" ON
 
 .include <bsd.port.options.mk>
 
-LICENSE=	GPLv2
-PATCH_STRIP=	-p1
 USE_PERL5=	yes
 USE_PHP=	gd iconv json pcre simplexml sockets xml zlib
 
diff --git a/net-mgmt/pnp/distinfo b/net-mgmt/pnp/distinfo
index 16207908dbb0..b36730e6a4cc 100644
--- a/net-mgmt/pnp/distinfo
+++ b/net-mgmt/pnp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pnp4nagios-0.6.10.tar.gz) = c99180dd2a36d799f48a73a9ac63d8877e0e1f36a0847a9ce7103bf2a4e86bc8
-SIZE (pnp4nagios-0.6.10.tar.gz) = 1950868
+SHA256 (pnp4nagios-0.6.18.tar.gz) = 51e385204c346cf9427ffb964f74df21a05f21dd99a95a15a520b645b6ec579e
+SIZE (pnp4nagios-0.6.18.tar.gz) = 3021603
diff --git a/net-mgmt/pnp/files/extra-patch-disable-pdf b/net-mgmt/pnp/files/extra-patch-disable-pdf
index 9a35d8c00c6e..d44f278c21d9 100644
--- a/net-mgmt/pnp/files/extra-patch-disable-pdf
+++ b/net-mgmt/pnp/files/extra-patch-disable-pdf
@@ -1,71 +1,50 @@
-From 689736f288253fdbaff816910317f5c532a583fe 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/4] 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/application/controllers/pdf.php
-index 330e341..6ff172c 100644
---- a/share/pnp/application/controllers/pdf.php
-+++ b/share/pnp/application/controllers/pdf.php
-@@ -10,6 +10,7 @@ class Pdf_Controller extends System_Controller  {
+--- share/pnp/application/controllers/pdf.php.orig	2012-05-25 13:14:03.968357306 +0200
++++ share/pnp/application/controllers/pdf.php	2012-05-25 13:15:02.528359378 +0200
+@@ -10,6 +10,7 @@
  
      public function __construct(){
          parent::__construct();
-+        exit;
++	exit;
  
-         $this->use_bg = 0;
-         $this->bg = $this->config->conf['background_pdf'];
-@@ -30,6 +31,7 @@ class Pdf_Controller extends System_Controller  {
+         $this->use_bg           = 0;
+         $this->bg               = $this->config->conf['background_pdf'];
+@@ -34,6 +35,7 @@
      }
  
      public function index(){
-+        exit;
++	exit;
  
          $this->tpl       = $this->input->get('tpl');
          $this->view      = "";
-@@ -137,6 +139,7 @@ class Pdf_Controller extends System_Controller  {
+@@ -141,6 +143,7 @@
      }
  
      public function page($page){
-+        exit;
++	exit;
          $this->start     = $this->input->get('start');
          $this->end       = $this->input->get('end');
          $this->view      = "";
-@@ -199,6 +202,7 @@ class Pdf_Controller extends System_Controller  {
+@@ -203,6 +206,7 @@
      }
  
      public function basket(){
-+        exit;
++	exit;
          $this->start     = $this->input->get('start');
          $this->end       = $this->input->get('end');
          $this->view      = "";
-diff --git a/share/pnp/application/models/rrdtool.php b/share/pnp/application/models/rrdtool.php
-index 308ab77..344478c 100644
---- a/share/pnp/application/models/rrdtool.php
-+++ b/share/pnp/application/models/rrdtool.php
-@@ -79,6 +79,7 @@ class Rrdtool_Model extends System_Model
+--- share/pnp/application/models/rrdtool.php.orig	2012-05-25 13:16:39.002532608 +0200
++++ share/pnp/application/models/rrdtool.php	2012-05-25 13:17:02.170472975 +0200
+@@ -79,6 +79,7 @@
          $width = 0;
          $height = 0;
          if ($out == 'PDF'){
-+            exit;
++	    exit;
              if($conf['pdf_graph_opt']){
                  $command .= $conf['pdf_graph_opt'];
              }
-diff --git a/share/pnp/application/views/icon_box.php b/share/pnp/application/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  = pnp::addToUri(array('start' => $this->start,'end' => $this->end, 'view'
+--- share/pnp/application/views/icon_box.php.orig	2012-05-25 13:15:31.817359837 +0200
++++ share/pnp/application/views/icon_box.php	2012-05-25 13:16:21.953358137 +0200
+@@ -9,15 +9,6 @@
  if($this->config->conf['use_calendar']){
  	echo "<a title=\"".Kohana::lang('common.title-calendar-link')."\" href=\"#\" id=\"button\"><img class=\"icon\" src=\"".url::base()."media/images/calendar.png\"></a>"; 
  }
@@ -78,9 +57,6 @@ index 7ce5301..838b474 100644
 -if($this->config->conf['use_fpdf'] == 1 && $position == "page"){
 -	echo "<a title=\"".Kohana::lang('common.title-pdf-link')."\" href=\"".url::base(TRUE)."pdf/page/".$this->page.$qsa."\"><img class=\"icon\" src=\"".url::base()."media/images/pdf.png\"></a>\n";
 -}
- if($this->config->conf['show_xml_icon'] == 1 && $position == "graph"){
+ if($this->config->conf['show_xml_icon'] == 1 && $position == "graph" && $xml_icon == TRUE){
  	$qsa  = pnp::addToUri(array(), False);
  	echo "<a title=\"".Kohana::lang('common.title-xml-link')."\" href=\"".url::base(TRUE)."xml".$qsa."\"><img class=\"icon\" src=\"".url::base()."media/images/xml.png\"></a>\n";
--- 
-1.7.3.2
-
diff --git a/net-mgmt/pnp/files/patch-0010-dont-overwrite-configs b/net-mgmt/pnp/files/patch-0010-dont-overwrite-configs
deleted file mode 100644
index 8925b1929e77..000000000000
--- a/net-mgmt/pnp/files/patch-0010-dont-overwrite-configs
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8276a8353ecafdf7041919f859940e2b6fc89c43 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/4] Do not overwrite PDF background
-
-Install background.pdf as background.pdf-sample.
-
-Signed-off-by: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
----
- sample-config/Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/sample-config/Makefile.in b/sample-config/Makefile.in
-index 883345c..62d0cf6 100644
---- a/sample-config/Makefile.in
-+++ b/sample-config/Makefile.in
-@@ -38,7 +38,7 @@ install:
- 	$(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/background.pdf $(DESTDIR)$(SYSCONFDIR)/background.pdf-sample
- 
- install-config: 
- 
--- 
-1.7.3.2
-
diff --git a/net-mgmt/pnp/files/patch-0020-directory-creation b/net-mgmt/pnp/files/patch-0020-directory-creation
deleted file mode 100644
index cdb161e3891b..000000000000
--- a/net-mgmt/pnp/files/patch-0020-directory-creation
+++ /dev/null
@@ -1,122 +0,0 @@
-From 1aa1833afb0c9b4e65d44d0cd595536f23433b4b 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/4] 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 |   12 ++++++------
- scripts/Makefile.in       |    8 ++++----
- share/Makefile.in         |    2 +-
- src/Makefile.in           |   10 +++++-----
- 5 files changed, 17 insertions(+), 17 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
- 
- install:
- 
--	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)      
-+	[ -d "$(DESTDIR)$(LIBDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(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/controllers
-diff --git a/sample-config/Makefile.in b/sample-config/Makefile.in
-index 62d0cf6..1bf667d 100644
---- a/sample-config/Makefile.in
-+++ b/sample-config/Makefile.in
-@@ -33,18 +33,18 @@ 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
-+	[ -d "$(DESTDIR)$(SYSCONFDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)
-+	[ -d "$(DESTDIR)$(SYSCONFDIR)"/check_commands ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands
-+	[ -d "$(DESTDIR)$(SYSCONFDIR)"/pages ] || $(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)/background.pdf-sample
- 
- install-config: 
-+	[ -d "$(DESTDIR)$(SYSCONFDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)
-+	[ -d "$(DESTDIR)$(SYSCONFDIR)"/check_commands ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands
-+	[ -d "$(DESTDIR)$(SYSCONFDIR)"/pages ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages
- 
--	$(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/process_perfdata.cfg-sample $(DESTDIR)$(SYSCONFDIR)
-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
- 
- install-init: 
--	$(INSTALL) -m 755 $(INIT_OPTS) -d $(DESTDIR)$(INIT_DIR)
-+	[ -d "$(DESTDIR)$(INIT_DIR)" ] || $(INSTALL) -m 755 $(INIT_OPTS) -d $(DESTDIR)$(INIT_DIR)
- 	$(INSTALL) -m 755 $(INIT_OPTS) rc.npcd $(DESTDIR)$(INIT_DIR)/npcd
- 
- install-processperfdata: 
-@@ -41,9 +41,9 @@ install-rrdconvert:
- 	$(INSTALL) -m 755 $(INSTALL_OPTS) rrd_convert.pl $(DESTDIR)$(LIBEXECDIR)
- 
- install: 
--	$(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 4b163bc..709ade7 100644
---- a/share/Makefile.in
-+++ b/share/Makefile.in
-@@ -22,7 +22,7 @@ distclean: clean
- devclean: distclean
- 
- 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
- 
- 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 $(DESTDIR)$(BINDIR)
-+	[ -d "$(DESTDIR)$(LIBDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
-+	[ -d "$(DESTDIR)$(LOGDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(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)
- 
--- 
-1.7.3.2
-
diff --git a/net-mgmt/pnp/files/patch-0030-nuke-libraries-directory b/net-mgmt/pnp/files/patch-0030-nuke-libraries-directory
deleted file mode 100644
index 25c3b85d6eb0..000000000000
--- a/net-mgmt/pnp/files/patch-0030-nuke-libraries-directory
+++ /dev/null
@@ -1,28 +0,0 @@
-From a3bc33c9134d25f8bdcc5fa696606bafbaac8c2c Mon Sep 17 00:00:00 2001
-From: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
-Date: Tue, 28 Dec 2010 18:32:10 +0300
-Subject: [PATCH 4/4] PNP: remove creation of an empty directory
-
-$SHARE/application/libraries contains nothing after the installtion,
-so it looks like a remains of some old directory layout.
-
-Signed-off-by: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
----
- share/Makefile.in |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/share/Makefile.in b/share/Makefile.in
-index 709ade7..1c75db2 100644
---- a/share/Makefile.in
-+++ b/share/Makefile.in
-@@ -43,7 +43,6 @@ install:
- 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/application/i18n/es_ES
- 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/application/i18n/ru_RU
- 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/application/i18n/fr_FR
--	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/application/libraries
- 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/application/models
- 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/application/views
- 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/application/vendor
--- 
-1.7.3.2
-
diff --git a/net-mgmt/pnp/files/patch-lib-Makefile.in b/net-mgmt/pnp/files/patch-lib-Makefile.in
new file mode 100644
index 000000000000..5cffcf8c2620
--- /dev/null
+++ b/net-mgmt/pnp/files/patch-lib-Makefile.in
@@ -0,0 +1,11 @@
+--- lib/Makefile.in.orig	2012-05-25 11:56:37.407786228 +0200
++++ lib/Makefile.in	2012-05-25 11:57:20.247777075 +0200
+@@ -22,7 +22,7 @@
+ 
+ install:
+ 
+-	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)      
++	[ -d "$(DESTDIR)$(LIBDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(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/controllers
diff --git a/net-mgmt/pnp/files/patch-sample-config-Makefile.in b/net-mgmt/pnp/files/patch-sample-config-Makefile.in
new file mode 100644
index 000000000000..7f36b1ea2ad9
--- /dev/null
+++ b/net-mgmt/pnp/files/patch-sample-config-Makefile.in
@@ -0,0 +1,54 @@
+--- sample-config/Makefile.in.orig	2012-03-25 17:30:16.000000000 +0200
++++ sample-config/Makefile.in	2012-05-25 17:15:14.898727335 +0200
+@@ -35,39 +35,27 @@
+ install:
+ 	-rm -f $(DESTDIR)$(HTMLDIR)/conf/config.php
+ 
+-	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)
+-	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/config.d
+-	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands
++	[ -d "$(DESTDIR)$(SYSCONFDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)
++	[ -d "$(DESTDIR)$(SYSCONFDIR)"/check_commands ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/config.d
++	[ -d "$(DESTDIR)$(SYSCONFDIR)"/pages ] || $(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/background.pdf $(DESTDIR)$(SYSCONFDIR)
+-	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php.$(PKG_VERSION); \
+-	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR); \
++	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/background.pdf $(DESTDIR)$(SYSCONFDIR)/background.pdf-sample
++	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)
+ 
+ install-config: 
+ 
+-	$(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
++	[ -d "$(DESTDIR)$(SYSCONFDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)
++	[ -d "$(DESTDIR)$(SYSCONFDIR)"/check_commands ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands
++	[ -d "$(DESTDIR)$(SYSCONFDIR)"/pages ] || $$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages
+ 	
+-	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php.$(PKG_VERSION); \
+-	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR); \
++	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php-sample
+ 		
+-	if [ ! -e $(DESTDIR)$(SYSCONFDIR)/config_local.php ] ;then \
+-		$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config_local.php; \
+-	fi
++	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config_local.php-sample
+ 		
+-	if [ -e $(DESTDIR)$(SYSCONFDIR)/process_perfdata.cfg ] ;then \
+-		$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/process_perfdata.cfg-sample $(DESTDIR)$(SYSCONFDIR)/process_perfdata.cfg.$(PKG_VERSION); \
+-	else\
+-		$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/process_perfdata.cfg-sample $(DESTDIR)$(SYSCONFDIR)/process_perfdata.cfg; \
+-	fi
++	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/process_perfdata.cfg-sample $(DESTDIR)$(SYSCONFDIR)
+ 		
+-	if [ -e $(DESTDIR)$(SYSCONFDIR)/npcd.cfg ] ;then \
+-		$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/npcd.cfg-sample $(DESTDIR)$(SYSCONFDIR)/npcd.cfg.$(PKG_VERSION); \
+-	else\
+-		$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/npcd.cfg-sample $(DESTDIR)$(SYSCONFDIR)/npcd.cfg; \
+-	fi
++	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/npcd.cfg-sample $(DESTDIR)$(SYSCONFDIR)
+ 		
+ 	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/rra.cfg-sample $(DESTDIR)$(SYSCONFDIR)
+ 	$(INSTALL) -m 644 $(INSTALL_OPTS)  misccommands.cfg-sample $(DESTDIR)$(SYSCONFDIR)
diff --git a/net-mgmt/pnp/files/patch-scripts-Makefile.in b/net-mgmt/pnp/files/patch-scripts-Makefile.in
new file mode 100644
index 000000000000..18d3a4271910
--- /dev/null
+++ b/net-mgmt/pnp/files/patch-scripts-Makefile.in
@@ -0,0 +1,24 @@
+--- scripts/Makefile.in.orig	2012-05-25 11:58:21.680778254 +0200
++++ scripts/Makefile.in	2012-05-25 12:05:19.843873179 +0200
+@@ -25,7 +25,7 @@
+ devclean: distclean
+ 
+ install-init: 
+-	$(INSTALL) -m 755 $(INIT_OPTS) -d $(DESTDIR)$(INIT_DIR)
++	[ -d "$(DESTDIR)$(INIT_DIR)" ] || $(INSTALL) -m 755 $(INIT_OPTS) -d $(DESTDIR)$(INIT_DIR)
+ 	$(INSTALL) -m 755 $(INIT_OPTS) rc.npcd $(DESTDIR)$(INIT_DIR)/npcd
+ 	$(INSTALL) -m 755 $(INIT_OPTS) rc.pnp_gearman_worker $(DESTDIR)$(INIT_DIR)/pnp_gearman_worker
+ 
+@@ -39,9 +39,9 @@
+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) rrd_convert.pl $(DESTDIR)$(LIBEXECDIR)
+ 
+ install: 
+-	$(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-rrdconvert
diff --git a/net-mgmt/pnp/files/patch-share-Makefile.in b/net-mgmt/pnp/files/patch-share-Makefile.in
new file mode 100644
index 000000000000..17ba015161d2
--- /dev/null
+++ b/net-mgmt/pnp/files/patch-share-Makefile.in
@@ -0,0 +1,11 @@
+--- share/Makefile.in.orig	2012-05-25 12:06:05.132777002 +0200
++++ share/Makefile.in	2012-05-25 12:06:26.484777320 +0200
+@@ -22,7 +22,7 @@
+ devclean: distclean
+ 
+ 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/net-mgmt/pnp/files/patch-src-Makefile.in b/net-mgmt/pnp/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..3b92dc671d0d
--- /dev/null
+++ b/net-mgmt/pnp/files/patch-src-Makefile.in
@@ -0,0 +1,18 @@
+--- src/Makefile.in.orig	2012-05-25 12:07:45.205779069 +0200
++++ src/Makefile.in	2012-05-25 12:08:25.165776003 +0200
+@@ -124,11 +124,11 @@
+ 	$(MAKE) install-basic
+ 
+ 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 $(DESTDIR)$(BINDIR)
++	[ -d "$(DESTDIR)$(LIBDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
++	[ -d "$(DESTDIR)$(LOGDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(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)
diff --git a/net-mgmt/pnp/pkg-descr b/net-mgmt/pnp/pkg-descr
index 89faec2f3e18..d21409d4d86b 100644
--- a/net-mgmt/pnp/pkg-descr
+++ b/net-mgmt/pnp/pkg-descr
@@ -6,4 +6,4 @@ During development of PNP we set value on easy installation and
 little maintenance while running it. An administrator should do
 other things than configure graphing tools.
 
-WWW: http://www.pnp4nagios.org/pnp/start
+WWW: http://www.pnp4nagios.org/
diff --git a/net-mgmt/pnp/pkg-plist b/net-mgmt/pnp/pkg-plist
index b12fdcba0536..4be4eadd1b4c 100644
--- a/net-mgmt/pnp/pkg-plist
+++ b/net-mgmt/pnp/pkg-plist
@@ -3,6 +3,8 @@
 %%ETCDIR%%/check_commands/check_nrpe.cfg-sample
 %%ETCDIR%%/check_commands/check_nwstat.cfg-sample
 %%ETCDIR%%/config.php
+%%ETCDIR%%/config.php-sample
+%%ETCDIR%%/config_local.php-sample
 %%ETCDIR%%/misccommands.cfg-sample
 %%ETCDIR%%/nagios.cfg-sample
 %%ETCDIR%%/npcd.cfg-sample
@@ -15,11 +17,13 @@
 %%WWWDIR%%/application/config/routes.php
 %%WWWDIR%%/application/config/session.php
 %%WWWDIR%%/application/controllers/ajax.php
+%%WWWDIR%%/application/controllers/color.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/mobile.php
 %%WWWDIR%%/application/controllers/page.php
 %%WWWDIR%%/application/controllers/pdf.php
 %%WWWDIR%%/application/controllers/popup.php
@@ -46,6 +50,7 @@
 %%WWWDIR%%/application/lib/jsonwrapper.php
 %%WWWDIR%%/application/lib/jsonwrapper_inner.php
 %%WWWDIR%%/application/models/auth.php
+%%WWWDIR%%/application/models/auth_multisite.php
 %%WWWDIR%%/application/models/config.php
 %%WWWDIR%%/application/models/data.php
 %%WWWDIR%%/application/models/rrdtool.php
@@ -73,6 +78,8 @@
 %%WWWDIR%%/application/vendor/fpdf/pdf_context.php
 %%WWWDIR%%/application/vendor/fpdf/pdf_parser.php
 %%WWWDIR%%/application/views/basket_box.php
+%%WWWDIR%%/application/views/color.php
+%%WWWDIR%%/application/views/color_box.php
 %%WWWDIR%%/application/views/debug.php
 %%WWWDIR%%/application/views/docs.php
 %%WWWDIR%%/application/views/docs_box.php
@@ -84,6 +91,16 @@
 %%WWWDIR%%/application/views/icon_box.php
 %%WWWDIR%%/application/views/kohana_error_page.php
 %%WWWDIR%%/application/views/logo_box.php
+%%WWWDIR%%/application/views/mobile.php
+%%WWWDIR%%/application/views/mobile_about.php
+%%WWWDIR%%/application/views/mobile_graph.php
+%%WWWDIR%%/application/views/mobile_graph_special.php
+%%WWWDIR%%/application/views/mobile_home.php
+%%WWWDIR%%/application/views/mobile_host.php
+%%WWWDIR%%/application/views/mobile_overview.php
+%%WWWDIR%%/application/views/mobile_pages.php
+%%WWWDIR%%/application/views/mobile_search.php
+%%WWWDIR%%/application/views/mobile_special.php
 %%WWWDIR%%/application/views/multisite_box.php
 %%WWWDIR%%/application/views/page.php
 %%WWWDIR%%/application/views/pages_box.php
@@ -102,6 +119,12 @@
 %%WWWDIR%%/documents/_media/bulk-npcd.png
 %%WWWDIR%%/documents/_media/bulk-npcdmod.png
 %%WWWDIR%%/documents/_media/bulk.png
+%%WWWDIR%%/documents/_media/gearman.png
+%%WWWDIR%%/documents/_media/mobile-graphs.png
+%%WWWDIR%%/documents/_media/mobile-home.png
+%%WWWDIR%%/documents/_media/mobile-hostlist.png
+%%WWWDIR%%/documents/_media/mobile-loading.png
+%%WWWDIR%%/documents/_media/mobile-servicelist.png
 %%WWWDIR%%/documents/_media/nagiospowered-72x72.png
 %%WWWDIR%%/documents/_media/pnp-preview-05-08-2009.png
 %%WWWDIR%%/documents/_media/popup.png
@@ -113,6 +136,7 @@
 %%WWWDIR%%/documents/de_DE/doc_complete.html
 %%WWWDIR%%/documents/de_DE/dwnld.html
 %%WWWDIR%%/documents/de_DE/install.html
+%%WWWDIR%%/documents/de_DE/mobile.html
 %%WWWDIR%%/documents/de_DE/modes.html
 %%WWWDIR%%/documents/de_DE/new-features.html
 %%WWWDIR%%/documents/de_DE/npcd.html
@@ -140,6 +164,7 @@
 %%WWWDIR%%/documents/en_US/doc_complete.html
 %%WWWDIR%%/documents/en_US/dwnld.html
 %%WWWDIR%%/documents/en_US/install.html
+%%WWWDIR%%/documents/en_US/mobile.html
 %%WWWDIR%%/documents/en_US/modes.html
 %%WWWDIR%%/documents/en_US/new-features.html
 %%WWWDIR%%/documents/en_US/npcd.html
@@ -194,23 +219,32 @@
 %%WWWDIR%%/index.php
 %%WWWDIR%%/install.php
 %%WWWDIR%%/media/css/autocomplete.css
+%%WWWDIR%%/media/css/border-h.gif
+%%WWWDIR%%/media/css/border-v.gif
 %%WWWDIR%%/media/css/common.css
+%%WWWDIR%%/media/css/imgareaselect-default.css
+%%WWWDIR%%/media/css/jquery.mobile.min.css
+%%WWWDIR%%/media/css/mobile.css
 %%WWWDIR%%/media/css/shadow.png
-%%WWWDIR%%/media/css/ui-lightness/images/ui-anim_basic_16x16.gif
-%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
-%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.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/images/icons-36-black.png
+%%WWWDIR%%/media/css/images/ajax-loader.png
+%%WWWDIR%%/media/css/images/icons-18-black.png
+%%WWWDIR%%/media/css/images/icons-36-white.png
+%%WWWDIR%%/media/css/images/icons-18-white.png
+%%WWWDIR%%/media/css/images/icon-search-black.png
+%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_flat_0_aaaaaa_40x100.png
+%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_flat_75_ffffff_40x100.png
+%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_glass_55_fbf9ee_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_500x100.png
-%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
-%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
+%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_glass_75_dadada_1x400.png
+%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_glass_75_e6e6e6_1x400.png
+%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_glass_95_fef1ec_1x400.png
+%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_highlight-soft_75_cccccc_1x100.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/images/ui-icons_2e83ff_256x240.png
+%%WWWDIR%%/media/css/ui-lightness/images/ui-icons_454545_256x240.png
+%%WWWDIR%%/media/css/ui-lightness/images/ui-icons_888888_256x240.png
+%%WWWDIR%%/media/css/ui-lightness/images/ui-icons_cd0a0a_256x240.png
 %%WWWDIR%%/media/css/ui-lightness/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
@@ -226,24 +260,20 @@
 %%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/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_flat_75_ffffff_40x100.png
+%%WWWDIR%%/media/css/ui-redmond/images/ui-bg_glass_55_fbf9ee_1x400.png
+%%WWWDIR%%/media/css/ui-redmond/images/ui-bg_glass_65_ffffff_1x400.png
+%%WWWDIR%%/media/css/ui-redmond/images/ui-bg_glass_75_dadada_1x400.png
+%%WWWDIR%%/media/css/ui-redmond/images/ui-bg_glass_75_e6e6e6_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.png
-%%WWWDIR%%/media/css/ui-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
-%%WWWDIR%%/media/css/ui-redmond/images/ui-icons_217bc0_256x240.png
+%%WWWDIR%%/media/css/ui-redmond/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+%%WWWDIR%%/media/css/ui-redmond/images/ui-icons_222222_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_454545_256x240.png
+%%WWWDIR%%/media/css/ui-redmond/images/ui-icons_888888_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-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
@@ -258,14 +288,18 @@
 %%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/images/1x1.gif
 %%WWWDIR%%/media/images/add.png
 %%WWWDIR%%/media/images/back.png
-%%WWWDIR%%/media/images/calendar.gif
 %%WWWDIR%%/media/images/calendar.png
+%%WWWDIR%%/media/images/color.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/go-left.png
+%%WWWDIR%%/media/images/go-now.png
+%%WWWDIR%%/media/images/go-right.png
 %%WWWDIR%%/media/images/graph.png
 %%WWWDIR%%/media/images/home.png
 %%WWWDIR%%/media/images/int.gif
@@ -280,28 +314,46 @@
 %%WWWDIR%%/media/images/special.png
 %%WWWDIR%%/media/images/stats.png
 %%WWWDIR%%/media/images/trends.gif
+%%WWWDIR%%/media/images/view-calendar.png
 %%WWWDIR%%/media/images/xml.png
 %%WWWDIR%%/media/images/zoom.png
 %%WWWDIR%%/media/js/jquery-min.js
 %%WWWDIR%%/media/js/jquery-ui.min.js
+%%WWWDIR%%/media/js/jquery-ui-timepicker-addon.js
 %%WWWDIR%%/media/js/jquery.cluetip.js
-%%WWWDIR%%/media/js/zoom.js
+%%WWWDIR%%/media/js/jquery.imgareaselect.min.js
+%%WWWDIR%%/media/js/jquery.mobile.min.js
 %%WWWDIR%%/templates.dist/check-host-alive.php
+%%WWWDIR%%/templates.dist/check_apachestatus.php
+%%WWWDIR%%/templates.dist/check_apachestatus_auto.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_gearman.php
 %%WWWDIR%%/templates.dist/check_hp_bladechassis.php
 %%WWWDIR%%/templates.dist/check_hpasm.php
 %%WWWDIR%%/templates.dist/check_http.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_jmx4perl_connector_errors.php
+%%WWWDIR%%/templates.dist/check_jmx4perl_connector_nr_requests.php
+%%WWWDIR%%/templates.dist/check_jmx4perl_connector_proc_time.php
+%%WWWDIR%%/templates.dist/check_jmx4perl_connector_received.php
+%%WWWDIR%%/templates.dist/check_jmx4perl_connector_sent.php
+%%WWWDIR%%/templates.dist/check_jmx4perl_connector_threads.php
+%%WWWDIR%%/templates.dist/check_jmx4perl_memory_gc_count.php
+%%WWWDIR%%/templates.dist/check_jmx4perl_memory_gc_time.php
+%%WWWDIR%%/templates.dist/check_jmx4perl_memory_heap.php
+%%WWWDIR%%/templates.dist/check_jmx4perl_thread_count.php
+%%WWWDIR%%/templates.dist/check_jmx4perl_thread_increase.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_mssql_health.php
 %%WWWDIR%%/templates.dist/check_multi.php
 %%WWWDIR%%/templates.dist/check_multi_nagiostats.php
 %%WWWDIR%%/templates.dist/check_mysql_health.php
@@ -600,7 +652,7 @@ lib/npcdmod.o
 libexec/check_pnp_rrds.pl
 libexec/process_perfdata.pl
 libexec/rrd_convert.pl
-libexec/verify_pnp_config.pl
+libexec/rrd_modify.pl
 @dirrm %%WWWDIR%%/media/js
 @dirrm %%WWWDIR%%/media/images
 @dirrm %%WWWDIR%%/media/css/ui-smoothness/images
@@ -611,6 +663,7 @@ libexec/verify_pnp_config.pl
 @dirrm %%WWWDIR%%/media/css/ui-multisite
 @dirrm %%WWWDIR%%/media/css/ui-lightness/images
 @dirrm %%WWWDIR%%/media/css/ui-lightness
+@dirrm %%WWWDIR%%/media/css/images
 @dirrm %%WWWDIR%%/media/css
 @dirrm %%WWWDIR%%/media
 @dirrm %%WWWDIR%%/documents/_media
@@ -668,6 +721,7 @@ libexec/verify_pnp_config.pl
 @dirrm lib/kohana/system/config
 @dirrm lib/kohana/system
 @dirrm lib/kohana
+@dirrmtry %%ETCDIR%%/config.d
 @dirrmtry %%ETCDIR%%/check_commands
 @dirrmtry %%ETCDIR%%/pages
 @dirrmtry %%ETCDIR%%