- Update to 3.0.r2

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

4 files changed, 17 insertions, 12 deletions

diff --git a/net-mgmt/nagios-devel/Makefile b/net-mgmt/nagios-devel/Makefile
index dc0bbd7e44b4..d82afaa09526 100644
--- a/net-mgmt/nagios-devel/Makefile
+++ b/net-mgmt/nagios-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nagios
-DISTVERSION=	3.0rc1
-PORTREVISION=	1
+DISTVERSION=	3.0rc2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nagios
diff --git a/net-mgmt/nagios-devel/distinfo b/net-mgmt/nagios-devel/distinfo
index 817c4545982d..e63c2ab8a629 100644
--- a/net-mgmt/nagios-devel/distinfo
+++ b/net-mgmt/nagios-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (nagios-3.0rc1.tar.gz) = d8b4fbf1c2527ddcc18a39372a41dba3
-SHA256 (nagios-3.0rc1.tar.gz) = 5635aaa1f45ff0c1f658ced605934618824b7928fdbc17f622bb7540810fdd43
-SIZE (nagios-3.0rc1.tar.gz) = 2736728
+MD5 (nagios-3.0rc2.tar.gz) = 96f4b16f8714eb29ca380405cb334c4b
+SHA256 (nagios-3.0rc2.tar.gz) = e608f7ec73e4d86a644bbb39283e90e56210784bbf2833cc571ded105a65a082
+SIZE (nagios-3.0rc2.tar.gz) = 2747084
diff --git a/net-mgmt/nagios-devel/files/patch-html__Makefile.in b/net-mgmt/nagios-devel/files/patch-html__Makefile.in
index 828c25cf0aea..0a5dc643d707 100644
--- a/net-mgmt/nagios-devel/files/patch-html__Makefile.in
+++ b/net-mgmt/nagios-devel/files/patch-html__Makefile.in
@@ -1,6 +1,6 @@
---- html/Makefile.in.orig	Thu Jun  1 05:56:42 2006
-+++ html/Makefile.in	Fri Jul 20 13:36:35 2007
-@@ -33,37 +33,37 @@
+--- html/Makefile.in.orig	2008-01-10 04:21:25.000000000 +1030
++++ html/Makefile.in	2008-01-30 23:02:38.000000000 +1030
+@@ -33,39 +33,39 @@
  devclean: distclean
  
  install:
@@ -53,6 +53,9 @@
  	for file in images/*.png; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
 +	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ 	for file in images/*.ico; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
++	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
  	for file in images/logos/*.*; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
 +	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
diff --git a/net-mgmt/nagios-devel/pkg-plist b/net-mgmt/nagios-devel/pkg-plist
index 3e25cefce741..22affb3077d9 100644
--- a/net-mgmt/nagios-devel/pkg-plist
+++ b/net-mgmt/nagios-devel/pkg-plist
@@ -274,6 +274,7 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/docs/verifyconfig.html
 %%NAGIOSWWWDIR%%/docs/volatileservices.html
 %%NAGIOSWWWDIR%%/docs/whatsnew.html
+%%NAGIOSWWWDIR%%/images/NagiosEnterprises-whitebg-112x46.png
 %%NAGIOSWWWDIR%%/images/ack.gif
 %%NAGIOSWWWDIR%%/images/action.gif
 %%NAGIOSWWWDIR%%/images/command.png
@@ -290,7 +291,9 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/images/empty.gif
 %%NAGIOSWWWDIR%%/images/enabled.gif
 %%NAGIOSWWWDIR%%/images/extinfo.gif
+%%NAGIOSWWWDIR%%/images/favicon.ico
 %%NAGIOSWWWDIR%%/images/flapping.gif
+%%NAGIOSWWWDIR%%/images/globe-support-150x150.png
 %%NAGIOSWWWDIR%%/images/greendot.gif
 %%NAGIOSWWWDIR%%/images/histogram.png
 %%NAGIOSWWWDIR%%/images/history.gif
@@ -377,7 +380,7 @@ etc/nagios/resource.cfg-sample
 @dirrm %%NAGIOSWWWDIR%%/ssi
 @dirrm %%NAGIOSWWWDIR%%/stylesheets
 @dirrmtry %%NAGIOSWWWDIR%%
-@dirrmtry %%NAGIOSDIR%%/archives
-@dirrmtry %%NAGIOSDIR%%/checkresults
-@dirrmtry %%NAGIOSDIR%%/rw
-@dirrmtry %%NAGIOSDIR%%
+@unexec rmdir %%NAGIOSDIR%%/archives 2>/dev/null || true
+@unexec rmdir %%NAGIOSDIR%%/checkresults 2>/dev/null || true
+@unexec rmdir %%NAGIOSDIR%%/rw 2>/dev/null || true
+@unexec rmdir %%NAGIOSDIR%% 2>/dev/null || true