Add nagios-1.0b1 after repocopy from net/netsaint.

Submitted by:	Blaz Zupan <blaz.zupan@amis.net>
PR:		35844

32 files changed, 208 insertions, 276 deletions

diff --git a/net-mgmt/nagios/files/patch-aa b/net-mgmt/nagios/files/patch-aa
index 52e4d1752784..651c011992c2 100644
--- a/net-mgmt/nagios/files/patch-aa
+++ b/net-mgmt/nagios/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Mon Apr 30 17:22:35 2001
-+++ Makefile.in	Tue May  1 19:58:50 2001
-@@ -27,7 +27,7 @@
+--- Makefile.in.orig	Tue Feb 26 05:03:26 2002
++++ Makefile.in	Sat May 25 17:03:35 2002
+@@ -28,7 +28,7 @@
  INSTALL_OPTS=@INSTALL_OPTS@
  COMMAND_OPTS=@COMMAND_OPTS@
  INIT_DIR=@init_dir@
@@ -9,26 +9,33 @@
  CGICFGDIR=$(CGIDIR)
  PERLDIR=@PERLDIR@
  
-@@ -99,20 +99,20 @@
+@@ -132,18 +132,29 @@
  
  install-config:
  	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) netsaint.cfg $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) hosts.cfg $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) commands.cfg $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 660 $(INSTALL_OPTS) resource.cfg $(DESTDIR)$(CFGDIR)
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) netsaint.cfg $(DESTDIR)$(CFGDIR)/netsaint.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) hosts.cfg $(DESTDIR)$(CFGDIR)/hosts.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(DESTDIR)$(CFGDIR)/nscgi.cfg.dist
-+	$(INSTALL) -m 660 $(INSTALL_OPTS) resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.dist
+-	$(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
  
  install-init: install-daemoninit
  
  install-daemoninit:
--	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint
-+	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint.sh
+-	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios
++	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios.sh
  
  install-commandmode:
  	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
diff --git a/net-mgmt/nagios/files/patch-ab b/net-mgmt/nagios/files/patch-ab
index 52c154d64fd0..777551a1ddc8 100644
--- a/net-mgmt/nagios/files/patch-ab
+++ b/net-mgmt/nagios/files/patch-ab
@@ -1,10 +1,10 @@
---- base/Makefile.in.orig	Sun Feb 18 22:33:22 2001
-+++ base/Makefile.in	Thu Mar  1 21:58:39 2001
-@@ -86,7 +86,6 @@
- devclean: clean
+--- base/Makefile.in.orig	Sat Apr 20 22:34:02 2002
++++ base/Makefile.in	Sun May 19 08:35:09 2002
+@@ -102,7 +102,6 @@
  
  install:
+ 	strip nagios 
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 774 $(INSTALL_OPTS) nagios $(DESTDIR)$(BINDIR)
  
  
diff --git a/net-mgmt/nagios/files/patch-ad b/net-mgmt/nagios/files/patch-ad
index 6d8038c4bd21..57212a7fed88 100644
--- a/net-mgmt/nagios/files/patch-ad
+++ b/net-mgmt/nagios/files/patch-ad
@@ -4,20 +4,20 @@
  ac_help=
  ac_default_prefix=/usr/local
  # Any additions from configure.in:
--ac_default_prefix=/usr/local/netsaint
-+#ac_default_prefix=/usr/local/netsaint
+-ac_default_prefix=/usr/local/nagios
++#ac_default_prefix=/usr/local/nagios
  ac_help="$ac_help
- --with-netsaint-user=<user> sets user name to run netsaint"
+ --with-nagios-user=<user> sets user name to run nagios"
  ac_help="$ac_help
 @@ -562,9 +562,9 @@
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
    if test "x$prefix" != xNONE; then
 -    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+    CONFIG_SITE="$prefix/share/netsaint/config.site $prefix/etc/netsaint/config.site"
++    CONFIG_SITE="$prefix/share/nagios/config.site $prefix/etc/nagios/config.site"
    else
 -    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+    CONFIG_SITE="$ac_default_prefix/share/netsaint/config.site $ac_default_prefix/etc/netsaint/config.site"
++    CONFIG_SITE="$ac_default_prefix/share/nagios/config.site $ac_default_prefix/etc/nagios/config.site"
    fi
  fi
  for ac_site_file in $CONFIG_SITE; do
diff --git a/net-mgmt/nagios/files/patch-ae b/net-mgmt/nagios/files/patch-ae
index 37f2c6d96f62..0bf8e064b3a7 100644
--- a/net-mgmt/nagios/files/patch-ae
+++ b/net-mgmt/nagios/files/patch-ae
@@ -2,9 +2,9 @@
 +++ configure.in	Tue May  1 19:36:54 2001
 @@ -1,7 +1,7 @@
  dnl Process this -*-m4-*- file with autoconf to produce a configure script.
- AC_INIT(base/netsaint.c)
- AC_CONFIG_HEADER(common/config.h common/snprintf.h base/netsaint.h cgi/cgiutils.h)
--AC_PREFIX_DEFAULT(/usr/local/netsaint)
+ AC_INIT(base/nagios.c)
+ AC_CONFIG_HEADER(common/config.h common/snprintf.h base/nagios.h cgi/cgiutils.h)
+-AC_PREFIX_DEFAULT(/usr/local/nagios)
 +AC_PREFIX_DEFAULT(/usr/local)
  
  dnl Figure out how to invoke "install" and what install options to use.
diff --git a/net-mgmt/nagios/files/patch-ai b/net-mgmt/nagios/files/patch-ai
index 1820da920208..433d6d74758d 100644
--- a/net-mgmt/nagios/files/patch-ai
+++ b/net-mgmt/nagios/files/patch-ai
@@ -1,27 +1,25 @@
---- daemon-init.in.orig	Sat Mar 24 19:58:26 2001
-+++ daemon-init.in	Tue May  1 19:38:52 2001
-@@ -68,12 +68,9 @@
+--- daemon-init.in.orig	Thu Apr 18 06:27:13 2002
++++ daemon-init.in	Sun May 19 08:39:29 2002
+@@ -68,11 +68,8 @@
  
  
  # Source function library
 -# Solaris doesn't have an rc.d directory, so do a test first
--#if [ -f /etc/rc.d/init.d/functions ]; then
--#. /etc/rc.d/init.d/functions
--#elif [ -f /etc/init.d/functions ]; then
--#. /etc/init.d/functions
--#fi
+-if [ -f /etc/rc.d/init.d/functions ]; then
+-	. /etc/rc.d/init.d/functions
+-elif [ -f /etc/init.d/functions ]; then
+-	. /etc/init.d/functions
 +if [ -f @sysconfdir@/functions ]; then
 +. @sysconfdir@/functions
-+fi
+ fi
  
  prefix=@prefix@
- exec_prefix=@exec_prefix@
 @@ -102,7 +99,7 @@
  
  	start)
