Update netsaint-base to 0.0.7. Package provided in PR pkg/15992 by

Murray Armfield <murray@river-styx.org>, thanks!

Changes include:
	- several new CGIs
	- WAP interface
	- forced service checks
	- acks w/o notifications
	- custom intervals for notification escalations
	- passive check submissions via web interface
	- auto-save of retention data
	- extended service information
	- scheduled downtime
	- service dependencies
	- flap detection
	- aggregated status updates
	- new macros
	- user-supplied coordinates in status map
	- minor bug fixes and tuning

14 files changed, 341 insertions, 315 deletions

diff --git a/net/netsaint-base/Makefile b/net/netsaint-base/Makefile
index d9be99d1d82..a2ea3830121 100644
--- a/net/netsaint-base/Makefile
+++ b/net/netsaint-base/Makefile
@@ -1,30 +1,34 @@
-# $NetBSD: Makefile,v 1.10 2002/03/22 11:00:34 rh Exp $
+# $NetBSD: Makefile,v 1.11 2002/03/25 12:54:17 rh Exp $
 #
 
-DISTNAME=	netsaint-0.0.6
-PKGNAME=	${DISTNAME:S/-/-base-/}
-PKGREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	http://netsaint.sourceforge.net/download/
+DISTNAME=		netsaint-0.0.7
+PKGNAME=		${DISTNAME:S/-/-base-/}
+CATEGORIES=		net
+MASTER_SITES=		http://www.netsaint.org/download/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.netsaint.org/
-COMMENT=	network monitor
+MAINTAINER=		murray@river-styx.org
+HOMEPAGE=		http://www.netsaint.org/
+COMMENT=		network monitor
 
-DEPENDS+=	gd>=1.8.4nb1:../../graphics/gd
+DEPENDS+=		gd>=1.8.4nb1:../../graphics/gd
 
-USE_PERL5=	YES
+.include "../../net/netsaint-base/Makefile.common"
 
-.include "Makefile.common"
-
-INSTALL_TARGET=	install install-config
+INSTALL_TARGET=		install install-config
 
 post-configure:
-	${SED} <${FILESDIR}/netsaint-setup.sh >${WRKDIR}/netsaint-setup.sh \
-		-e 's:@@USER@@:${NETSAINT_USER}:g'			\
+	${SED} <${FILESDIR}/netsaint-setup.sh >${WRKDIR}/netsaint-setup.sh	\
+		-e 's:@@USER@@:${NETSAINT_USER}:g'	\
 		-e 's:@@GROUP@@:${NETSAINT_GROUP}:g'
 
 post-install:
-	cd ${WRKDIR} && ${INSTALL_SCRIPT} netsaint-setup.sh ${PREFIX}/sbin
+	cd ${WRKDIR} && ${INSTALL_SCRIPT} netsaint-setup.sh ${PREFIX}/sbin;	\
+	cd ${PREFIX}/etc/netsaint;	\
+	${MV} commands.cfg commands.cfg.sample;	\
+	${MV} hosts.cfg hosts.cfg.sample;	\
+	${MV} netsaint.cfg netsaint.cfg.sample;	\
+	${MV} nscgi.cfg nscgi.cfg.sample;	\
+	${MV} resource.cfg resource.cfg.sample;	\
+	${CHMOD} u+x *.sample
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netsaint-base/Makefile.common b/net/netsaint-base/Makefile.common
index 6426a738a96..9c89823db12 100644
--- a/net/netsaint-base/Makefile.common
+++ b/net/netsaint-base/Makefile.common
@@ -1,15 +1,20 @@
-# $NetBSD: Makefile.common,v 1.1 2001/01/16 16:23:07 rh Exp $
+# $NetBSD: Makefile.common,v 1.2 2002/03/25 12:54:17 rh Exp $
 #
 
-NETSAINT_USER?=	netsaint
-NETSAINT_GROUP?=${NETSAINT_USER}
-
-USE_X11=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=--localstatedir=/var
-CONFIGURE_ARGS+=--datadir=${PREFIX}/share/netsaint
-CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/netsaint
-CONFIGURE_ARGS+=--libexecdir=${PREFIX}/libexec/netsaint
-CONFIGURE_ARGS+=--with-lockfile=/var/run/netsaint/netsaint.lock
-CONFIGURE_ARGS+=--with-netsaint-user=${NETSAINT_USER}
-CONFIGURE_ARGS+=--with-netsaint-grp=${NETSAINT_GROUP}
+NETSAINT_USER?=		netsaint
+NETSAINT_GROUP?=	${NETSAINT_USER}
+
+USE_X11=		YES
+GNU_CONFIGURE=		YES
+USE_GMAKE=		YES
+
+USE_PERL5=		YES
+
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc/netsaint
+CONFIGURE_ARGS+=	--localstatedir=/var
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/netsaint
+CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec/netsaint
+CONFIGURE_ARGS+=	--with-lockfile=var/run/netsaint/netsaint.lock
+CONFIGURE_ARGS+=	--with-netsaint-user=${NETSAINT_USER}
+CONFIGURE_ARGS+=	--with-netsaint-grp=${NETSAINT_GROUP}
+CONFIGURE_ARGS+=	--with-init-dir=${PREFIX}/etc/rc.d
diff --git a/net/netsaint-base/PLIST b/net/netsaint-base/PLIST
index e94e5009331..2ebb15d4816 100644
--- a/net/netsaint-base/PLIST
+++ b/net/netsaint-base/PLIST
@@ -1,25 +1,28 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:45 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/03/25 12:54:18 rh Exp $
 bin/netsaint
 etc/netsaint/commands.cfg.sample
 etc/netsaint/hosts.cfg.sample
 etc/netsaint/netsaint.cfg.sample
 etc/netsaint/nscgi.cfg.sample
 etc/netsaint/resource.cfg.sample
