3 files changed, 29 insertions, 33 deletions

diff --git a/net-mgmt/nagios2/files/patch-aa b/net-mgmt/nagios2/files/patch-aa
index 0b7c36206eff..e106d0e255b3 100644
--- a/net-mgmt/nagios2/files/patch-aa
+++ b/net-mgmt/nagios2/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Thu Mar  1 04:49:19 2001
-+++ Makefile.in	Thu Mar  1 21:59:03 2001
+--- Makefile.in.orig	Thu Mar  1 05:49:19 2001
++++ Makefile.in	Tue Apr  3 10:02:31 2001
 @@ -27,7 +27,7 @@
  INSTALL_OPTS=@INSTALL_OPTS@
  COMMAND_OPTS=@COMMAND_OPTS@
@@ -9,7 +9,21 @@
  CGICFGDIR=$(CGIDIR)
  PERLDIR=@PERLDIR@
  
-@@ -108,7 +108,7 @@
+@@ -99,16 +99,16 @@
+ 
+ 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-init: install-daemoninit
  
  install-daemoninit:
diff --git a/net-mgmt/nagios2/files/patch-ad b/net-mgmt/nagios2/files/patch-ad
index 5342c3e21f0f..6d8038c4bd21 100644
--- a/net-mgmt/nagios2/files/patch-ad
+++ b/net-mgmt/nagios2/files/patch-ad
@@ -9,24 +9,6 @@
  ac_help="$ac_help
  --with-netsaint-user=<user> sets user name to run netsaint"
  ac_help="$ac_help
-@@ -117,12 +117,12 @@
- x_includes=NONE
- x_libraries=NONE
- bindir='${exec_prefix}/bin'
--sbindir='${exec_prefix}/sbin'
--libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
--sysconfdir='${prefix}/etc'
-+sbindir='${exec_prefix}/share/netsaint/sbin'
-+libexecdir='${exec_prefix}/libexec/netsaint'
-+datadir='${prefix}/share/netsaint'
-+sysconfdir='${prefix}/etc/netsaint'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstatedir='${prefix}/var/netsaint'
- libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
 @@ -562,9 +562,9 @@
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
diff --git a/net-mgmt/nagios2/files/patch-ai b/net-mgmt/nagios2/files/patch-ai
index 6ad4c57daddd..ef3b63b31395 100644
--- a/net-mgmt/nagios2/files/patch-ai
+++ b/net-mgmt/nagios2/files/patch-ai
@@ -1,5 +1,5 @@
---- daemon-init.in.orig	Sun Feb 18 22:33:21 2001
-+++ daemon-init.in	Thu Mar  1 22:00:37 2001
+--- daemon-init.in.orig	Sun Feb 18 23:33:21 2001
++++ daemon-init.in	Tue Apr  3 20:58:18 2001
 @@ -68,12 +68,9 @@
  
  
@@ -10,18 +10,18 @@
 -#elif [ -f /etc/init.d/functions ]; then
 -#. /etc/init.d/functions
 -#fi
-+if [ -f /usr/local/etc/netsaint/functions ]; then
-+. /usr/local/etc/netsaint/functions
++if [ -f @sysconfdir@/functions ]; then
++. @sysconfdir@/functions
 +fi
  
  prefix=@prefix@
  exec_prefix=@exec_prefix@
-@@ -92,7 +89,7 @@
+@@ -101,7 +98,7 @@
  
- # Check that netsaint exists.
- test -f $NetsaintBin || exit 0
--
-+        
- # Check that netsaint.cfg exists.
- test -f $NetsaintCfg || exit 0
-           
+ 	start)
+ 		echo "Starting network monitor: netsaint"
+-		su $Netsaint -c "touch $NetsaintVar/netsaint.log $NetsaintSav"
++		su -m $Netsaint -c "touch $NetsaintVar/netsaint.log $NetsaintSav"
+ 		$NetsaintBin -d $NetsaintCfg
+ 		if [ -d $NetsaintLckDir ]; then touch $NetsaintLckDir/$NetsaintLckFile; fi
+ 		sleep 1