- 		echo "Starting network monitor: netsaint"
--		su $Netsaint -c "touch $NetsaintVar/netsaint.log $NetsaintSav"
-+		su -m $Netsaint -c "touch $NetsaintVar/netsaint.log $NetsaintSav"
- 		rm -f $NetsaintCmd
- 		$NetsaintBin -d $NetsaintCfg
- 		if [ -d $NetsaintLckDir ]; then touch $NetsaintLckDir/$NetsaintLckFile; fi
+ 		echo "Starting network monitor: nagios"
+-		su -l $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
++		su -m $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
+ 		rm -f $NagiosCmd
+ 		$NagiosBin -d $NagiosCfg
+ 		if [ -d $NagiosLckDir ]; then touch $NagiosLckDir/$NagiosLckFile; fi
diff --git a/net-mgmt/nagios/files/patch-aj b/net-mgmt/nagios/files/patch-aj
index c427778f0d2b..e69de29bb2d1 100644
--- a/net-mgmt/nagios/files/patch-aj
+++ b/net-mgmt/nagios/files/patch-aj
@@ -1,11 +0,0 @@
---- html/main.html.orig	Sat Mar  2 01:41:54 2002
-+++ html/main.html	Wed Mar 13 09:12:58 2002
-@@ -27,7 +27,7 @@
- 
- <P>
- <div align="center">
--<IMG SRC="images/logofullsize.gif" BORDER="0" ALT="NetSaint" width="238" height="227"><br>
-+<IMG SRC="images/bsd_logofullsize.gif" BORDER="0" ALT="NetSaint" width="238" height="227"><br>
- Copyright (c) 1999-2002 Ethan Galstad<br>
- <a href="mailto:netsaint@netsaint.org">netsaint@netsaint.org</a>
- </div>
diff --git a/net-mgmt/nagios/files/patch-ak b/net-mgmt/nagios/files/patch-ak
index b419a9d04564..e69de29bb2d1 100644
--- a/net-mgmt/nagios/files/patch-ak
+++ b/net-mgmt/nagios/files/patch-ak
@@ -1,11 +0,0 @@
---- html/side.html.in.org	Sun Sep 16 11:36:54 2001
-+++ html/side.html.in	Sun Sep 16 11:39:53 2001
-@@ -44,7 +44,7 @@
- <table width="150" border="0">
-   <tr>
-     <td>
--      <div align="center"><a href="http://www.netsaint.org" target="_top"><img src="images/sblogo.gif" width="130" height="125" border="0"></a></div>
-+      <div align="center"><a href="http://www.netsaint.org" target="_top"><img src="images/bsd_sblogo.gif" width="110" height="95" border="0"></a></div>
-     </td>
-   </tr>
- </table>
diff --git a/net-mgmt/nagios/scripts/checkps b/net-mgmt/nagios/scripts/checkps
index 61a4d67baaa7..6014bfca04cb 100644
--- a/net-mgmt/nagios/scripts/checkps
+++ b/net-mgmt/nagios/scripts/checkps
@@ -3,8 +3,8 @@
 if [ $? = 0 ]; then
 	echo "You need to upgrade to RELENG_3, RELENG_4, or HEAD sometime"
 	echo "after July 8, 2000 around 5:15AM UTC, so that ps(1) will"
-	echo "return an error code if a PID does not exist.  Netsaint needs this!"
+	echo "return an error code if a PID does not exist.  Nagios needs this!"
 	exit
 else
