Update to 2.4

PR:		98413
Submitted by:	Jarrod Sayers <jarrod@netleader.com.au> (maintainer)

6 files changed, 18 insertions, 55 deletions

diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index 088a91410e25..dbc1c4407b45 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nagios
-PORTVERSION=	2.3.1
+PORTVERSION=	2.4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nagios
diff --git a/net-mgmt/nagios/distinfo b/net-mgmt/nagios/distinfo
index ab23be893b96..8c6eeca30c35 100644
--- a/net-mgmt/nagios/distinfo
+++ b/net-mgmt/nagios/distinfo
@@ -1,3 +1,3 @@
-MD5 (nagios-2.3.1.tar.gz) = 22029e5b71b50036c41a44f63e58150d
-SHA256 (nagios-2.3.1.tar.gz) = 40cd86756eb859cfd00c47c8a6670aac74c841393c49fc24bd5ed43099e3cdcc
-SIZE (nagios-2.3.1.tar.gz) = 1734958
+MD5 (nagios-2.4.tar.gz) = bb8f0106dc7f282c239f54db1f308445
+SHA256 (nagios-2.4.tar.gz) = e62346de93df5f4387377faac9ad1fd2fbfd5628f0482646144dc2b8d266fcd8
+SIZE (nagios-2.4.tar.gz) = 1735573
diff --git a/net-mgmt/nagios/files/patch-base-Makefile.in b/net-mgmt/nagios/files/patch-base-Makefile.in
index 4e83fe27623a..2b8138e62835 100644
--- a/net-mgmt/nagios/files/patch-base-Makefile.in
+++ b/net-mgmt/nagios/files/patch-base-Makefile.in
@@ -1,16 +1,15 @@
---- base/Makefile.in.orig	Thu Dec  9 07:48:33 2004
-+++ base/Makefile.in	Sat Feb 12 13:59:24 2005
-@@ -181,10 +181,10 @@
- devclean: distclean
+--- base/Makefile.in.orig	Wed May 31 02:01:44 2006
++++ base/Makefile.in	Sat Jun  3 11:09:48 2006
+@@ -188,9 +188,9 @@
+ 	 $(MAKE) install-basic
  
- install:
+ 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)
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
- 	$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
--	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
- 	$(STRIP) $(DESTDIR)$(BINDIR)/@nagiostats_name@
- 
  
+ strip-post-install:
+ 	$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
diff --git a/net-mgmt/nagios/files/patch-cgi-Makefile.in b/net-mgmt/nagios/files/patch-cgi-Makefile.in
index 27e6a10cf9bd..e746d0009c95 100644
--- a/net-mgmt/nagios/files/patch-cgi-Makefile.in
+++ b/net-mgmt/nagios/files/patch-cgi-Makefile.in
@@ -1,14 +1,14 @@
---- cgi/Makefile.in.orig	Mon Oct 25 07:05:54 2004
-+++ cgi/Makefile.in	Sat Feb 12 13:56:57 2005
-@@ -191,9 +191,9 @@
- devclean: distclean
+--- cgi/Makefile.in.orig	Wed May 31 02:01:44 2006
++++ cgi/Makefile.in	Sat Jun  3 11:14:04 2006
+@@ -198,9 +198,9 @@
+ 	 $(MAKE) install-basic
  
- install:
+ install-basic:
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
  	for file in *.cgi; do \
 -		$(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
 +		$(INSTALL) -m 755 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
- 		$(STRIP) $(DESTDIR)$(CGIDIR)/$$file; \
  	done
  
+ strip-post-install:
diff --git a/net-mgmt/nagios/files/patch-cgi-getcgi.c b/net-mgmt/nagios/files/patch-cgi-getcgi.c
deleted file mode 100644
index 22bc58d9032e..000000000000
--- a/net-mgmt/nagios/files/patch-cgi-getcgi.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- cgi/getcgi.c.orig	Thu Apr 13 04:47:23 2006
-+++ cgi/getcgi.c	Sun May 21 01:14:04 2006
-@@ -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-mgmt/nagios/files/patch-include-config.h.in b/net-mgmt/nagios/files/patch-include-config.h.in
deleted file mode 100644
index 9c3c10cc3d5f..000000000000
--- a/net-mgmt/nagios/files/patch-include-config.h.in
+++ /dev/null
@@ -1,26 +0,0 @@
---- include/config.h.in.orig	Mon Aug 29 17:34:30 2005
-+++ include/config.h.in	Mon Aug 29 17:41:03 2005
-@@ -108,11 +108,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
--#undef HAVE_SYS_RESOURCE_H
--#ifdef HAVE_SYS_RESOURCE_H
--#include <sys/resource.h>
--#endif
--
- #undef HAVE_PWD_H
- #ifdef HAVE_PWD_H
- #include <pwd.h>
-@@ -190,6 +185,11 @@
- #else
- #include <time.h>
- #endif
-+#endif
-+
-+#undef HAVE_SYS_RESOURCE_H
-+#ifdef HAVE_SYS_RESOURCE_H
-+#include <sys/resource.h>
- #endif
- 
- #undef HAVE_SYS_TIMEB_H