Update to 4.0.4.

Sponsored by:	Absolight

5 files changed, 16 insertions, 14 deletions

diff --git a/net-mgmt/nagios4/Makefile b/net-mgmt/nagios4/Makefile
index bc21d2f152cc..66d6be5b4650 100644
--- a/net-mgmt/nagios4/Makefile
+++ b/net-mgmt/nagios4/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nagios
-PORTVERSION=	4.0.3
+PORTVERSION=	4.0.4
 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 3318a5947f0f..db2fda9204c8 100644
--- a/net-mgmt/nagios4/distinfo
+++ b/net-mgmt/nagios4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nagios-4.0.3.tar.gz) = cf2050c1202c8532bbf5b56cd3399ad5852ec4df0dc46afc3576600f77d2bad9
-SIZE (nagios-4.0.3.tar.gz) = 1700420
+SHA256 (nagios-4.0.4.tar.gz) = aedbcd15c2fb536dcfaff015498dc77361194762432c2c505bd10d2b44417bb5
+SIZE (nagios-4.0.4.tar.gz) = 1792721
diff --git a/net-mgmt/nagios4/files/patch-configure.in b/net-mgmt/nagios4/files/patch-configure.in
index 245f34836614..45f92381133f 100644
--- a/net-mgmt/nagios4/files/patch-configure.in
+++ b/net-mgmt/nagios4/files/patch-configure.in
@@ -1,5 +1,5 @@
---- ./configure.in.orig	2013-11-25 14:16:25.000000000 +0000
-+++ ./configure.in	2014-01-24 22:41:15.000000000 +0000
+--- ./configure.in.orig	2014-03-14 18:24:57.000000000 +0100
++++ ./configure.in	2014-03-15 20:44:57.000000000 +0100
 @@ -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.2"
+ PKG_VERSION="4.0.4"
 @@ -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__Makefile.in b/net-mgmt/nagios4/files/patch-html__Makefile.in
index 682d419e2d54..eda256bb6c0f 100644
--- a/net-mgmt/nagios4/files/patch-html__Makefile.in
+++ b/net-mgmt/nagios4/files/patch-html__Makefile.in
@@ -1,6 +1,6 @@
---- ./html/Makefile.in.orig	2014-01-24 22:44:21.000000000 +0000
-+++ ./html/Makefile.in	2014-01-24 22:44:31.000000000 +0000
-@@ -35,55 +35,55 @@
+--- ./html/Makefile.in.orig	2014-03-14 18:24:57.000000000 +0100
++++ ./html/Makefile.in	2014-03-15 20:44:57.000000000 +0100
+@@ -35,56 +35,56 @@
  devclean: distclean
  
  install:
@@ -38,6 +38,8 @@
  	rm -f $(DESTDIR)$(HTMLDIR)/index.html
  	rm -f $(DESTDIR)$(HTMLDIR)/main.html
  	rm -f $(DESTDIR)$(HTMLDIR)/side.html
+-	$(INSTALL) -m 664 $(INSTALL_OPTS) jsonquery.html $(DESTDIR)$(HTMLDIR)
++	$(INSTALL) -m 644 $(INSTALL_OPTS) jsonquery.html $(DESTDIR)$(HTMLDIR)
  	for file in *.php; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
 +	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
diff --git a/net-mgmt/nagios4/files/patch-html__main.php b/net-mgmt/nagios4/files/patch-html__main.php
index ba58ae5b3061..54e043e18cdd 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-02-28 17:50:25.000000000 +0100
-+++ ./html/main.php	2014-03-04 19:17:31.000000000 +0100
+--- ./html/main.php.orig	2014-03-14 18:24:57.000000000 +0100
++++ ./html/main.php	2014-03-15 20:45:27.000000000 +0100
 @@ -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.3</div>
- <div class="releasedate">February 28, 2014</div>
--<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=4.0.3&product=nagioscore" target="_blank">Check for updates</a></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="whatsnew"><a href="http://go.nagios.com/nagioscore/whatsnew">Read what's new in Nagios Core 3</a></div>-->
  </div>