+libexec/netsaint/cgi-bin/avail.cgi
 libexec/netsaint/cgi-bin/cmd.cgi
 libexec/netsaint/cgi-bin/config.cgi
 libexec/netsaint/cgi-bin/extinfo.cgi
 libexec/netsaint/cgi-bin/history.cgi
+libexec/netsaint/cgi-bin/ministatus.cgi
 libexec/netsaint/cgi-bin/notifications.cgi
 libexec/netsaint/cgi-bin/outages.cgi
 libexec/netsaint/cgi-bin/showlog.cgi
 libexec/netsaint/cgi-bin/status.cgi
 libexec/netsaint/cgi-bin/statusmap.cgi
+libexec/netsaint/cgi-bin/statuswml.cgi
 libexec/netsaint/cgi-bin/statuswrl.cgi
+libexec/netsaint/cgi-bin/tac.cgi
 libexec/netsaint/cgi-bin/trends.cgi
 sbin/netsaint-setup.sh
 share/netsaint/docs/about.html
 share/netsaint/docs/addons.html
-share/netsaint/docs/bigtime.html
 share/netsaint/docs/cgiauth.html
 share/netsaint/docs/cgis.html
 share/netsaint/docs/checkscheduling.html
@@ -29,6 +32,7 @@ share/netsaint/docs/config.html
 share/netsaint/docs/configcgi.html
 share/netsaint/docs/confighost.html
 share/netsaint/docs/configmain.html
+share/netsaint/docs/dependencies.html
 share/netsaint/docs/developer/commentfile.html
 share/netsaint/docs/developer/images/xcdapi.gif
 share/netsaint/docs/developer/images/xedapi.gif
@@ -46,12 +50,16 @@ share/netsaint/docs/developer/xod.html
 share/netsaint/docs/developer/xrd.html
 share/netsaint/docs/developer/xsd.html
 share/netsaint/docs/distributed.html
+share/netsaint/docs/downtime.html
+share/netsaint/docs/embeddedperl.html
 share/netsaint/docs/escalations.html
 share/netsaint/docs/eventhandlers.html
 share/netsaint/docs/extcommands.html
 share/netsaint/docs/faqs.html
+share/netsaint/docs/flapping.html
 share/netsaint/docs/funstuff.html
 share/netsaint/docs/images/activepassive.gif
+share/netsaint/docs/images/avail_cgi.gif
 share/netsaint/docs/images/checktiming.gif
 share/netsaint/docs/images/cmd_cgi.gif
 share/netsaint/docs/images/config_cgi.gif
@@ -60,6 +68,7 @@ share/netsaint/docs/images/extinfo_cgi_a.gif
 share/netsaint/docs/images/extinfo_cgi_b.gif
 share/netsaint/docs/images/extinfo_cgi_c.gif
 share/netsaint/docs/images/extinfo_cgi_d.gif
+share/netsaint/docs/images/extinfo_cgi_e.gif
 share/netsaint/docs/images/history_cgi.gif
 share/netsaint/docs/images/indirecthostcheck.gif
 share/netsaint/docs/images/indirectsvccheck.gif
@@ -78,11 +87,16 @@ share/netsaint/docs/images/physical-network.gif
 share/netsaint/docs/images/plugintheory.gif
 share/netsaint/docs/images/redundancy-1.gif
 share/netsaint/docs/images/redundancy-2.gif
+share/netsaint/docs/images/service-dependencies.gif
 share/netsaint/docs/images/showlog_cgi.gif
+share/netsaint/docs/images/statetransitions.gif
+share/netsaint/docs/images/statetransitions2.gif
 share/netsaint/docs/images/status_cgi_a.gif
 share/netsaint/docs/images/status_cgi_b.gif
 share/netsaint/docs/images/statusmap_cgi.gif
+share/netsaint/docs/images/statuswml_cgi.gif
 share/netsaint/docs/images/statuswrl_cgi.gif
+share/netsaint/docs/images/tac_cgi.gif
 share/netsaint/docs/images/trends_cgi.gif
 share/netsaint/docs/index.html
 share/netsaint/docs/indirectchecks.html
@@ -93,9 +107,9 @@ share/netsaint/docs/makehtml.html
 share/netsaint/docs/networkoutages.html
 share/netsaint/docs/networkreachability.html
 share/netsaint/docs/notifications.html
-share/netsaint/docs/oldplugins.html
 share/netsaint/docs/parallelization.html
 share/netsaint/docs/passivechecks.html
+share/netsaint/docs/perfdata.html
 share/netsaint/docs/pluginhowto.html
 share/netsaint/docs/plugins.html
 share/netsaint/docs/plugintheory.html
@@ -109,38 +123,33 @@ share/netsaint/docs/statuslevels.html
 share/netsaint/docs/stoprestart.html
 share/netsaint/docs/theory.html
 share/netsaint/docs/timeperiods.html
+share/netsaint/docs/tuning.html
 share/netsaint/docs/verifyconfig.html
 share/netsaint/docs/volatileservices.html
 share/netsaint/docs/whatsnew.html
+share/netsaint/docs/xdata-db.html
 share/netsaint/images/ack.gif
 share/netsaint/images/active.gif
 share/netsaint/images/command.gif
-share/netsaint/images/commandsbar.gif
 share/netsaint/images/comment.gif
 share/netsaint/images/config.gif
 share/netsaint/images/contact.gif
 share/netsaint/images/contactgroup.gif
-share/netsaint/images/contactgroupsbar.gif
-share/netsaint/images/contactsbar.gif
 share/netsaint/images/critical.gif
 share/netsaint/images/delay.gif
 share/netsaint/images/delete.gif
 share/netsaint/images/disabled.gif