-	echo "Great, you have a working ps(1)!  Netsaint can build."
+	echo "Great, you have a working ps(1)!  Nagios can build."
 fi
diff --git a/net-mgmt/nagios12/files/patch-aa b/net-mgmt/nagios12/files/patch-aa
index 52e4d1752784..651c011992c2 100644
--- a/net-mgmt/nagios12/files/patch-aa
+++ b/net-mgmt/nagios12/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Mon Apr 30 17:22:35 2001
-+++ Makefile.in	Tue May  1 19:58:50 2001
-@@ -27,7 +27,7 @@
+--- Makefile.in.orig	Tue Feb 26 05:03:26 2002
++++ Makefile.in	Sat May 25 17:03:35 2002
+@@ -28,7 +28,7 @@
  INSTALL_OPTS=@INSTALL_OPTS@
  COMMAND_OPTS=@COMMAND_OPTS@
  INIT_DIR=@init_dir@
@@ -9,26 +9,33 @@
  CGICFGDIR=$(CGIDIR)
  PERLDIR=@PERLDIR@
  
-@@ -99,20 +99,20 @@
+@@ -132,18 +132,29 @@
  
  install-config:
  	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) netsaint.cfg $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) hosts.cfg $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) commands.cfg $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 660 $(INSTALL_OPTS) resource.cfg $(DESTDIR)$(CFGDIR)
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) netsaint.cfg $(DESTDIR)$(CFGDIR)/netsaint.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) hosts.cfg $(DESTDIR)$(CFGDIR)/hosts.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(DESTDIR)$(CFGDIR)/nscgi.cfg.dist
-+	$(INSTALL) -m 660 $(INSTALL_OPTS) resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.dist
+-	$(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
  
  install-init: install-daemoninit
  
  install-daemoninit:
--	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint
-+	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint.sh
+-	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios
++	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios.sh
  
  install-commandmode:
  	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
diff --git a/net-mgmt/nagios12/files/patch-ab b/net-mgmt/nagios12/files/patch-ab
index 52c154d64fd0..777551a1ddc8 100644
--- a/net-mgmt/nagios12/files/patch-ab
+++ b/net-mgmt/nagios12/files/patch-ab
@@ -1,10 +1,10 @@
---- base/Makefile.in.orig	Sun Feb 18 22:33:22 2001
-+++ base/Makefile.in	Thu Mar  1 21:58:39 2001
-@@ -86,7 +86,6 @@
- devclean: clean
+--- base/Makefile.in.orig	Sat Apr 20 22:34:02 2002
++++ base/Makefile.in	Sun May 19 08:35:09 2002
+@@ -102,7 +102,6 @@
  
  install:
+ 	strip nagios 
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 774 $(INSTALL_OPTS) nagios $(DESTDIR)$(BINDIR)
  
  
diff --git a/net-mgmt/nagios12/files/patch-ad b/net-mgmt/nagios12/files/patch-ad
index 6d8038c4bd21..57212a7fed88 100644
--- a/net-mgmt/nagios12/files/patch-ad
+++ b/net-mgmt/nagios12/files/patch-ad
@@ -4,20 +4,20 @@
  ac_help=
  ac_default_prefix=/usr/local
  # Any additions from configure.in:
--ac_default_prefix=/usr/local/netsaint
-+#ac_default_prefix=/usr/local/netsaint
+-ac_default_prefix=/usr/local/nagios
++#ac_default_prefix=/usr/local/nagios
  ac_help="$ac_help
- --with-netsaint-user=<user> sets user name to run netsaint"
+ --with-nagios-user=<user> sets user name to run nagios"
  ac_help="$ac_help
 @@ -562,9 +562,9 @@
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
    if test "x$prefix" != xNONE; then
 -    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+    CONFIG_SITE="$prefix/share/netsaint/config.site $prefix/etc/netsaint/config.site"
++    CONFIG_SITE="$prefix/share/nagios/config.site $prefix/etc/nagios/config.site"
    else
 -    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+    CONFIG_SITE="$ac_default_prefix/share/netsaint/config.site $ac_default_prefix/etc/netsaint/config.site"
++    CONFIG_SITE="$ac_default_prefix/share/nagios/config.site $ac_default_prefix/etc/nagios/config.site"
    fi
  fi
  for ac_site_file in $CONFIG_SITE; do
diff --git a/net-mgmt/nagios12/files/patch-ae b/net-mgmt/nagios12/files/patch-ae
index 37f2c6d96f62..0bf8e064b3a7 100644
--- a/net-mgmt/nagios12/files/patch-ae
+++ b/net-mgmt/nagios12/files/patch-ae
@@ -2,9 +2,9 @@
 +++ configure.in	Tue May  1 19:36:54 2001
 @@ -1,7 +1,7 @@
  dnl Process this -*-m4-*- file with autoconf to produce a configure script.
- AC_INIT(base/netsaint.c)
- AC_CONFIG_HEADER(common/config.h common/snprintf.h base/netsaint.h cgi/cgiutils.h)
--AC_PREFIX_DEFAULT(/usr/local/netsaint)
+ AC_INIT(base/nagios.c)
+ AC_CONFIG_HEADER(common/config.h common/snprintf.h base/nagios.h cgi/cgiutils.h)
+-AC_PREFIX_DEFAULT(/usr/local/nagios)
 +AC_PREFIX_DEFAULT(/usr/local)
  
  dnl Figure out how to invoke "install" and what install options to use.
diff --git a/net-mgmt/nagios12/files/patch-ai b/net-mgmt/nagios12/files/patch-ai
index 1820da920208..433d6d74758d 100644
--- a/net-mgmt/nagios12/files/patch-ai
+++ b/net-mgmt/nagios12/files/patch-ai
@@ -1,27 +1,25 @@
---- daemon-init.in.orig	Sat Mar 24 19:58:26 2001
-+++ daemon-init.in	Tue May  1 19:38:52 2001
-@@ -68,12 +68,9 @@
+--- daemon-init.in.orig	Thu Apr 18 06:27:13 2002
++++ daemon-init.in	Sun May 19 08:39:29 2002
+@@ -68,11 +68,8 @@
  
  
  # Source function library
 -# Solaris doesn't have an rc.d directory, so do a test first
--#if [ -f /etc/rc.d/init.d/functions ]; then
--#. /etc/rc.d/init.d/functions
--#elif [ -f /etc/init.d/functions ]; then
--#. /etc/init.d/functions
--#fi
+-if [ -f /etc/rc.d/init.d/functions ]; then
+-	. /etc/rc.d/init.d/functions
+-elif [ -f /etc/init.d/functions ]; then
+-	. /etc/init.d/functions
 +if [ -f @sysconfdir@/functions ]; then
 +. @sysconfdir@/functions
-+fi
+ fi
  
  prefix=@prefix@
- exec_prefix=@exec_prefix@
 @@ -102,7 +99,7 @@
  
  	start)
