Update to 4.0.5

Changes:	http://www.nagios.org/projects/nagioscore/history/nagios-4-version-history
Sponsored by:	Absolight

5 files changed, 19 insertions, 13 deletions

diff --git a/net-mgmt/nagios4/Makefile b/net-mgmt/nagios4/Makefile
index 44732f1d21e3..6a53776d62c2 100644
--- a/net-mgmt/nagios4/Makefile
+++ b/net-mgmt/nagios4/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nagios
-PORTVERSION=	4.0.4
-PORTREVISION=	1
+PORTVERSION=	4.0.5
 PKGNAMESUFFIX=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION}
diff --git a/net-mgmt/nagios4/distinfo b/net-mgmt/nagios4/distinfo
index db2fda9204c8..c0117b1a33bf 100644
--- a/net-mgmt/nagios4/distinfo
+++ b/net-mgmt/nagios4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nagios-4.0.4.tar.gz) = aedbcd15c2fb536dcfaff015498dc77361194762432c2c505bd10d2b44417bb5
-SIZE (nagios-4.0.4.tar.gz) = 1792721
+SHA256 (nagios-4.0.5.tar.gz) = ad790bebadda8cc04daf639d1866864081849305fdf92dc0243b6d6246d3da3c
+SIZE (nagios-4.0.5.tar.gz) = 1793038
diff --git a/net-mgmt/nagios4/files/patch-configure.in b/net-mgmt/nagios4/files/patch-configure.in
index 45f92381133f..e5c68e6705bf 100644
--- a/net-mgmt/nagios4/files/patch-configure.in
+++ b/net-mgmt/nagios4/files/patch-configure.in
@@ -1,5 +1,5 @@
---- ./configure.in.orig	2014-03-14 18:24:57.000000000 +0100
-+++ ./configure.in	2014-03-15 20:44:57.000000000 +0100
+--- ./configure.in.orig	2014-04-11 20:37:42.000000000 +0200
++++ ./configure.in	2014-04-15 15:19:42.000000000 +0200
 @@ -6,7 +6,6 @@
  
  AC_INIT(base/nagios.c)
@@ -7,7 +7,7 @@
 -AC_PREFIX_DEFAULT(/usr/local/nagios)
  
  PKG_NAME=nagios
- PKG_VERSION="4.0.4"
+ PKG_VERSION="4.0.5"
 @@ -134,14 +133,14 @@
  AC_SUBST(nagios_grp)
  AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user",[user name to run nagios])
diff --git a/net-mgmt/nagios4/files/patch-html__main.php b/net-mgmt/nagios4/files/patch-html__main.php
index 54e043e18cdd..847dd893a1e8 100644
--- a/net-mgmt/nagios4/files/patch-html__main.php
+++ b/net-mgmt/nagios4/files/patch-html__main.php
@@ -1,10 +1,10 @@
---- ./html/main.php.orig	2014-03-14 18:24:57.000000000 +0100
-+++ ./html/main.php	2014-03-15 20:45:27.000000000 +0100
+--- ./html/main.php.orig	2014-04-11 20:37:42.000000000 +0200
++++ ./html/main.php	2014-04-15 15:20:13.000000000 +0200
 @@ -40,38 +40,10 @@
  <div class="product">Nagios<sup><span style="font-size: small;">&reg;</span></sup> Core<sup><span style="font-size: small;">&trade;</span></sup></div>
- <div class="version">Version 4.0.4</div>
- <div class="releasedate">March 14, 2014</div>
--<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=4.0.4&product=nagioscore" target="_blank">Check for updates</a></div>
+ <div class="version">Version 4.0.5</div>
+ <div class="releasedate">April 11, 2014</div>
+-<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=4.0.5&product=nagioscore" target="_blank">Check for updates</a></div>
  <!--<div class="whatsnew"><a href="http://go.nagios.com/nagioscore/whatsnew">Read what's new in Nagios Core 3</a></div>-->
  </div>
  
diff --git a/net-mgmt/nagios4/pkg-plist b/net-mgmt/nagios4/pkg-plist
index 974a7dc0ea55..598fed3843f6 100644
--- a/net-mgmt/nagios4/pkg-plist
+++ b/net-mgmt/nagios4/pkg-plist
@@ -17,6 +17,7 @@ etc/nagios/objects/switch.cfg-sample
 etc/nagios/objects/templates.cfg-sample
 etc/nagios/objects/timeperiods.cfg-sample
 etc/nagios/resource.cfg-sample
+%%NAGIOSWWWDIR%%/cgi-bin/archivejson.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/avail.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/cmd.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/config.cgi
@@ -24,9 +25,11 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/cgi-bin/histogram.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/history.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/notifications.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/objectjson.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/outages.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/showlog.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/status.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/statusjson.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/statusmap.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/statuswml.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/summary.cgi
@@ -348,15 +351,17 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/images/weblogo1.png
 %%NAGIOSWWWDIR%%/images/zoom1.gif
 %%NAGIOSWWWDIR%%/images/zoom2.gif
+%%NAGIOSWWWDIR%%/includes/jquery-1.7.1.min.js
 %%NAGIOSWWWDIR%%/includes/rss/extlib/Snoopy.class.inc
 %%NAGIOSWWWDIR%%/includes/rss/rss_cache.inc
 %%NAGIOSWWWDIR%%/includes/rss/rss_fetch.inc
 %%NAGIOSWWWDIR%%/includes/rss/rss_parse.inc
 %%NAGIOSWWWDIR%%/includes/rss/rss_utils.inc
-%%NAGIOSWWWDIR%%/includes/jquery-1.7.1.min.js
 %%NAGIOSWWWDIR%%/includes/utils.inc.php
 %%NAGIOSWWWDIR%%/index.php
 %%NAGIOSWWWDIR%%/js/jquery-1.7.1.min.js
+%%NAGIOSWWWDIR%%/js/jsonquery.js
+%%NAGIOSWWWDIR%%/jsonquery.html
 %%NAGIOSWWWDIR%%/main.php
 %%NAGIOSWWWDIR%%/robots.txt
 %%NAGIOSWWWDIR%%/rss-corefeed.php
@@ -370,6 +375,7 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/stylesheets/extinfo.css
 %%NAGIOSWWWDIR%%/stylesheets/histogram.css
 %%NAGIOSWWWDIR%%/stylesheets/history.css
+%%NAGIOSWWWDIR%%/stylesheets/jsonquery.css
 %%NAGIOSWWWDIR%%/stylesheets/ministatus.css
 %%NAGIOSWWWDIR%%/stylesheets/notifications.css
 %%NAGIOSWWWDIR%%/stylesheets/outages.css
@@ -379,6 +385,7 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/stylesheets/summary.css
 %%NAGIOSWWWDIR%%/stylesheets/tac.css
 %%NAGIOSWWWDIR%%/stylesheets/trends.css
+@dirrmtry libexec/nagios
 @dirrmtry etc/nagios/objects
 @dirrmtry etc/nagios
 @dirrm %%NAGIOSWWWDIR%%/cgi-bin