-share/netsaint/images/docbar.gif
 share/netsaint/images/down.gif
+share/netsaint/images/downtime.gif
 share/netsaint/images/enabled.gif
 share/netsaint/images/extinfo.gif
+share/netsaint/images/flapping.gif
 share/netsaint/images/greendot.gif
 share/netsaint/images/history.gif
-share/netsaint/images/historybar.gif
-share/netsaint/images/homebar.gif
 share/netsaint/images/host.gif
 share/netsaint/images/hostevent.gif
-share/netsaint/images/hostgroupsbar.gif
-share/netsaint/images/hostsbar.gif
 share/netsaint/images/info.gif
 share/netsaint/images/left.gif
-share/netsaint/images/logfilebar.gif
 share/netsaint/images/logofullsize.gif
 share/netsaint/images/logos/aix.gd2
 share/netsaint/images/logos/aix.gif
@@ -172,6 +181,7 @@ share/netsaint/images/logos/mac40.gd2
 share/netsaint/images/logos/mac40.gif
 share/netsaint/images/logos/mandrake.gd2
 share/netsaint/images/logos/mandrake.gif
+share/netsaint/images/logos/netsaint.gd2
 share/netsaint/images/logos/next.gd2
 share/netsaint/images/logos/next.gif
 share/netsaint/images/logos/ng-switch40.gd2
@@ -210,15 +220,11 @@ share/netsaint/images/logos/yellowdog.gif
 share/netsaint/images/logrotate.gif
 share/netsaint/images/logs.gif
 share/netsaint/images/ndisabled.gif
-share/netsaint/images/networkhealthbar.gif
-share/netsaint/images/networkoutagesbar.gif
 share/netsaint/images/noack.gif
 share/netsaint/images/notes.gif
-share/netsaint/images/notificationsbar.gif
 share/netsaint/images/notify.gif
 share/netsaint/images/orangedot.gif
 share/netsaint/images/parentup.gif
-share/netsaint/images/processinfobar.gif
 share/netsaint/images/recovery.gif
 share/netsaint/images/restart.gif
 share/netsaint/images/right.gif
@@ -227,33 +233,28 @@ share/netsaint/images/sbconfig.gif
 share/netsaint/images/sbgeneral.gif
 share/netsaint/images/sblogo.gif
 share/netsaint/images/sbmonitor.gif
-share/netsaint/images/scale.gif
 share/netsaint/images/serviceevent.gif
-share/netsaint/images/serviceproblemsbar.gif
-share/netsaint/images/servicesbar.gif
+share/netsaint/images/sideback.jpg
 share/netsaint/images/standby.gif
 share/netsaint/images/start.gif
 share/netsaint/images/status.gif
 share/netsaint/images/status2.gif
 share/netsaint/images/status3.gif
 share/netsaint/images/status4.gif
-share/netsaint/images/statusdetailbar.gif
-share/netsaint/images/statusmapbar.gif
-share/netsaint/images/statusoverviewbar.gif
-share/netsaint/images/statussummarybar.gif
-share/netsaint/images/statusworldbar.gif
 share/netsaint/images/stop.gif
+share/netsaint/images/tacdisabled.jpg
+share/netsaint/images/tacenabled.jpg
 share/netsaint/images/thermcrit.gif
 share/netsaint/images/thermok.gif
 share/netsaint/images/thermwarn.gif
-share/netsaint/images/timeperiodsbar.gif
 share/netsaint/images/trends.gif
-share/netsaint/images/trendsbar.gif
 share/netsaint/images/trendshost.png
 share/netsaint/images/trendssvc.png
 share/netsaint/images/unknown.gif
 share/netsaint/images/up.gif
 share/netsaint/images/warning.gif
+share/netsaint/images/zoom1.gif
+share/netsaint/images/zoom2.gif
 share/netsaint/index.html
 share/netsaint/main.html
 share/netsaint/media/critical.wav
@@ -261,6 +262,7 @@ share/netsaint/media/hostdown.wav
 share/netsaint/media/warning.wav
 share/netsaint/robots.txt
 share/netsaint/side.html
+share/netsaint/stylesheets/avail.css
 share/netsaint/stylesheets/cmd.css
 share/netsaint/stylesheets/config.css
 share/netsaint/stylesheets/extinfo.css
@@ -270,6 +272,7 @@ share/netsaint/stylesheets/outages.css
 share/netsaint/stylesheets/showlog.css
 share/netsaint/stylesheets/status.css
 share/netsaint/stylesheets/statusmap.css
+share/netsaint/stylesheets/tac.css
 share/netsaint/stylesheets/trends.css
 @dirrm share/netsaint/stylesheets
 @dirrm share/netsaint/media
diff --git a/net/netsaint-base/distinfo b/net/netsaint-base/distinfo
index 4d49c865131..90452302ee0 100644
--- a/net/netsaint-base/distinfo
+++ b/net/netsaint-base/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:24 wiz Exp $
 