- 		echo "Starting network monitor: netsaint"
--		su $Netsaint -c "touch $NetsaintVar/netsaint.log $NetsaintSav"
-+		su -m $Netsaint -c "touch $NetsaintVar/netsaint.log $NetsaintSav"
- 		rm -f $NetsaintCmd
- 		$NetsaintBin -d $NetsaintCfg
- 		if [ -d $NetsaintLckDir ]; then touch $NetsaintLckDir/$NetsaintLckFile; fi
+ 		echo "Starting network monitor: nagios"
+-		su -l $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
++		su -m $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
+ 		rm -f $NagiosCmd
+ 		$NagiosBin -d $NagiosCfg
+ 		if [ -d $NagiosLckDir ]; then touch $NagiosLckDir/$NagiosLckFile; fi
diff --git a/net-mgmt/nagios12/files/patch-aj b/net-mgmt/nagios12/files/patch-aj
index c427778f0d2b..e69de29bb2d1 100644
--- a/net-mgmt/nagios12/files/patch-aj
+++ b/net-mgmt/nagios12/files/patch-aj
@@ -1,11 +0,0 @@
---- html/main.html.orig	Sat Mar  2 01:41:54 2002
-+++ html/main.html	Wed Mar 13 09:12:58 2002
-@@ -27,7 +27,7 @@
- 
- <P>
- <div align="center">
--<IMG SRC="images/logofullsize.gif" BORDER="0" ALT="NetSaint" width="238" height="227"><br>
-+<IMG SRC="images/bsd_logofullsize.gif" BORDER="0" ALT="NetSaint" width="238" height="227"><br>
- Copyright (c) 1999-2002 Ethan Galstad<br>
- <a href="mailto:netsaint@netsaint.org">netsaint@netsaint.org</a>
- </div>
diff --git a/net-mgmt/nagios12/files/patch-ak b/net-mgmt/nagios12/files/patch-ak
index b419a9d04564..e69de29bb2d1 100644
--- a/net-mgmt/nagios12/files/patch-ak
+++ b/net-mgmt/nagios12/files/patch-ak
@@ -1,11 +0,0 @@
---- html/side.html.in.org	Sun Sep 16 11:36:54 2001
-+++ html/side.html.in	Sun Sep 16 11:39:53 2001
-@@ -44,7 +44,7 @@
- <table width="150" border="0">
-   <tr>
-     <td>
--      <div align="center"><a href="http://www.netsaint.org" target="_top"><img src="images/sblogo.gif" width="130" height="125" border="0"></a></div>
-+      <div align="center"><a href="http://www.netsaint.org" target="_top"><img src="images/bsd_sblogo.gif" width="110" height="95" border="0"></a></div>
-     </td>
-   </tr>
- </table>
diff --git a/net-mgmt/nagios12/scripts/checkps b/net-mgmt/nagios12/scripts/checkps
index 61a4d67baaa7..6014bfca04cb 100644
--- a/net-mgmt/nagios12/scripts/checkps
+++ b/net-mgmt/nagios12/scripts/checkps
@@ -3,8 +3,8 @@
 if [ $? = 0 ]; then
 	echo "You need to upgrade to RELENG_3, RELENG_4, or HEAD sometime"
 	echo "after July 8, 2000 around 5:15AM UTC, so that ps(1) will"
