Update nagios-base to 3.5.0.

based on PR pkg/48082.

3.5.0 - 03/15/2013
------------------
* Fixed bug #403: The "configuration" page of the webui doesn't use entity
  encoding when displaying the "command expansion" item (Eric Stanley, Phil
  Randal)
* Fixed bug #424: Nagios Core 3.4.4 seg fault (core dump) on restart after
  removing config for running service (Eric Stanley)
* Updated CGI utility functions to support UTF-8 characters (Eric Stanley)
* Fixed bug where selecting Command Expansion from Configuration CGI page would
  display commands instead (Eric Stanley)
* Fixed bug #369: status.cgi crashes with segfault when there are german ulauts
  (äöüß) in the hostname or the servicename (Eric Stanley)
* Fixed bug #418: Scheduled Downtime Notifications Resent On Nagios
  Restart/reload (Eric Stanley)

7 files changed, 34 insertions, 44 deletions

diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile
index 2453a1ad56f..99219f86a71 100644
--- a/net/nagios-base/Makefile
+++ b/net/nagios-base/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2013/08/05 10:43:55 obache Exp $
+# $NetBSD: Makefile,v 1.48 2013/08/05 11:22:29 obache Exp $
 #
 
-DISTNAME=		nagios-3.4.4
+DISTNAME=		nagios-3.5.0
 PKGNAME=		${DISTNAME:S/-/-base-/}
 CATEGORIES=		net sysutils
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
diff --git a/net/nagios-base/PLIST b/net/nagios-base/PLIST
index b03ef9518f7..a2fad5d74a3 100644
--- a/net/nagios-base/PLIST
+++ b/net/nagios-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2013/08/05 10:53:34 obache Exp $
+@comment $NetBSD: PLIST,v 1.14 2013/08/05 11:22:29 obache Exp $
 bin/nagios
 bin/nagiostats
 bin/p1.pl
@@ -383,4 +383,6 @@ share/nagios/stylesheets/summary.css
 share/nagios/stylesheets/tac.css
 share/nagios/stylesheets/trends.css
 @pkgdir share/nagios/ssi
+@pkgdir share/nagios/media
+@pkgdir share/nagios/docs/images
 @pkgdir etc/nagios/objects
diff --git a/net/nagios-base/distinfo b/net/nagios-base/distinfo
index ff360fae76f..d3c9d41d830 100644
--- a/net/nagios-base/distinfo
+++ b/net/nagios-base/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.17 2013/08/05 10:43:55 obache Exp $
+$NetBSD: distinfo,v 1.18 2013/08/05 11:22:29 obache Exp $
 
-SHA1 (nagios-3.4.4.tar.gz) = 19aaa4eda92a2837fe29ebcbe85140aef50e90cd
-RMD160 (nagios-3.4.4.tar.gz) = 328fefc30d03b18bf757d619f36ea6747ea4efdc
-Size (nagios-3.4.4.tar.gz) = 1786507 bytes
+SHA1 (nagios-3.5.0.tar.gz) = 972e76c638b7d3f15d994eaa8fce0e4907d5d6e1
+RMD160 (nagios-3.5.0.tar.gz) = d75a764486fd3dc0462fb49924698754852d39be
+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) = 7f08522be804aec2b439f0a550f2f0fdb26c827b
-SHA1 (patch-ab) = 37beee7195879806a2cd44cde2f376e07fc13470
-SHA1 (patch-ac) = 66a112e4545e54f408f0e53f4ed05e4720713c48
-SHA1 (patch-ad) = 475c22bdcf41d590dae8309a7f410a53ae9cc872
+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
diff --git a/net/nagios-base/patches/patch-aa b/net/nagios-base/patches/patch-aa
index 727ab0f1853..48e1ef91abe 100644
--- a/net/nagios-base/patches/patch-aa
+++ b/net/nagios-base/patches/patch-aa
@@ -1,9 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2012/12/14 18:49:51 manu Exp $
+$NetBSD: patch-aa,v 1.11 2013/08/05 11:22:29 obache Exp $
 
---- Makefile.in.orig	2012-04-25 14:30:47.000000000 +0200
-+++ Makefile.in	2012-10-04 18:40:13.000000000 +0200
-@@ -23,19 +23,18 @@
- prefix=@prefix@
+--- 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@
@@ -24,9 +23,7 @@ $NetBSD: patch-aa,v 1.10 2012/12/14 18:49:51 manu Exp $
  CGICFGDIR=$(CGIDIR)
  PERLDIR=@PERLDIR@
  
- USE_EVENTBROKER=@USE_EVENTBROKER@
-@@ -71,76 +70,8 @@
- all:
+@@ -72,74 +71,6 @@ all:
  	cd $(SRC_BASE) && $(MAKE)
  	cd $(SRC_CGI) && $(MAKE)
  	cd $(SRC_HTM) && $(MAKE)