-SHA1 (netsaint-0.0.6.tar.gz) = 5446c4f66d5b0c721e645f3a1dd7e82e3442ed31
-Size (netsaint-0.0.6.tar.gz) = 1098483 bytes
-SHA1 (patch-aa) = 6195777c4fd906a05770db89f07b1db28470e574
-SHA1 (patch-ab) = 3a77a4b0e9356ab447ceb5524bc18ac3460cc3b3
-SHA1 (patch-ac) = 33d7fbebdfddbf82a3dffc39da8f492023c50051
-SHA1 (patch-ad) = 97a1ab99178b175ab40ae033476c9391d779a6d5
-SHA1 (patch-ae) = 75a3d56be088ca8f4d484481eb8554d67e393bbb
-SHA1 (patch-af) = 1b76193f2aead2ff61aa3a4cf4d1709130d10039
-SHA1 (patch-ag) = b038d842d6f7d8bfe4e84c4e41396aeef7c41a64
-SHA1 (patch-ah) = 23eeafb08ff0a881003b5a76929598c173fbfaea
-SHA1 (patch-ai) = e686c3c666c2cec368752db6722b9eb7820317ea
+SHA1 (netsaint-0.0.7.tar.gz) = 5ce4832c9cccaba0baa49fe3e222c6753a811143
+Size (netsaint-0.0.7.tar.gz) = 1278019 bytes
+SHA1 (patch-aa) = b3f9d59f06d7cc3b9824142c6f69d42b6eae8452
+SHA1 (patch-ab) = 9708d1139dde1908563b9d44a8f339aad39e18b9
+SHA1 (patch-ac) = 3489bb8fb1148ca8fa0cc25c4decdfe8ebe5ada9
+SHA1 (patch-ad) = 53d82c97be2b1b232d860cbc3210c4228b50944b
+SHA1 (patch-ae) = fee9769c9dec4cd74a528823c52de456c230b77c
+SHA1 (patch-af) = 9df309dde76fa4d79fa0880824af425f6982ed84
+SHA1 (patch-ag) = f6c8105adbdcb0ba22da1d2aa7395d7dbf8d7329
+SHA1 (patch-ah) = 3e215778e529a04803f5027612578636fc91aa2d
+SHA1 (patch-ai) = 7412e8430abf640e74d16d1ff18436b8b272871c
diff --git a/net/netsaint-base/files/netsaint-setup.sh b/net/netsaint-base/files/netsaint-setup.sh
index 0a05686edff..cc156b5121c 100644
--- a/net/netsaint-base/files/netsaint-setup.sh
+++ b/net/netsaint-base/files/netsaint-setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: netsaint-setup.sh,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $
+#       $NetBSD: netsaint-setup.sh,v 1.2 2002/03/25 12:54:18 rh Exp $
 #
 install -m 0755 -o @@USER@@ -g @@GROUP@@ -d /var/log/netsaint
 install -m 0755 -o @@USER@@ -g @@GROUP@@ -d /var/log/netsaint/archives
diff --git a/net/netsaint-base/patches/patch-aa b/net/netsaint-base/patches/patch-aa
index f17394248e4..4658743f84c 100644
--- a/net/netsaint-base/patches/patch-aa
+++ b/net/netsaint-base/patches/patch-aa
@@ -1,13 +1,45 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $
+$NetBSD: patch-aa,v 1.2 2002/03/25 12:54:19 rh Exp $
 
---- configure.orig	Thu Dec 28 13:49:35 2000
-+++ configure
-@@ -1210,7 +1210,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--	LIBS="-lgd -lz -lm -lpng $LIBS"
-+	LIBS="-lgd -lz -lm -lpng -lxpm $LIBS"
- 	cat > conftest.$ac_ext <<EOF
- #line 1216 "configure"
- #include "confdefs.h"
+--- Makefile.in.orig	Mon Oct 22 04:49:39 2001
++++ Makefile.in
+@@ -95,28 +95,26 @@
+ 	cd $(SRC_BASE); $(MAKE) $@ ; cd ..
+ 	cd $(SRC_CGI); $(MAKE) $@ ; cd ..
+ 	cd $(SRC_HTM); $(MAKE) $@ ; cd ..
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
+-	if [ $(INSTALLPERLSTUFF) = yes ]; then \
+-		$(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
+-	fi;
++#	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
++#	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
++#	if [ $(INSTALLPERLSTUFF) = yes ]; then \
++#		$(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
++#	fi;
+ 
+ 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)
++	[ -d ${DESTDIR}${CFGDIR} ] || ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${CFGDIR}
++	${BSD_INSTALL_DATA} netsaint.cfg $(DESTDIR)$(CFGDIR)
++	${BSD_INSTALL_DATA} hosts.cfg $(DESTDIR)$(CFGDIR)
++	${BSD_INSTALL_DATA} commands.cfg $(DESTDIR)$(CFGDIR)
++	${BSD_INSTALL_DATA} nscgi.cfg $(DESTDIR)$(CFGDIR)
++	${BSD_INSTALL_DATA} resource.cfg $(DESTDIR)$(CFGDIR)
+ 
+ install-init: install-daemoninit
+ 
+ install-daemoninit:
+-	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint
++	${BSD_INSTALL_SCRIPT} daemon-init $(DESTDIR)$(INIT_DIR)/netsaint
+ 
+ install-commandmode:
+-	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
+-	chmod g+s $(DESTDIR)$(LOGDIR)/rw
+ 
+ fullinstall: install install-init install-commandmode
+ 
diff --git a/net/netsaint-base/patches/patch-ab b/net/netsaint-base/patches/patch-ab
index 644587e0ee5..731cf7ea625 100644
--- a/net/netsaint-base/patches/patch-ab
+++ b/net/netsaint-base/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $
+$NetBSD: patch-ab,v 1.2 2002/03/25 12:54:19 rh Exp $
 
---- cgi/Makefile.in.orig	Sun Oct 29 23:43:53 2000
+--- cgi/Makefile.in.orig	Mon Dec 24 08:23:45 2001
 +++ cgi/Makefile.in
 @@ -14,7 +14,7 @@
  LOGDIR=@localstatedir@
@@ -16,18 +16,18 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $
  CP=@CP@
  CC=@CC@
 -CFLAGS=@CFLAGS@ @DEFS@ -DNSCGI
