4 files changed, 22 insertions, 17 deletions

diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index ebe0e799bdef..7a6e652099e0 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	nagios
-PORTVERSION=	1.0.b6
-PORTREVISION=	0
+PORTVERSION=	1.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
-DISTNAME=	nagios-1.0b6
+DISTNAME=	nagios-1.0
 
 MAINTAINER=	blaz@si.FreeBSD.org
 
diff --git a/net-mgmt/nagios2/distinfo b/net-mgmt/nagios2/distinfo
index f269e03d3548..a6612a6ad8f0 100644
--- a/net-mgmt/nagios2/distinfo
+++ b/net-mgmt/nagios2/distinfo
@@ -1 +1 @@
-MD5 (nagios-1.0b6.tar.gz) = 023cb51a54bd1659b2a6a0ac08c0c237
+MD5 (nagios-1.0.tar.gz) = 9f95388c59b34c06745870fd2012388e
diff --git a/net-mgmt/nagios2/files/patch-aa b/net-mgmt/nagios2/files/patch-aa
index 96002804b574..595da2b80d2c 100644
--- a/net-mgmt/nagios2/files/patch-aa
+++ b/net-mgmt/nagios2/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sat Jun 29 21:15:49 2002
-+++ Makefile.in	Sun Jul 14 09:37:12 2002
+--- Makefile.in.orig	Sat Oct 26 02:47:15 2002
++++ Makefile.in	Tue Nov 26 13:58:29 2002
 @@ -28,7 +28,7 @@
  INSTALL_OPTS=@INSTALL_OPTS@
  COMMAND_OPTS=@COMMAND_OPTS@
@@ -9,23 +9,29 @@
  CGICFGDIR=$(CGIDIR)
  PERLDIR=@PERLDIR@
  
-@@ -145,16 +145,17 @@
+@@ -196,6 +196,8 @@
  	$(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 644 $(INSTALL_OPTS) sample-config/template-extinfo/hostextinfo.cfg $(DESTDIR)$(CFGDIR)/hostextinfo.cfg-sample
-+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-extinfo/serviceextinfo.cfg $(DESTDIR)$(CFGDIR)/serviceextinfo.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
+ 	@echo ""
+ 	@echo "*** Sample config file installed ***"
+@@ -215,7 +217,7 @@
  
  install-daemoninit:
  	$(INSTALL) -m 755 -d $(INIT_OPTS) $(DESTDIR)$(INIT_DIR)
 -	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios
 +	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios.sh
  
+ 	@echo ""
+ 	@echo "*** Init script installed ***"
+@@ -238,7 +240,6 @@
+ 
  install-commandmode:
  	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
 -	chmod g+s $(DESTDIR)$(LOGDIR)/rw
  
- fullinstall: install install-init install-commandmode
- 
+ 	@echo ""
+ 	@echo "*** External command directory configured ***"
diff --git a/net-mgmt/nagios2/files/patch-ab b/net-mgmt/nagios2/files/patch-ab
index 1482e2e6cd46..6634c8f6b40a 100644
--- a/net-mgmt/nagios2/files/patch-ab
+++ b/net-mgmt/nagios2/files/patch-ab
@@ -1,10 +1,10 @@
---- base/Makefile.in.orig	Sat Jun 29 21:15:49 2002
-+++ base/Makefile.in	Sun Jul 14 09:15:27 2002
-@@ -102,7 +102,6 @@
+--- base/Makefile.in.orig	Mon Nov 11 04:52:13 2002
++++ base/Makefile.in	Tue Nov 26 13:46:41 2002
+@@ -105,7 +105,6 @@
  devclean: clean
  
  install:
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -m 774 $(INSTALL_OPTS) nagios $(DESTDIR)$(BINDIR)
- 	$(STRIP) $(DESTDIR)$(BINDIR)/nagios
+ 	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
+ 	$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@