-	echo "return an error code if a PID does not exist.  Netsaint needs this!"
+	echo "return an error code if a PID does not exist.  Nagios needs this!"
 	exit
 else
-	echo "Great, you have a working ps(1)!  Netsaint can build."
+	echo "Great, you have a working ps(1)!  Nagios can build."
 fi
diff --git a/net-mgmt/nagios2/files/patch-aa b/net-mgmt/nagios2/files/patch-aa
index 52e4d1752784..651c011992c2 100644
--- a/net-mgmt/nagios2/files/patch-aa
+++ b/net-mgmt/nagios2/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Mon Apr 30 17:22:35 2001
-+++ Makefile.in	Tue May  1 19:58:50 2001
-@@ -27,7 +27,7 @@
+--- Makefile.in.orig	Tue Feb 26 05:03:26 2002
++++ Makefile.in	Sat May 25 17:03:35 2002
+@@ -28,7 +28,7 @@
  INSTALL_OPTS=@INSTALL_OPTS@
  COMMAND_OPTS=@COMMAND_OPTS@
  INIT_DIR=@init_dir@
@@ -9,26 +9,33 @@
  CGICFGDIR=$(CGIDIR)
  PERLDIR=@PERLDIR@
  
-@@ -99,20 +99,20 @@
+@@ -132,18 +132,29 @@
  
  install-config:
  	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) netsaint.cfg $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) hosts.cfg $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) commands.cfg $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 660 $(INSTALL_OPTS) resource.cfg $(DESTDIR)$(CFGDIR)
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) netsaint.cfg $(DESTDIR)$(CFGDIR)/netsaint.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) hosts.cfg $(DESTDIR)$(CFGDIR)/hosts.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(DESTDIR)$(CFGDIR)/nscgi.cfg.dist
-+	$(INSTALL) -m 660 $(INSTALL_OPTS) resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.dist
+-	$(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
  
  install-init: install-daemoninit
  
  install-daemoninit:
--	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint
-+	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint.sh
+-	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios
++	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios.sh
  
  install-commandmode:
  	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
diff --git a/net-mgmt/nagios2/files/patch-ab b/net-mgmt/nagios2/files/patch-ab
index 52c154d64fd0..777551a1ddc8 100644
--- a/net-mgmt/nagios2/files/patch-ab
+++ b/net-mgmt/nagios2/files/patch-ab
@@ -1,10 +1,10 @@
---- base/Makefile.in.orig	Sun Feb 18 22:33:22 2001
-+++ base/Makefile.in	Thu Mar  1 21:58:39 2001
-@@ -86,7 +86,6 @@
- devclean: clean
+--- base/Makefile.in.orig	Sat Apr 20 22:34:02 2002
++++ base/Makefile.in	Sun May 19 08:35:09 2002
+@@ -102,7 +102,6 @@
  
  install:
+ 	strip nagios 
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 774 $(INSTALL_OPTS) nagios $(DESTDIR)$(BINDIR)
  
  
diff --git a/net-mgmt/nagios2/files/patch-ad b/net-mgmt/nagios2/files/patch-ad
index 6d8038c4bd21..57212a7fed88 100644
--- a/net-mgmt/nagios2/files/patch-ad
+++ b/net-mgmt/nagios2/files/patch-ad
@@ -4,20 +4,20 @@
  ac_help=
  ac_default_prefix=/usr/local
  # Any additions from configure.in:
--ac_default_prefix=/usr/local/netsaint
-+#ac_default_prefix=/usr/local/netsaint
+-ac_default_prefix=/usr/local/nagios
++#ac_default_prefix=/usr/local/nagios
  ac_help="$ac_help
- --with-netsaint-user=<user> sets user name to run netsaint"
+ --with-nagios-user=<user> sets user name to run nagios"
  ac_help="$ac_help
 @@ -562,9 +562,9 @@
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
    if test "x$prefix" != xNONE; then
 -    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+    CONFIG_SITE="$prefix/share/netsaint/config.site $prefix/etc/netsaint/config.site"
++    CONFIG_SITE="$prefix/share/nagios/config.site $prefix/etc/nagios/config.site"
    else
 -    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+    CONFIG_SITE="$ac_default_prefix/share/netsaint/config.site $ac_default_prefix/etc/netsaint/config.site"
++    CONFIG_SITE="$ac_default_prefix/share/nagios/config.site $ac_default_prefix/etc/nagios/config.site"
    fi
  fi
  for ac_site_file in $CONFIG_SITE; do
diff --git a/net-mgmt/nagios2/files/patch-ae b/net-mgmt/nagios2/files/patch-ae
index 37f2c6d96f62..0bf8e064b3a7 100644
--- a/net-mgmt/nagios2/files/patch-ae
+++ b/net-mgmt/nagios2/files/patch-ae
@@ -2,9 +2,9 @@
 +++ configure.in	Tue May  1 19:36:54 2001
 @@ -1,7 +1,7 @@
  dnl Process this -*-m4-*- file with autoconf to produce a configure script.
- AC_INIT(base/netsaint.c)
- AC_CONFIG_HEADER(common/config.h common/snprintf.h base/netsaint.h cgi/cgiutils.h)
--AC_PREFIX_DEFAULT(/usr/local/netsaint)
+ AC_INIT(base/nagios.c)
+ AC_CONFIG_HEADER(common/config.h common/snprintf.h base/nagios.h cgi/cgiutils.h)
+-AC_PREFIX_DEFAULT(/usr/local/nagios)
 +AC_PREFIX_DEFAULT(/usr/local)
  
  dnl Figure out how to invoke "install" and what install options to use.
diff --git a/net-mgmt/nagios2/files/patch-ai b/net-mgmt/nagios2/files/patch-ai
index 1820da920208..433d6d74758d 100644
--- a/net-mgmt/nagios2/files/patch-ai
+++ b/net-mgmt/nagios2/files/patch-ai
@@ -1,27 +1,25 @@
---- daemon-init.in.orig	Sat Mar 24 19:58:26 2001
-+++ daemon-init.in	Tue May  1 19:38:52 2001
-@@ -68,12 +68,9 @@
+--- daemon-init.in.orig	Thu Apr 18 06:27:13 2002
++++ daemon-init.in	Sun May 19 08:39:29 2002
+@@ -68,11 +68,8 @@
  
  
  # Source function library
 -# Solaris doesn't have an rc.d directory, so do a test first
--#if [ -f /etc/rc.d/init.d/functions ]; then
--#. /etc/rc.d/init.d/functions
--#elif [ -f /etc/init.d/functions ]; then
--#. /etc/init.d/functions
--#fi
+-if [ -f /etc/rc.d/init.d/functions ]; then
+-	. /etc/rc.d/init.d/functions
+-elif [ -f /etc/init.d/functions ]; then
+-	. /etc/init.d/functions
 +if [ -f @sysconfdir@/functions ]; then
 +. @sysconfdir@/functions
-+fi
+ fi
  
  prefix=@prefix@
- exec_prefix=@exec_prefix@
 @@ -102,7 +99,7 @@
  
  	start)