-+CFLAGS=@CFLAGS@ @DEFS@ -I${prefix}/include -DNSCGI
++CFLAGS=@CFLAGS@ @DEFS@ -I${PREFIX}/include -DNSCGI
  #CFLAGS=-O3 -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -DHAVE_CONFIG_H -DNSCGI
  LDFLAGS=@LDFLAGS@ @LIBS@
  
-@@ -131,8 +131,8 @@
- 	rm -f *~
+@@ -142,8 +142,6 @@
+ devclean: clean
  
  install:
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
 +	[ -d ${DESTDIR}${CGIDIR} ] || ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${CGIDIR}
  	for file in *.cgi; \
 -	do $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); done
+-
+-
 +	do ${BSD_INSTALL_SCRIPT} $$file $(DESTDIR)$(CGIDIR); done
- 
- 
diff --git a/net/netsaint-base/patches/patch-ac b/net/netsaint-base/patches/patch-ac
index 4727233b453..c89c4f2f28a 100644
--- a/net/netsaint-base/patches/patch-ac
+++ b/net/netsaint-base/patches/patch-ac
@@ -1,38 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $
+$NetBSD: patch-ac,v 1.2 2002/03/25 12:54:19 rh Exp $
 
---- Makefile.in.orig	Sun Oct 29 23:43:54 2000
-+++ Makefile.in
-@@ -94,25 +94,22 @@
- 	cd $(SRC_BASE); $(MAKE) $@ ; cd ..
- 	cd $(SRC_CGI); $(MAKE) $@ ; cd ..
- 	cd $(SRC_HTM); $(MAKE) $@ ; cd ..
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
- 
- 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)
-+	[ -d ${DESTDIR}${CFGDIR} ] || ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${CFGDIR} 
-+	${BSD_INSTALL_DATA} netsaint.cfg $(DESTDIR)$(CFGDIR)/netsaint.cfg.sample
-+	${BSD_INSTALL_DATA} hosts.cfg $(DESTDIR)$(CFGDIR)/hosts.cfg.sample
-+	${BSD_INSTALL_DATA} commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg.sample
-+	${BSD_INSTALL_DATA} nscgi.cfg $(DESTDIR)$(CFGDIR)/nscgi.cfg.sample
-+	${BSD_INSTALL_DATA} resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.sample
- 
- install-init:
--	$(INSTALL) -m 774 $(INIT_OPTS) init-script $(DESTDIR)$(INIT_DIR)/netsaint
-+	${BSD_INSTALL_SCRIPT} init-script $(DESTDIR)$(INIT_DIR)/netsaint
- 
- install-daemoninit:
--	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint
-+	${BSD_INSTALL_SCRIPT} daemon-init $(DESTDIR)$(INIT_DIR)/netsaint
- 
- install-commandmode:
--	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
- 
- uninstall:
- 	rm -rf $(DESTDIR)$(BINDIR)/netsaint $(DESTDIR)$(CGIDIR)/*.cgi $(DESTDIR)$(CFGDIR)/*.cfg $(DESTDIR)$(HTMLDIR)
+--- base/Makefile.in.orig	Fri Apr 27 01:08:27 2001
++++ base/Makefile.in
+@@ -87,7 +87,4 @@
+ devclean: clean
+ 
+ install:
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+-	$(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(DESTDIR)$(BINDIR)
+-
+-
++	${BSD_INSTALL_PROGRAM} netsaint $(DESTDIR)$(BINDIR)
diff --git a/net/netsaint-base/patches/patch-ad b/net/netsaint-base/patches/patch-ad
index 456d7c9c83a..71e3d392113 100644
--- a/net/netsaint-base/patches/patch-ad
+++ b/net/netsaint-base/patches/patch-ad
@@ -1,13 +1,64 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $
+$NetBSD: patch-ad,v 1.2 2002/03/25 12:54:19 rh Exp $
 
---- base/Makefile.in.orig	Sun Oct 29 23:43:53 2000
-+++ base/Makefile.in
-@@ -83,7 +83,5 @@
- 	rm -f *~
+--- html/Makefile.in.orig	Mon Feb 19 09:33:30 2001
++++ html/Makefile.in
+@@ -41,38 +41,38 @@
+ devclean: clean
  
  install:
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
--	$(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(DESTDIR)$(BINDIR)
--
-+	${BSD_INSTALL_PROGRAM} netsaint $(DESTDIR)$(BINDIR)
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/developer
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/developer/images
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
+-	$(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
+-	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/media
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/stylesheets
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/images
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/developer
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/developer/images
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images/logos
++	${BSD_INSTALL_DATA} robots.txt $(DESTDIR)$(HTMLDIR)
++	${BSD_INSTALL_DATA} docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
+ 	for file in *.html; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR); done
+ 	for file in media/*.wav; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/media; done
+ 	for file in stylesheets/*.css; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
+ 	for file in docs/*.html; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs; done
+ 	for file in docs/developer/*.html; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/developer; done
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs/developer; done
+ 	for file in docs/developer/images/*; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/developer/images; done
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs/developer/images; done
+ 	for file in docs/images/*; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
+ 	for file in images/*.gif; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
+ 	for file in images/*.jpg; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
+ 	for file in images/*.png; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
+ 	for file in images/logos/*; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+ 
+ 
  
diff --git a/net/netsaint-base/patches/patch-ae b/net/netsaint-base/patches/patch-ae
index e2c7c571a95..a809ee766d2 100644
--- a/net/netsaint-base/patches/patch-ae
+++ b/net/netsaint-base/patches/patch-ae
@@ -1,63 +1,67 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $
+$NetBSD: patch-ae,v 1.2 2002/03/25 12:54:19 rh Exp $
 
---- html/Makefile.in.orig	Sun Oct 29 23:43:53 2000
-+++ html/Makefile.in
-@@ -36,38 +36,34 @@
- 	rm -f docs/developer/*~
- 
- install:
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/developer
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/developer/images
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
--	$(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/media
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/stylesheets
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/images
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/developer
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/developer/images
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images/logos
-+	${BSD_INSTALL_DATA} robots.txt $(DESTDIR)$(HTMLDIR)
-+	${BSD_INSTALL_DATA} docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
- 	for file in *.html; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR); done
- 	for file in media/*.wav; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/media; done
- 	for file in stylesheets/*.css; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
- 	for file in docs/*.html; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs; done
- 	for file in docs/developer/*.html; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/developer; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs/developer; done
- 	for file in docs/developer/images/*; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/developer/images; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs/developer/images; done
- 	for file in docs/images/*; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
- 	for file in images/*.gif; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
- 	for file in images/*.png; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
- 	for file in images/logos/*; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
--
--
--
--
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+--- netsaint.cfg.in.orig	Mon Dec  3 07:27:51 2001
++++ netsaint.cfg.in
+@@ -16,7 +16,7 @@
+ # for historical purposes.  This should be the first option specified 
+ # in the config file!!!
+ 
+-log_file=@localstatedir@/netsaint.log
++log_file=@localstatedir@/log/netsaint/netsaint.log
+ 
+ 
+ 
+@@ -72,7 +72,7 @@
+ # The contentsof the status file are deleted every time NetSaint
+ #  restarts.
+ 
+-status_file=@localstatedir@/status.log
++status_file=@localstatedir@/log/netsaint/status.log
+ 
+ 
+ 
+@@ -138,7 +138,7 @@
+ # directory level instead of on the file, as the file is deleted every
+ # time its contents are processed.
+ 
+-command_file=@localstatedir@/rw/netsaint.cmd
++command_file=@localstatedir@/run/netsaint/rw/netsaint.cmd
+ 
+ 
+ 
+@@ -146,7 +146,7 @@
+ # This is the file that NetSaint will use for storing host and service
+ # comments.
+ 
+-comment_file=@localstatedir@/comment.log
++comment_file=@localstatedir@/log/netsaint/comment.log
+ 
+ 
+ 
+@@ -164,7 +164,7 @@
+ # is created, used, and deleted throughout the time that NetSaint is
+ # running. 
+ 
+-temp_file=@localstatedir@/netsaint.tmp
++temp_file=@localstatedir@/run/netsaint/netsaint.tmp
+ 
+ 
+ 
+@@ -185,7 +185,7 @@
+ # This is the directory where archived (rotated) log files should be 
+ # placed (assuming you've chosen to do log rotation).
+ 
+-log_archive_path=@localstatedir@/archives
++log_archive_path=@localstatedir@/log/netsaint/archives
+ 
+ 
+ 
+@@ -378,7 +378,7 @@
+ # This file is used only if the preserve_state_information
+ # variable is set to 1.
+ 
+-state_retention_file=@localstatedir@/status.sav
++state_retention_file=@localstatedir@/log/netsaint/status.sav
+ 
+ 
  
diff --git a/net/netsaint-base/patches/patch-af b/net/netsaint-base/patches/patch-af
index ff107a7d417..0367824fbc8 100644
--- a/net/netsaint-base/patches/patch-af
+++ b/net/netsaint-base/patches/patch-af
@@ -1,66 +1,13 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $
+$NetBSD: patch-af,v 1.2 2002/03/25 12:54:19 rh Exp $
 
---- netsaint.cfg.in.orig	Tue Jan 16 11:05:53 2001
-+++ netsaint.cfg.in
-@@ -16,7 +16,7 @@
- # for historical purposes.  This should be the first option specified 
- # in the config file!!!
+--- nscgi.cfg.in.orig	Thu Jan 17 16:12:59 2002
++++ nscgi.cfg.in
+@@ -55,7 +55,7 @@
+ # NetSaint.  Run the 'ps' command manually to see what the command
+ # line entry for the NetSaint process looks like.
  
--log_file=@localstatedir@/netsaint.log
-+log_file=@localstatedir@/log/netsaint/netsaint.log
+-#netsaint_check_command=@libexecdir@/check_netsaint @localstatedir@/status.log 5 '@bindir@/netsaint'
++#netsaint_check_command=@libexecdir@/check_netsaint -F @localstatedir@/log/netsaint/status.log -e 5 -C 'netsaint'
  
  
- # OBJECT CONFIGURATION FILE (A.K.A "HOST" CONFIG FILE)
-@@ -64,7 +64,7 @@
- # The contentsof the status file are deleted every time NetSaint
- #  restarts.
  
--status_file=@localstatedir@/status.log
-+status_file=@localstatedir@/log/netsaint/status.log
- 
- 
- # NETSAINT USER
-@@ -124,14 +124,14 @@
- # directory level instead of on the file, as the file is deleted every
- # time its contents are processed.
- 
--command_file=@localstatedir@/rw/netsaint.cmd
-+command_file=@localstatedir@/run/netsaint/rw/netsaint.cmd
- 
- 
- # COMMENT FILE
- # This is the file that NetSaint will use for storing host and service
- # comments.
- 
--comment_file=@localstatedir@/comment.log
-+comment_file=@localstatedir@/log/netsaint/comment.log
- 
- 
- # LOCK FILE
-@@ -149,7 +149,7 @@
- # the other files (status log, comment file, main log file) are
- # located on.  This limitation will likely disappear in future versions.
- 
--temp_file=@localstatedir@/netsaint.tmp
-+temp_file=@localstatedir@/run/netsaint/netsaint.tmp
- 
- 
- # LOG ROTATION METHOD
-@@ -168,7 +168,7 @@
- # This is the directory where archived (rotated) log files should be 
- # placed (assuming you've chosen to do log rotation).
- 
--log_archive_path=@localstatedir@/archives
-+log_archive_path=@localstatedir@/log/netsaint/archives
- 
- 
- # LOG SEVERITY LEVEL
-@@ -370,7 +370,7 @@
- # This file is used only if the preserve_state_information
- # variable is set to 1.
- 
--state_retention_file=@localstatedir@/status.sav
-+state_retention_file=@localstatedir@/log/netsaint/status.sav
- 
- 
- # INTERVAL LENGTH
diff --git a/net/netsaint-base/patches/patch-ag b/net/netsaint-base/patches/patch-ag
index b4144bd3786..7eb6cf2201a 100644
--- a/net/netsaint-base/patches/patch-ag
+++ b/net/netsaint-base/patches/patch-ag
@@ -1,13 +1,23 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $
+$NetBSD: patch-ag,v 1.2 2002/03/25 12:54:19 rh Exp $
 
---- nscgi.cfg.in.orig	Sun Oct 29 23:43:54 2000
-+++ nscgi.cfg.in
-@@ -55,7 +55,7 @@
- # NetSaint.  Run the 'ps' command manually to see what the command
- # line entry for the NetSaint process looks like.
- 
--#netsaint_check_command=@libexecdir@/check_netsaint @localstatedir@/status.log 5 '@bindir@/netsaint'
-+#netsaint_check_command=@libexecdir@/check_netsaint @localstatedir@/log/netsaint/status.log 5 'netsaint'
- 
- 
+--- common/locations.h.in.orig	Mon Feb 19 09:33:28 2001
++++ common/locations.h.in
+@@ -19,12 +19,12 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  ************************************************************************/
  
