aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-mgmt/nagios/Makefile2
-rw-r--r--net-mgmt/nagios/distinfo6
-rw-r--r--net-mgmt/nagios/files/patch-Makefile.in20
-rw-r--r--net-mgmt/nagios/pkg-plist6
-rw-r--r--net-mgmt/nagios2/Makefile2
-rw-r--r--net-mgmt/nagios2/distinfo6
-rw-r--r--net-mgmt/nagios2/files/patch-Makefile.in20
-rw-r--r--net-mgmt/nagios2/pkg-plist6
8 files changed, 28 insertions, 40 deletions
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index 2b8524b2e986..be2472e5a97e 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= nagios
-PORTVERSION= 2.5
+PORTVERSION= 2.6
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 879a8ddc6cdd..c8f34bfe38b0 100644
--- a/net-mgmt/nagios/distinfo
+++ b/net-mgmt/nagios/distinfo
@@ -1,3 +1,3 @@
-MD5 (nagios-2.5.tar.gz) = 1a77528f6797bd3c0320da5e4fae2b1a
-SHA256 (nagios-2.5.tar.gz) = de9eb06609299cc231d0c2104a7f65367446cb86cb6aa3f6787fb25003fd452e
-SIZE (nagios-2.5.tar.gz) = 1736167
+MD5 (nagios-2.6.tar.gz) = a032edba07bf389b803ce817e9406c02
+SHA256 (nagios-2.6.tar.gz) = e53cd8cc5cb00a00b66aa7e33fb34b70b783f095161cde9376cea489c5445e42
+SIZE (nagios-2.6.tar.gz) = 1734400
diff --git a/net-mgmt/nagios/files/patch-Makefile.in b/net-mgmt/nagios/files/patch-Makefile.in
index b8b172b25938..f98d44cb9bd7 100644
--- a/net-mgmt/nagios/files/patch-Makefile.in
+++ b/net-mgmt/nagios/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig Sat Nov 26 17:35:35 2005
-+++ Makefile.in Wed Dec 28 23:06:40 2005
-@@ -177,7 +177,7 @@
+--- Makefile.in.orig Tue Nov 28 12:59:04 2006
++++ Makefile.in Sat Dec 9 08:04:47 2006
+@@ -186,7 +186,7 @@
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
if [ $(INSTALLPERLSTUFF) = yes ]; then \
@@ -9,7 +9,7 @@
fi;
@echo ""
-@@ -204,14 +204,14 @@
+@@ -213,12 +213,12 @@
install-config:
@@ -17,18 +17,14 @@
- $(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/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample
-- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample
-- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
-- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.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) -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
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
++ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg-sample
++ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg-sample
@echo ""
@echo "*** Sample config file installed ***"
diff --git a/net-mgmt/nagios/pkg-plist b/net-mgmt/nagios/pkg-plist
index f2b4d4334ddf..f889005af8ad 100644
--- a/net-mgmt/nagios/pkg-plist
+++ b/net-mgmt/nagios/pkg-plist
@@ -7,11 +7,9 @@
bin/nagios
bin/nagiostats
%%EMBEDDED_PERL%%bin/p1.pl
-etc/nagios/bigger.cfg-sample
etc/nagios/cgi.cfg-sample
-etc/nagios/checkcommands.cfg-sample
-etc/nagios/minimal.cfg-sample
-etc/nagios/misccommands.cfg-sample
+etc/nagios/commands.cfg-sample
+etc/nagios/localhost.cfg-sample
etc/nagios/nagios.cfg-sample
etc/nagios/resource.cfg-sample
%%NAGIOSWWWDIR%%/cgi-bin/avail.cgi
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index 2b8524b2e986..be2472e5a97e 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= nagios
-PORTVERSION= 2.5
+PORTVERSION= 2.6
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= nagios
diff --git a/net-mgmt/nagios2/distinfo b/net-mgmt/nagios2/distinfo
index 879a8ddc6cdd..c8f34bfe38b0 100644
--- a/net-mgmt/nagios2/distinfo
+++ b/net-mgmt/nagios2/distinfo
@@ -1,3 +1,3 @@
-MD5 (nagios-2.5.tar.gz) = 1a77528f6797bd3c0320da5e4fae2b1a
-SHA256 (nagios-2.5.tar.gz) = de9eb06609299cc231d0c2104a7f65367446cb86cb6aa3f6787fb25003fd452e
-SIZE (nagios-2.5.tar.gz) = 1736167
+MD5 (nagios-2.6.tar.gz) = a032edba07bf389b803ce817e9406c02
+SHA256 (nagios-2.6.tar.gz) = e53cd8cc5cb00a00b66aa7e33fb34b70b783f095161cde9376cea489c5445e42
+SIZE (nagios-2.6.tar.gz) = 1734400
diff --git a/net-mgmt/nagios2/files/patch-Makefile.in b/net-mgmt/nagios2/files/patch-Makefile.in
index b8b172b25938..f98d44cb9bd7 100644
--- a/net-mgmt/nagios2/files/patch-Makefile.in
+++ b/net-mgmt/nagios2/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig Sat Nov 26 17:35:35 2005
-+++ Makefile.in Wed Dec 28 23:06:40 2005
-@@ -177,7 +177,7 @@
+--- Makefile.in.orig Tue Nov 28 12:59:04 2006
++++ Makefile.in Sat Dec 9 08:04:47 2006
+@@ -186,7 +186,7 @@
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
if [ $(INSTALLPERLSTUFF) = yes ]; then \
@@ -9,7 +9,7 @@
fi;
@echo ""
-@@ -204,14 +204,14 @@
+@@ -213,12 +213,12 @@
install-config:
@@ -17,18 +17,14 @@
- $(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/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample
-- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample
-- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
-- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.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) -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
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
++ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg-sample
++ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg-sample
@echo ""
@echo "*** Sample config file installed ***"
diff --git a/net-mgmt/nagios2/pkg-plist b/net-mgmt/nagios2/pkg-plist
index f2b4d4334ddf..f889005af8ad 100644
--- a/net-mgmt/nagios2/pkg-plist
+++ b/net-mgmt/nagios2/pkg-plist
@@ -7,11 +7,9 @@
bin/nagios
bin/nagiostats
%%EMBEDDED_PERL%%bin/p1.pl
-etc/nagios/bigger.cfg-sample
etc/nagios/cgi.cfg-sample
-etc/nagios/checkcommands.cfg-sample
-etc/nagios/minimal.cfg-sample
-etc/nagios/misccommands.cfg-sample
+etc/nagios/commands.cfg-sample
+etc/nagios/localhost.cfg-sample
etc/nagios/nagios.cfg-sample
etc/nagios/resource.cfg-sample
%%NAGIOSWWWDIR%%/cgi-bin/avail.cgi
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 14:27:57 +0000