- 		echo "Starting network monitor: netsaint"
--		su $Netsaint -c "touch $NetsaintVar/netsaint.log $NetsaintSav"
-+		su -m $Netsaint -c "touch $NetsaintVar/netsaint.log $NetsaintSav"
- 		rm -f $NetsaintCmd
- 		$NetsaintBin -d $NetsaintCfg
- 		if [ -d $NetsaintLckDir ]; then touch $NetsaintLckDir/$NetsaintLckFile; fi
+ 		echo "Starting network monitor: nagios"
+-		su -l $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
++		su -m $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
+ 		rm -f $NagiosCmd
+ 		$NagiosBin -d $NagiosCfg
+ 		if [ -d $NagiosLckDir ]; then touch $NagiosLckDir/$NagiosLckFile; fi
diff --git a/net-mgmt/nagios2/files/patch-aj b/net-mgmt/nagios2/files/patch-aj
index c427778f0d2b..e69de29bb2d1 100644
--- a/net-mgmt/nagios2/files/patch-aj
+++ b/net-mgmt/nagios2/files/patch-aj
@@ -1,11 +0,0 @@
---- html/main.html.orig	Sat Mar  2 01:41:54 2002
-+++ html/main.html	Wed Mar 13 09:12:58 2002
-@@ -27,7 +27,7 @@
- 
- <P>
- <div align="center">
--<IMG SRC="images/logofullsize.gif" BORDER="0" ALT="NetSaint" width="238" height="227"><br>
-+<IMG SRC="images/bsd_logofullsize.gif" BORDER="0" ALT="NetSaint" width="238" height="227"><br>
- Copyright (c) 1999-2002 Ethan Galstad<br>
- <a href="mailto:netsaint@netsaint.org">netsaint@netsaint.org</a>
- </div>
diff --git a/net-mgmt/nagios2/files/patch-ak b/net-mgmt/nagios2/files/patch-ak
index b419a9d04564..e69de29bb2d1 100644
--- a/net-mgmt/nagios2/files/patch-ak
+++ b/net-mgmt/nagios2/files/patch-ak
@@ -1,11 +0,0 @@
---- html/side.html.in.org	Sun Sep 16 11:36:54 2001
-+++ html/side.html.in	Sun Sep 16 11:39:53 2001
-@@ -44,7 +44,7 @@
- <table width="150" border="0">
-   <tr>
-     <td>
--      <div align="center"><a href="http://www.netsaint.org" target="_top"><img src="images/sblogo.gif" width="130" height="125" border="0"></a></div>
-+      <div align="center"><a href="http://www.netsaint.org" target="_top"><img src="images/bsd_sblogo.gif" width="110" height="95" border="0"></a></div>
-     </td>
-   </tr>
- </table>
diff --git a/net-mgmt/nagios2/scripts/checkps b/net-mgmt/nagios2/scripts/checkps
index 61a4d67baaa7..6014bfca04cb 100644
--- a/net-mgmt/nagios2/scripts/checkps
+++ b/net-mgmt/nagios2/scripts/checkps
@@ -3,8 +3,8 @@
 if [ $? = 0 ]; then
 	echo "You need to upgrade to RELENG_3, RELENG_4, or HEAD sometime"
 	echo "after July 8, 2000 around 5:15AM UTC, so that ps(1) will"