+-#define DEFAULT_TEMP_FILE			"@localstatedir@/netsaint.tmp"
+-#define DEFAULT_STATUS_FILE			"@localstatedir@/status.log"
+-#define DEFAULT_LOG_FILE			"@localstatedir@/netsaint.log"
+-#define DEFAULT_LOG_ARCHIVE_PATH		"@localstatedir@/archives/"
+-#define DEFAULT_COMMENT_FILE			"@localstatedir@/comment.log"
+-#define DEFAULT_COMMAND_FILE			"@localstatedir@/rw/netsaint.cmd"
++#define DEFAULT_TEMP_FILE			"@localstatedir@/run/netsaint/netsaint.tmp"
++#define DEFAULT_STATUS_FILE			"@localstatedir@/log/netsaint/status.log"
++#define DEFAULT_LOG_FILE			"@localstatedir@/log/netsaint/netsaint.log"
++#define DEFAULT_LOG_ARCHIVE_PATH		"@localstatedir@/log/netsaint/archives/"
++#define DEFAULT_COMMENT_FILE			"@localstatedir@/log/netsaint/comment.log"
++#define DEFAULT_COMMAND_FILE			"@localstatedir@/run/netsaint/rw/netsaint.cmd"
+ #define DEFAULT_PHYSICAL_HTML_PATH		"@datadir@"
+ #define DEFAULT_URL_HTML_PATH			"@htmurl@"
+ #define DEFAULT_PHYSICAL_CGIBIN_PATH		"@sbindir@"
diff --git a/net/netsaint-base/patches/patch-ah b/net/netsaint-base/patches/patch-ah
index a77941ed5fd..170f8fca74f 100644
--- a/net/netsaint-base/patches/patch-ah
+++ b/net/netsaint-base/patches/patch-ah
@@ -1,29 +1,27 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $
+$NetBSD: patch-ah,v 1.2 2002/03/25 12:54:19 rh Exp $
 
