From fb4675cf3ff8e23297820b6e8ed416c9c2275bbe Mon Sep 17 00:00:00 2001
From: he <he>
Date: Wed, 2 Apr 2014 10:22:37 +0000
Subject: Import a fix for CVE-2013-7108 and CVE-2013-7205, which is multiple
 off-by-one errors causing information leakage and possibly DoS.

Restructure the patch files to follow the newer naming conventions.
Add the rc.d script to PLIST.

Bump PKGREVISION.
---
 net/nagios-base/Makefile                           |   4 +-
 net/nagios-base/PLIST                              |   3 +-
 net/nagios-base/distinfo                           |  33 ++--
 net/nagios-base/patches/patch-Makefile.in          | 184 +++++++++++++++++++++
 net/nagios-base/patches/patch-aa                   | 182 --------------------
 net/nagios-base/patches/patch-ab                   |  25 ---
 net/nagios-base/patches/patch-ac                   |  26 ---
 net/nagios-base/patches/patch-ad                   | 116 -------------
 net/nagios-base/patches/patch-ae                   |  13 --
 net/nagios-base/patches/patch-af                   |  13 --
 net/nagios-base/patches/patch-ag                   |  13 --
 net/nagios-base/patches/patch-ah                   |  12 --
 net/nagios-base/patches/patch-ai                   |  13 --
 net/nagios-base/patches/patch-base_Makefile.in     |  28 ++++
 net/nagios-base/patches/patch-cgi_Makefile.in      |  27 +++
 net/nagios-base/patches/patch-cgi_avail.c          |  14 ++
 net/nagios-base/patches/patch-cgi_cmd.c            |  14 ++
 net/nagios-base/patches/patch-cgi_config.c         |  14 ++
 net/nagios-base/patches/patch-cgi_extinfo.c        |  14 ++
 net/nagios-base/patches/patch-cgi_getcgi.c         |  14 ++
 net/nagios-base/patches/patch-cgi_histogram.c      |  14 ++
 net/nagios-base/patches/patch-cgi_notifications.c  |  14 ++
 net/nagios-base/patches/patch-cgi_outages.c        |  14 ++
 net/nagios-base/patches/patch-cgi_status.c         |  14 ++
 net/nagios-base/patches/patch-cgi_statusmap.c      |  14 ++
 net/nagios-base/patches/patch-cgi_statuswml.c      |  21 +++
 net/nagios-base/patches/patch-cgi_summary.c        |  14 ++
 net/nagios-base/patches/patch-cgi_trends.c         |  14 ++
 net/nagios-base/patches/patch-common_Makefile.in   |  15 ++
 net/nagios-base/patches/patch-configure            |  15 ++
 net/nagios-base/patches/patch-contrib_daemonchk.c  |  14 ++
 net/nagios-base/patches/patch-html_Makefile.in     | 116 +++++++++++++
 .../patches/patch-include_locations.h.in           |  15 ++
 .../patches/patch-sample-config_nagios.cfg.in      |  15 ++
 34 files changed, 645 insertions(+), 426 deletions(-)
 create mode 100644 net/nagios-base/patches/patch-Makefile.in
 delete mode 100644 net/nagios-base/patches/patch-aa
 delete mode 100644 net/nagios-base/patches/patch-ab
 delete mode 100644 net/nagios-base/patches/patch-ac
 delete mode 100644 net/nagios-base/patches/patch-ad
 delete mode 100644 net/nagios-base/patches/patch-ae
 delete mode 100644 net/nagios-base/patches/patch-af
 delete mode 100644 net/nagios-base/patches/patch-ag
 delete mode 100644 net/nagios-base/patches/patch-ah
 delete mode 100644 net/nagios-base/patches/patch-ai
 create mode 100644 net/nagios-base/patches/patch-base_Makefile.in
 create mode 100644 net/nagios-base/patches/patch-cgi_Makefile.in
 create mode 100644 net/nagios-base/patches/patch-cgi_avail.c
 create mode 100644 net/nagios-base/patches/patch-cgi_cmd.c
 create mode 100644 net/nagios-base/patches/patch-cgi_config.c
 create mode 100644 net/nagios-base/patches/patch-cgi_extinfo.c
 create mode 100644 net/nagios-base/patches/patch-cgi_getcgi.c
 create mode 100644 net/nagios-base/patches/patch-cgi_histogram.c
 create mode 100644 net/nagios-base/patches/patch-cgi_notifications.c
 create mode 100644 net/nagios-base/patches/patch-cgi_outages.c
 create mode 100644 net/nagios-base/patches/patch-cgi_status.c
 create mode 100644 net/nagios-base/patches/patch-cgi_statusmap.c
 create mode 100644 net/nagios-base/patches/patch-cgi_statuswml.c
 create mode 100644 net/nagios-base/patches/patch-cgi_summary.c
 create mode 100644 net/nagios-base/patches/patch-cgi_trends.c
 create mode 100644 net/nagios-base/patches/patch-common_Makefile.in
 create mode 100644 net/nagios-base/patches/patch-configure
 create mode 100644 net/nagios-base/patches/patch-contrib_daemonchk.c
 create mode 100644 net/nagios-base/patches/patch-html_Makefile.in
 create mode 100644 net/nagios-base/patches/patch-include_locations.h.in
 create mode 100644 net/nagios-base/patches/patch-sample-config_nagios.cfg.in

(limited to 'net')

diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile
index 8197d832e4e..d62a905ba19 100644
--- a/net/nagios-base/Makefile
+++ b/net/nagios-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.51 2014/03/13 11:08:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.52 2014/04/02 10:22:37 he Exp $
 #
 
 DISTNAME=		nagios-3.5.0
 PKGNAME=		${DISTNAME:S/-/-base-/}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		net sysutils
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=nagios/}
diff --git a/net/nagios-base/PLIST b/net/nagios-base/PLIST
index 2e1cf3508dd..c1ffd4548c9 100644
--- a/net/nagios-base/PLIST
+++ b/net/nagios-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2014/03/11 14:05:09 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.16 2014/04/02 10:22:37 he Exp $
 bin/nagios
 bin/nagiostats
 bin/p1.pl
@@ -30,6 +30,7 @@ share/examples/nagios/objects/templates.cfg-sample
 share/examples/nagios/objects/timeperiods.cfg-sample
 share/examples/nagios/objects/windows.cfg-sample
 share/examples/nagios/resource.cfg-sample
+share/examples/rc.d/nagios
 share/nagios/config.inc.php
 share/nagios/contexthelp/A1.html
 share/nagios/contexthelp/A2.html