-	echo "return an error code if a PID does not exist.  Netsaint needs this!"
+	echo "return an error code if a PID does not exist.  Nagios needs this!"
 	exit
 else
-	echo "Great, you have a working ps(1)!  Netsaint can build."
+	echo "Great, you have a working ps(1)!  Nagios can build."
 fi
diff --git a/net/nagios/files/patch-aa b/net/nagios/files/patch-aa
index 52e4d1752784..651c011992c2 100644
--- a/net/nagios/files/patch-aa
+++ b/net/nagios/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Mon Apr 30 17:22:35 2001
-+++ Makefile.in	Tue May  1 19:58:50 2001
-@@ -27,7 +27,7 @@
+--- Makefile.in.orig	Tue Feb 26 05:03:26 2002
++++ Makefile.in	Sat May 25 17:03:35 2002
+@@ -28,7 +28,7 @@
  INSTALL_OPTS=@INSTALL_OPTS@
  COMMAND_OPTS=@COMMAND_OPTS@
  INIT_DIR=@init_dir@
@@ -9,26 +9,33 @@
  CGICFGDIR=$(CGIDIR)
  PERLDIR=@PERLDIR@
  
-@@ -99,20 +99,20 @@
+@@ -132,18 +132,29 @@
  
  install-config:
  	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) netsaint.cfg $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) hosts.cfg $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) commands.cfg $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(DESTDIR)$(CFGDIR)