---- hosts.cfg.in.orig	Tue Jan 16 12:57:49 2001
-+++ hosts.cfg.in
-@@ -199,20 +199,20 @@
- 
- # Service notification command - send email with problem summary
- 
--command[notify-by-email]=/bin/echo -e '***** NetSaint 0.0.6 *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $DATETIME$\n\nAdditional Info:\n\n$OUTPUT$' | /bin/mail -s '** $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **' $CONTACTEMAIL$
-+command[notify-by-email]=/bin/echo -e '***** NetSaint 0.0.6 *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $DATETIME$\n\nAdditional Info:\n\n$OUTPUT$' | /usr/bin/mail -s '** $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **' $CONTACTEMAIL$
- 
- # Service notification command - send email to alphanumeric pager gateway
- #       The notify-by-epager command assumes that each contact has a pager email gateway, and
- #       that the address has been entered into the appropriate contact field instead of an
- #       actual pager number. (i.e. 'pagejoe@nowhere.com' routes mail to Joe's alphanumeric pager)
- 
--command[notify-by-epager]=/bin/echo -e "Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\nInfo: $OUTPUT$\nDate: $DATETIME$" | /bin/mail -s '$NOTIFICATIONTYPE$: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$' $CONTACTPAGER$
-+command[notify-by-epager]=/bin/echo -e "Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\nInfo: $OUTPUT$\nDate: $DATETIME$" | /usr/bin/mail -s '$NOTIFICATIONTYPE$: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$' $CONTACTPAGER$
- 
- # Host notification commands (one for email, one for alphanumeric pager with email gateway)
- 
--command[host-notify-by-email]=/bin/echo -e "***** NetSaint 0.0.6 *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$\n\nDate/Time: $DATETIME$\n" | /bin/mail -s 'Host $HOSTSTATE$ alert for $HOSTNAME$!' $CONTACTEMAIL$
-+command[host-notify-by-email]=/bin/echo -e "***** NetSaint 0.0.6 *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$\n\nDate/Time: $DATETIME$\n" | /usr/bin/mail -s 'Host $HOSTSTATE$ alert for $HOSTNAME$!' $CONTACTEMAIL$
- 
--command[host-notify-by-epager]=/bin/echo -e "Host '$HOSTALIAS$' is $HOSTSTATE$\nInfo: $OUTPUT$\nTime: $DATETIME$" | /bin/mail -s '$NOTIFICATIONTYPE$ alert - Host $HOSTNAME$ is $HOSTSTATE$' $CONTACTPAGER$
-+command[host-notify-by-epager]=/bin/echo -e "Host '$HOSTALIAS$' is $HOSTSTATE$\nInfo: $OUTPUT$\nTime: $DATETIME$" | /usr/bin/mail -s '$NOTIFICATIONTYPE$ alert - Host $HOSTNAME$ is $HOSTSTATE$' $CONTACTPAGER$
- 
- 
+--- daemon-init.in.orig	Thu Jan 10 16:38:57 2002
++++ daemon-init.in
+@@ -79,15 +79,15 @@
+ exec_prefix=@exec_prefix@
+ NetsaintBin=@bindir@/netsaint
+ NetsaintCfg=@sysconfdir@/netsaint.cfg
+-NetsaintLog=@localstatedir@/status.log
+-NetsaintTmp=@localstatedir@/netsaint.tmp
+-NetsaintSav=@localstatedir@/status.sav
+-NetsaintCmd=@localstatedir@/rw/netsaint.cmd
++NetsaintLog=@localstatedir@/log/netsaint/status.log
++NetsaintTmp=@localstatedir@/run/netsaint/netsaint.tmp
++NetsaintSav=@localstatedir@/log/netsaint/status.sav
++NetsaintCmd=@localstatedir@/run/netsaint/rw/netsaint.cmd
+ NetsaintVar=@localstatedir@
+ NetsaintRun=@lockfile@
+-NetsaintLckDir=/var/lock/subsys
+-NetsaintLckFile=netsaint
+-NetsaintCGI=@sbindir@
++NetsaintLckDir=/var/run/netsaint
++NetsaintLckFile=netsaint.lock
++NetsaintCGI=@libexecdir@
+ Netsaint=@netsaint_user@
+           
  
