- Update to 2.10

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

8 files changed, 44 insertions, 54 deletions

diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index b9e579608d99..6996ed70a506 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nagios
-PORTVERSION=	2.9
-PORTREVISION=	2
+PORTVERSION=	2.10
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nagios
@@ -24,6 +23,8 @@ USE_PERL5_BUILD=	yes
 USE_AUTOTOOLS=	autoconf:261
 USE_RC_SUBR=	nagios.sh
 
+CONFLICTS=	nagios-[13].*
+
 OPTIONS=	EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8+]" OFF \
 		NANOSLEEP "Use nanosleep in event timing" OFF
 
diff --git a/net-mgmt/nagios/distinfo b/net-mgmt/nagios/distinfo
index 96e7a5f083ed..76a564777aea 100644
--- a/net-mgmt/nagios/distinfo
+++ b/net-mgmt/nagios/distinfo
@@ -1,3 +1,3 @@
-MD5 (nagios-2.9.tar.gz) = b6e3a21c91edb063c00712c6001e15ec
-SHA256 (nagios-2.9.tar.gz) = f60a72dec1edef308a899734eff4f7e5167522f1afeb5c24fd1852e2749c5d9d
-SIZE (nagios-2.9.tar.gz) = 1738698
+MD5 (nagios-2.10.tar.gz) = 8c3a29e138f2ff8c8abbd3dd8a40c4b6
+SHA256 (nagios-2.10.tar.gz) = d3e916bd11619259246e12a45aac8761e7318b54ed701472e8e49a03d939e5c8
+SIZE (nagios-2.10.tar.gz) = 1740558
diff --git a/net-mgmt/nagios/files/patch-Makefile.in b/net-mgmt/nagios/files/patch-Makefile.in
index f98d44cb9bd7..be4f6689afc8 100644
--- a/net-mgmt/nagios/files/patch-Makefile.in
+++ b/net-mgmt/nagios/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Nov 28 12:59:04 2006
-+++ Makefile.in	Sat Dec  9 08:04:47 2006
+--- Makefile.in.orig	Tue Apr 24 01:14:25 2007
++++ Makefile.in	Thu Nov  1 20:08:40 2007
 @@ -186,7 +186,7 @@
  	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
  	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