--	$(INSTALL) -m 660 $(INSTALL_OPTS) resource.cfg $(DESTDIR)$(CFGDIR)
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) netsaint.cfg $(DESTDIR)$(CFGDIR)/netsaint.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) hosts.cfg $(DESTDIR)$(CFGDIR)/hosts.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg.dist
-+	$(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(DESTDIR)$(CFGDIR)/nscgi.cfg.dist
-+	$(INSTALL) -m 660 $(INSTALL_OPTS) resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.dist
+-	$(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
  
  install-init: install-daemoninit
  
  install-daemoninit:
--	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint
-+	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint.sh
+-	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios
++	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios.sh
  
  install-commandmode:
  	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
diff --git a/net/nagios/files/patch-ab b/net/nagios/files/patch-ab
index 52c154d64fd0..777551a1ddc8 100644
--- a/net/nagios/files/patch-ab
+++ b/net/nagios/files/patch-ab
@@ -1,10 +1,10 @@
---- base/Makefile.in.orig	Sun Feb 18 22:33:22 2001
-+++ base/Makefile.in	Thu Mar  1 21:58:39 2001
-@@ -86,7 +86,6 @@
- devclean: clean
+--- base/Makefile.in.orig	Sat Apr 20 22:34:02 2002
++++ base/Makefile.in	Sun May 19 08:35:09 2002
+@@ -102,7 +102,6 @@
  
  install:
+ 	strip nagios 
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 774 $(INSTALL_OPTS) nagios $(DESTDIR)$(BINDIR)
  
  
diff --git a/net/nagios/files/patch-ad b/net/nagios/files/patch-ad
index 6d8038c4bd21..57212a7fed88 100644
--- a/net/nagios/files/patch-ad
+++ b/net/nagios/files/patch-ad
@@ -4,20 +4,20 @@
  ac_help=
  ac_default_prefix=/usr/local
  # Any additions from configure.in:
--ac_default_prefix=/usr/local/netsaint
-+#ac_default_prefix=/usr/local/netsaint
+-ac_default_prefix=/usr/local/nagios
++#ac_default_prefix=/usr/local/nagios
  ac_help="$ac_help
- --with-netsaint-user=<user> sets user name to run netsaint"
+ --with-nagios-user=<user> sets user name to run nagios"
  ac_help="$ac_help
 @@ -562,9 +562,9 @@
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
    if test "x$prefix" != xNONE; then
 -    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+    CONFIG_SITE="$prefix/share/netsaint/config.site $prefix/etc/netsaint/config.site"
++    CONFIG_SITE="$prefix/share/nagios/config.site $prefix/etc/nagios/config.site"
    else
 -    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+    CONFIG_SITE="$ac_default_prefix/share/netsaint/config.site $ac_default_prefix/etc/netsaint/config.site"
++    CONFIG_SITE="$ac_default_prefix/share/nagios/config.site $ac_default_prefix/etc/nagios/config.site"
    fi
  fi
  for ac_site_file in $CONFIG_SITE; do
diff --git a/net/nagios/files/patch-ae b/net/nagios/files/patch-ae
index 37f2c6d96f62..0bf8e064b3a7 100644
--- a/net/nagios/files/patch-ae
+++ b/net/nagios/files/patch-ae
@@ -2,9 +2,9 @@
 +++ configure.in	Tue May  1 19:36:54 2001
 @@ -1,7 +1,7 @@
  dnl Process this -*-m4-*- file with autoconf to produce a configure script.
- AC_INIT(base/netsaint.c)
- AC_CONFIG_HEADER(common/config.h common/snprintf.h base/netsaint.h cgi/cgiutils.h)
--AC_PREFIX_DEFAULT(/usr/local/netsaint)
+ AC_INIT(base/nagios.c)
+ AC_CONFIG_HEADER(common/config.h common/snprintf.h base/nagios.h cgi/cgiutils.h)
+-AC_PREFIX_DEFAULT(/usr/local/nagios)
 +AC_PREFIX_DEFAULT(/usr/local)
  
  dnl Figure out how to invoke "install" and what install options to use.
diff --git a/net/nagios/files/patch-ai b/net/nagios/files/patch-ai
index 1820da920208..433d6d74758d 100644
--- a/net/nagios/files/patch-ai
+++ b/net/nagios/files/patch-ai
@@ -1,27 +1,25 @@
---- daemon-init.in.orig	Sat Mar 24 19:58:26 2001
-+++ daemon-init.in	Tue May  1 19:38:52 2001
-@@ -68,12 +68,9 @@
+--- daemon-init.in.orig	Thu Apr 18 06:27:13 2002
++++ daemon-init.in	Sun May 19 08:39:29 2002
+@@ -68,11 +68,8 @@
  
  
  # Source function library
 -# Solaris doesn't have an rc.d directory, so do a test first
--#if [ -f /etc/rc.d/init.d/functions ]; then
--#. /etc/rc.d/init.d/functions
--#elif [ -f /etc/init.d/functions ]; then
--#. /etc/init.d/functions
--#fi
+-if [ -f /etc/rc.d/init.d/functions ]; then
+-	. /etc/rc.d/init.d/functions
+-elif [ -f /etc/init.d/functions ]; then
+-	. /etc/init.d/functions
 +if [ -f @sysconfdir@/functions ]; then
 +. @sysconfdir@/functions
-+fi
+ fi
  
  prefix=@prefix@
- exec_prefix=@exec_prefix@
 @@ -102,7 +99,7 @@
  
  	start)
- 		echo "Starting network monitor: netsaint"
--		su $Netsaint -c "touch $NetsaintVar/netsaint.log $NetsaintSav"
-+		su -m $Netsaint -c "touch $NetsaintVar/netsaint.log $NetsaintSav"
- 		rm -f $NetsaintCmd
- 		$NetsaintBin -d $NetsaintCfg
- 		if [ -d $NetsaintLckDir ]; then touch $NetsaintLckDir/$NetsaintLckFile; fi
+ 		echo "Starting network monitor: nagios"
+-		su -l $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
++		su -m $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
+ 		rm -f $NagiosCmd
+ 		$NagiosBin -d $NagiosCfg
+ 		if [ -d $NagiosLckDir ]; then touch $NagiosLckDir/$NagiosLckFile; fi
diff --git a/net/nagios/files/patch-aj b/net/nagios/files/patch-aj
index c427778f0d2b..e69de29bb2d1 100644
--- a/net/nagios/files/patch-aj
+++ b/net/nagios/files/patch-aj
@@ -1,11 +0,0 @@
---- html/main.html.orig	Sat Mar  2 01:41:54 2002
-+++ html/main.html	Wed Mar 13 09:12:58 2002
-@@ -27,7 +27,7 @@
- 
- <P>
- <div align="center">
--<IMG SRC="images/logofullsize.gif" BORDER="0" ALT="NetSaint" width="238" height="227"><br>
-+<IMG SRC="images/bsd_logofullsize.gif" BORDER="0" ALT="NetSaint" width="238" height="227"><br>
- Copyright (c) 1999-2002 Ethan Galstad<br>
- <a href="mailto:netsaint@netsaint.org">netsaint@netsaint.org</a>
- </div>
diff --git a/net/nagios/files/patch-ak b/net/nagios/files/patch-ak
index b419a9d04564..e69de29bb2d1 100644
--- a/net/nagios/files/patch-ak
+++ b/net/nagios/files/patch-ak
@@ -1,11 +0,0 @@
---- html/side.html.in.org	Sun Sep 16 11:36:54 2001
-+++ html/side.html.in	Sun Sep 16 11:39:53 2001
-@@ -44,7 +44,7 @@
- <table width="150" border="0">
-   <tr>
-     <td>
--      <div align="center"><a href="http://www.netsaint.org" target="_top"><img src="images/sblogo.gif" width="130" height="125" border="0"></a></div>
-+      <div align="center"><a href="http://www.netsaint.org" target="_top"><img src="images/bsd_sblogo.gif" width="110" height="95" border="0"></a></div>
-     </td>
-   </tr>
- </table>
diff --git a/net/nagios/scripts/checkps b/net/nagios/scripts/checkps
index 61a4d67baaa7..6014bfca04cb 100644
--- a/net/nagios/scripts/checkps
+++ b/net/nagios/scripts/checkps
@@ -3,8 +3,8 @@
 if [ $? = 0 ]; then
 	echo "You need to upgrade to RELENG_3, RELENG_4, or HEAD sometime"
 	echo "after July 8, 2000 around 5:15AM UTC, so that ps(1) will"
-	echo "return an error code if a PID does not exist.  Netsaint needs this!"
+	echo "return an error code if a PID does not exist.  Nagios needs this!"
 	exit
 else
-	echo "Great, you have a working ps(1)!  Netsaint can build."
+	echo "Great, you have a working ps(1)!  Nagios can build."
 fi