diff -ruN ports/net-mgmt/nagios.orig/Makefile ports/net-mgmt/nagios/Makefile --- ports/net-mgmt/nagios.orig/Makefile 2011-09-24 07:54:48.000000000 +0930 +++ ports/net-mgmt/nagios/Makefile 2012-05-21 21:29:22.000000000 +0930 @@ -6,7 +6,7 @@ # PORTNAME= nagios -PORTVERSION= 3.3.1 +PORTVERSION= 3.4.1 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION} diff -ruN ports/net-mgmt/nagios.orig/distinfo ports/net-mgmt/nagios/distinfo --- ports/net-mgmt/nagios.orig/distinfo 2011-08-23 11:20:48.000000000 +0930 +++ ports/net-mgmt/nagios/distinfo 2012-05-21 21:29:37.000000000 +0930 @@ -1,2 +1,2 @@ -SHA256 (nagios-3.3.1.tar.gz) = c4e39cd31a8a9ee814df848fd933b8611465f749b48432672aef4ae5849d9652 -SIZE (nagios-3.3.1.tar.gz) = 1714630 +SHA256 (nagios-3.4.1.tar.gz) = a5c693f9af22410cc17d6da9c0df9bd65c47d787de3f937b5ccbda934131f8c8 +SIZE (nagios-3.4.1.tar.gz) = 1782817 diff -ruN ports/net-mgmt/nagios.orig/files/patch-html-Makefile.in ports/net-mgmt/nagios/files/patch-html-Makefile.in --- ports/net-mgmt/nagios.orig/files/patch-html-Makefile.in 2011-08-23 11:20:48.000000000 +0930 +++ ports/net-mgmt/nagios/files/patch-html-Makefile.in 2012-05-21 21:34:31.000000000 +0930 @@ -1,6 +1,6 @@ ---- html/Makefile.in.orig 2011-07-25 03:23:52.000000000 +0930 -+++ html/Makefile.in 2011-08-20 19:32:21.000000000 +0930 -@@ -33,52 +33,52 @@ +--- html/Makefile.in.orig 2012-02-14 07:10:42.000000000 +1030 ++++ html/Makefile.in 2012-05-21 21:34:09.000000000 +0930 +@@ -34,55 +34,55 @@ devclean: distclean install: @@ -10,6 +10,7 @@ - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes @@ -24,6 +25,7 @@ + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes @@ -48,6 +50,9 @@ for file in contexthelp/*.html; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done + do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done + for file in js/*.js; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done ++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done # for file in docs/*.html; \ -# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done +# do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done @@ -71,12 +76,11 @@ + do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done for file in includes/*.*; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done -- for file in includes/rss/*; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done + do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done -+ for file in includes/rss/*.*; \ + for file in includes/rss/*.*; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done + do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done - for file in includes/rss/extlib/*; \ + for file in includes/rss/extlib/*.*; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done + do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done diff -ruN ports/net-mgmt/nagios.orig/files/patch-html-main.php ports/net-mgmt/nagios/files/patch-html-main.php --- ports/net-mgmt/nagios.orig/files/patch-html-main.php 2011-08-23 11:20:48.000000000 +0930 +++ ports/net-mgmt/nagios/files/patch-html-main.php 2012-05-21 21:37:56.000000000 +0930 @@ -1,39 +1,38 @@ ---- html/main.php.orig 2011-07-26 12:46:26.000000000 +0930 -+++ html/main.php 2011-08-20 19:57:13.000000000 +0930 -@@ -36,36 +36,10 @@ -
Nagios® Core
-
Version 3.3.1
-
July 25, 2011
--
Check for updates
- - - - --
-- --
--
Warning: Automatic Update Checks are Disabled!
--
Disabling update checks presents a possible security risk. Visit nagios.org to check for updates manually or enable update checks in your Nagios config file.
--
-- --
--
A new version of Nagios Core is available!
--
Visit nagios.org to download Nagios .
--
-- --
-- -
-
-

Get Started

+--- html/main.php.orig 2012-05-12 09:30:53.000000000 +0930 ++++ html/main.php 2012-05-21 21:37:23.000000000 +0930 +@@ -40,35 +40,10 @@ +
Nagios® Core
+
Version 3.4.1
+
May 11, 2012
+- + +
+ + +-
+- +-
+-
Warning: Automatic Update Checks are Disabled!
+-
Disabling update checks presents a possible security risk. Visit nagios.org to check for updates manually or enable update checks in your Nagios config file.
+-
+- +-
+-
A new version of Nagios Core is available!
+-
Visit nagios.org to download Nagios .
+-
+- +-
+ + + diff -ruN ports/net-mgmt/nagios.orig/pkg-plist ports/net-mgmt/nagios/pkg-plist --- ports/net-mgmt/nagios.orig/pkg-plist 2011-08-23 11:20:48.000000000 +0930 +++ ports/net-mgmt/nagios/pkg-plist 2012-05-21 21:46:21.000000000 +0930 @@ -97,12 +97,17 @@ %%NAGIOSWWWDIR%%/contexthelp/N5.html %%NAGIOSWWWDIR%%/contexthelp/N6.html %%NAGIOSWWWDIR%%/contexthelp/N7.html +%%NAGIOSWWWDIR%%/images/Nagios-clearbg.png %%NAGIOSWWWDIR%%/images/NagiosEnterprises-whitebg-112x46.png %%NAGIOSWWWDIR%%/images/ack.gif %%NAGIOSWWWDIR%%/images/action-graph.gif %%NAGIOSWWWDIR%%/images/action-nagios.gif %%NAGIOSWWWDIR%%/images/action-orig.gif %%NAGIOSWWWDIR%%/images/action.gif +%%NAGIOSWWWDIR%%/images/b_first2.png +%%NAGIOSWWWDIR%%/images/b_last2.png +%%NAGIOSWWWDIR%%/images/b_next2.png +%%NAGIOSWWWDIR%%/images/b_prev2.png %%NAGIOSWWWDIR%%/images/command.png %%NAGIOSWWWDIR%%/images/comment.gif %%NAGIOSWWWDIR%%/images/contexthelp1.gif @@ -349,10 +354,14 @@ %%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%%/main.php %%NAGIOSWWWDIR%%/robots.txt +%%NAGIOSWWWDIR%%/rss-corefeed.php +%%NAGIOSWWWDIR%%/rss-newsfeed.php %%NAGIOSWWWDIR%%/side.php %%NAGIOSWWWDIR%%/stylesheets/avail.css %%NAGIOSWWWDIR%%/stylesheets/checksanity.css @@ -382,6 +391,7 @@ @dirrm %%NAGIOSWWWDIR%%/includes/rss/extlib @dirrm %%NAGIOSWWWDIR%%/includes/rss @dirrm %%NAGIOSWWWDIR%%/includes +@dirrm %%NAGIOSWWWDIR%%/js @dirrm %%NAGIOSWWWDIR%%/media @dirrm %%NAGIOSWWWDIR%%/ssi @dirrm %%NAGIOSWWWDIR%%/stylesheets