@@ -14,11 +14,11 @@
  
  install-config:
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
--	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
--	$(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
--	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg-sample
--	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg-sample
+-	$(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/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
 +	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
 +	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
diff --git a/net-mgmt/nagios/files/pkg-message.in b/net-mgmt/nagios/files/pkg-message.in
index 41b08b6bcc67..a6cd7784dae3 100644
--- a/net-mgmt/nagios/files/pkg-message.in
+++ b/net-mgmt/nagios/files/pkg-message.in
@@ -1,36 +1,30 @@
 **********************************************************************
 
- Enable nagios in /etc/rc.conf with the following line:
+ Enable Nagios in /etc/rc.conf with the following line:
 
    nagios_enable="YES"
 
  Configuration templates are available in %%PREFIX%%/etc/nagios as
- *.cfg-sample files.  Copy then to *.cfg files where required and
+ *.cfg-sample files.  Copy them to *.cfg files where required and
  edit to suit your needs.  Documentation is available in HTML form
  in %%PREFIX%%/%%NAGIOSWWWDIR%%/docs.
 
  If you don't already have a web server running, you will need to
- install and configure one to finish off your nagios installation.
+ install and configure one to finish off your Nagios installation.
  When used with Apache, the following should be sufficient to publish
- the web component of nagios (modification of allow list encouraged):
+ the web component of Nagios (modify the allow list to suit):
 
    <Directory %%PREFIX%%/%%NAGIOSWWWDIR%%>
-     Order allow,deny
-     Allow from all
+     Order deny,allow
+     Deny from all
+     Allow from 127.0.0.1
    </Directory>
 
    <Directory %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin>
      Options ExecCGI
    </Directory>
 
-  ScriptAlias %%NAGIOSCGIURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin/
-  Alias %%NAGIOSHTMURL%%/  %%PREFIX%%/%%NAGIOSWWWDIR%%/
-
-**********************************************************************
-
- Users experiencing troubles with logos used in the Status Map CGI
- should first check the value of the physical_html_path variable
- defined in %%PREFIX%%/etc/nagios/cgi.cfg.  Refer to the example in
- %%PREFIX%%/etc/nagios/cgi.cfg-sample for the correct value.
+   ScriptAlias %%NAGIOSCGIURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin/
+   Alias %%NAGIOSHTMURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/
 
 **********************************************************************
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index b9e579608d99..6996ed70a506 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nagios
-PORTVERSION=	2.9
-PORTREVISION=	2
+PORTVERSION=	2.10
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nagios
@@ -24,6 +23,8 @@ USE_PERL5_BUILD=	yes
 USE_AUTOTOOLS=	autoconf:261
 USE_RC_SUBR=	nagios.sh
 
+CONFLICTS=	nagios-[13].*
+
 OPTIONS=	EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8+]" OFF \
 		NANOSLEEP "Use nanosleep in event timing" OFF
 
diff --git a/net-mgmt/nagios2/distinfo b/net-mgmt/nagios2/distinfo
index 96e7a5f083ed..76a564777aea 100644
--- a/net-mgmt/nagios2/distinfo
+++ b/net-mgmt/nagios2/distinfo
@@ -1,3 +1,3 @@
-MD5 (nagios-2.9.tar.gz) = b6e3a21c91edb063c00712c6001e15ec
-SHA256 (nagios-2.9.tar.gz) = f60a72dec1edef308a899734eff4f7e5167522f1afeb5c24fd1852e2749c5d9d
-SIZE (nagios-2.9.tar.gz) = 1738698
+MD5 (nagios-2.10.tar.gz) = 8c3a29e138f2ff8c8abbd3dd8a40c4b6
+SHA256 (nagios-2.10.tar.gz) = d3e916bd11619259246e12a45aac8761e7318b54ed701472e8e49a03d939e5c8
+SIZE (nagios-2.10.tar.gz) = 1740558
diff --git a/net-mgmt/nagios2/files/patch-Makefile.in b/net-mgmt/nagios2/files/patch-Makefile.in
index f98d44cb9bd7..be4f6689afc8 100644
--- a/net-mgmt/nagios2/files/patch-Makefile.in
+++ b/net-mgmt/nagios2/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Nov 28 12:59:04 2006
-+++ Makefile.in	Sat Dec  9 08:04:47 2006
+--- Makefile.in.orig	Tue Apr 24 01:14:25 2007
++++ Makefile.in	Thu Nov  1 20:08:40 2007
 @@ -186,7 +186,7 @@
  	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
  	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
@@ -14,11 +14,11 @@
  
  install-config:
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
--	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
--	$(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
--	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg-sample
--	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg-sample
+-	$(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/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
 +	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
 +	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
diff --git a/net-mgmt/nagios2/files/pkg-message.in b/net-mgmt/nagios2/files/pkg-message.in
index 41b08b6bcc67..a6cd7784dae3 100644
--- a/net-mgmt/nagios2/files/pkg-message.in
+++ b/net-mgmt/nagios2/files/pkg-message.in
@@ -1,36 +1,30 @@
 **********************************************************************
 
- Enable nagios in /etc/rc.conf with the following line:
+ Enable Nagios in /etc/rc.conf with the following line:
 
    nagios_enable="YES"
 
  Configuration templates are available in %%PREFIX%%/etc/nagios as
- *.cfg-sample files.  Copy then to *.cfg files where required and
+ *.cfg-sample files.  Copy them to *.cfg files where required and
  edit to suit your needs.  Documentation is available in HTML form
  in %%PREFIX%%/%%NAGIOSWWWDIR%%/docs.
 
  If you don't already have a web server running, you will need to
- install and configure one to finish off your nagios installation.
+ install and configure one to finish off your Nagios installation.
  When used with Apache, the following should be sufficient to publish
- the web component of nagios (modification of allow list encouraged):
+ the web component of Nagios (modify the allow list to suit):
 
    <Directory %%PREFIX%%/%%NAGIOSWWWDIR%%>
-     Order allow,deny
-     Allow from all
+     Order deny,allow
+     Deny from all
+     Allow from 127.0.0.1
    </Directory>
 
    <Directory %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin>
      Options ExecCGI
    </Directory>
 
-  ScriptAlias %%NAGIOSCGIURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin/
-  Alias %%NAGIOSHTMURL%%/  %%PREFIX%%/%%NAGIOSWWWDIR%%/
-
-**********************************************************************
-
- Users experiencing troubles with logos used in the Status Map CGI
- should first check the value of the physical_html_path variable
- defined in %%PREFIX%%/etc/nagios/cgi.cfg.  Refer to the example in
- %%PREFIX%%/etc/nagios/cgi.cfg-sample for the correct value.
+   ScriptAlias %%NAGIOSCGIURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin/
+   Alias %%NAGIOSHTMURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/
 
 **********************************************************************