diff --git a/net/nagios-base/distinfo b/net/nagios-base/distinfo
index d3c9d41d830..50f3d3579fd 100644
--- a/net/nagios-base/distinfo
+++ b/net/nagios-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2013/08/05 11:22:29 obache Exp $
+$NetBSD: distinfo,v 1.19 2014/04/02 10:22:37 he Exp $
 
 SHA1 (nagios-3.5.0.tar.gz) = 972e76c638b7d3f15d994eaa8fce0e4907d5d6e1
 RMD160 (nagios-3.5.0.tar.gz) = d75a764486fd3dc0462fb49924698754852d39be
@@ -6,12 +6,25 @@ Size (nagios-3.5.0.tar.gz) = 1789376 bytes
 SHA1 (nagios-netbsd40-icons.tar.gz) = 62919c22c5d5dc3f603c3320578431e93dfdd9fe
 RMD160 (nagios-netbsd40-icons.tar.gz) = 96ad67a107dad095213ddbf58debcfd5b46d6dee
 Size (nagios-netbsd40-icons.tar.gz) = 5659 bytes
-SHA1 (patch-aa) = 2e8c278785de40073d7d39d3dc94696268af28e9
-SHA1 (patch-ab) = d15eb8913b28ed12664ee224941270e75857ecc1
-SHA1 (patch-ac) = a948575bd26e3b0d835c62cb96cba2657b38ffee
-SHA1 (patch-ad) = a5e4956aab0f002ec9076f65da013e7fb094027d
-SHA1 (patch-ae) = 35418dbe26f2e7c14d6a98951e62247344ae80b0
-SHA1 (patch-af) = a91ab37f16e8adda3146a2dde7273ebf841ef9af
-SHA1 (patch-ag) = ae13cf98b7e2f68304406ebab80292c5c4c8ea30
-SHA1 (patch-ah) = 702571fe4a0073c1d1a9f7b166a85d4cf41f284c
-SHA1 (patch-ai) = 9212106c141be6faaf65e4e4909fcf92907c0e58
+SHA1 (patch-Makefile.in) = 6a02bb8a9e4f10ddf19458c8485ccda813057637
+SHA1 (patch-base_Makefile.in) = 4c56192ec7d4df0b162f1fe09018902a970dd5c7
+SHA1 (patch-cgi_Makefile.in) = d8e6bb1ca4039e1f613caae8537666738f61ce08
+SHA1 (patch-cgi_avail.c) = 1ca4bbc28496ba1a4f4034284d003b8bfaed5a82
+SHA1 (patch-cgi_cmd.c) = a62e800e500ded9f32441649a0474d644e837d9b
+SHA1 (patch-cgi_config.c) = 9eb7887ee774e312f9254e9db38a04e41614d5e8
+SHA1 (patch-cgi_extinfo.c) = 27fada8f82a42ff80933ed8bacf6e6263ea7f3c0
+SHA1 (patch-cgi_getcgi.c) = 3aa7223473c7a961645591ee9ad46120cd7231b3
+SHA1 (patch-cgi_histogram.c) = 1d24e481a34db0d469de81ef70f079a01b704314
+SHA1 (patch-cgi_notifications.c) = 414013df5a298efd37051273d4da9aee46516241
+SHA1 (patch-cgi_outages.c) = dec955b3468b052ec988b46abb9933ff65e44505
+SHA1 (patch-cgi_status.c) = 009da866967e992fdd8f11bd9e53dbc9cbffeace
+SHA1 (patch-cgi_statusmap.c) = 73be1d14a7daf327eee253cfe66f4ebb50ae4fca
+SHA1 (patch-cgi_statuswml.c) = 027d1f7d9e246374d84804a5a4472cc70ae2edf1
+SHA1 (patch-cgi_summary.c) = 0a8c903b5eb1a9abc33af5091e97e31682cf2cb5
+SHA1 (patch-cgi_trends.c) = 49dcdb16d150268352176360197b03cbaabcc357
+SHA1 (patch-common_Makefile.in) = 9531dcc15c3a4fa953070275065d50978aeef050
+SHA1 (patch-configure) = a62a51408ac2b09176dcfdea4efab02abe652c7f
+SHA1 (patch-contrib_daemonchk.c) = c95efd621e1496f508d5938acc8f354afbb99277
+SHA1 (patch-html_Makefile.in) = 70f48e5aefe914a2c58d82dd38ec16e8b4cd8b71
+SHA1 (patch-include_locations.h.in) = 17c721da9b5d44fe159d385f3c0da2157df14231
+SHA1 (patch-sample-config_nagios.cfg.in) = c8422814bad0b19dfefe116b6db961ac7213c92f
diff --git a/net/nagios-base/patches/patch-Makefile.in b/net/nagios-base/patches/patch-Makefile.in
new file mode 100644
index 00000000000..8a5eca0a40d
--- /dev/null
+++ b/net/nagios-base/patches/patch-Makefile.in
@@ -0,0 +1,184 @@
+$NetBSD: patch-Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Adjustments to build procedure.
+
+--- Makefile.in.orig	2012-04-25 12:30:47.000000000 +0000
++++ Makefile.in
+@@ -24,17 +24,16 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ LOGDIR=@localstatedir@
+ CHECKRESULTDIR=@CHECKRESULTDIR@
+-CFGDIR=@sysconfdir@
++SAMPDIR=@prefix@/share/examples/nagios
+ BINDIR=@bindir@
+-CGIDIR=@sbindir@
++CGIDIR=@libexecdir@
+ LIBEXECDIR=@libexecdir@
+ HTMLDIR=@datadir@
+ INSTALL=@INSTALL@
+ INSTALL_OPTS=@INSTALL_OPTS@
+ COMMAND_OPTS=@COMMAND_OPTS@
+-HTTPD_CONF=@HTTPD_CONF@
+ INIT_DIR=@init_dir@
+-INIT_OPTS=-o root -g root
++INIT_OPTS=-o root -g wheel
+ CGICFGDIR=$(CGIDIR)
+ PERLDIR=@PERLDIR@
+ 
+@@ -72,74 +71,6 @@ all:
+ 	cd $(SRC_BASE) && $(MAKE)
+ 	cd $(SRC_CGI) && $(MAKE)
+ 	cd $(SRC_HTM) && $(MAKE)
+-	if [ x$(USE_EVENTBROKER) = xyes ]; then \
+-		cd $(SRC_MODULE) && $(MAKE); \
+-	fi
+-
+-	@echo ""
+-	@echo "*** Compile finished ***"
+-	@echo ""
+-	@echo "If the main program and CGIs compiled without any errors, you"
+-	@echo "can continue with installing Nagios as follows (type 'make'"
+-	@echo "without any arguments for a list of all possible options):"
+-	@echo ""
+-	@echo "  make install"
+-	@echo "     - This installs the main program, CGIs, and HTML files"
+-	@echo ""
+-	@echo "  make install-init"
+-	@echo "     - This installs the init script in $(DESTDIR)$(INIT_DIR)"
+-	@echo ""
+-	@echo "  make install-commandmode"
+-	@echo "     - This installs and configures permissions on the"
+-	@echo "       directory for holding the external command file"
+-	@echo ""
+-	@echo "  make install-config"
+-	@echo "     - This installs *SAMPLE* config files in $(DESTDIR)$(CFGDIR)"
+-	@echo "       You'll have to modify these sample files before you can"
+-	@echo "       use Nagios.  Read the HTML documentation for more info"
+-	@echo "       on doing this.  Pay particular attention to the docs on"
+-	@echo "       object configuration files, as they determine what/how"
+-	@echo "       things get monitored!"
+-	@echo ""
+-	@echo "  make install-webconf"
+-	@echo "     - This installs the Apache config file for the Nagios"
+-	@echo "       web interface"
+-	@echo ""
+-	@echo "  make install-exfoliation"
+-	@echo "     - This installs the Exfoliation theme for the Nagios"
+-	@echo "       web interface"
+-	@echo ""
+-	@echo "  make install-classicui"
+-	@echo "     - This installs the classic theme for the Nagios"
+-	@echo "       web interface"
+-	@echo ""
+-	@echo ""
+-	@echo "*** Support Notes *******************************************"
+-	@echo ""
+-	@echo "If you have questions about configuring or running Nagios,"
+-	@echo "please make sure that you:"
+-	@echo ""
+-	@echo "     - Look at the sample config files"
+-	@echo "     - Read the documentation on the Nagios Library at:"
+-	@echo "           http://library.nagios.com"
+-	@echo ""
+-	@echo "before you post a question to one of the mailing lists."
+-	@echo "Also make sure to include pertinent information that could"
+-	@echo "help others help you.  This might include:"
+-	@echo ""
+-	@echo "     - What version of Nagios you are using"
+-	@echo "     - What version of the plugins you are using"
+-	@echo "     - Relevant snippets from your config files"
+-	@echo "     - Relevant error messages from the Nagios log file"
+-	@echo ""
+-	@echo "For more information on obtaining support for Nagios, visit:"
+-	@echo ""
+-	@echo "       http://support.nagios.com"
+-	@echo ""
+-	@echo "*************************************************************"
+-	@echo ""
+-	@echo "Enjoy."
+-	@echo ""
+ 
+ nagios:
+ 	cd $(SRC_BASE) && $(MAKE)
+@@ -234,14 +165,10 @@ install-unstripped:
+ 	$(MAKE) install-basic
+ 
+ install-basic:
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR)
+ 	if [ $(INSTALLPERLSTUFF) = yes ]; then \
+-		$(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
++		$(BSD_INSTALL_SCRIPT) p1.pl $(DESTDIR)$(BINDIR); \
+ 	fi;
+-
++	
+ 	@echo ""
+ 	@echo "*** Main program, CGIs and HTML files installed ***"
+ 	@echo ""
+@@ -261,20 +188,20 @@ install-basic:
+ 
+ 
+ install-config:
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
+-	$(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg
+-
++	[ -d $(DESTDIR)$(SAMPDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)
++	[ -d $(DESTDIR)$(SAMPDIR)/objects ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)/objects
++	${BSD_INSTALL_DATA} -m 644 sample-config/nagios.cfg $(DESTDIR)$(SAMPDIR)/nagios.cfg-sample
++	${BSD_INSTALL_DATA} -m 644 sample-config/cgi.cfg $(DESTDIR)$(SAMPDIR)/cgi.cfg-sample
++	${BSD_INSTALL_DATA} -m 640 sample-config/resource.cfg $(DESTDIR)$(SAMPDIR)/resource.cfg-sample
++	${BSD_INSTALL_DATA} -m 644 sample-config/template-object/templates.cfg $(DESTDIR)$(SAMPDIR)/objects/templates.cfg-sample
++	${BSD_INSTALL_DATA} -m 644 sample-config/template-object/commands.cfg $(DESTDIR)$(SAMPDIR)/objects/commands.cfg-sample
++	${BSD_INSTALL_DATA} -m 644 sample-config/template-object/contacts.cfg $(DESTDIR)$(SAMPDIR)/objects/contacts.cfg-sample
++	${BSD_INSTALL_DATA} -m 644 sample-config/template-object/timeperiods.cfg $(DESTDIR)$(SAMPDIR)/objects/timeperiods.cfg-sample
++	${BSD_INSTALL_DATA} -m 644 sample-config/template-object/localhost.cfg $(DESTDIR)$(SAMPDIR)/objects/localhost.cfg-sample
++	${BSD_INSTALL_DATA} -m 644 sample-config/template-object/windows.cfg $(DESTDIR)$(SAMPDIR)/objects/windows.cfg-sample
++	${BSD_INSTALL_DATA} -m 644 sample-config/template-object/printer.cfg $(DESTDIR)$(SAMPDIR)/objects/printer.cfg-sample
++	${BSD_INSTALL_DATA} -m 644 sample-config/template-object/switch.cfg $(DESTDIR)$(SAMPDIR)/objects/switch.cfg-sample
++	
+ 	@echo ""
+ 	@echo "*** Config files installed ***"
+ 	@echo ""
+@@ -291,8 +218,15 @@ install-webconf:
+ 	@echo ""
+ 	
+ install-exfoliation:
+-	cp -rf contrib/exfoliation/stylesheets/* $(DESTDIR)$(HTMLDIR)/stylesheets
+-	cp -rf contrib/exfoliation/images/* $(DESTDIR)$(HTMLDIR)/images
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/stylesheets
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images/logos
++	for file in contrib/exfoliation/stylesheets/* ; \
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
++	for file in contrib/exfoliation/images/*.* ; \
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
++	for file in contrib/exfoliation/images/logos/* ; \
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+ 
+ 	@echo ""
+ 	@echo "*** Exfoliation theme installed ***"
+@@ -320,7 +254,10 @@ install-daemoninit:
+ 
+ 
+ install-commandmode:
+-	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/archives
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/rw
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CHECKRESULTDIR)
++	chmod g+s $(DESTDIR)$(LOGDIR)/archives
+ 	chmod g+s $(DESTDIR)$(LOGDIR)/rw
+ 
+ 	@echo ""
diff --git a/net/nagios-base/patches/patch-aa b/net/nagios-base/patches/patch-aa
deleted file mode 100644
index 48e1ef91abe..00000000000
--- a/net/nagios-base/patches/patch-aa
+++ /dev/null
@@ -1,182 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2013/08/05 11:22:29 obache Exp $
-
---- Makefile.in.orig	2012-04-25 12:30:47.000000000 +0000
-+++ Makefile.in
-@@ -24,17 +24,16 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- LOGDIR=@localstatedir@
- CHECKRESULTDIR=@CHECKRESULTDIR@
--CFGDIR=@sysconfdir@
-+SAMPDIR=@prefix@/share/examples/nagios
- BINDIR=@bindir@
--CGIDIR=@sbindir@
-+CGIDIR=@libexecdir@
- LIBEXECDIR=@libexecdir@
- HTMLDIR=@datadir@
- INSTALL=@INSTALL@
- INSTALL_OPTS=@INSTALL_OPTS@
- COMMAND_OPTS=@COMMAND_OPTS@
--HTTPD_CONF=@HTTPD_CONF@
- INIT_DIR=@init_dir@
--INIT_OPTS=-o root -g root
-+INIT_OPTS=-o root -g wheel
- CGICFGDIR=$(CGIDIR)
- PERLDIR=@PERLDIR@
- 
-@@ -72,74 +71,6 @@ all:
- 	cd $(SRC_BASE) && $(MAKE)
- 	cd $(SRC_CGI) && $(MAKE)
- 	cd $(SRC_HTM) && $(MAKE)
--	if [ x$(USE_EVENTBROKER) = xyes ]; then \
--		cd $(SRC_MODULE) && $(MAKE); \
--	fi
--
--	@echo ""
--	@echo "*** Compile finished ***"
--	@echo ""
--	@echo "If the main program and CGIs compiled without any errors, you"
--	@echo "can continue with installing Nagios as follows (type 'make'"
--	@echo "without any arguments for a list of all possible options):"
--	@echo ""
--	@echo "  make install"
--	@echo "     - This installs the main program, CGIs, and HTML files"
--	@echo ""
--	@echo "  make install-init"
--	@echo "     - This installs the init script in $(DESTDIR)$(INIT_DIR)"
--	@echo ""
--	@echo "  make install-commandmode"
--	@echo "     - This installs and configures permissions on the"
--	@echo "       directory for holding the external command file"
--	@echo ""
--	@echo "  make install-config"
--	@echo "     - This installs *SAMPLE* config files in $(DESTDIR)$(CFGDIR)"
--	@echo "       You'll have to modify these sample files before you can"
--	@echo "       use Nagios.  Read the HTML documentation for more info"
--	@echo "       on doing this.  Pay particular attention to the docs on"
--	@echo "       object configuration files, as they determine what/how"
--	@echo "       things get monitored!"
--	@echo ""
--	@echo "  make install-webconf"
--	@echo "     - This installs the Apache config file for the Nagios"
--	@echo "       web interface"
--	@echo ""
--	@echo "  make install-exfoliation"
--	@echo "     - This installs the Exfoliation theme for the Nagios"
--	@echo "       web interface"
--	@echo ""
--	@echo "  make install-classicui"
--	@echo "     - This installs the classic theme for the Nagios"
--	@echo "       web interface"
--	@echo ""
--	@echo ""
--	@echo "*** Support Notes *******************************************"
--	@echo ""
--	@echo "If you have questions about configuring or running Nagios,"
--	@echo "please make sure that you:"
--	@echo ""
--	@echo "     - Look at the sample config files"
--	@echo "     - Read the documentation on the Nagios Library at:"
--	@echo "           http://library.nagios.com"
--	@echo ""
--	@echo "before you post a question to one of the mailing lists."
--	@echo "Also make sure to include pertinent information that could"
--	@echo "help others help you.  This might include:"
--	@echo ""
--	@echo "     - What version of Nagios you are using"
--	@echo "     - What version of the plugins you are using"
--	@echo "     - Relevant snippets from your config files"
--	@echo "     - Relevant error messages from the Nagios log file"
--	@echo ""
--	@echo "For more information on obtaining support for Nagios, visit:"
--	@echo ""
--	@echo "       http://support.nagios.com"
--	@echo ""
--	@echo "*************************************************************"
--	@echo ""
--	@echo "Enjoy."
--	@echo ""
- 
- nagios:
- 	cd $(SRC_BASE) && $(MAKE)
-@@ -234,14 +165,10 @@ install-unstripped:
- 	$(MAKE) install-basic
- 
- install-basic:
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR)
- 	if [ $(INSTALLPERLSTUFF) = yes ]; then \
--		$(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
-+		$(BSD_INSTALL_SCRIPT) p1.pl $(DESTDIR)$(BINDIR); \
- 	fi;
--
-+	
- 	@echo ""
- 	@echo "*** Main program, CGIs and HTML files installed ***"
- 	@echo ""
-@@ -261,20 +188,20 @@ install-basic:
- 
- 
- install-config:
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
--	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg
--	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
--	$(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
--	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg
--	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg
--	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg
--	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg
--	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg
--	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg
--	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg
--	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg
--
-+	[ -d $(DESTDIR)$(SAMPDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)
-+	[ -d $(DESTDIR)$(SAMPDIR)/objects ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)/objects
-+	${BSD_INSTALL_DATA} -m 644 sample-config/nagios.cfg $(DESTDIR)$(SAMPDIR)/nagios.cfg-sample
-+	${BSD_INSTALL_DATA} -m 644 sample-config/cgi.cfg $(DESTDIR)$(SAMPDIR)/cgi.cfg-sample
-+	${BSD_INSTALL_DATA} -m 640 sample-config/resource.cfg $(DESTDIR)$(SAMPDIR)/resource.cfg-sample
-+	${BSD_INSTALL_DATA} -m 644 sample-config/template-object/templates.cfg $(DESTDIR)$(SAMPDIR)/objects/templates.cfg-sample
-+	${BSD_INSTALL_DATA} -m 644 sample-config/template-object/commands.cfg $(DESTDIR)$(SAMPDIR)/objects/commands.cfg-sample
-+	${BSD_INSTALL_DATA} -m 644 sample-config/template-object/contacts.cfg $(DESTDIR)$(SAMPDIR)/objects/contacts.cfg-sample
-+	${BSD_INSTALL_DATA} -m 644 sample-config/template-object/timeperiods.cfg $(DESTDIR)$(SAMPDIR)/objects/timeperiods.cfg-sample
-+	${BSD_INSTALL_DATA} -m 644 sample-config/template-object/localhost.cfg $(DESTDIR)$(SAMPDIR)/objects/localhost.cfg-sample
-+	${BSD_INSTALL_DATA} -m 644 sample-config/template-object/windows.cfg $(DESTDIR)$(SAMPDIR)/objects/windows.cfg-sample
-+	${BSD_INSTALL_DATA} -m 644 sample-config/template-object/printer.cfg $(DESTDIR)$(SAMPDIR)/objects/printer.cfg-sample
-+	${BSD_INSTALL_DATA} -m 644 sample-config/template-object/switch.cfg $(DESTDIR)$(SAMPDIR)/objects/switch.cfg-sample
-+	
- 	@echo ""
- 	@echo "*** Config files installed ***"
- 	@echo ""
-@@ -291,8 +218,15 @@ install-webconf:
- 	@echo ""
- 	
- install-exfoliation:
--	cp -rf contrib/exfoliation/stylesheets/* $(DESTDIR)$(HTMLDIR)/stylesheets
--	cp -rf contrib/exfoliation/images/* $(DESTDIR)$(HTMLDIR)/images
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/stylesheets
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images/logos
-+	for file in contrib/exfoliation/stylesheets/* ; \
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
-+	for file in contrib/exfoliation/images/*.* ; \
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
-+	for file in contrib/exfoliation/images/logos/* ; \
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
- 
- 	@echo ""
- 	@echo "*** Exfoliation theme installed ***"
-@@ -320,7 +254,10 @@ install-daemoninit:
- 
- 
- install-commandmode:
--	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/archives
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/rw
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CHECKRESULTDIR)
-+	chmod g+s $(DESTDIR)$(LOGDIR)/archives
- 	chmod g+s $(DESTDIR)$(LOGDIR)/rw
- 
- 	@echo ""
diff --git a/net/nagios-base/patches/patch-ab b/net/nagios-base/patches/patch-ab
deleted file mode 100644
index 6c2f052b066..00000000000
--- a/net/nagios-base/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2013/08/05 11:22:29 obache Exp $
-
---- cgi/Makefile.in.orig	2010-10-23 10:00:59.000000000 +0000
-+++ cgi/Makefile.in
-@@ -15,7 +15,7 @@ exec_prefix=@exec_prefix@
- LOGDIR=@localstatedir@
- CFGDIR=@sysconfdir@
- BINDIR=@bindir@
--CGIDIR=@sbindir@
-+CGIDIR=@libexecdir@/cgi-bin
- HTMLDIR=@datarootdir@
- INSTALL=@INSTALL@
- INSTALL_OPTS=@INSTALL_OPTS@
-@@ -201,9 +201,9 @@ install-unstripped:
- 	$(MAKE) install-basic
- 
- install-basic:
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
-+	[ -d $(DESTDIR)$(CGIDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CGIDIR)
- 	for file in *.cgi; do \
--		$(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
-+		$(BSD_INSTALL_SCRIPT) $$file $(DESTDIR)$(CGIDIR); \
- 	done
- 
- strip-post-install:
diff --git a/net/nagios-base/patches/patch-ac b/net/nagios-base/patches/patch-ac
deleted file mode 100644
index d9276568d0b..00000000000
--- a/net/nagios-base/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2013/08/05 11:22:29 obache Exp $
-
---- base/Makefile.in.orig	2010-10-23 10:00:59.000000000 +0000
-+++ base/Makefile.in
-@@ -36,7 +36,7 @@ exec_prefix=@exec_prefix@
- LOGDIR=@localstatedir@
- CFGDIR=@sysconfdir@
- BINDIR=@bindir@
--CGIDIR=@sbindir@
-+CGIDIR=@libexecdir@
- HTMLDIR=@datarootdir@
- INSTALL=@INSTALL@
- INSTALL_OPTS=@INSTALL_OPTS@
-@@ -204,9 +204,9 @@ install-unstripped:
- 	$(MAKE) install-basic
- 
- install-basic:
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
--	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
--	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
-+	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(BINDIR)
-+	${BSD_INSTALL_PROGRAM} @nagios_name@ $(DESTDIR)$(BINDIR)
-+	${BSD_INSTALL_PROGRAM} @nagiostats_name@ $(DESTDIR)$(BINDIR)
- 
- strip-post-install:
- 	$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
diff --git a/net/nagios-base/patches/patch-ad b/net/nagios-base/patches/patch-ad
deleted file mode 100644
index cea6a67149a..00000000000
--- a/net/nagios-base/patches/patch-ad
+++ /dev/null
@@ -1,116 +0,0 @@
-$NetBSD: patch-ad,v 1.10 2013/08/05 11:22:29 obache Exp $
-
---- html/Makefile.in.orig	2012-02-13 21:40:42.000000000 +0100
-+++ html/Makefile.in	2012-10-05 15:13:58.000000000 +0200
---- html/Makefile.in.orig	2012-02-13 20:40:42.000000000 +0000
-+++ html/Makefile.in
-@@ -7,7 +7,7 @@ exec_prefix=@exec_prefix@
- LOGDIR=@localstatedir@
- CFGDIR=@sysconfdir@
- BINDIR=@bindir@
--CGIDIR=@sbindir@
-+CGIDIR=@libexecdir@
- HTMLDIR=@datadir@
- INSTALL=@INSTALL@
- INSTALL_OPTS=@INSTALL_OPTS@
-@@ -34,55 +34,55 @@ distclean: clean
- devclean: distclean
- 
- install:
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
--	$(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
--#	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/media
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/stylesheets
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/contexthelp
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs/images
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/js
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images/logos
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/ssi
-+	$(BSD_INSTALL_DATA) robots.txt $(DESTDIR)$(HTMLDIR)
-+#	$(BSD_INSTALL_DATA) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
- # Remove old HTML files (PHP files are used now)
- 	rm -f $(DESTDIR)$(HTMLDIR)/index.html
- 	rm -f $(DESTDIR)$(HTMLDIR)/main.html
- 	rm -f $(DESTDIR)$(HTMLDIR)/side.html
--	for file in *.php; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
--#	for file in media/*.wav; \
--#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
--	for file in stylesheets/*.css; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
--	for file in contexthelp/*.html; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
--	for file in js/*.js; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done
--#	for file in docs/*.html; \
--#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
--#	for file in docs/images/*.*; \
--#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
--	for file in images/*.gif; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
--	for file in images/*.jpg; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
--	for file in images/*.png; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
--	for file in images/*.ico; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
--	for file in images/logos/*.*; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
--	for file in includes/*.*; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
--	for file in includes/rss/*.*; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
--	for file in includes/rss/extlib/*.*; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
-+	for file in *.php; do \
-+	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR); done
-+#	for file in media/*.wav; do \
-+#	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/media; done
-+	for file in stylesheets/*.css; do \
-+	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
-+	for file in contexthelp/*.html; do \
-+	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
-+	for file in js/*.js; do \
-+	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/js; done
-+#	for file in docs/*.html; do \
-+#	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs; done
-+#	for file in docs/images/*.*; do \
-+#	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
-+	for file in images/*.gif; do \
-+	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+	for file in images/*.jpg; do \
-+	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+	for file in images/*.png; do \
-+	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+	for file in images/*.ico; do \
-+	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+	for file in images/logos/*.*; do \
-+	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
-+	for file in includes/*.*; do \
-+	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes; done
-+	for file in includes/rss/*.*; do \
-+	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
-+	for file in includes/rss/extlib/*.*; do \
-+	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
- 
- install-unstripped:
- 	$(MAKE) install
diff --git a/net/nagios-base/patches/patch-ae b/net/nagios-base/patches/patch-ae
deleted file mode 100644
index 5acb45618f5..00000000000
--- a/net/nagios-base/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2011/04/08 22:37:25 morr Exp $
-
---- common/Makefile.in.orig	2009-06-17 03:57:21.000000000 +0000
-+++ common/Makefile.in
-@@ -17,7 +17,7 @@ exec_prefix=@exec_prefix@
- LOGDIR=@localstatedir@
- CFGDIR=@sysconfdir@
- BINDIR=@bindir@
--CGIDIR=@sbindir@
-+CGIDIR=@libexecdir@
- HTMLDIR=@datarootdir@
- INSTALL=@INSTALL@
- INSTALL_OPTS=@INSTALL_OPTS@
diff --git a/net/nagios-base/patches/patch-af b/net/nagios-base/patches/patch-af
deleted file mode 100644
index 5142739fa5c..00000000000
--- a/net/nagios-base/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.4 2011/04/08 22:37:25 morr Exp $
-
---- sample-config/nagios.cfg.in.orig	2010-10-04 02:27:55.000000000 +0000
-+++ sample-config/nagios.cfg.in
-@@ -198,7 +198,7 @@ lock_file=@lockfile@
- # is created, used, and deleted throughout the time that Nagios is
- # running.
- 
--temp_file=@localstatedir@/nagios.tmp
-+temp_file=/tmp/nagios.tmp
- 
- 
- 
diff --git a/net/nagios-base/patches/patch-ag b/net/nagios-base/patches/patch-ag
deleted file mode 100644
index 7b48168c284..00000000000
--- a/net/nagios-base/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.8 2011/08/02 14:03:18 bouyer Exp $
-
---- configure.orig	2011-07-26 05:16:26.000000000 +0200
-+++ configure	2011-08-01 18:36:37.000000000 +0200
-@@ -5775,7 +5775,7 @@
-   CHECKRESULTDIR=no
- fi;
- if test x$CHECKRESULTDIR = xno; then
--	CHECKRESULTDIR="$localstatedir/spool/checkresults"
-+	CHECKRESULTDIR="$localstatedir/checkresults"
- fi
- 
- 
diff --git a/net/nagios-base/patches/patch-ah b/net/nagios-base/patches/patch-ah
deleted file mode 100644
index f72f312c5d7..00000000000
--- a/net/nagios-base/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2012/12/14 18:49:51 manu Exp $
-
---- cgi/getcgi.c.orig	2012-10-04 18:31:47.000000000 +0200
-+++ cgi/getcgi.c	2012-10-04 18:31:57.000000000 +0200
-@@ -10,6 +10,7 @@
- #include "../include/getcgi.h"
- #include <stdio.h>
- #include <stdlib.h>
-+#include <limits.h>
- 
- 
- #undef PARANOID_CGI_INPUT
diff --git a/net/nagios-base/patches/patch-ai b/net/nagios-base/patches/patch-ai
deleted file mode 100644
index 3bac72dc35c..00000000000
--- a/net/nagios-base/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2011/04/08 22:37:25 morr Exp $
-
---- include/locations.h.in.orig	2008-11-30 17:22:59.000000000 +0000
-+++ include/locations.h.in
-@@ -20,7 +20,7 @@
- 
- #define DEFAULT_TEMP_FILE			"@localstatedir@/tempfile"
- #define DEFAULT_TEMP_PATH                       "/tmp"
--#define DEFAULT_CHECK_RESULT_PATH		"@localstatedir@/spool/checkresults"
-+#define DEFAULT_CHECK_RESULT_PATH		"@localstatedir@/checkresults"
- #define DEFAULT_STATUS_FILE			"@localstatedir@/status.dat"
- #define DEFAULT_LOG_FILE			"@localstatedir@/nagios.log"
- #define DEFAULT_LOG_ARCHIVE_PATH		"@localstatedir@/archives/"
diff --git a/net/nagios-base/patches/patch-base_Makefile.in b/net/nagios-base/patches/patch-base_Makefile.in
new file mode 100644
index 00000000000..f6fbf1e6711
--- /dev/null
+++ b/net/nagios-base/patches/patch-base_Makefile.in
@@ -0,0 +1,28 @@
+$NetBSD: patch-base_Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Adjustments to build procedure.
+
+--- base/Makefile.in.orig	2010-10-23 10:00:59.000000000 +0000
++++ base/Makefile.in
+@@ -36,7 +36,7 @@ exec_prefix=@exec_prefix@
+ LOGDIR=@localstatedir@
+ CFGDIR=@sysconfdir@
+ BINDIR=@bindir@
+-CGIDIR=@sbindir@
++CGIDIR=@libexecdir@
+ HTMLDIR=@datarootdir@
+ INSTALL=@INSTALL@
+ INSTALL_OPTS=@INSTALL_OPTS@
+@@ -204,9 +204,9 @@ install-unstripped:
+ 	$(MAKE) install-basic
+ 
+ install-basic:
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+-	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
+-	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
++	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(BINDIR)
++	${BSD_INSTALL_PROGRAM} @nagios_name@ $(DESTDIR)$(BINDIR)
++	${BSD_INSTALL_PROGRAM} @nagiostats_name@ $(DESTDIR)$(BINDIR)
+ 
+ strip-post-install:
+ 	$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
diff --git a/net/nagios-base/patches/patch-cgi_Makefile.in b/net/nagios-base/patches/patch-cgi_Makefile.in
new file mode 100644
index 00000000000..d4e88a750f7
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_Makefile.in
@@ -0,0 +1,27 @@
+$NetBSD: patch-cgi_Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Adjustments to build procedure.
+
+--- cgi/Makefile.in.orig	2010-10-23 10:00:59.000000000 +0000
++++ cgi/Makefile.in
+@@ -15,7 +15,7 @@ exec_prefix=@exec_prefix@
+ LOGDIR=@localstatedir@
+ CFGDIR=@sysconfdir@
+ BINDIR=@bindir@
+-CGIDIR=@sbindir@
++CGIDIR=@libexecdir@/cgi-bin
+ HTMLDIR=@datarootdir@
+ INSTALL=@INSTALL@
+ INSTALL_OPTS=@INSTALL_OPTS@
+@@ -201,9 +201,9 @@ install-unstripped:
+ 	$(MAKE) install-basic
+ 
+ install-basic:
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
++	[ -d $(DESTDIR)$(CGIDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CGIDIR)
+ 	for file in *.cgi; do \
+-		$(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
++		$(BSD_INSTALL_SCRIPT) $$file $(DESTDIR)$(CGIDIR); \
+ 	done
+ 
+ strip-post-install:
diff --git a/net/nagios-base/patches/patch-cgi_avail.c b/net/nagios-base/patches/patch-cgi_avail.c
new file mode 100644
index 00000000000..a85a421b817
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_avail.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_avail.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/avail.c.orig	2012-02-03 15:23:14.000000000 +0000
++++ cgi/avail.c
+@@ -1141,7 +1141,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_cmd.c b/net/nagios-base/patches/patch-cgi_cmd.c
new file mode 100644
index 00000000000..fe9d04401e7
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_cmd.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_cmd.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/cmd.c.orig	2013-03-09 21:46:35.000000000 +0000
++++ cgi/cmd.c
+@@ -321,7 +321,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_config.c b/net/nagios-base/patches/patch-cgi_config.c
new file mode 100644
index 00000000000..3432691035d
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_config.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_config.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/config.c.orig	2013-02-27 01:37:32.000000000 +0000
++++ cgi/config.c
+@@ -386,7 +386,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_extinfo.c b/net/nagios-base/patches/patch-cgi_extinfo.c
new file mode 100644
index 00000000000..dedd14f107c
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_extinfo.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_extinfo.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/extinfo.c.orig	2011-08-17 07:36:27.000000000 +0000
++++ cgi/extinfo.c
+@@ -651,7 +651,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_getcgi.c b/net/nagios-base/patches/patch-cgi_getcgi.c
new file mode 100644
index 00000000000..da91f2c8420
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_getcgi.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_getcgi.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Also include limits.h.
+
+--- cgi/getcgi.c.orig	2012-10-04 18:31:47.000000000 +0200
++++ cgi/getcgi.c	2012-10-04 18:31:57.000000000 +0200
+@@ -10,6 +10,7 @@
+ #include "../include/getcgi.h"
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <limits.h>
+ 
+ 
+ #undef PARANOID_CGI_INPUT
diff --git a/net/nagios-base/patches/patch-cgi_histogram.c b/net/nagios-base/patches/patch-cgi_histogram.c
new file mode 100644
index 00000000000..d568b6a7e44
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_histogram.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_histogram.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/histogram.c.orig	2011-11-21 20:51:52.000000000 +0000
++++ cgi/histogram.c
+@@ -1069,7 +1069,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_notifications.c b/net/nagios-base/patches/patch-cgi_notifications.c
new file mode 100644
index 00000000000..9700411d949
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_notifications.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_notifications.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/notifications.c.orig	2012-02-03 15:22:56.000000000 +0000
++++ cgi/notifications.c
+@@ -358,7 +358,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_outages.c b/net/nagios-base/patches/patch-cgi_outages.c
new file mode 100644
index 00000000000..f30cdb9bc00
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_outages.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_outages.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/outages.c.orig	2011-08-17 07:36:27.000000000 +0000
++++ cgi/outages.c
+@@ -269,7 +269,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_status.c b/net/nagios-base/patches/patch-cgi_status.c
new file mode 100644
index 00000000000..6d377bc7c15
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_status.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_status.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/status.c.orig	2013-03-09 21:46:35.000000000 +0000
++++ cgi/status.c
+@@ -600,7 +600,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_statusmap.c b/net/nagios-base/patches/patch-cgi_statusmap.c
new file mode 100644
index 00000000000..c9d71e3660d
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_statusmap.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_statusmap.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/statusmap.c.orig	2011-08-17 07:36:27.000000000 +0000
++++ cgi/statusmap.c
+@@ -407,7 +407,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_statuswml.c b/net/nagios-base/patches/patch-cgi_statuswml.c
new file mode 100644
index 00000000000..6599f29552f
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_statuswml.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-cgi_statuswml.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/statuswml.c.orig	2011-08-17 07:36:27.000000000 +0000
++++ cgi/statuswml.c
+@@ -235,8 +235,13 @@ int process_cgivars(void) {
+ 
+ 	for(x = 0; variables[x] != NULL; x++) {
+ 
++		/* do some basic length checking on the variable identifier to prevent buffer overflows */
++		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
++			continue;
++			}
++
+ 		/* we found the hostgroup argument */
+-		if(!strcmp(variables[x], "hostgroup")) {
++		else if(!strcmp(variables[x], "hostgroup")) {
+ 			display_type = DISPLAY_HOSTGROUP;
+ 			x++;
+ 			if(variables[x] == NULL) {
diff --git a/net/nagios-base/patches/patch-cgi_summary.c b/net/nagios-base/patches/patch-cgi_summary.c
new file mode 100644
index 00000000000..d544b3e3812
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_summary.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_summary.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/summary.c.orig	2011-08-17 07:36:27.000000000 +0000
++++ cgi/summary.c
+@@ -761,7 +761,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_trends.c b/net/nagios-base/patches/patch-cgi_trends.c
new file mode 100644
index 00000000000..0797ab9b171
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_trends.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_trends.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/trends.c.orig	2011-08-17 07:36:27.000000000 +0000
++++ cgi/trends.c
+@@ -1271,7 +1271,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-common_Makefile.in b/net/nagios-base/patches/patch-common_Makefile.in
new file mode 100644
index 00000000000..41da57b2662
--- /dev/null
+++ b/net/nagios-base/patches/patch-common_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Adjustments to build procedure.
+
+--- common/Makefile.in.orig	2009-06-17 03:57:21.000000000 +0000
++++ common/Makefile.in
+@@ -17,7 +17,7 @@ exec_prefix=@exec_prefix@
+ LOGDIR=@localstatedir@
+ CFGDIR=@sysconfdir@
+ BINDIR=@bindir@
+-CGIDIR=@sbindir@
++CGIDIR=@libexecdir@
+ HTMLDIR=@datarootdir@
+ INSTALL=@INSTALL@
+ INSTALL_OPTS=@INSTALL_OPTS@
diff --git a/net/nagios-base/patches/patch-configure b/net/nagios-base/patches/patch-configure
new file mode 100644
index 00000000000..672918bb075
--- /dev/null
+++ b/net/nagios-base/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Adjustments to build procedure.
+
+--- configure.orig	2011-07-26 05:16:26.000000000 +0200
++++ configure	2011-08-01 18:36:37.000000000 +0200
+@@ -5775,7 +5775,7 @@
+   CHECKRESULTDIR=no
+ fi;
+ if test x$CHECKRESULTDIR = xno; then
+-	CHECKRESULTDIR="$localstatedir/spool/checkresults"
++	CHECKRESULTDIR="$localstatedir/checkresults"
+ fi
+ 
+ 
diff --git a/net/nagios-base/patches/patch-contrib_daemonchk.c b/net/nagios-base/patches/patch-contrib_daemonchk.c
new file mode 100644
index 00000000000..d446c890df4
--- /dev/null
+++ b/net/nagios-base/patches/patch-contrib_daemonchk.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-contrib_daemonchk.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- contrib/daemonchk.c.orig	2011-08-17 07:36:27.000000000 +0000
++++ contrib/daemonchk.c
+@@ -174,7 +174,6 @@ static int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 		}
diff --git a/net/nagios-base/patches/patch-html_Makefile.in b/net/nagios-base/patches/patch-html_Makefile.in
new file mode 100644
index 00000000000..c57ab310ce9
--- /dev/null
+++ b/net/nagios-base/patches/patch-html_Makefile.in
@@ -0,0 +1,116 @@
+$NetBSD: patch-html_Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Adjustments to build procedure.
+
+--- html/Makefile.in.orig	2012-02-13 20:40:42.000000000 +0000
++++ html/Makefile.in
+@@ -7,7 +7,7 @@ exec_prefix=@exec_prefix@
+ LOGDIR=@localstatedir@
+ CFGDIR=@sysconfdir@
+ BINDIR=@bindir@
+-CGIDIR=@sbindir@
++CGIDIR=@libexecdir@
+ HTMLDIR=@datadir@
+ INSTALL=@INSTALL@
+ INSTALL_OPTS=@INSTALL_OPTS@
+@@ -34,55 +34,55 @@ distclean: clean
+ devclean: distclean
+ 
+ install:
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
+-	$(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
+-#	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/media
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/stylesheets
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/contexthelp
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs/images
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/js
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images/logos
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/ssi
++	$(BSD_INSTALL_DATA) robots.txt $(DESTDIR)$(HTMLDIR)
++#	$(BSD_INSTALL_DATA) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
+ # Remove old HTML files (PHP files are used now)
+ 	rm -f $(DESTDIR)$(HTMLDIR)/index.html
+ 	rm -f $(DESTDIR)$(HTMLDIR)/main.html
+ 	rm -f $(DESTDIR)$(HTMLDIR)/side.html
+-	for file in *.php; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
+-#	for file in media/*.wav; \
+-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
+-	for file in stylesheets/*.css; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
+-	for file in contexthelp/*.html; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
+-	for file in js/*.js; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done
+-#	for file in docs/*.html; \
+-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
+-#	for file in docs/images/*.*; \
+-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
+-	for file in images/*.gif; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+-	for file in images/*.jpg; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+-	for file in images/*.png; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+-	for file in images/*.ico; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+-	for file in images/logos/*.*; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+-	for file in includes/*.*; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
+-	for file in includes/rss/*.*; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
+-	for file in includes/rss/extlib/*.*; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
++	for file in *.php; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR); done
++#	for file in media/*.wav; do \
++#	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/media; done
++	for file in stylesheets/*.css; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
++	for file in contexthelp/*.html; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
++	for file in js/*.js; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/js; done
++#	for file in docs/*.html; do \
++#	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs; done
++#	for file in docs/images/*.*; do \
++#	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
++	for file in images/*.gif; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
++	for file in images/*.jpg; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
++	for file in images/*.png; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
++	for file in images/*.ico; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
++	for file in images/logos/*.*; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
++	for file in includes/*.*; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes; done
++	for file in includes/rss/*.*; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
++	for file in includes/rss/extlib/*.*; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
+ 
+ install-unstripped:
+ 	$(MAKE) install
diff --git a/net/nagios-base/patches/patch-include_locations.h.in b/net/nagios-base/patches/patch-include_locations.h.in
new file mode 100644
index 00000000000..f20c80277ab
--- /dev/null
+++ b/net/nagios-base/patches/patch-include_locations.h.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_locations.h.in,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Adjustments to build procedure.
+
+--- include/locations.h.in.orig	2008-11-30 17:22:59.000000000 +0000
++++ include/locations.h.in
+@@ -20,7 +20,7 @@
+ 
+ #define DEFAULT_TEMP_FILE			"@localstatedir@/tempfile"
+ #define DEFAULT_TEMP_PATH                       "/tmp"
+-#define DEFAULT_CHECK_RESULT_PATH		"@localstatedir@/spool/checkresults"
++#define DEFAULT_CHECK_RESULT_PATH		"@localstatedir@/checkresults"
+ #define DEFAULT_STATUS_FILE			"@localstatedir@/status.dat"
+ #define DEFAULT_LOG_FILE			"@localstatedir@/nagios.log"
+ #define DEFAULT_LOG_ARCHIVE_PATH		"@localstatedir@/archives/"
diff --git a/net/nagios-base/patches/patch-sample-config_nagios.cfg.in b/net/nagios-base/patches/patch-sample-config_nagios.cfg.in
new file mode 100644
index 00000000000..51c4fa64dfb
--- /dev/null
+++ b/net/nagios-base/patches/patch-sample-config_nagios.cfg.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-sample-config_nagios.cfg.in,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix placement of temporary file.
+
+--- sample-config/nagios.cfg.in.orig	2010-10-04 02:27:55.000000000 +0000
++++ sample-config/nagios.cfg.in
+@@ -198,7 +198,7 @@ lock_file=@lockfile@
+ # is created, used, and deleted throughout the time that Nagios is
+ # running.
+ 
+-temp_file=@localstatedir@/nagios.tmp
++temp_file=/tmp/nagios.tmp
+ 
+ 
+ 
-- 
cgit v1.2.3