diff --git a/net/netsaint-base/patches/patch-ai b/net/netsaint-base/patches/patch-ai
index a00c2f805fe..256b8e4eec9 100644
--- a/net/netsaint-base/patches/patch-ai
+++ b/net/netsaint-base/patches/patch-ai
@@ -1,23 +1,21 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $
+$NetBSD: patch-ai,v 1.2 2002/03/25 12:54:20 rh Exp $
 
---- common/locations.h.in.orig	Tue Jan 16 14:06:12 2001
-+++ common/locations.h.in
-@@ -19,12 +19,12 @@
-  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  ************************************************************************/
+--- commands.cfg.in.orig	Thu Jan 17 16:12:59 2002
++++ commands.cfg.in
+@@ -55,7 +55,15 @@
+ command[check_http]=$USER1$/check_http -H $HOSTADDRESS$
+ command[check_telnet]=$USER1$/check_tcp -H $HOSTADDRESS$ -p 23
+ command[check_ping]=$USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5
+-
++command[check_disk]=$USER1$/check_disk 85 95 $ARG1$
++command[check_users]=$USER1$/check_users $ARG1$ $ARG2$
++command[check_procs]=$USER1$/check_procs $ARG1$ $ARG2$ $ARG3$
++command[check_http2]=$USER1$/check_http $ARG1$ $ARG2$ $ARG3$
++command[check_dns]=$USER1$/check_dns www.yahoo.com $HOSTADDRESS$
++command[check_hpjd]=$USER1$/check_hpjd $HOSTADDRESS$ public
++command[check_mrtg]=$USER1$/check_mrtg $ARG1$ 10 AVG $ARG2$ $ARG3$ $ARG4$ $ARG5$ $ARG6$
++command[traffic_average]=$USER1$/check_mrtgtraf $ARG1$ 10 AVG $ARG2$ $ARG3$ $ARG4$ $ARG5$
++command[check_load]=$USER1$/check_load $ARG1$ $ARG2$ $ARG3$ $ARG4$ $ARG5$ $ARG6$
  
--#define DEFAULT_TEMP_FILE			"@localstatedir@/netsaint.tmp"
--#define DEFAULT_STATUS_FILE			"@localstatedir@/status.log"
--#define DEFAULT_LOG_FILE			"@localstatedir@/netsaint.log"
--#define DEFAULT_LOG_ARCHIVE_PATH		"@localstatedir@/archives/"
--#define DEFAULT_COMMENT_FILE			"@localstatedir@/comment.log"
--#define DEFAULT_COMMAND_FILE			"@localstatedir@/rw/netsaint.cmd"
-+#define DEFAULT_TEMP_FILE			"@localstatedir@/run/netsaint/netsaint.tmp"
-+#define DEFAULT_STATUS_FILE			"@localstatedir@/log/netsaint/status.log"
-+#define DEFAULT_LOG_FILE			"@localstatedir@/log/netsaint/netsaint.log"
-+#define DEFAULT_LOG_ARCHIVE_PATH		"@localstatedir@/log/netsaint/archives/"
-+#define DEFAULT_COMMENT_FILE			"@localstatedir@/log/netsaint/comment.log"
-+#define DEFAULT_COMMAND_FILE			"@localstatedir@/run/netsaint/rw/netsaint.cmd"
- #define DEFAULT_PHYSICAL_HTML_PATH		"@datadir@"
- #define DEFAULT_URL_HTML_PATH			"@htmurl@"
- #define DEFAULT_PHYSICAL_CGIBIN_PATH		"@sbindir@"
+ # These are examples of commands for checking "local" services - i.e. things
+ # on this machine that cannot be checked from remote machines.  If you want