4 files changed, 27 insertions, 40 deletions

diff --git a/net-mgmt/nagios12/Makefile b/net-mgmt/nagios12/Makefile
index 806fda7d1705..a8fff2f2919a 100644
--- a/net-mgmt/nagios12/Makefile
+++ b/net-mgmt/nagios12/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	nagios
-PORTVERSION=	1.0.b1
+PORTVERSION=	1.0.b2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
-DISTNAME=	nagios-1.0b1
+DISTNAME=	nagios-1.0b2
 
 MAINTAINER=	blaz@si.FreeBSD.org
 
diff --git a/net-mgmt/nagios12/distinfo b/net-mgmt/nagios12/distinfo
index 577f40f54ce3..61055ebea4df 100644
--- a/net-mgmt/nagios12/distinfo
+++ b/net-mgmt/nagios12/distinfo
@@ -1 +1 @@
-MD5 (nagios-1.0b1.tar.gz) = 12b1c3a39579a354b82000602d9213a3
+MD5 (nagios-1.0b2.tar.gz) = beb6349b4ce46cd19e27a12ab1c79f70
diff --git a/net-mgmt/nagios12/files/patch-aa b/net-mgmt/nagios12/files/patch-aa
index 651c011992c2..7b6966cefe68 100644
--- a/net-mgmt/nagios12/files/patch-aa
+++ b/net-mgmt/nagios12/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Feb 26 05:03:26 2002
-+++ Makefile.in	Sat May 25 17:03:35 2002
+--- Makefile.in.orig	Tue May 28 09:20:45 2002
++++ Makefile.in	Sat Jun  1 17:04:39 2002
 @@ -28,7 +28,7 @@
  INSTALL_OPTS=@INSTALL_OPTS@
  COMMAND_OPTS=@COMMAND_OPTS@
@@ -9,27 +9,12 @@
  CGICFGDIR=$(CGIDIR)
  PERLDIR=@PERLDIR@
  
-@@ -132,18 +132,29 @@
- 
- 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/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg.dist
-+	$(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/contactgroups.cfg $(DESTDIR)$(CFGDIR)/contactgroups.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/contacts.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/dependencies.cfg $(DESTDIR)$(CFGDIR)/dependencies.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/escalations.cfg $(DESTDIR)$(CFGDIR)/escalations.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/hostgroups.cfg $(DESTDIR)$(CFGDIR)/hostgroups.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/hosts.cfg $(DESTDIR)$(CFGDIR)/hosts.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/services.cfg $(DESTDIR)$(CFGDIR)/services.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-extinfo/hostextinfo.cfg $(DESTDIR)$(CFGDIR)/hostextinfo.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-extinfo/serviceextinfo.cfg $(DESTDIR)$(CFGDIR)/serviceextinfo.cfg.dist
+@@ -145,15 +145,17 @@
+ 	$(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/services.cfg $(DESTDIR)$(CFGDIR)/services.cfg-sample
+ 	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/timeperiods.cfg-sample
++	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-extinfo/hostextinfo.cfg $(DESTDIR)$(CFGDIR)/hostextinfo.cfg-sample
++	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-extinfo/serviceextinfo.cfg $(DESTDIR)$(CFGDIR)/serviceextinfo.cfg-sample
  
  install-init: install-daemoninit
  
diff --git a/net-mgmt/nagios12/pkg-plist b/net-mgmt/nagios12/pkg-plist
index b31a3a4cd535..ab8d75d26d23 100644
--- a/net-mgmt/nagios12/pkg-plist
+++ b/net-mgmt/nagios12/pkg-plist
@@ -5,20 +5,21 @@
 @exec chown nagios:nagios %D/var/nagios %D/var/nagios/archives
 @exec chown nagios:nogroup %D/var/nagios/rw
 bin/nagios
-etc/nagios/cgi.cfg.dist
-etc/nagios/checkcommands.cfg.dist
-etc/nagios/contactgroups.cfg.dist
-etc/nagios/contacts.cfg.dist
-etc/nagios/dependencies.cfg.dist
-etc/nagios/escalations.cfg.dist
-etc/nagios/hostextinfo.cfg.dist
-etc/nagios/hostgroups.cfg.dist
-etc/nagios/hosts.cfg.dist
-etc/nagios/misccommands.cfg.dist
-etc/nagios/nagios.cfg.dist
-etc/nagios/resource.cfg.dist
-etc/nagios/serviceextinfo.cfg.dist
-etc/nagios/services.cfg.dist
+etc/nagios/cgi.cfg-sample
+etc/nagios/checkcommands.cfg-sample
+etc/nagios/contactgroups.cfg-sample
+etc/nagios/contacts.cfg-sample
+etc/nagios/dependencies.cfg-sample
+etc/nagios/escalations.cfg-sample
+etc/nagios/hostextinfo.cfg-sample
+etc/nagios/hostgroups.cfg-sample
+etc/nagios/hosts.cfg-sample
+etc/nagios/misccommands.cfg-sample
+etc/nagios/nagios.cfg-sample
+etc/nagios/resource.cfg-sample
+etc/nagios/serviceextinfo.cfg-sample
+etc/nagios/services.cfg-sample
+etc/nagios/timeperiods.cfg-sample
 etc/rc.d/nagios.sh
 share/nagios/contexthelp/A1.html
 share/nagios/contexthelp/A2.html
@@ -177,6 +178,7 @@ share/nagios/docs/starting.html
 share/nagios/docs/statetypes.html
 share/nagios/docs/stoprestart.html
 share/nagios/docs/templaterecursion.html
+share/nagios/docs/templatetricks.html
 share/nagios/docs/timeperiods.html
 share/nagios/docs/toc.html
 share/nagios/docs/tuning.html