@@ -101,9 +98,7 @@ $NetBSD: patch-aa,v 1.10 2012/12/14 18:49:51 manu Exp $
  
  nagios:
  	cd $(SRC_BASE) && $(MAKE)
- 
-@@ -233,16 +164,12 @@
- 	$(MAKE) install-exfoliation	
+@@ -234,14 +165,10 @@ install-unstripped:
  	$(MAKE) install-basic
  
  install-basic:
@@ -120,9 +115,7 @@ $NetBSD: patch-aa,v 1.10 2012/12/14 18:49:51 manu Exp $
  	@echo ""
  	@echo "*** Main program, CGIs and HTML files installed ***"
  	@echo ""
- 	@echo "You can continue with installing Nagios as follows (type 'make'"
-@@ -260,22 +187,22 @@
- 	@echo ""
+@@ -261,20 +188,20 @@ install-basic:
  
  
  install-config:
@@ -157,9 +150,7 @@ $NetBSD: patch-aa,v 1.10 2012/12/14 18:49:51 manu Exp $
  	@echo ""
  	@echo "*** Config files installed ***"
  	@echo ""
- 	@echo "Remember, these are *SAMPLE* config files.  You'll need to read"
-@@ -290,10 +217,17 @@
- 	@echo "*** Nagios/Apache conf file installed ***"
+@@ -291,8 +218,15 @@ install-webconf:
  	@echo ""
  	
  install-exfoliation:
@@ -177,9 +168,7 @@ $NetBSD: patch-aa,v 1.10 2012/12/14 18:49:51 manu Exp $
  
  	@echo ""
  	@echo "*** Exfoliation theme installed ***"
- 	@echo "NOTE: Use 'make install-classicui' to revert to classic Nagios theme";
-@@ -319,9 +253,12 @@
- 	@echo ""
+@@ -320,7 +254,10 @@ install-daemoninit:
  
  
  install-commandmode:
@@ -191,4 +180,3 @@ $NetBSD: patch-aa,v 1.10 2012/12/14 18:49:51 manu Exp $
  	chmod g+s $(DESTDIR)$(LOGDIR)/rw
  
  	@echo ""
- 	@echo "*** External command directory configured ***"
diff --git a/net/nagios-base/patches/patch-ab b/net/nagios-base/patches/patch-ab
index b84720e56e0..6c2f052b066 100644
--- a/net/nagios-base/patches/patch-ab
+++ b/net/nagios-base/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2011/04/08 22:37:25 morr Exp $
+$NetBSD: patch-ab,v 1.7 2013/08/05 11:22:29 obache Exp $
 
---- cgi/Makefile.in.orig	2010-08-28 13:01:25.000000000 +0000
+--- 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@
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.6 2011/04/08 22:37:25 morr Exp $
  HTMLDIR=@datarootdir@
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
-@@ -199,9 +199,9 @@ install-unstripped:
+@@ -201,9 +201,9 @@ install-unstripped:
  	$(MAKE) install-basic
  
  install-basic:
diff --git a/net/nagios-base/patches/patch-ac b/net/nagios-base/patches/patch-ac
index 38d529ff5c5..d9276568d0b 100644
--- a/net/nagios-base/patches/patch-ac
+++ b/net/nagios-base/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.8 2011/11/27 19:49:16 joerg Exp $
+$NetBSD: patch-ac,v 1.9 2013/08/05 11:22:29 obache Exp $
 
---- base/Makefile.in.orig	2009-06-17 03:57:21.000000000 +0000
+--- 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@
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.8 2011/11/27 19:49:16 joerg Exp $
  HTMLDIR=@datarootdir@
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
-@@ -202,9 +202,9 @@ install-unstripped:
+@@ -204,9 +204,9 @@ install-unstripped:
  	$(MAKE) install-basic
  
  install-basic:
diff --git a/net/nagios-base/patches/patch-ad b/net/nagios-base/patches/patch-ad
index 2ee2cb26f48..cea6a67149a 100644
--- a/net/nagios-base/patches/patch-ad
+++ b/net/nagios-base/patches/patch-ad
@@ -1,7 +1,10 @@
+$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
-@@ -6,9 +6,9 @@
- exec_prefix=@exec_prefix@
+--- 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@
@@ -10,9 +13,7 @@
  HTMLDIR=@datadir@
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
- COMMAND_OPTS=@COMMAND_OPTS@
-@@ -33,57 +33,57 @@
- 
+@@ -34,55 +34,55 @@ distclean: clean
  devclean: distclean
  
  install:
@@ -113,4 +114,3 @@
  
  install-unstripped:
  	$(MAKE) install
-