36 files changed, 1488 insertions, 1486 deletions

diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index f3d3d1593e0a..806fda7d1705 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -1,18 +1,16 @@
-# New ports collection makefile for:	netsaint
-# Date created:				Wed 12 Jul 2000
-# Whom:					will
+# New ports collection makefile for:	nagios
+# Date created:				19 May 2002
+# Whom:					Blaz Zupan <blaz@si.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	netsaint
-PORTVERSION=	0.0.7
-PORTEPOCH=	1
+PORTNAME=	nagios
+PORTVERSION=	1.0.b1
 CATEGORIES=	net
-MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dwcjr
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=nagios
+DISTNAME=	nagios-1.0b1
 
 MAINTAINER=	blaz@si.FreeBSD.org
 
@@ -24,15 +22,19 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lgd -lgnugetopt"
-CONFIGURE_ARGS=	--with-command-user=netsaint \
+CONFIGURE_ARGS=	--with-command-user=nagios \
 		--with-command-grp=nogroup \
-		--with-netsaint-user=netsaint \
-		--with-netsaint-grp=netsaint \
-		--sbindir=${PREFIX}/share/netsaint/sbin \
+		--with-nagios-user=nagios \
+		--with-nagios-grp=nagios \
+		--with-template-objects \
+		--with-template-extinfo \
+		--with-init-dir=${PREFIX}/etc/rc.d \
+		--sbindir=${PREFIX}/share/nagios/sbin \
 		--libexecdir=${PREFIX}/libexec/netsaint \
-		--datadir=${PREFIX}/share/netsaint \
-		--sysconfdir=${PREFIX}/etc/netsaint \
-		--localstatedir=${PREFIX}/var/netsaint
+		--datadir=${PREFIX}/share/nagios \
+		--sysconfdir=${PREFIX}/etc/nagios \
+		--localstatedir=${PREFIX}/var/nagios \
+		--prefix=${PREFIX}
 
 INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
 
@@ -42,11 +44,4 @@ pre-fetch:
 pre-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-BSDIMAGES=	bsd_logofullsize.gif bsd_sblogo.gif
-
-post-install:
-.for i in ${BSDIMAGES}
-	${INSTALL_DATA} ${WRKDIR}/netsaint-0.0.7b6/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
-.endfor
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/nagios/distinfo b/net-mgmt/nagios/distinfo
index 24c7d5e2daee..577f40f54ce3 100644
--- a/net-mgmt/nagios/distinfo
+++ b/net-mgmt/nagios/distinfo
@@ -1,2 +1 @@
-MD5 (netsaint-0.0.7.tar.gz) = 5cabd55a73a618acbc82adc76d6ef382
-MD5 (netsaint-graphics.tar.gz) = d959b80cccdee3ff22f4025c6f2446c4
+MD5 (nagios-1.0b1.tar.gz) = 12b1c3a39579a354b82000602d9213a3
diff --git a/net-mgmt/nagios/pkg-descr b/net-mgmt/nagios/pkg-descr
index ba87fff062b8..b1ff9995e7fc 100644
--- a/net-mgmt/nagios/pkg-descr
+++ b/net-mgmt/nagios/pkg-descr
@@ -1,12 +1,12 @@
-NetSaint is a program that will monitor hosts and services on your
-network. It has the ability to email or page you when a problem arises
-and when it gets resolved. NetSaint is written in C and is designed to
-run under Linux, although it should work under most other *NIX variants.
-It can run either as a normal process or as a daemon, intermittently
-running checks on various services that you specify. The actual service
-checks are performed by external "plugins" which return service
-information to NetSaint. Several CGI programs are included with NetSaint
-in order to allow you to view the current service status, history, etc.
-via a web browser.
+Nagios is a host and service monitor designed to inform you of network
+problems before your clients, end-users or managers do. It has been
+designed to run under the Linux operating system, but works fine under
+most *NIX variants as well. The monitoring daemon runs intermittent
+checks on hosts and services you specify using external "plugins"
+which return status information to Nagios. When problems are
+encountered, the daemon can send notifications out to administrative
+contacts in a variety of different ways (email, instant message, SMS,
+etc.). Current status information, historical logs, and reports can
+all be accessed via a web browser. 
 
-WWW: http://www.netsaint.org/
+WWW: http://www.nagios.org/
diff --git a/net-mgmt/nagios/pkg-install b/net-mgmt/nagios/pkg-install
index 52af9cc24d68..dbc6461bb05e 100644
--- a/net-mgmt/nagios/pkg-install
+++ b/net-mgmt/nagios/pkg-install
@@ -5,8 +5,8 @@
 
 PKG_PREFIX=${PKG_PREFIX:=/usr/local}
 
-user=netsaint
-group=netsaint
+user=nagios
+group=nagios
 
 ask() {
     local question default answer
@@ -56,8 +56,8 @@ if [ x"$2" = xPRE-INSTALL ]; then
     else
         echo "You need a user \"${user}\"."
         if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw useradd ${user} -g ${group} -h - -d ${PKG_PREFIX}/var/netsaint \
-                -s /nonexistent -c "Netsaint pseudo-user" || exit
+            /usr/sbin/pw useradd ${user} -g ${group} -h - -d ${PKG_PREFIX}/var/nagios \
+                -s /nonexistent -c "Nagios pseudo-user" || exit
             echo "Done."
         else
             echo "Please create it, and try again."
diff --git a/net-mgmt/nagios/pkg-plist b/net-mgmt/nagios/pkg-plist
index 577913c6eba7..b31a3a4cd535 100644
--- a/net-mgmt/nagios/pkg-plist
+++ b/net-mgmt/nagios/pkg-plist
@@ -1,297 +1,312 @@
-@exec mkdir -p %D/var/netsaint/archives
-@exec mkdir -p %D/var/netsaint/rw
-@exec chmod 775 %D/var/netsaint %D/var/netsaint/archives %D/var/netsaint/rw
-@exec chown netsaint:netsaint %D/var/netsaint %D/var/netsaint/archives
-@exec chown netsaint:nogroup %D/var/netsaint/rw
-bin/netsaint
-etc/netsaint/commands.cfg.dist
-etc/netsaint/hosts.cfg.dist
-etc/netsaint/netsaint.cfg.dist
-etc/netsaint/nscgi.cfg.dist
-etc/netsaint/resource.cfg.dist
-etc/rc.d/netsaint.sh
-share/netsaint/docs/about.html
-share/netsaint/docs/addons.html
-share/netsaint/docs/cgiauth.html
-share/netsaint/docs/cgis.html
-share/netsaint/docs/checkscheduling.html
-share/netsaint/docs/clusters.html
-share/netsaint/docs/commandfile.html
-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
-share/netsaint/docs/developer/images/xodapi.gif
-share/netsaint/docs/developer/images/xrdapi.gif
-share/netsaint/docs/developer/images/xsdapi.gif
-share/netsaint/docs/developer/index.html
-share/netsaint/docs/developer/pluginhowto.html
-share/netsaint/docs/developer/stateretentionfile.html
-share/netsaint/docs/developer/statusfile.html
-share/netsaint/docs/developer/xcd.html
-share/netsaint/docs/developer/xdata.html
-share/netsaint/docs/developer/xed.html
-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
-share/netsaint/docs/images/distributed.gif
-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
-share/netsaint/docs/images/indirectsvccheck2.gif
-share/netsaint/docs/images/interleaved1.gif
-share/netsaint/docs/images/interleaved2.gif
-share/netsaint/docs/images/network-heirarchy.gif
-share/netsaint/docs/images/network-outage1.gif
-share/netsaint/docs/images/network-outage2.gif
-share/netsaint/docs/images/noninterleaved1.gif
-share/netsaint/docs/images/noninterleaved2.gif
-share/netsaint/docs/images/notification-process.gif
-share/netsaint/docs/images/notifications_cgi.gif
-share/netsaint/docs/images/outages_cgi.gif
-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
-share/netsaint/docs/installing.html
-share/netsaint/docs/installweb.html
-share/netsaint/docs/macros.html
-share/netsaint/docs/makehtml.html
-share/netsaint/docs/networkoutages.html
-share/netsaint/docs/networkreachability.html
-share/netsaint/docs/notifications.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
-share/netsaint/docs/programmodes.html
-share/netsaint/docs/redundancy.html
-share/netsaint/docs/robots.txt
-share/netsaint/docs/security.html
-share/netsaint/docs/starting.html
-share/netsaint/docs/statetypes.html
-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/bsd_logofullsize.gif
-share/netsaint/images/bsd_sblogo.gif
-share/netsaint/images/command.gif
-share/netsaint/images/comment.gif
-share/netsaint/images/config.gif
-share/netsaint/images/contact.gif
-share/netsaint/images/contactgroup.gif
-share/netsaint/images/critical.gif
-share/netsaint/images/delay.gif
-share/netsaint/images/delete.gif
-share/netsaint/images/disabled.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/host.gif
-share/netsaint/images/hostevent.gif
-share/netsaint/images/info.gif
-share/netsaint/images/left.gif
-share/netsaint/images/logofullsize.gif
-share/netsaint/images/logos/aix.gd2
-share/netsaint/images/logos/aix.gif
-share/netsaint/images/logos/amiga.gd2
-share/netsaint/images/logos/amiga.gif
-share/netsaint/images/logos/apple.gd2
-share/netsaint/images/logos/apple.gif
-share/netsaint/images/logos/beos.gd2
-share/netsaint/images/logos/beos.gif
-share/netsaint/images/logos/caldera.gd2
-share/netsaint/images/logos/caldera.gif
-share/netsaint/images/logos/cat1900.gd2
-share/netsaint/images/logos/cat2900.gd2
-share/netsaint/images/logos/cat5000.gd2
-share/netsaint/images/logos/debian.gd2
-share/netsaint/images/logos/debian.gif
-share/netsaint/images/logos/freebsd40.gd2
-share/netsaint/images/logos/freebsd40.gif
-share/netsaint/images/logos/hp-printer40.gd2
-share/netsaint/images/logos/hp-printer40.gif
-share/netsaint/images/logos/hpux.gd2
-share/netsaint/images/logos/hpux.gif
-share/netsaint/images/logos/irix.gd2
-share/netsaint/images/logos/irix.gif
-share/netsaint/images/logos/linux40.gd2
-share/netsaint/images/logos/linux40.gif
-share/netsaint/images/logos/logo.gd2
-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/next.gd2
-share/netsaint/images/logos/next.gif
-share/netsaint/images/logos/netsaint.gd2
-share/netsaint/images/logos/ng-switch40.gd2
-share/netsaint/images/logos/ng-switch40.gif
-share/netsaint/images/logos/novell40.gd2
-share/netsaint/images/logos/novell40.gif
-share/netsaint/images/logos/openbsd.gd2
-share/netsaint/images/logos/openbsd.gif
-share/netsaint/images/logos/redhat.gd2
-share/netsaint/images/logos/redhat.gif
-share/netsaint/images/logos/router40.gd2
-share/netsaint/images/logos/router40.gif
-share/netsaint/images/logos/slackware.gd2
-share/netsaint/images/logos/slackware.gif
-share/netsaint/images/logos/stampede.gd2
-share/netsaint/images/logos/stampede.gif
-share/netsaint/images/logos/storm.gd2
-share/netsaint/images/logos/storm.gif
-share/netsaint/images/logos/sun40.gd2
-share/netsaint/images/logos/sun40.gif
-share/netsaint/images/logos/sunlogo.gd2
-share/netsaint/images/logos/sunlogo.gif
-share/netsaint/images/logos/switch40.gd2
-share/netsaint/images/logos/switch40.gif
-share/netsaint/images/logos/turbolinux.gd2
-share/netsaint/images/logos/turbolinux.gif
-share/netsaint/images/logos/ultrapenguin.gd2
-share/netsaint/images/logos/ultrapenguin.gif
-share/netsaint/images/logos/unicos.gd2
-share/netsaint/images/logos/unicos.gif
-share/netsaint/images/logos/unknown.gd2
-share/netsaint/images/logos/win40.gd2
-share/netsaint/images/logos/win40.gif
-share/netsaint/images/logos/yellowdog.gd2
-share/netsaint/images/logos/yellowdog.gif
-share/netsaint/images/logrotate.gif
-share/netsaint/images/logs.gif
-share/netsaint/images/ndisabled.gif
-share/netsaint/images/noack.gif
-share/netsaint/images/notes.gif
-share/netsaint/images/notify.gif
-share/netsaint/images/orangedot.gif
-share/netsaint/images/parentup.gif
-share/netsaint/images/recovery.gif
-share/netsaint/images/restart.gif
-share/netsaint/images/right.gif
-share/netsaint/images/sbbg.gif
-share/netsaint/images/sbconfig.gif
-share/netsaint/images/sbgeneral.gif
-share/netsaint/images/sblogo.gif
-share/netsaint/images/sbmonitor.gif
-share/netsaint/images/serviceevent.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/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/trends.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
-share/netsaint/media/hostdown.wav
-share/netsaint/media/warning.wav
-share/netsaint/robots.txt
-share/netsaint/sbin/avail.cgi
-share/netsaint/sbin/cmd.cgi
-share/netsaint/sbin/config.cgi
-share/netsaint/sbin/extinfo.cgi
-share/netsaint/sbin/history.cgi
-share/netsaint/sbin/ministatus.cgi
-share/netsaint/sbin/notifications.cgi
-share/netsaint/sbin/outages.cgi
-share/netsaint/sbin/showlog.cgi
-share/netsaint/sbin/status.cgi
-share/netsaint/sbin/statusmap.cgi
-share/netsaint/sbin/statuswml.cgi
-share/netsaint/sbin/statuswrl.cgi
-share/netsaint/sbin/tac.cgi
-share/netsaint/sbin/trends.cgi
-share/netsaint/side.html
-share/netsaint/stylesheets/avail.css
-share/netsaint/stylesheets/cmd.css
-share/netsaint/stylesheets/config.css
-share/netsaint/stylesheets/extinfo.css
-share/netsaint/stylesheets/history.css
-share/netsaint/stylesheets/notifications.css
-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
-@unexec rmdir %D/etc/netsaint 2>/dev/null || true
-@dirrm share/netsaint/docs/developer/images
-@dirrm share/netsaint/docs/developer
-@dirrm share/netsaint/docs/images
-@dirrm share/netsaint/docs
-@dirrm share/netsaint/images/logos
-@dirrm share/netsaint/images
-@dirrm share/netsaint/media
-@dirrm share/netsaint/sbin
-@dirrm share/netsaint/stylesheets
-@dirrm share/netsaint
-@unexec rmdir %D/var/netsaint/archives 2>/dev/null || true
-@unexec rmdir %D/var/netsaint/rw 2>/dev/null || true
-@unexec rmdir %D/var/netsaint 2>/dev/null || true
+@exec mkdir -p %D/share/nagios/ssi
+@exec mkdir -p %D/var/nagios/archives
+@exec mkdir -p %D/var/nagios/rw
+@exec chmod 775 %D/var/nagios %D/var/nagios/archives %D/var/nagios/rw
+@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/rc.d/nagios.sh
+share/nagios/contexthelp/A1.html
+share/nagios/contexthelp/A2.html
+share/nagios/contexthelp/A3.html
+share/nagios/contexthelp/A4.html
+share/nagios/contexthelp/A5.html
+share/nagios/contexthelp/A6.html
+share/nagios/contexthelp/A7.html
+share/nagios/contexthelp/B1.html
+share/nagios/contexthelp/C1.html
+share/nagios/contexthelp/D1.html
+share/nagios/contexthelp/E1.html
+share/nagios/contexthelp/F1.html
+share/nagios/contexthelp/G1.html
+share/nagios/contexthelp/G2.html
+share/nagios/contexthelp/G3.html
+share/nagios/contexthelp/G4.html
+share/nagios/contexthelp/G5.html
+share/nagios/contexthelp/G6.html
+share/nagios/contexthelp/H1.html
+share/nagios/contexthelp/H2.html
+share/nagios/contexthelp/H3.html
+share/nagios/contexthelp/H4.html
+share/nagios/contexthelp/H5.html
+share/nagios/contexthelp/H6.html
+share/nagios/contexthelp/H7.html
+share/nagios/contexthelp/H8.html
+share/nagios/contexthelp/I1.html
+share/nagios/contexthelp/I2.html
+share/nagios/contexthelp/I3.html
+share/nagios/contexthelp/I4.html
+share/nagios/contexthelp/I5.html
+share/nagios/contexthelp/I6.html
+share/nagios/contexthelp/I7.html
+share/nagios/contexthelp/I8.html
+share/nagios/contexthelp/J1.html
+share/nagios/contexthelp/K1.html
+share/nagios/contexthelp/L1.html
+share/nagios/contexthelp/L10.html
+share/nagios/contexthelp/L11.html
+share/nagios/contexthelp/L12.html
+share/nagios/contexthelp/L13.html
+share/nagios/contexthelp/L2.html
+share/nagios/contexthelp/L3.html
+share/nagios/contexthelp/L4.html
+share/nagios/contexthelp/L5.html
+share/nagios/contexthelp/L6.html
+share/nagios/contexthelp/L7.html
+share/nagios/contexthelp/L8.html
+share/nagios/contexthelp/L9.html
+share/nagios/contexthelp/M1.html
+share/nagios/contexthelp/M2.html
+share/nagios/contexthelp/M3.html
+share/nagios/contexthelp/M4.html
+share/nagios/contexthelp/M5.html
+share/nagios/contexthelp/M6.html
+share/nagios/contexthelp/N1.html
+share/nagios/contexthelp/N2.html
+share/nagios/contexthelp/N3.html
+share/nagios/contexthelp/N4.html
+share/nagios/contexthelp/N5.html
+share/nagios/contexthelp/N6.html
+share/nagios/contexthelp/N7.html
+share/nagios/docs/images/activepassive.png
+share/nagios/docs/images/cgi-avail-a.png
+share/nagios/docs/images/cgi-avail-b.png
+share/nagios/docs/images/cgi-cmd.png
+share/nagios/docs/images/cgi-config.png
+share/nagios/docs/images/cgi-extinfo-a.png
+share/nagios/docs/images/cgi-extinfo-b.png
+share/nagios/docs/images/cgi-extinfo-c.png
+share/nagios/docs/images/cgi-extinfo-d.png
+share/nagios/docs/images/cgi-histogram.png
+share/nagios/docs/images/cgi-history.png
+share/nagios/docs/images/cgi-notifications.png
+share/nagios/docs/images/cgi-outages.png
+share/nagios/docs/images/cgi-showlog.png
+share/nagios/docs/images/cgi-status-a.png
+share/nagios/docs/images/cgi-status-b.png
+share/nagios/docs/images/cgi-status-c.png
+share/nagios/docs/images/cgi-status-d.png
+share/nagios/docs/images/cgi-statusmap.png
+share/nagios/docs/images/cgi-statuswml.png
+share/nagios/docs/images/cgi-statuswrl.png
+share/nagios/docs/images/cgi-summary.png
+share/nagios/docs/images/cgi-tac.png
+share/nagios/docs/images/cgi-trends.png
+share/nagios/docs/images/checktiming.png
+share/nagios/docs/images/distributed.png
+share/nagios/docs/images/host-dependencies.png
+share/nagios/docs/images/indirecthostcheck.png
+share/nagios/docs/images/indirectsvccheck.png
+share/nagios/docs/images/indirectsvccheck2.png
+share/nagios/docs/images/interleaved1.png
+share/nagios/docs/images/interleaved2.png
+share/nagios/docs/images/interleaved3.png
+share/nagios/docs/images/logofullsize.png
+share/nagios/docs/images/network-heirarchy.png
+share/nagios/docs/images/network-outage1.png
+share/nagios/docs/images/network-outage2.png
+share/nagios/docs/images/noninterleaved1.png
+share/nagios/docs/images/noninterleaved2.png
+share/nagios/docs/images/physical-network.png
+share/nagios/docs/images/plugintheory.png
+share/nagios/docs/images/redudancy.png
+share/nagios/docs/images/redundancy.png
+share/nagios/docs/images/service-dependencies.png
+share/nagios/docs/images/statetransitions.png
+share/nagios/docs/images/statetransitions2.png
+share/nagios/docs/about.html
+share/nagios/docs/addons.html
+share/nagios/docs/beginners.html
+share/nagios/docs/cgiauth.html
+share/nagios/docs/cgiincludes.html
+share/nagios/docs/cgis.html
+share/nagios/docs/checkscheduling.html
+share/nagios/docs/clusters.html
+share/nagios/docs/commandfile.html
+share/nagios/docs/config.html
+share/nagios/docs/configcgi.html
+share/nagios/docs/configextinfo.html
+share/nagios/docs/configmain.html
+share/nagios/docs/configobject.html
+share/nagios/docs/dependencies.html
+share/nagios/docs/distributed.html
+share/nagios/docs/downtime.html
+share/nagios/docs/embeddedperl.html
+share/nagios/docs/escalations.html
+share/nagios/docs/eventhandlers.html
+share/nagios/docs/extcommands.html
+share/nagios/docs/faqs.html
+share/nagios/docs/flapping.html
+share/nagios/docs/freshness.html
+share/nagios/docs/funstuff.html
+share/nagios/docs/index.html
+share/nagios/docs/indirectchecks.html
+share/nagios/docs/installing.html
+share/nagios/docs/installweb.html
+share/nagios/docs/int-portsentry.html
+share/nagios/docs/int-snmptrap.html
+share/nagios/docs/int-tcpwrappers.html
+share/nagios/docs/macros.html
+share/nagios/docs/networkoutages.html
+share/nagios/docs/networkreachability.html
+share/nagios/docs/notifications.html
+share/nagios/docs/parallelization.html
+share/nagios/docs/passivechecks.html
+share/nagios/docs/perfdata.html
+share/nagios/docs/plugins.html
+share/nagios/docs/plugintheory.html
+share/nagios/docs/redundancy.html
+share/nagios/docs/robots.txt
+share/nagios/docs/security.html
+share/nagios/docs/stalking.html
+share/nagios/docs/starting.html
+share/nagios/docs/statetypes.html
+share/nagios/docs/stoprestart.html
+share/nagios/docs/templaterecursion.html
+share/nagios/docs/timeperiods.html
+share/nagios/docs/toc.html
+share/nagios/docs/tuning.html
+share/nagios/docs/verifyconfig.html
+share/nagios/docs/volatileservices.html
+share/nagios/docs/whatsnew.html
+share/nagios/docs/xdata-db.html
+share/nagios/docs/xeddefault.html
+share/nagios/docs/xedtemplate.html
+share/nagios/docs/xoddefault.html
+share/nagios/docs/xodtemplate.html
+share/nagios/docs/xpddefault.html
+share/nagios/docs/xpdfile.html
+share/nagios/images/ack.gif
+share/nagios/images/command.png
+share/nagios/images/comment.gif
+share/nagios/images/contexthelp1.gif
+share/nagios/images/contexthelp2.gif
+share/nagios/images/critical.png
+share/nagios/images/delay.gif
+share/nagios/images/delete.gif
+share/nagios/images/disabled.gif
+share/nagios/images/down.gif
+share/nagios/images/downtime.gif
+share/nagios/images/empty.gif
+share/nagios/images/enabled.gif
+share/nagios/images/extinfo.gif
+share/nagios/images/flapping.gif
+share/nagios/images/greendot.gif
+share/nagios/images/histogram.png
+share/nagios/images/history.gif
+share/nagios/images/hostevent.gif
+share/nagios/images/info.png
+share/nagios/images/left.gif
+share/nagios/images/logofullsize.jpg
+share/nagios/images/logos/nagios.gd2
+share/nagios/images/logos/nagios.gif
+share/nagios/images/logos/nagiosvrml.png
+share/nagios/images/logos/unknown.gd2
+share/nagios/images/logos/unknown.gif
+share/nagios/images/logrotate.png
+share/nagios/images/ndisabled.gif
+share/nagios/images/noack.gif
+share/nagios/images/notes.gif
+share/nagios/images/notify.gif
+share/nagios/images/orangedot.gif
+share/nagios/images/recovery.png
+share/nagios/images/redudancy.png
+share/nagios/images/redundancy.png
+share/nagios/images/restart.gif
+share/nagios/images/right.gif
+share/nagios/images/sbconfig.png
+share/nagios/images/sbgeneral.png
+share/nagios/images/sblogo.jpg
+share/nagios/images/sbmonitor.png
+share/nagios/images/sbreport.png
+share/nagios/images/serviceevent.gif
+share/nagios/images/start.gif
+share/nagios/images/status.gif
+share/nagios/images/status2.gif
+share/nagios/images/status3.gif
+share/nagios/images/status4.gif
+share/nagios/images/stop.gif
+share/nagios/images/tacdisabled.jpg
+share/nagios/images/tacdisabled.png
+share/nagios/images/tacenabled.jpg
+share/nagios/images/tacenabled.png
+share/nagios/images/thermcrit.png
+share/nagios/images/thermok.png
+share/nagios/images/thermwarn.png
+share/nagios/images/trends.gif
+share/nagios/images/trendshost.png
+share/nagios/images/trendssvc.png
+share/nagios/images/unknown.png
+share/nagios/images/up.gif
+share/nagios/images/warning.png
+share/nagios/images/weblogo1.png
+share/nagios/images/zoom1.gif
+share/nagios/images/zoom2.gif
+share/nagios/index.html
+share/nagios/main.html
+share/nagios/media/critical.wav
+share/nagios/media/hostdown.wav
+share/nagios/media/warning.wav
+share/nagios/robots.txt
+share/nagios/sbin/avail.cgi
+share/nagios/sbin/cmd.cgi
+share/nagios/sbin/config.cgi
+share/nagios/sbin/extinfo.cgi
+share/nagios/sbin/histogram.cgi
+share/nagios/sbin/history.cgi
+share/nagios/sbin/notifications.cgi
+share/nagios/sbin/outages.cgi
+share/nagios/sbin/showlog.cgi
+share/nagios/sbin/status.cgi
+share/nagios/sbin/statusmap.cgi
+share/nagios/sbin/statuswml.cgi
+share/nagios/sbin/statuswrl.cgi
+share/nagios/sbin/summary.cgi
+share/nagios/sbin/tac.cgi
+share/nagios/sbin/trends.cgi
+share/nagios/side.html
+share/nagios/stylesheets/avail.css
+share/nagios/stylesheets/checksanity.css
+share/nagios/stylesheets/cmd.css
+share/nagios/stylesheets/config.css
+share/nagios/stylesheets/extinfo.css
+share/nagios/stylesheets/histogram.css
+share/nagios/stylesheets/history.css
+share/nagios/stylesheets/ministatus.css
+share/nagios/stylesheets/notifications.css
+share/nagios/stylesheets/outages.css
+share/nagios/stylesheets/showlog.css
+share/nagios/stylesheets/status.css
+share/nagios/stylesheets/statusmap.css
+share/nagios/stylesheets/summary.css
+share/nagios/stylesheets/tac.css
+share/nagios/stylesheets/trends.css
+@unexec rmdir %D/etc/nagios 2>/dev/null || true
+@dirrm share/nagios/contexthelp
+@dirrm share/nagios/docs/images
+@dirrm share/nagios/docs
+@dirrm share/nagios/images/logos
+@dirrm share/nagios/images
+@dirrm share/nagios/media
+@dirrm share/nagios/sbin
+@dirrm share/nagios/ssi
+@dirrm share/nagios/stylesheets
+@dirrm share/nagios
+@unexec rmdir %D/var/nagios/archives 2>/dev/null || true
+@unexec rmdir %D/var/nagios/rw 2>/dev/null || true
+@unexec rmdir %D/var/nagios 2>/dev/null || true
 @unexec rmdir %D/var 2>/dev/null || true
diff --git a/net-mgmt/nagios12/Makefile b/net-mgmt/nagios12/Makefile
index f3d3d1593e0a..806fda7d1705 100644
--- a/net-mgmt/nagios12/Makefile
+++ b/net-mgmt/nagios12/Makefile
@@ -1,18 +1,16 @@
-# New ports collection makefile for:	netsaint
-# Date created:				Wed 12 Jul 2000
-# Whom:					will
+# New ports collection makefile for:	nagios
+# Date created:				19 May 2002
+# Whom:					Blaz Zupan <blaz@si.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	netsaint
-PORTVERSION=	0.0.7
-PORTEPOCH=	1
+PORTNAME=	nagios
+PORTVERSION=	1.0.b1
 CATEGORIES=	net
-MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dwcjr
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=nagios
+DISTNAME=	nagios-1.0b1
 
 MAINTAINER=	blaz@si.FreeBSD.org
 
@@ -24,15 +22,19 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lgd -lgnugetopt"
-CONFIGURE_ARGS=	--with-command-user=netsaint \
+CONFIGURE_ARGS=	--with-command-user=nagios \
 		--with-command-grp=nogroup \
-		--with-netsaint-user=netsaint \
-		--with-netsaint-grp=netsaint \
-		--sbindir=${PREFIX}/share/netsaint/sbin \
+		--with-nagios-user=nagios \
+		--with-nagios-grp=nagios \
+		--with-template-objects \
+		--with-template-extinfo \
+		--with-init-dir=${PREFIX}/etc/rc.d \
+		--sbindir=${PREFIX}/share/nagios/sbin \
 		--libexecdir=${PREFIX}/libexec/netsaint \
-		--datadir=${PREFIX}/share/netsaint \
-		--sysconfdir=${PREFIX}/etc/netsaint \
-		--localstatedir=${PREFIX}/var/netsaint
+		--datadir=${PREFIX}/share/nagios \
+		--sysconfdir=${PREFIX}/etc/nagios \
+		--localstatedir=${PREFIX}/var/nagios \
+		--prefix=${PREFIX}
 
 INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
 
@@ -42,11 +44,4 @@ pre-fetch:
 pre-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-BSDIMAGES=	bsd_logofullsize.gif bsd_sblogo.gif
-
-post-install:
-.for i in ${BSDIMAGES}
-	${INSTALL_DATA} ${WRKDIR}/netsaint-0.0.7b6/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
-.endfor
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/nagios12/distinfo b/net-mgmt/nagios12/distinfo
index 24c7d5e2daee..577f40f54ce3 100644
--- a/net-mgmt/nagios12/distinfo
+++ b/net-mgmt/nagios12/distinfo
@@ -1,2 +1 @@
-MD5 (netsaint-0.0.7.tar.gz) = 5cabd55a73a618acbc82adc76d6ef382
-MD5 (netsaint-graphics.tar.gz) = d959b80cccdee3ff22f4025c6f2446c4
+MD5 (nagios-1.0b1.tar.gz) = 12b1c3a39579a354b82000602d9213a3
diff --git a/net-mgmt/nagios12/pkg-descr b/net-mgmt/nagios12/pkg-descr
index ba87fff062b8..b1ff9995e7fc 100644
--- a/net-mgmt/nagios12/pkg-descr
+++ b/net-mgmt/nagios12/pkg-descr
@@ -1,12 +1,12 @@
-NetSaint is a program that will monitor hosts and services on your
-network. It has the ability to email or page you when a problem arises
-and when it gets resolved. NetSaint is written in C and is designed to
-run under Linux, although it should work under most other *NIX variants.
-It can run either as a normal process or as a daemon, intermittently
-running checks on various services that you specify. The actual service
-checks are performed by external "plugins" which return service
-information to NetSaint. Several CGI programs are included with NetSaint
-in order to allow you to view the current service status, history, etc.
-via a web browser.
+Nagios is a host and service monitor designed to inform you of network
+problems before your clients, end-users or managers do. It has been
+designed to run under the Linux operating system, but works fine under
+most *NIX variants as well. The monitoring daemon runs intermittent
+checks on hosts and services you specify using external "plugins"
+which return status information to Nagios. When problems are
+encountered, the daemon can send notifications out to administrative
+contacts in a variety of different ways (email, instant message, SMS,
+etc.). Current status information, historical logs, and reports can
+all be accessed via a web browser. 
 
-WWW: http://www.netsaint.org/
+WWW: http://www.nagios.org/
diff --git a/net-mgmt/nagios12/pkg-install b/net-mgmt/nagios12/pkg-install
index 52af9cc24d68..dbc6461bb05e 100644
--- a/net-mgmt/nagios12/pkg-install
+++ b/net-mgmt/nagios12/pkg-install
@@ -5,8 +5,8 @@
 
 PKG_PREFIX=${PKG_PREFIX:=/usr/local}
 
-user=netsaint
-group=netsaint
+user=nagios
+group=nagios
 
 ask() {
     local question default answer
@@ -56,8 +56,8 @@ if [ x"$2" = xPRE-INSTALL ]; then
     else
         echo "You need a user \"${user}\"."
         if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw useradd ${user} -g ${group} -h - -d ${PKG_PREFIX}/var/netsaint \
-                -s /nonexistent -c "Netsaint pseudo-user" || exit
+            /usr/sbin/pw useradd ${user} -g ${group} -h - -d ${PKG_PREFIX}/var/nagios \
+                -s /nonexistent -c "Nagios pseudo-user" || exit
             echo "Done."
         else
             echo "Please create it, and try again."
diff --git a/net-mgmt/nagios12/pkg-plist b/net-mgmt/nagios12/pkg-plist
index 577913c6eba7..b31a3a4cd535 100644
--- a/net-mgmt/nagios12/pkg-plist
+++ b/net-mgmt/nagios12/pkg-plist
@@ -1,297 +1,312 @@
-@exec mkdir -p %D/var/netsaint/archives
-@exec mkdir -p %D/var/netsaint/rw
-@exec chmod 775 %D/var/netsaint %D/var/netsaint/archives %D/var/netsaint/rw
-@exec chown netsaint:netsaint %D/var/netsaint %D/var/netsaint/archives
-@exec chown netsaint:nogroup %D/var/netsaint/rw
-bin/netsaint
-etc/netsaint/commands.cfg.dist
-etc/netsaint/hosts.cfg.dist
-etc/netsaint/netsaint.cfg.dist
-etc/netsaint/nscgi.cfg.dist
-etc/netsaint/resource.cfg.dist
-etc/rc.d/netsaint.sh
-share/netsaint/docs/about.html
-share/netsaint/docs/addons.html
-share/netsaint/docs/cgiauth.html
-share/netsaint/docs/cgis.html
-share/netsaint/docs/checkscheduling.html
-share/netsaint/docs/clusters.html
-share/netsaint/docs/commandfile.html
-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
-share/netsaint/docs/developer/images/xodapi.gif
-share/netsaint/docs/developer/images/xrdapi.gif
-share/netsaint/docs/developer/images/xsdapi.gif
-share/netsaint/docs/developer/index.html
-share/netsaint/docs/developer/pluginhowto.html
-share/netsaint/docs/developer/stateretentionfile.html
-share/netsaint/docs/developer/statusfile.html
-share/netsaint/docs/developer/xcd.html
-share/netsaint/docs/developer/xdata.html
-share/netsaint/docs/developer/xed.html
-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
-share/netsaint/docs/images/distributed.gif
-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
-share/netsaint/docs/images/indirectsvccheck2.gif
-share/netsaint/docs/images/interleaved1.gif
-share/netsaint/docs/images/interleaved2.gif
-share/netsaint/docs/images/network-heirarchy.gif
-share/netsaint/docs/images/network-outage1.gif
-share/netsaint/docs/images/network-outage2.gif
-share/netsaint/docs/images/noninterleaved1.gif
-share/netsaint/docs/images/noninterleaved2.gif
-share/netsaint/docs/images/notification-process.gif
-share/netsaint/docs/images/notifications_cgi.gif
-share/netsaint/docs/images/outages_cgi.gif
-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
-share/netsaint/docs/installing.html
-share/netsaint/docs/installweb.html
-share/netsaint/docs/macros.html
-share/netsaint/docs/makehtml.html
-share/netsaint/docs/networkoutages.html
-share/netsaint/docs/networkreachability.html
-share/netsaint/docs/notifications.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
-share/netsaint/docs/programmodes.html
-share/netsaint/docs/redundancy.html
-share/netsaint/docs/robots.txt
-share/netsaint/docs/security.html
-share/netsaint/docs/starting.html
-share/netsaint/docs/statetypes.html
-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/bsd_logofullsize.gif
-share/netsaint/images/bsd_sblogo.gif
-share/netsaint/images/command.gif
-share/netsaint/images/comment.gif
-share/netsaint/images/config.gif
-share/netsaint/images/contact.gif
-share/netsaint/images/contactgroup.gif
-share/netsaint/images/critical.gif
-share/netsaint/images/delay.gif
-share/netsaint/images/delete.gif
-share/netsaint/images/disabled.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/host.gif
-share/netsaint/images/hostevent.gif
-share/netsaint/images/info.gif
-share/netsaint/images/left.gif
-share/netsaint/images/logofullsize.gif
-share/netsaint/images/logos/aix.gd2
-share/netsaint/images/logos/aix.gif
-share/netsaint/images/logos/amiga.gd2
-share/netsaint/images/logos/amiga.gif
-share/netsaint/images/logos/apple.gd2
-share/netsaint/images/logos/apple.gif
-share/netsaint/images/logos/beos.gd2
-share/netsaint/images/logos/beos.gif
-share/netsaint/images/logos/caldera.gd2
-share/netsaint/images/logos/caldera.gif
-share/netsaint/images/logos/cat1900.gd2
-share/netsaint/images/logos/cat2900.gd2
-share/netsaint/images/logos/cat5000.gd2
-share/netsaint/images/logos/debian.gd2
-share/netsaint/images/logos/debian.gif
-share/netsaint/images/logos/freebsd40.gd2
-share/netsaint/images/logos/freebsd40.gif
-share/netsaint/images/logos/hp-printer40.gd2
-share/netsaint/images/logos/hp-printer40.gif
-share/netsaint/images/logos/hpux.gd2
-share/netsaint/images/logos/hpux.gif
-share/netsaint/images/logos/irix.gd2
-share/netsaint/images/logos/irix.gif
-share/netsaint/images/logos/linux40.gd2
-share/netsaint/images/logos/linux40.gif
-share/netsaint/images/logos/logo.gd2
-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/next.gd2
-share/netsaint/images/logos/next.gif
-share/netsaint/images/logos/netsaint.gd2
-share/netsaint/images/logos/ng-switch40.gd2
-share/netsaint/images/logos/ng-switch40.gif
-share/netsaint/images/logos/novell40.gd2
-share/netsaint/images/logos/novell40.gif
-share/netsaint/images/logos/openbsd.gd2
-share/netsaint/images/logos/openbsd.gif
-share/netsaint/images/logos/redhat.gd2
-share/netsaint/images/logos/redhat.gif
-share/netsaint/images/logos/router40.gd2
-share/netsaint/images/logos/router40.gif
-share/netsaint/images/logos/slackware.gd2
-share/netsaint/images/logos/slackware.gif
-share/netsaint/images/logos/stampede.gd2
-share/netsaint/images/logos/stampede.gif
-share/netsaint/images/logos/storm.gd2
-share/netsaint/images/logos/storm.gif
-share/netsaint/images/logos/sun40.gd2
-share/netsaint/images/logos/sun40.gif
-share/netsaint/images/logos/sunlogo.gd2
-share/netsaint/images/logos/sunlogo.gif
-share/netsaint/images/logos/switch40.gd2
-share/netsaint/images/logos/switch40.gif
-share/netsaint/images/logos/turbolinux.gd2
-share/netsaint/images/logos/turbolinux.gif
-share/netsaint/images/logos/ultrapenguin.gd2
-share/netsaint/images/logos/ultrapenguin.gif
-share/netsaint/images/logos/unicos.gd2
-share/netsaint/images/logos/unicos.gif
-share/netsaint/images/logos/unknown.gd2
-share/netsaint/images/logos/win40.gd2
-share/netsaint/images/logos/win40.gif
-share/netsaint/images/logos/yellowdog.gd2
-share/netsaint/images/logos/yellowdog.gif
-share/netsaint/images/logrotate.gif
-share/netsaint/images/logs.gif
-share/netsaint/images/ndisabled.gif
-share/netsaint/images/noack.gif
-share/netsaint/images/notes.gif
-share/netsaint/images/notify.gif
-share/netsaint/images/orangedot.gif
-share/netsaint/images/parentup.gif
-share/netsaint/images/recovery.gif
-share/netsaint/images/restart.gif
-share/netsaint/images/right.gif
-share/netsaint/images/sbbg.gif
-share/netsaint/images/sbconfig.gif
-share/netsaint/images/sbgeneral.gif
-share/netsaint/images/sblogo.gif
-share/netsaint/images/sbmonitor.gif
-share/netsaint/images/serviceevent.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/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/trends.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
-share/netsaint/media/hostdown.wav
-share/netsaint/media/warning.wav
-share/netsaint/robots.txt
-share/netsaint/sbin/avail.cgi
-share/netsaint/sbin/cmd.cgi
-share/netsaint/sbin/config.cgi
-share/netsaint/sbin/extinfo.cgi
-share/netsaint/sbin/history.cgi
-share/netsaint/sbin/ministatus.cgi
-share/netsaint/sbin/notifications.cgi
-share/netsaint/sbin/outages.cgi
-share/netsaint/sbin/showlog.cgi
-share/netsaint/sbin/status.cgi
-share/netsaint/sbin/statusmap.cgi
-share/netsaint/sbin/statuswml.cgi
-share/netsaint/sbin/statuswrl.cgi
-share/netsaint/sbin/tac.cgi
-share/netsaint/sbin/trends.cgi
-share/netsaint/side.html
-share/netsaint/stylesheets/avail.css
-share/netsaint/stylesheets/cmd.css
-share/netsaint/stylesheets/config.css
-share/netsaint/stylesheets/extinfo.css
-share/netsaint/stylesheets/history.css
-share/netsaint/stylesheets/notifications.css
-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
-@unexec rmdir %D/etc/netsaint 2>/dev/null || true
-@dirrm share/netsaint/docs/developer/images
-@dirrm share/netsaint/docs/developer
-@dirrm share/netsaint/docs/images
-@dirrm share/netsaint/docs
-@dirrm share/netsaint/images/logos
-@dirrm share/netsaint/images
-@dirrm share/netsaint/media
-@dirrm share/netsaint/sbin
-@dirrm share/netsaint/stylesheets
-@dirrm share/netsaint
-@unexec rmdir %D/var/netsaint/archives 2>/dev/null || true
-@unexec rmdir %D/var/netsaint/rw 2>/dev/null || true
-@unexec rmdir %D/var/netsaint 2>/dev/null || true
+@exec mkdir -p %D/share/nagios/ssi
+@exec mkdir -p %D/var/nagios/archives
+@exec mkdir -p %D/var/nagios/rw
+@exec chmod 775 %D/var/nagios %D/var/nagios/archives %D/var/nagios/rw
+@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/rc.d/nagios.sh
+share/nagios/contexthelp/A1.html
+share/nagios/contexthelp/A2.html
+share/nagios/contexthelp/A3.html
+share/nagios/contexthelp/A4.html
+share/nagios/contexthelp/A5.html
+share/nagios/contexthelp/A6.html
+share/nagios/contexthelp/A7.html
+share/nagios/contexthelp/B1.html
+share/nagios/contexthelp/C1.html
+share/nagios/contexthelp/D1.html
+share/nagios/contexthelp/E1.html
+share/nagios/contexthelp/F1.html
+share/nagios/contexthelp/G1.html
+share/nagios/contexthelp/G2.html
+share/nagios/contexthelp/G3.html
+share/nagios/contexthelp/G4.html
+share/nagios/contexthelp/G5.html
+share/nagios/contexthelp/G6.html
+share/nagios/contexthelp/H1.html
+share/nagios/contexthelp/H2.html
+share/nagios/contexthelp/H3.html
+share/nagios/contexthelp/H4.html
+share/nagios/contexthelp/H5.html
+share/nagios/contexthelp/H6.html
+share/nagios/contexthelp/H7.html
+share/nagios/contexthelp/H8.html
+share/nagios/contexthelp/I1.html
+share/nagios/contexthelp/I2.html
+share/nagios/contexthelp/I3.html
+share/nagios/contexthelp/I4.html
+share/nagios/contexthelp/I5.html
+share/nagios/contexthelp/I6.html
+share/nagios/contexthelp/I7.html
+share/nagios/contexthelp/I8.html
+share/nagios/contexthelp/J1.html
+share/nagios/contexthelp/K1.html
+share/nagios/contexthelp/L1.html
+share/nagios/contexthelp/L10.html
+share/nagios/contexthelp/L11.html
+share/nagios/contexthelp/L12.html
+share/nagios/contexthelp/L13.html
+share/nagios/contexthelp/L2.html
+share/nagios/contexthelp/L3.html
+share/nagios/contexthelp/L4.html
+share/nagios/contexthelp/L5.html
+share/nagios/contexthelp/L6.html
+share/nagios/contexthelp/L7.html
+share/nagios/contexthelp/L8.html
+share/nagios/contexthelp/L9.html
+share/nagios/contexthelp/M1.html
+share/nagios/contexthelp/M2.html
+share/nagios/contexthelp/M3.html
+share/nagios/contexthelp/M4.html
+share/nagios/contexthelp/M5.html
+share/nagios/contexthelp/M6.html
+share/nagios/contexthelp/N1.html
+share/nagios/contexthelp/N2.html
+share/nagios/contexthelp/N3.html
+share/nagios/contexthelp/N4.html
+share/nagios/contexthelp/N5.html
+share/nagios/contexthelp/N6.html
+share/nagios/contexthelp/N7.html
+share/nagios/docs/images/activepassive.png
+share/nagios/docs/images/cgi-avail-a.png
+share/nagios/docs/images/cgi-avail-b.png
+share/nagios/docs/images/cgi-cmd.png
+share/nagios/docs/images/cgi-config.png
+share/nagios/docs/images/cgi-extinfo-a.png
+share/nagios/docs/images/cgi-extinfo-b.png
+share/nagios/docs/images/cgi-extinfo-c.png
+share/nagios/docs/images/cgi-extinfo-d.png
+share/nagios/docs/images/cgi-histogram.png
+share/nagios/docs/images/cgi-history.png
+share/nagios/docs/images/cgi-notifications.png
+share/nagios/docs/images/cgi-outages.png
+share/nagios/docs/images/cgi-showlog.png
+share/nagios/docs/images/cgi-status-a.png
+share/nagios/docs/images/cgi-status-b.png
+share/nagios/docs/images/cgi-status-c.png
+share/nagios/docs/images/cgi-status-d.png
+share/nagios/docs/images/cgi-statusmap.png
+share/nagios/docs/images/cgi-statuswml.png
+share/nagios/docs/images/cgi-statuswrl.png
+share/nagios/docs/images/cgi-summary.png
+share/nagios/docs/images/cgi-tac.png
+share/nagios/docs/images/cgi-trends.png
+share/nagios/docs/images/checktiming.png
+share/nagios/docs/images/distributed.png
+share/nagios/docs/images/host-dependencies.png
+share/nagios/docs/images/indirecthostcheck.png
+share/nagios/docs/images/indirectsvccheck.png
+share/nagios/docs/images/indirectsvccheck2.png
+share/nagios/docs/images/interleaved1.png
+share/nagios/docs/images/interleaved2.png
+share/nagios/docs/images/interleaved3.png
+share/nagios/docs/images/logofullsize.png
+share/nagios/docs/images/network-heirarchy.png
+share/nagios/docs/images/network-outage1.png
+share/nagios/docs/images/network-outage2.png
+share/nagios/docs/images/noninterleaved1.png
+share/nagios/docs/images/noninterleaved2.png
+share/nagios/docs/images/physical-network.png
+share/nagios/docs/images/plugintheory.png
+share/nagios/docs/images/redudancy.png
+share/nagios/docs/images/redundancy.png
+share/nagios/docs/images/service-dependencies.png
+share/nagios/docs/images/statetransitions.png
+share/nagios/docs/images/statetransitions2.png
+share/nagios/docs/about.html
+share/nagios/docs/addons.html
+share/nagios/docs/beginners.html
+share/nagios/docs/cgiauth.html
+share/nagios/docs/cgiincludes.html
+share/nagios/docs/cgis.html
+share/nagios/docs/checkscheduling.html
+share/nagios/docs/clusters.html
+share/nagios/docs/commandfile.html
+share/nagios/docs/config.html
+share/nagios/docs/configcgi.html
+share/nagios/docs/configextinfo.html
+share/nagios/docs/configmain.html
+share/nagios/docs/configobject.html
+share/nagios/docs/dependencies.html
+share/nagios/docs/distributed.html
+share/nagios/docs/downtime.html
+share/nagios/docs/embeddedperl.html
+share/nagios/docs/escalations.html
+share/nagios/docs/eventhandlers.html
+share/nagios/docs/extcommands.html
+share/nagios/docs/faqs.html
+share/nagios/docs/flapping.html
+share/nagios/docs/freshness.html
+share/nagios/docs/funstuff.html
+share/nagios/docs/index.html
+share/nagios/docs/indirectchecks.html
+share/nagios/docs/installing.html
+share/nagios/docs/installweb.html
+share/nagios/docs/int-portsentry.html
+share/nagios/docs/int-snmptrap.html
+share/nagios/docs/int-tcpwrappers.html
+share/nagios/docs/macros.html
+share/nagios/docs/networkoutages.html
+share/nagios/docs/networkreachability.html
+share/nagios/docs/notifications.html
+share/nagios/docs/parallelization.html
+share/nagios/docs/passivechecks.html
+share/nagios/docs/perfdata.html
+share/nagios/docs/plugins.html
+share/nagios/docs/plugintheory.html
+share/nagios/docs/redundancy.html
+share/nagios/docs/robots.txt
+share/nagios/docs/security.html
+share/nagios/docs/stalking.html
+share/nagios/docs/starting.html
+share/nagios/docs/statetypes.html
+share/nagios/docs/stoprestart.html
+share/nagios/docs/templaterecursion.html
+share/nagios/docs/timeperiods.html
+share/nagios/docs/toc.html
+share/nagios/docs/tuning.html
+share/nagios/docs/verifyconfig.html
+share/nagios/docs/volatileservices.html
+share/nagios/docs/whatsnew.html
+share/nagios/docs/xdata-db.html
+share/nagios/docs/xeddefault.html
+share/nagios/docs/xedtemplate.html
+share/nagios/docs/xoddefault.html
+share/nagios/docs/xodtemplate.html
+share/nagios/docs/xpddefault.html
+share/nagios/docs/xpdfile.html
+share/nagios/images/ack.gif
+share/nagios/images/command.png
+share/nagios/images/comment.gif
+share/nagios/images/contexthelp1.gif
+share/nagios/images/contexthelp2.gif
+share/nagios/images/critical.png
+share/nagios/images/delay.gif
+share/nagios/images/delete.gif
+share/nagios/images/disabled.gif
+share/nagios/images/down.gif
+share/nagios/images/downtime.gif
+share/nagios/images/empty.gif
+share/nagios/images/enabled.gif
+share/nagios/images/extinfo.gif
+share/nagios/images/flapping.gif
+share/nagios/images/greendot.gif
+share/nagios/images/histogram.png
+share/nagios/images/history.gif
+share/nagios/images/hostevent.gif
+share/nagios/images/info.png
+share/nagios/images/left.gif
+share/nagios/images/logofullsize.jpg
+share/nagios/images/logos/nagios.gd2
+share/nagios/images/logos/nagios.gif
+share/nagios/images/logos/nagiosvrml.png
+share/nagios/images/logos/unknown.gd2
+share/nagios/images/logos/unknown.gif
+share/nagios/images/logrotate.png
+share/nagios/images/ndisabled.gif
+share/nagios/images/noack.gif
+share/nagios/images/notes.gif
+share/nagios/images/notify.gif
+share/nagios/images/orangedot.gif
+share/nagios/images/recovery.png
+share/nagios/images/redudancy.png
+share/nagios/images/redundancy.png
+share/nagios/images/restart.gif
+share/nagios/images/right.gif
+share/nagios/images/sbconfig.png
+share/nagios/images/sbgeneral.png
+share/nagios/images/sblogo.jpg
+share/nagios/images/sbmonitor.png
+share/nagios/images/sbreport.png
+share/nagios/images/serviceevent.gif
+share/nagios/images/start.gif
+share/nagios/images/status.gif
+share/nagios/images/status2.gif
+share/nagios/images/status3.gif
+share/nagios/images/status4.gif
+share/nagios/images/stop.gif
+share/nagios/images/tacdisabled.jpg
+share/nagios/images/tacdisabled.png
+share/nagios/images/tacenabled.jpg
+share/nagios/images/tacenabled.png
+share/nagios/images/thermcrit.png
+share/nagios/images/thermok.png
+share/nagios/images/thermwarn.png
+share/nagios/images/trends.gif
+share/nagios/images/trendshost.png
+share/nagios/images/trendssvc.png
+share/nagios/images/unknown.png
+share/nagios/images/up.gif
+share/nagios/images/warning.png
+share/nagios/images/weblogo1.png
+share/nagios/images/zoom1.gif
+share/nagios/images/zoom2.gif
+share/nagios/index.html
+share/nagios/main.html
+share/nagios/media/critical.wav
+share/nagios/media/hostdown.wav
+share/nagios/media/warning.wav
+share/nagios/robots.txt
+share/nagios/sbin/avail.cgi
+share/nagios/sbin/cmd.cgi
+share/nagios/sbin/config.cgi
+share/nagios/sbin/extinfo.cgi
+share/nagios/sbin/histogram.cgi
+share/nagios/sbin/history.cgi
+share/nagios/sbin/notifications.cgi
+share/nagios/sbin/outages.cgi
+share/nagios/sbin/showlog.cgi
+share/nagios/sbin/status.cgi
+share/nagios/sbin/statusmap.cgi
+share/nagios/sbin/statuswml.cgi
+share/nagios/sbin/statuswrl.cgi
+share/nagios/sbin/summary.cgi
+share/nagios/sbin/tac.cgi
+share/nagios/sbin/trends.cgi
+share/nagios/side.html
+share/nagios/stylesheets/avail.css
+share/nagios/stylesheets/checksanity.css
+share/nagios/stylesheets/cmd.css
+share/nagios/stylesheets/config.css
+share/nagios/stylesheets/extinfo.css
+share/nagios/stylesheets/histogram.css
+share/nagios/stylesheets/history.css
+share/nagios/stylesheets/ministatus.css
+share/nagios/stylesheets/notifications.css
+share/nagios/stylesheets/outages.css
+share/nagios/stylesheets/showlog.css
+share/nagios/stylesheets/status.css
+share/nagios/stylesheets/statusmap.css
+share/nagios/stylesheets/summary.css
+share/nagios/stylesheets/tac.css
+share/nagios/stylesheets/trends.css
+@unexec rmdir %D/etc/nagios 2>/dev/null || true
+@dirrm share/nagios/contexthelp
+@dirrm share/nagios/docs/images
+@dirrm share/nagios/docs
+@dirrm share/nagios/images/logos
+@dirrm share/nagios/images
+@dirrm share/nagios/media
+@dirrm share/nagios/sbin
+@dirrm share/nagios/ssi
+@dirrm share/nagios/stylesheets
+@dirrm share/nagios
+@unexec rmdir %D/var/nagios/archives 2>/dev/null || true
+@unexec rmdir %D/var/nagios/rw 2>/dev/null || true
+@unexec rmdir %D/var/nagios 2>/dev/null || true
 @unexec rmdir %D/var 2>/dev/null || true
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index f3d3d1593e0a..806fda7d1705 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -1,18 +1,16 @@
-# New ports collection makefile for:	netsaint
-# Date created:				Wed 12 Jul 2000
-# Whom:					will
+# New ports collection makefile for:	nagios
+# Date created:				19 May 2002
+# Whom:					Blaz Zupan <blaz@si.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	netsaint
-PORTVERSION=	0.0.7
-PORTEPOCH=	1
+PORTNAME=	nagios
+PORTVERSION=	1.0.b1
 CATEGORIES=	net
-MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dwcjr
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=nagios
+DISTNAME=	nagios-1.0b1
 
 MAINTAINER=	blaz@si.FreeBSD.org
 
@@ -24,15 +22,19 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lgd -lgnugetopt"
-CONFIGURE_ARGS=	--with-command-user=netsaint \
+CONFIGURE_ARGS=	--with-command-user=nagios \
 		--with-command-grp=nogroup \
-		--with-netsaint-user=netsaint \
-		--with-netsaint-grp=netsaint \
-		--sbindir=${PREFIX}/share/netsaint/sbin \
+		--with-nagios-user=nagios \
+		--with-nagios-grp=nagios \
+		--with-template-objects \
+		--with-template-extinfo \
+		--with-init-dir=${PREFIX}/etc/rc.d \
+		--sbindir=${PREFIX}/share/nagios/sbin \
 		--libexecdir=${PREFIX}/libexec/netsaint \
-		--datadir=${PREFIX}/share/netsaint \
-		--sysconfdir=${PREFIX}/etc/netsaint \
-		--localstatedir=${PREFIX}/var/netsaint
+		--datadir=${PREFIX}/share/nagios \
+		--sysconfdir=${PREFIX}/etc/nagios \
+		--localstatedir=${PREFIX}/var/nagios \
+		--prefix=${PREFIX}
 
 INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
 
@@ -42,11 +44,4 @@ pre-fetch:
 pre-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-BSDIMAGES=	bsd_logofullsize.gif bsd_sblogo.gif
-
-post-install:
-.for i in ${BSDIMAGES}
-	${INSTALL_DATA} ${WRKDIR}/netsaint-0.0.7b6/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
-.endfor
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/nagios2/distinfo b/net-mgmt/nagios2/distinfo
index 24c7d5e2daee..577f40f54ce3 100644
--- a/net-mgmt/nagios2/distinfo
+++ b/net-mgmt/nagios2/distinfo
@@ -1,2 +1 @@
-MD5 (netsaint-0.0.7.tar.gz) = 5cabd55a73a618acbc82adc76d6ef382
-MD5 (netsaint-graphics.tar.gz) = d959b80cccdee3ff22f4025c6f2446c4
+MD5 (nagios-1.0b1.tar.gz) = 12b1c3a39579a354b82000602d9213a3
diff --git a/net-mgmt/nagios2/pkg-descr b/net-mgmt/nagios2/pkg-descr
index ba87fff062b8..b1ff9995e7fc 100644
--- a/net-mgmt/nagios2/pkg-descr
+++ b/net-mgmt/nagios2/pkg-descr
@@ -1,12 +1,12 @@
-NetSaint is a program that will monitor hosts and services on your
-network. It has the ability to email or page you when a problem arises
-and when it gets resolved. NetSaint is written in C and is designed to
-run under Linux, although it should work under most other *NIX variants.
-It can run either as a normal process or as a daemon, intermittently
-running checks on various services that you specify. The actual service
-checks are performed by external "plugins" which return service
-information to NetSaint. Several CGI programs are included with NetSaint
-in order to allow you to view the current service status, history, etc.
-via a web browser.
+Nagios is a host and service monitor designed to inform you of network
+problems before your clients, end-users or managers do. It has been
+designed to run under the Linux operating system, but works fine under
+most *NIX variants as well. The monitoring daemon runs intermittent
+checks on hosts and services you specify using external "plugins"
+which return status information to Nagios. When problems are
+encountered, the daemon can send notifications out to administrative
+contacts in a variety of different ways (email, instant message, SMS,
+etc.). Current status information, historical logs, and reports can
+all be accessed via a web browser. 
 
-WWW: http://www.netsaint.org/
+WWW: http://www.nagios.org/
diff --git a/net-mgmt/nagios2/pkg-install b/net-mgmt/nagios2/pkg-install
index 52af9cc24d68..dbc6461bb05e 100644
--- a/net-mgmt/nagios2/pkg-install
+++ b/net-mgmt/nagios2/pkg-install
@@ -5,8 +5,8 @@
 
 PKG_PREFIX=${PKG_PREFIX:=/usr/local}
 
-user=netsaint
-group=netsaint
+user=nagios
+group=nagios
 
 ask() {
     local question default answer
@@ -56,8 +56,8 @@ if [ x"$2" = xPRE-INSTALL ]; then
     else
         echo "You need a user \"${user}\"."
         if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw useradd ${user} -g ${group} -h - -d ${PKG_PREFIX}/var/netsaint \
-                -s /nonexistent -c "Netsaint pseudo-user" || exit
+            /usr/sbin/pw useradd ${user} -g ${group} -h - -d ${PKG_PREFIX}/var/nagios \
+                -s /nonexistent -c "Nagios pseudo-user" || exit
             echo "Done."
         else
             echo "Please create it, and try again."
diff --git a/net-mgmt/nagios2/pkg-plist b/net-mgmt/nagios2/pkg-plist
index 577913c6eba7..b31a3a4cd535 100644
--- a/net-mgmt/nagios2/pkg-plist
+++ b/net-mgmt/nagios2/pkg-plist
@@ -1,297 +1,312 @@
-@exec mkdir -p %D/var/netsaint/archives
-@exec mkdir -p %D/var/netsaint/rw
-@exec chmod 775 %D/var/netsaint %D/var/netsaint/archives %D/var/netsaint/rw
-@exec chown netsaint:netsaint %D/var/netsaint %D/var/netsaint/archives
-@exec chown netsaint:nogroup %D/var/netsaint/rw
-bin/netsaint
-etc/netsaint/commands.cfg.dist
-etc/netsaint/hosts.cfg.dist
-etc/netsaint/netsaint.cfg.dist
-etc/netsaint/nscgi.cfg.dist
-etc/netsaint/resource.cfg.dist
-etc/rc.d/netsaint.sh
-share/netsaint/docs/about.html
-share/netsaint/docs/addons.html
-share/netsaint/docs/cgiauth.html
-share/netsaint/docs/cgis.html
-share/netsaint/docs/checkscheduling.html
-share/netsaint/docs/clusters.html
-share/netsaint/docs/commandfile.html
-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
-share/netsaint/docs/developer/images/xodapi.gif
-share/netsaint/docs/developer/images/xrdapi.gif
-share/netsaint/docs/developer/images/xsdapi.gif
-share/netsaint/docs/developer/index.html
-share/netsaint/docs/developer/pluginhowto.html
-share/netsaint/docs/developer/stateretentionfile.html
-share/netsaint/docs/developer/statusfile.html
-share/netsaint/docs/developer/xcd.html
-share/netsaint/docs/developer/xdata.html
-share/netsaint/docs/developer/xed.html
-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
-share/netsaint/docs/images/distributed.gif
-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
-share/netsaint/docs/images/indirectsvccheck2.gif
-share/netsaint/docs/images/interleaved1.gif
-share/netsaint/docs/images/interleaved2.gif
-share/netsaint/docs/images/network-heirarchy.gif
-share/netsaint/docs/images/network-outage1.gif
-share/netsaint/docs/images/network-outage2.gif
-share/netsaint/docs/images/noninterleaved1.gif
-share/netsaint/docs/images/noninterleaved2.gif
-share/netsaint/docs/images/notification-process.gif
-share/netsaint/docs/images/notifications_cgi.gif
-share/netsaint/docs/images/outages_cgi.gif
-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
-share/netsaint/docs/installing.html
-share/netsaint/docs/installweb.html
-share/netsaint/docs/macros.html
-share/netsaint/docs/makehtml.html
-share/netsaint/docs/networkoutages.html
-share/netsaint/docs/networkreachability.html
-share/netsaint/docs/notifications.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
-share/netsaint/docs/programmodes.html
-share/netsaint/docs/redundancy.html
-share/netsaint/docs/robots.txt
-share/netsaint/docs/security.html
-share/netsaint/docs/starting.html
-share/netsaint/docs/statetypes.html
-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/bsd_logofullsize.gif
-share/netsaint/images/bsd_sblogo.gif
-share/netsaint/images/command.gif
-share/netsaint/images/comment.gif
-share/netsaint/images/config.gif
-share/netsaint/images/contact.gif
-share/netsaint/images/contactgroup.gif
-share/netsaint/images/critical.gif
-share/netsaint/images/delay.gif
-share/netsaint/images/delete.gif
-share/netsaint/images/disabled.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/host.gif
-share/netsaint/images/hostevent.gif
-share/netsaint/images/info.gif
-share/netsaint/images/left.gif
-share/netsaint/images/logofullsize.gif
-share/netsaint/images/logos/aix.gd2
-share/netsaint/images/logos/aix.gif
-share/netsaint/images/logos/amiga.gd2
-share/netsaint/images/logos/amiga.gif
-share/netsaint/images/logos/apple.gd2
-share/netsaint/images/logos/apple.gif
-share/netsaint/images/logos/beos.gd2
-share/netsaint/images/logos/beos.gif
-share/netsaint/images/logos/caldera.gd2
-share/netsaint/images/logos/caldera.gif
-share/netsaint/images/logos/cat1900.gd2
-share/netsaint/images/logos/cat2900.gd2
-share/netsaint/images/logos/cat5000.gd2
-share/netsaint/images/logos/debian.gd2
-share/netsaint/images/logos/debian.gif
-share/netsaint/images/logos/freebsd40.gd2
-share/netsaint/images/logos/freebsd40.gif
-share/netsaint/images/logos/hp-printer40.gd2
-share/netsaint/images/logos/hp-printer40.gif
-share/netsaint/images/logos/hpux.gd2
-share/netsaint/images/logos/hpux.gif
-share/netsaint/images/logos/irix.gd2
-share/netsaint/images/logos/irix.gif
-share/netsaint/images/logos/linux40.gd2
-share/netsaint/images/logos/linux40.gif
-share/netsaint/images/logos/logo.gd2
-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/next.gd2
-share/netsaint/images/logos/next.gif
-share/netsaint/images/logos/netsaint.gd2
-share/netsaint/images/logos/ng-switch40.gd2
-share/netsaint/images/logos/ng-switch40.gif
-share/netsaint/images/logos/novell40.gd2
-share/netsaint/images/logos/novell40.gif
-share/netsaint/images/logos/openbsd.gd2
-share/netsaint/images/logos/openbsd.gif
-share/netsaint/images/logos/redhat.gd2
-share/netsaint/images/logos/redhat.gif
-share/netsaint/images/logos/router40.gd2
-share/netsaint/images/logos/router40.gif
-share/netsaint/images/logos/slackware.gd2
-share/netsaint/images/logos/slackware.gif
-share/netsaint/images/logos/stampede.gd2
-share/netsaint/images/logos/stampede.gif
-share/netsaint/images/logos/storm.gd2
-share/netsaint/images/logos/storm.gif
-share/netsaint/images/logos/sun40.gd2
-share/netsaint/images/logos/sun40.gif
-share/netsaint/images/logos/sunlogo.gd2
-share/netsaint/images/logos/sunlogo.gif
-share/netsaint/images/logos/switch40.gd2
-share/netsaint/images/logos/switch40.gif
-share/netsaint/images/logos/turbolinux.gd2
-share/netsaint/images/logos/turbolinux.gif
-share/netsaint/images/logos/ultrapenguin.gd2
-share/netsaint/images/logos/ultrapenguin.gif
-share/netsaint/images/logos/unicos.gd2
-share/netsaint/images/logos/unicos.gif
-share/netsaint/images/logos/unknown.gd2
-share/netsaint/images/logos/win40.gd2
-share/netsaint/images/logos/win40.gif
-share/netsaint/images/logos/yellowdog.gd2
-share/netsaint/images/logos/yellowdog.gif
-share/netsaint/images/logrotate.gif
-share/netsaint/images/logs.gif
-share/netsaint/images/ndisabled.gif
-share/netsaint/images/noack.gif
-share/netsaint/images/notes.gif
-share/netsaint/images/notify.gif
-share/netsaint/images/orangedot.gif
-share/netsaint/images/parentup.gif
-share/netsaint/images/recovery.gif
-share/netsaint/images/restart.gif
-share/netsaint/images/right.gif
-share/netsaint/images/sbbg.gif
-share/netsaint/images/sbconfig.gif
-share/netsaint/images/sbgeneral.gif
-share/netsaint/images/sblogo.gif
-share/netsaint/images/sbmonitor.gif
-share/netsaint/images/serviceevent.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/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/trends.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
-share/netsaint/media/hostdown.wav
-share/netsaint/media/warning.wav
-share/netsaint/robots.txt
-share/netsaint/sbin/avail.cgi
-share/netsaint/sbin/cmd.cgi
-share/netsaint/sbin/config.cgi
-share/netsaint/sbin/extinfo.cgi
-share/netsaint/sbin/history.cgi
-share/netsaint/sbin/ministatus.cgi
-share/netsaint/sbin/notifications.cgi
-share/netsaint/sbin/outages.cgi
-share/netsaint/sbin/showlog.cgi
-share/netsaint/sbin/status.cgi
-share/netsaint/sbin/statusmap.cgi
-share/netsaint/sbin/statuswml.cgi
-share/netsaint/sbin/statuswrl.cgi
-share/netsaint/sbin/tac.cgi
-share/netsaint/sbin/trends.cgi
-share/netsaint/side.html
-share/netsaint/stylesheets/avail.css
-share/netsaint/stylesheets/cmd.css
-share/netsaint/stylesheets/config.css
-share/netsaint/stylesheets/extinfo.css
-share/netsaint/stylesheets/history.css
-share/netsaint/stylesheets/notifications.css
-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
-@unexec rmdir %D/etc/netsaint 2>/dev/null || true
-@dirrm share/netsaint/docs/developer/images
-@dirrm share/netsaint/docs/developer
-@dirrm share/netsaint/docs/images
-@dirrm share/netsaint/docs
-@dirrm share/netsaint/images/logos
-@dirrm share/netsaint/images
-@dirrm share/netsaint/media
-@dirrm share/netsaint/sbin
-@dirrm share/netsaint/stylesheets
-@dirrm share/netsaint
-@unexec rmdir %D/var/netsaint/archives 2>/dev/null || true
-@unexec rmdir %D/var/netsaint/rw 2>/dev/null || true
-@unexec rmdir %D/var/netsaint 2>/dev/null || true
+@exec mkdir -p %D/share/nagios/ssi
+@exec mkdir -p %D/var/nagios/archives
+@exec mkdir -p %D/var/nagios/rw
+@exec chmod 775 %D/var/nagios %D/var/nagios/archives %D/var/nagios/rw
+@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/rc.d/nagios.sh
+share/nagios/contexthelp/A1.html
+share/nagios/contexthelp/A2.html
+share/nagios/contexthelp/A3.html
+share/nagios/contexthelp/A4.html
+share/nagios/contexthelp/A5.html
+share/nagios/contexthelp/A6.html
+share/nagios/contexthelp/A7.html
+share/nagios/contexthelp/B1.html
+share/nagios/contexthelp/C1.html
+share/nagios/contexthelp/D1.html
+share/nagios/contexthelp/E1.html
+share/nagios/contexthelp/F1.html
+share/nagios/contexthelp/G1.html
+share/nagios/contexthelp/G2.html
+share/nagios/contexthelp/G3.html
+share/nagios/contexthelp/G4.html
+share/nagios/contexthelp/G5.html
+share/nagios/contexthelp/G6.html
+share/nagios/contexthelp/H1.html
+share/nagios/contexthelp/H2.html
+share/nagios/contexthelp/H3.html
+share/nagios/contexthelp/H4.html
+share/nagios/contexthelp/H5.html
+share/nagios/contexthelp/H6.html
+share/nagios/contexthelp/H7.html
+share/nagios/contexthelp/H8.html
+share/nagios/contexthelp/I1.html
+share/nagios/contexthelp/I2.html
+share/nagios/contexthelp/I3.html
+share/nagios/contexthelp/I4.html
+share/nagios/contexthelp/I5.html
+share/nagios/contexthelp/I6.html
+share/nagios/contexthelp/I7.html
+share/nagios/contexthelp/I8.html
+share/nagios/contexthelp/J1.html
+share/nagios/contexthelp/K1.html
+share/nagios/contexthelp/L1.html
+share/nagios/contexthelp/L10.html
+share/nagios/contexthelp/L11.html
+share/nagios/contexthelp/L12.html
+share/nagios/contexthelp/L13.html
+share/nagios/contexthelp/L2.html
+share/nagios/contexthelp/L3.html
+share/nagios/contexthelp/L4.html
+share/nagios/contexthelp/L5.html
+share/nagios/contexthelp/L6.html
+share/nagios/contexthelp/L7.html
+share/nagios/contexthelp/L8.html
+share/nagios/contexthelp/L9.html
+share/nagios/contexthelp/M1.html
+share/nagios/contexthelp/M2.html
+share/nagios/contexthelp/M3.html
+share/nagios/contexthelp/M4.html
+share/nagios/contexthelp/M5.html
+share/nagios/contexthelp/M6.html
+share/nagios/contexthelp/N1.html
+share/nagios/contexthelp/N2.html
+share/nagios/contexthelp/N3.html
+share/nagios/contexthelp/N4.html
+share/nagios/contexthelp/N5.html
+share/nagios/contexthelp/N6.html
+share/nagios/contexthelp/N7.html
+share/nagios/docs/images/activepassive.png
+share/nagios/docs/images/cgi-avail-a.png
+share/nagios/docs/images/cgi-avail-b.png
+share/nagios/docs/images/cgi-cmd.png
+share/nagios/docs/images/cgi-config.png
+share/nagios/docs/images/cgi-extinfo-a.png
+share/nagios/docs/images/cgi-extinfo-b.png
+share/nagios/docs/images/cgi-extinfo-c.png
+share/nagios/docs/images/cgi-extinfo-d.png
+share/nagios/docs/images/cgi-histogram.png
+share/nagios/docs/images/cgi-history.png
+share/nagios/docs/images/cgi-notifications.png
+share/nagios/docs/images/cgi-outages.png
+share/nagios/docs/images/cgi-showlog.png
+share/nagios/docs/images/cgi-status-a.png
+share/nagios/docs/images/cgi-status-b.png
+share/nagios/docs/images/cgi-status-c.png
+share/nagios/docs/images/cgi-status-d.png
+share/nagios/docs/images/cgi-statusmap.png
+share/nagios/docs/images/cgi-statuswml.png
+share/nagios/docs/images/cgi-statuswrl.png
+share/nagios/docs/images/cgi-summary.png
+share/nagios/docs/images/cgi-tac.png
+share/nagios/docs/images/cgi-trends.png
+share/nagios/docs/images/checktiming.png
+share/nagios/docs/images/distributed.png
+share/nagios/docs/images/host-dependencies.png
+share/nagios/docs/images/indirecthostcheck.png
+share/nagios/docs/images/indirectsvccheck.png
+share/nagios/docs/images/indirectsvccheck2.png
+share/nagios/docs/images/interleaved1.png
+share/nagios/docs/images/interleaved2.png
+share/nagios/docs/images/interleaved3.png
+share/nagios/docs/images/logofullsize.png
+share/nagios/docs/images/network-heirarchy.png
+share/nagios/docs/images/network-outage1.png
+share/nagios/docs/images/network-outage2.png
+share/nagios/docs/images/noninterleaved1.png
+share/nagios/docs/images/noninterleaved2.png
+share/nagios/docs/images/physical-network.png
+share/nagios/docs/images/plugintheory.png
+share/nagios/docs/images/redudancy.png
+share/nagios/docs/images/redundancy.png
+share/nagios/docs/images/service-dependencies.png
+share/nagios/docs/images/statetransitions.png
+share/nagios/docs/images/statetransitions2.png
+share/nagios/docs/about.html
+share/nagios/docs/addons.html
+share/nagios/docs/beginners.html
+share/nagios/docs/cgiauth.html
+share/nagios/docs/cgiincludes.html
+share/nagios/docs/cgis.html
+share/nagios/docs/checkscheduling.html
+share/nagios/docs/clusters.html
+share/nagios/docs/commandfile.html
+share/nagios/docs/config.html
+share/nagios/docs/configcgi.html
+share/nagios/docs/configextinfo.html
+share/nagios/docs/configmain.html
+share/nagios/docs/configobject.html
+share/nagios/docs/dependencies.html
+share/nagios/docs/distributed.html
+share/nagios/docs/downtime.html
+share/nagios/docs/embeddedperl.html
+share/nagios/docs/escalations.html
+share/nagios/docs/eventhandlers.html
+share/nagios/docs/extcommands.html
+share/nagios/docs/faqs.html
+share/nagios/docs/flapping.html
+share/nagios/docs/freshness.html
+share/nagios/docs/funstuff.html
+share/nagios/docs/index.html
+share/nagios/docs/indirectchecks.html
+share/nagios/docs/installing.html
+share/nagios/docs/installweb.html
+share/nagios/docs/int-portsentry.html
+share/nagios/docs/int-snmptrap.html
+share/nagios/docs/int-tcpwrappers.html
+share/nagios/docs/macros.html
+share/nagios/docs/networkoutages.html
+share/nagios/docs/networkreachability.html
+share/nagios/docs/notifications.html
+share/nagios/docs/parallelization.html
+share/nagios/docs/passivechecks.html
+share/nagios/docs/perfdata.html
+share/nagios/docs/plugins.html
+share/nagios/docs/plugintheory.html
+share/nagios/docs/redundancy.html
+share/nagios/docs/robots.txt
+share/nagios/docs/security.html
+share/nagios/docs/stalking.html
+share/nagios/docs/starting.html
+share/nagios/docs/statetypes.html
+share/nagios/docs/stoprestart.html
+share/nagios/docs/templaterecursion.html
+share/nagios/docs/timeperiods.html
+share/nagios/docs/toc.html
+share/nagios/docs/tuning.html
+share/nagios/docs/verifyconfig.html
+share/nagios/docs/volatileservices.html
+share/nagios/docs/whatsnew.html
+share/nagios/docs/xdata-db.html
+share/nagios/docs/xeddefault.html
+share/nagios/docs/xedtemplate.html
+share/nagios/docs/xoddefault.html
+share/nagios/docs/xodtemplate.html
+share/nagios/docs/xpddefault.html
+share/nagios/docs/xpdfile.html
+share/nagios/images/ack.gif
+share/nagios/images/command.png
+share/nagios/images/comment.gif
+share/nagios/images/contexthelp1.gif
+share/nagios/images/contexthelp2.gif
+share/nagios/images/critical.png
+share/nagios/images/delay.gif
+share/nagios/images/delete.gif
+share/nagios/images/disabled.gif
+share/nagios/images/down.gif
+share/nagios/images/downtime.gif
+share/nagios/images/empty.gif
+share/nagios/images/enabled.gif
+share/nagios/images/extinfo.gif
+share/nagios/images/flapping.gif
+share/nagios/images/greendot.gif
+share/nagios/images/histogram.png
+share/nagios/images/history.gif
+share/nagios/images/hostevent.gif
+share/nagios/images/info.png
+share/nagios/images/left.gif
+share/nagios/images/logofullsize.jpg
+share/nagios/images/logos/nagios.gd2
+share/nagios/images/logos/nagios.gif
+share/nagios/images/logos/nagiosvrml.png
+share/nagios/images/logos/unknown.gd2
+share/nagios/images/logos/unknown.gif
+share/nagios/images/logrotate.png
+share/nagios/images/ndisabled.gif
+share/nagios/images/noack.gif
+share/nagios/images/notes.gif
+share/nagios/images/notify.gif
+share/nagios/images/orangedot.gif
+share/nagios/images/recovery.png
+share/nagios/images/redudancy.png
+share/nagios/images/redundancy.png
+share/nagios/images/restart.gif
+share/nagios/images/right.gif
+share/nagios/images/sbconfig.png
+share/nagios/images/sbgeneral.png
+share/nagios/images/sblogo.jpg
+share/nagios/images/sbmonitor.png
+share/nagios/images/sbreport.png
+share/nagios/images/serviceevent.gif
+share/nagios/images/start.gif
+share/nagios/images/status.gif
+share/nagios/images/status2.gif
+share/nagios/images/status3.gif
+share/nagios/images/status4.gif
+share/nagios/images/stop.gif
+share/nagios/images/tacdisabled.jpg
+share/nagios/images/tacdisabled.png
+share/nagios/images/tacenabled.jpg
+share/nagios/images/tacenabled.png
+share/nagios/images/thermcrit.png
+share/nagios/images/thermok.png
+share/nagios/images/thermwarn.png
+share/nagios/images/trends.gif
+share/nagios/images/trendshost.png
+share/nagios/images/trendssvc.png
+share/nagios/images/unknown.png
+share/nagios/images/up.gif
+share/nagios/images/warning.png
+share/nagios/images/weblogo1.png
+share/nagios/images/zoom1.gif
+share/nagios/images/zoom2.gif
+share/nagios/index.html
+share/nagios/main.html
+share/nagios/media/critical.wav
+share/nagios/media/hostdown.wav
+share/nagios/media/warning.wav
+share/nagios/robots.txt
+share/nagios/sbin/avail.cgi
+share/nagios/sbin/cmd.cgi
+share/nagios/sbin/config.cgi
+share/nagios/sbin/extinfo.cgi
+share/nagios/sbin/histogram.cgi
+share/nagios/sbin/history.cgi
+share/nagios/sbin/notifications.cgi
+share/nagios/sbin/outages.cgi
+share/nagios/sbin/showlog.cgi
+share/nagios/sbin/status.cgi
+share/nagios/sbin/statusmap.cgi
+share/nagios/sbin/statuswml.cgi
+share/nagios/sbin/statuswrl.cgi
+share/nagios/sbin/summary.cgi
+share/nagios/sbin/tac.cgi
+share/nagios/sbin/trends.cgi
+share/nagios/side.html
+share/nagios/stylesheets/avail.css
+share/nagios/stylesheets/checksanity.css
+share/nagios/stylesheets/cmd.css
+share/nagios/stylesheets/config.css
+share/nagios/stylesheets/extinfo.css
+share/nagios/stylesheets/histogram.css
+share/nagios/stylesheets/history.css
+share/nagios/stylesheets/ministatus.css
+share/nagios/stylesheets/notifications.css
+share/nagios/stylesheets/outages.css
+share/nagios/stylesheets/showlog.css
+share/nagios/stylesheets/status.css
+share/nagios/stylesheets/statusmap.css
+share/nagios/stylesheets/summary.css
+share/nagios/stylesheets/tac.css
+share/nagios/stylesheets/trends.css
+@unexec rmdir %D/etc/nagios 2>/dev/null || true
+@dirrm share/nagios/contexthelp
+@dirrm share/nagios/docs/images
+@dirrm share/nagios/docs
+@dirrm share/nagios/images/logos
+@dirrm share/nagios/images
+@dirrm share/nagios/media
+@dirrm share/nagios/sbin
+@dirrm share/nagios/ssi
+@dirrm share/nagios/stylesheets
+@dirrm share/nagios
+@unexec rmdir %D/var/nagios/archives 2>/dev/null || true
+@unexec rmdir %D/var/nagios/rw 2>/dev/null || true
+@unexec rmdir %D/var/nagios 2>/dev/null || true
 @unexec rmdir %D/var 2>/dev/null || true
diff --git a/net-mgmt/netsaint/files/patch-aa b/net-mgmt/netsaint/files/patch-aa
index 52e4d1752784..651c011992c2 100644
--- a/net-mgmt/netsaint/files/patch-aa
+++ b/net-mgmt/netsaint/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/netsaint/files/patch-ab b/net-mgmt/netsaint/files/patch-ab
index 52c154d64fd0..777551a1ddc8 100644
--- a/net-mgmt/netsaint/files/patch-ab
+++ b/net-mgmt/netsaint/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/netsaint/files/patch-ad b/net-mgmt/netsaint/files/patch-ad
index 6d8038c4bd21..57212a7fed88 100644
--- a/net-mgmt/netsaint/files/patch-ad
+++ b/net-mgmt/netsaint/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/netsaint/files/patch-ae b/net-mgmt/netsaint/files/patch-ae
index 37f2c6d96f62..0bf8e064b3a7 100644
--- a/net-mgmt/netsaint/files/patch-ae
+++ b/net-mgmt/netsaint/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/netsaint/files/patch-ai b/net-mgmt/netsaint/files/patch-ai
index 1820da920208..433d6d74758d 100644
--- a/net-mgmt/netsaint/files/patch-ai
+++ b/net-mgmt/netsaint/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/netsaint/files/patch-aj b/net-mgmt/netsaint/files/patch-aj
deleted file mode 100644
index c427778f0d2b..000000000000
--- a/net-mgmt/netsaint/files/patch-aj
+++ /dev/null
@@ -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/netsaint/files/patch-ak b/net-mgmt/netsaint/files/patch-ak
deleted file mode 100644
index b419a9d04564..000000000000
--- a/net-mgmt/netsaint/files/patch-ak
+++ /dev/null
@@ -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/netsaint/scripts/checkps b/net-mgmt/netsaint/scripts/checkps
index 61a4d67baaa7..6014bfca04cb 100644
--- a/net-mgmt/netsaint/scripts/checkps
+++ b/net-mgmt/netsaint/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/Makefile b/net/nagios/Makefile
index f3d3d1593e0a..806fda7d1705 100644
--- a/net/nagios/Makefile
+++ b/net/nagios/Makefile
@@ -1,18 +1,16 @@
-# New ports collection makefile for:	netsaint
-# Date created:				Wed 12 Jul 2000
-# Whom:					will
+# New ports collection makefile for:	nagios
+# Date created:				19 May 2002
+# Whom:					Blaz Zupan <blaz@si.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	netsaint
-PORTVERSION=	0.0.7
-PORTEPOCH=	1
+PORTNAME=	nagios
+PORTVERSION=	1.0.b1
 CATEGORIES=	net
-MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dwcjr
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=nagios
+DISTNAME=	nagios-1.0b1
 
 MAINTAINER=	blaz@si.FreeBSD.org
 
@@ -24,15 +22,19 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lgd -lgnugetopt"
-CONFIGURE_ARGS=	--with-command-user=netsaint \
+CONFIGURE_ARGS=	--with-command-user=nagios \
 		--with-command-grp=nogroup \
-		--with-netsaint-user=netsaint \
-		--with-netsaint-grp=netsaint \
-		--sbindir=${PREFIX}/share/netsaint/sbin \
+		--with-nagios-user=nagios \
+		--with-nagios-grp=nagios \
+		--with-template-objects \
+		--with-template-extinfo \
+		--with-init-dir=${PREFIX}/etc/rc.d \
+		--sbindir=${PREFIX}/share/nagios/sbin \
 		--libexecdir=${PREFIX}/libexec/netsaint \
-		--datadir=${PREFIX}/share/netsaint \
-		--sysconfdir=${PREFIX}/etc/netsaint \
-		--localstatedir=${PREFIX}/var/netsaint
+		--datadir=${PREFIX}/share/nagios \
+		--sysconfdir=${PREFIX}/etc/nagios \
+		--localstatedir=${PREFIX}/var/nagios \
+		--prefix=${PREFIX}
 
 INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
 
@@ -42,11 +44,4 @@ pre-fetch:
 pre-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-BSDIMAGES=	bsd_logofullsize.gif bsd_sblogo.gif
-
-post-install:
-.for i in ${BSDIMAGES}
-	${INSTALL_DATA} ${WRKDIR}/netsaint-0.0.7b6/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
-.endfor
-
 .include <bsd.port.mk>
diff --git a/net/nagios/distinfo b/net/nagios/distinfo
index 24c7d5e2daee..577f40f54ce3 100644
--- a/net/nagios/distinfo
+++ b/net/nagios/distinfo
@@ -1,2 +1 @@
-MD5 (netsaint-0.0.7.tar.gz) = 5cabd55a73a618acbc82adc76d6ef382
-MD5 (netsaint-graphics.tar.gz) = d959b80cccdee3ff22f4025c6f2446c4
+MD5 (nagios-1.0b1.tar.gz) = 12b1c3a39579a354b82000602d9213a3
diff --git a/net/nagios/pkg-descr b/net/nagios/pkg-descr
index ba87fff062b8..b1ff9995e7fc 100644
--- a/net/nagios/pkg-descr
+++ b/net/nagios/pkg-descr
@@ -1,12 +1,12 @@
-NetSaint is a program that will monitor hosts and services on your
-network. It has the ability to email or page you when a problem arises
-and when it gets resolved. NetSaint is written in C and is designed to
-run under Linux, although it should work under most other *NIX variants.
-It can run either as a normal process or as a daemon, intermittently
-running checks on various services that you specify. The actual service
-checks are performed by external "plugins" which return service
-information to NetSaint. Several CGI programs are included with NetSaint
-in order to allow you to view the current service status, history, etc.
-via a web browser.
+Nagios is a host and service monitor designed to inform you of network
+problems before your clients, end-users or managers do. It has been
+designed to run under the Linux operating system, but works fine under
+most *NIX variants as well. The monitoring daemon runs intermittent
+checks on hosts and services you specify using external "plugins"
+which return status information to Nagios. When problems are
+encountered, the daemon can send notifications out to administrative
+contacts in a variety of different ways (email, instant message, SMS,
+etc.). Current status information, historical logs, and reports can
+all be accessed via a web browser. 
 
-WWW: http://www.netsaint.org/
+WWW: http://www.nagios.org/
diff --git a/net/nagios/pkg-install b/net/nagios/pkg-install
index 52af9cc24d68..dbc6461bb05e 100644
--- a/net/nagios/pkg-install
+++ b/net/nagios/pkg-install
@@ -5,8 +5,8 @@
 
 PKG_PREFIX=${PKG_PREFIX:=/usr/local}
 
-user=netsaint
-group=netsaint
+user=nagios
+group=nagios
 
 ask() {
     local question default answer
@@ -56,8 +56,8 @@ if [ x"$2" = xPRE-INSTALL ]; then
     else
         echo "You need a user \"${user}\"."
         if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw useradd ${user} -g ${group} -h - -d ${PKG_PREFIX}/var/netsaint \
-                -s /nonexistent -c "Netsaint pseudo-user" || exit
+            /usr/sbin/pw useradd ${user} -g ${group} -h - -d ${PKG_PREFIX}/var/nagios \
+                -s /nonexistent -c "Nagios pseudo-user" || exit
             echo "Done."
         else
             echo "Please create it, and try again."
diff --git a/net/nagios/pkg-plist b/net/nagios/pkg-plist
index 577913c6eba7..b31a3a4cd535 100644
--- a/net/nagios/pkg-plist
+++ b/net/nagios/pkg-plist
@@ -1,297 +1,312 @@
-@exec mkdir -p %D/var/netsaint/archives
-@exec mkdir -p %D/var/netsaint/rw
-@exec chmod 775 %D/var/netsaint %D/var/netsaint/archives %D/var/netsaint/rw
-@exec chown netsaint:netsaint %D/var/netsaint %D/var/netsaint/archives
-@exec chown netsaint:nogroup %D/var/netsaint/rw
-bin/netsaint
-etc/netsaint/commands.cfg.dist
-etc/netsaint/hosts.cfg.dist
-etc/netsaint/netsaint.cfg.dist
-etc/netsaint/nscgi.cfg.dist
-etc/netsaint/resource.cfg.dist
-etc/rc.d/netsaint.sh
-share/netsaint/docs/about.html
-share/netsaint/docs/addons.html
-share/netsaint/docs/cgiauth.html
-share/netsaint/docs/cgis.html
-share/netsaint/docs/checkscheduling.html
-share/netsaint/docs/clusters.html
-share/netsaint/docs/commandfile.html
-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
-share/netsaint/docs/developer/images/xodapi.gif
-share/netsaint/docs/developer/images/xrdapi.gif
-share/netsaint/docs/developer/images/xsdapi.gif
-share/netsaint/docs/developer/index.html
-share/netsaint/docs/developer/pluginhowto.html
-share/netsaint/docs/developer/stateretentionfile.html
-share/netsaint/docs/developer/statusfile.html
-share/netsaint/docs/developer/xcd.html
-share/netsaint/docs/developer/xdata.html
-share/netsaint/docs/developer/xed.html
-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
-share/netsaint/docs/images/distributed.gif
-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
-share/netsaint/docs/images/indirectsvccheck2.gif
-share/netsaint/docs/images/interleaved1.gif
-share/netsaint/docs/images/interleaved2.gif
-share/netsaint/docs/images/network-heirarchy.gif
-share/netsaint/docs/images/network-outage1.gif
-share/netsaint/docs/images/network-outage2.gif
-share/netsaint/docs/images/noninterleaved1.gif
-share/netsaint/docs/images/noninterleaved2.gif
-share/netsaint/docs/images/notification-process.gif
-share/netsaint/docs/images/notifications_cgi.gif
-share/netsaint/docs/images/outages_cgi.gif
-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
-share/netsaint/docs/installing.html
-share/netsaint/docs/installweb.html
-share/netsaint/docs/macros.html
-share/netsaint/docs/makehtml.html
-share/netsaint/docs/networkoutages.html
-share/netsaint/docs/networkreachability.html
-share/netsaint/docs/notifications.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
-share/netsaint/docs/programmodes.html
-share/netsaint/docs/redundancy.html
-share/netsaint/docs/robots.txt
-share/netsaint/docs/security.html
-share/netsaint/docs/starting.html
-share/netsaint/docs/statetypes.html
-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/bsd_logofullsize.gif
-share/netsaint/images/bsd_sblogo.gif
-share/netsaint/images/command.gif
-share/netsaint/images/comment.gif
-share/netsaint/images/config.gif
-share/netsaint/images/contact.gif
-share/netsaint/images/contactgroup.gif
-share/netsaint/images/critical.gif
-share/netsaint/images/delay.gif
-share/netsaint/images/delete.gif
-share/netsaint/images/disabled.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/host.gif
-share/netsaint/images/hostevent.gif
-share/netsaint/images/info.gif
-share/netsaint/images/left.gif
-share/netsaint/images/logofullsize.gif
-share/netsaint/images/logos/aix.gd2
-share/netsaint/images/logos/aix.gif
-share/netsaint/images/logos/amiga.gd2
-share/netsaint/images/logos/amiga.gif
-share/netsaint/images/logos/apple.gd2
-share/netsaint/images/logos/apple.gif
-share/netsaint/images/logos/beos.gd2
-share/netsaint/images/logos/beos.gif
-share/netsaint/images/logos/caldera.gd2
-share/netsaint/images/logos/caldera.gif
-share/netsaint/images/logos/cat1900.gd2
-share/netsaint/images/logos/cat2900.gd2
-share/netsaint/images/logos/cat5000.gd2
-share/netsaint/images/logos/debian.gd2
-share/netsaint/images/logos/debian.gif
-share/netsaint/images/logos/freebsd40.gd2
-share/netsaint/images/logos/freebsd40.gif
-share/netsaint/images/logos/hp-printer40.gd2
-share/netsaint/images/logos/hp-printer40.gif
-share/netsaint/images/logos/hpux.gd2
-share/netsaint/images/logos/hpux.gif
-share/netsaint/images/logos/irix.gd2
-share/netsaint/images/logos/irix.gif
-share/netsaint/images/logos/linux40.gd2
-share/netsaint/images/logos/linux40.gif
-share/netsaint/images/logos/logo.gd2
-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/next.gd2
-share/netsaint/images/logos/next.gif
-share/netsaint/images/logos/netsaint.gd2
-share/netsaint/images/logos/ng-switch40.gd2
-share/netsaint/images/logos/ng-switch40.gif
-share/netsaint/images/logos/novell40.gd2
-share/netsaint/images/logos/novell40.gif
-share/netsaint/images/logos/openbsd.gd2
-share/netsaint/images/logos/openbsd.gif
-share/netsaint/images/logos/redhat.gd2
-share/netsaint/images/logos/redhat.gif
-share/netsaint/images/logos/router40.gd2
-share/netsaint/images/logos/router40.gif
-share/netsaint/images/logos/slackware.gd2
-share/netsaint/images/logos/slackware.gif
-share/netsaint/images/logos/stampede.gd2
-share/netsaint/images/logos/stampede.gif
-share/netsaint/images/logos/storm.gd2
-share/netsaint/images/logos/storm.gif
-share/netsaint/images/logos/sun40.gd2
-share/netsaint/images/logos/sun40.gif
-share/netsaint/images/logos/sunlogo.gd2
-share/netsaint/images/logos/sunlogo.gif
-share/netsaint/images/logos/switch40.gd2
-share/netsaint/images/logos/switch40.gif
-share/netsaint/images/logos/turbolinux.gd2
-share/netsaint/images/logos/turbolinux.gif
-share/netsaint/images/logos/ultrapenguin.gd2
-share/netsaint/images/logos/ultrapenguin.gif
-share/netsaint/images/logos/unicos.gd2
-share/netsaint/images/logos/unicos.gif
-share/netsaint/images/logos/unknown.gd2
-share/netsaint/images/logos/win40.gd2
-share/netsaint/images/logos/win40.gif
-share/netsaint/images/logos/yellowdog.gd2
-share/netsaint/images/logos/yellowdog.gif
-share/netsaint/images/logrotate.gif
-share/netsaint/images/logs.gif
-share/netsaint/images/ndisabled.gif
-share/netsaint/images/noack.gif
-share/netsaint/images/notes.gif
-share/netsaint/images/notify.gif
-share/netsaint/images/orangedot.gif
-share/netsaint/images/parentup.gif
-share/netsaint/images/recovery.gif
-share/netsaint/images/restart.gif
-share/netsaint/images/right.gif
-share/netsaint/images/sbbg.gif
-share/netsaint/images/sbconfig.gif
-share/netsaint/images/sbgeneral.gif
-share/netsaint/images/sblogo.gif
-share/netsaint/images/sbmonitor.gif
-share/netsaint/images/serviceevent.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/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/trends.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
-share/netsaint/media/hostdown.wav
-share/netsaint/media/warning.wav
-share/netsaint/robots.txt
-share/netsaint/sbin/avail.cgi
-share/netsaint/sbin/cmd.cgi
-share/netsaint/sbin/config.cgi
-share/netsaint/sbin/extinfo.cgi
-share/netsaint/sbin/history.cgi
-share/netsaint/sbin/ministatus.cgi
-share/netsaint/sbin/notifications.cgi
-share/netsaint/sbin/outages.cgi
-share/netsaint/sbin/showlog.cgi
-share/netsaint/sbin/status.cgi
-share/netsaint/sbin/statusmap.cgi
-share/netsaint/sbin/statuswml.cgi
-share/netsaint/sbin/statuswrl.cgi
-share/netsaint/sbin/tac.cgi
-share/netsaint/sbin/trends.cgi
-share/netsaint/side.html
-share/netsaint/stylesheets/avail.css
-share/netsaint/stylesheets/cmd.css
-share/netsaint/stylesheets/config.css
-share/netsaint/stylesheets/extinfo.css
-share/netsaint/stylesheets/history.css
-share/netsaint/stylesheets/notifications.css
-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
-@unexec rmdir %D/etc/netsaint 2>/dev/null || true
-@dirrm share/netsaint/docs/developer/images
-@dirrm share/netsaint/docs/developer
-@dirrm share/netsaint/docs/images
-@dirrm share/netsaint/docs
-@dirrm share/netsaint/images/logos
-@dirrm share/netsaint/images
-@dirrm share/netsaint/media
-@dirrm share/netsaint/sbin
-@dirrm share/netsaint/stylesheets
-@dirrm share/netsaint
-@unexec rmdir %D/var/netsaint/archives 2>/dev/null || true
-@unexec rmdir %D/var/netsaint/rw 2>/dev/null || true
-@unexec rmdir %D/var/netsaint 2>/dev/null || true
+@exec mkdir -p %D/share/nagios/ssi
+@exec mkdir -p %D/var/nagios/archives
+@exec mkdir -p %D/var/nagios/rw
+@exec chmod 775 %D/var/nagios %D/var/nagios/archives %D/var/nagios/rw
+@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/rc.d/nagios.sh
+share/nagios/contexthelp/A1.html
+share/nagios/contexthelp/A2.html
+share/nagios/contexthelp/A3.html
+share/nagios/contexthelp/A4.html
+share/nagios/contexthelp/A5.html
+share/nagios/contexthelp/A6.html
+share/nagios/contexthelp/A7.html
+share/nagios/contexthelp/B1.html
+share/nagios/contexthelp/C1.html
+share/nagios/contexthelp/D1.html
+share/nagios/contexthelp/E1.html
+share/nagios/contexthelp/F1.html
+share/nagios/contexthelp/G1.html
+share/nagios/contexthelp/G2.html
+share/nagios/contexthelp/G3.html
+share/nagios/contexthelp/G4.html
+share/nagios/contexthelp/G5.html
+share/nagios/contexthelp/G6.html
+share/nagios/contexthelp/H1.html
+share/nagios/contexthelp/H2.html
+share/nagios/contexthelp/H3.html
+share/nagios/contexthelp/H4.html
+share/nagios/contexthelp/H5.html
+share/nagios/contexthelp/H6.html
+share/nagios/contexthelp/H7.html
+share/nagios/contexthelp/H8.html
+share/nagios/contexthelp/I1.html
+share/nagios/contexthelp/I2.html
+share/nagios/contexthelp/I3.html
+share/nagios/contexthelp/I4.html
+share/nagios/contexthelp/I5.html
+share/nagios/contexthelp/I6.html
+share/nagios/contexthelp/I7.html
+share/nagios/contexthelp/I8.html
+share/nagios/contexthelp/J1.html
+share/nagios/contexthelp/K1.html
+share/nagios/contexthelp/L1.html
+share/nagios/contexthelp/L10.html
+share/nagios/contexthelp/L11.html
+share/nagios/contexthelp/L12.html
+share/nagios/contexthelp/L13.html
+share/nagios/contexthelp/L2.html
+share/nagios/contexthelp/L3.html
+share/nagios/contexthelp/L4.html
+share/nagios/contexthelp/L5.html
+share/nagios/contexthelp/L6.html
+share/nagios/contexthelp/L7.html
+share/nagios/contexthelp/L8.html
+share/nagios/contexthelp/L9.html
+share/nagios/contexthelp/M1.html
+share/nagios/contexthelp/M2.html
+share/nagios/contexthelp/M3.html
+share/nagios/contexthelp/M4.html
+share/nagios/contexthelp/M5.html
+share/nagios/contexthelp/M6.html
+share/nagios/contexthelp/N1.html
+share/nagios/contexthelp/N2.html
+share/nagios/contexthelp/N3.html
+share/nagios/contexthelp/N4.html
+share/nagios/contexthelp/N5.html
+share/nagios/contexthelp/N6.html
+share/nagios/contexthelp/N7.html
+share/nagios/docs/images/activepassive.png
+share/nagios/docs/images/cgi-avail-a.png
+share/nagios/docs/images/cgi-avail-b.png
+share/nagios/docs/images/cgi-cmd.png
+share/nagios/docs/images/cgi-config.png
+share/nagios/docs/images/cgi-extinfo-a.png
+share/nagios/docs/images/cgi-extinfo-b.png
+share/nagios/docs/images/cgi-extinfo-c.png
+share/nagios/docs/images/cgi-extinfo-d.png
+share/nagios/docs/images/cgi-histogram.png
+share/nagios/docs/images/cgi-history.png
+share/nagios/docs/images/cgi-notifications.png
+share/nagios/docs/images/cgi-outages.png
+share/nagios/docs/images/cgi-showlog.png
+share/nagios/docs/images/cgi-status-a.png
+share/nagios/docs/images/cgi-status-b.png
+share/nagios/docs/images/cgi-status-c.png
+share/nagios/docs/images/cgi-status-d.png
+share/nagios/docs/images/cgi-statusmap.png
+share/nagios/docs/images/cgi-statuswml.png
+share/nagios/docs/images/cgi-statuswrl.png
+share/nagios/docs/images/cgi-summary.png
+share/nagios/docs/images/cgi-tac.png
+share/nagios/docs/images/cgi-trends.png
+share/nagios/docs/images/checktiming.png
+share/nagios/docs/images/distributed.png
+share/nagios/docs/images/host-dependencies.png
+share/nagios/docs/images/indirecthostcheck.png
+share/nagios/docs/images/indirectsvccheck.png
+share/nagios/docs/images/indirectsvccheck2.png
+share/nagios/docs/images/interleaved1.png
+share/nagios/docs/images/interleaved2.png
+share/nagios/docs/images/interleaved3.png
+share/nagios/docs/images/logofullsize.png
+share/nagios/docs/images/network-heirarchy.png
+share/nagios/docs/images/network-outage1.png
+share/nagios/docs/images/network-outage2.png
+share/nagios/docs/images/noninterleaved1.png
+share/nagios/docs/images/noninterleaved2.png
+share/nagios/docs/images/physical-network.png
+share/nagios/docs/images/plugintheory.png
+share/nagios/docs/images/redudancy.png
+share/nagios/docs/images/redundancy.png
+share/nagios/docs/images/service-dependencies.png
+share/nagios/docs/images/statetransitions.png
+share/nagios/docs/images/statetransitions2.png
+share/nagios/docs/about.html
+share/nagios/docs/addons.html
+share/nagios/docs/beginners.html
+share/nagios/docs/cgiauth.html
+share/nagios/docs/cgiincludes.html
+share/nagios/docs/cgis.html
+share/nagios/docs/checkscheduling.html
+share/nagios/docs/clusters.html
+share/nagios/docs/commandfile.html
+share/nagios/docs/config.html
+share/nagios/docs/configcgi.html
+share/nagios/docs/configextinfo.html
+share/nagios/docs/configmain.html
+share/nagios/docs/configobject.html
+share/nagios/docs/dependencies.html
+share/nagios/docs/distributed.html
+share/nagios/docs/downtime.html
+share/nagios/docs/embeddedperl.html
+share/nagios/docs/escalations.html
+share/nagios/docs/eventhandlers.html
+share/nagios/docs/extcommands.html
+share/nagios/docs/faqs.html
+share/nagios/docs/flapping.html
+share/nagios/docs/freshness.html
+share/nagios/docs/funstuff.html
+share/nagios/docs/index.html
+share/nagios/docs/indirectchecks.html
+share/nagios/docs/installing.html
+share/nagios/docs/installweb.html
+share/nagios/docs/int-portsentry.html
+share/nagios/docs/int-snmptrap.html
+share/nagios/docs/int-tcpwrappers.html
+share/nagios/docs/macros.html
+share/nagios/docs/networkoutages.html
+share/nagios/docs/networkreachability.html
+share/nagios/docs/notifications.html
+share/nagios/docs/parallelization.html
+share/nagios/docs/passivechecks.html
+share/nagios/docs/perfdata.html
+share/nagios/docs/plugins.html
+share/nagios/docs/plugintheory.html
+share/nagios/docs/redundancy.html
+share/nagios/docs/robots.txt
+share/nagios/docs/security.html
+share/nagios/docs/stalking.html
+share/nagios/docs/starting.html
+share/nagios/docs/statetypes.html
+share/nagios/docs/stoprestart.html
+share/nagios/docs/templaterecursion.html
+share/nagios/docs/timeperiods.html
+share/nagios/docs/toc.html
+share/nagios/docs/tuning.html
+share/nagios/docs/verifyconfig.html
+share/nagios/docs/volatileservices.html
+share/nagios/docs/whatsnew.html
+share/nagios/docs/xdata-db.html
+share/nagios/docs/xeddefault.html
+share/nagios/docs/xedtemplate.html
+share/nagios/docs/xoddefault.html
+share/nagios/docs/xodtemplate.html
+share/nagios/docs/xpddefault.html
+share/nagios/docs/xpdfile.html
+share/nagios/images/ack.gif
+share/nagios/images/command.png
+share/nagios/images/comment.gif
+share/nagios/images/contexthelp1.gif
+share/nagios/images/contexthelp2.gif
+share/nagios/images/critical.png
+share/nagios/images/delay.gif
+share/nagios/images/delete.gif
+share/nagios/images/disabled.gif
+share/nagios/images/down.gif
+share/nagios/images/downtime.gif
+share/nagios/images/empty.gif
+share/nagios/images/enabled.gif
+share/nagios/images/extinfo.gif
+share/nagios/images/flapping.gif
+share/nagios/images/greendot.gif
+share/nagios/images/histogram.png
+share/nagios/images/history.gif
+share/nagios/images/hostevent.gif
+share/nagios/images/info.png
+share/nagios/images/left.gif
+share/nagios/images/logofullsize.jpg
+share/nagios/images/logos/nagios.gd2
+share/nagios/images/logos/nagios.gif
+share/nagios/images/logos/nagiosvrml.png
+share/nagios/images/logos/unknown.gd2
+share/nagios/images/logos/unknown.gif
+share/nagios/images/logrotate.png
+share/nagios/images/ndisabled.gif
+share/nagios/images/noack.gif
+share/nagios/images/notes.gif
+share/nagios/images/notify.gif
+share/nagios/images/orangedot.gif
+share/nagios/images/recovery.png
+share/nagios/images/redudancy.png
+share/nagios/images/redundancy.png
+share/nagios/images/restart.gif
+share/nagios/images/right.gif
+share/nagios/images/sbconfig.png
+share/nagios/images/sbgeneral.png
+share/nagios/images/sblogo.jpg
+share/nagios/images/sbmonitor.png
+share/nagios/images/sbreport.png
+share/nagios/images/serviceevent.gif
+share/nagios/images/start.gif
+share/nagios/images/status.gif
+share/nagios/images/status2.gif
+share/nagios/images/status3.gif
+share/nagios/images/status4.gif
+share/nagios/images/stop.gif
+share/nagios/images/tacdisabled.jpg
+share/nagios/images/tacdisabled.png
+share/nagios/images/tacenabled.jpg
+share/nagios/images/tacenabled.png
+share/nagios/images/thermcrit.png
+share/nagios/images/thermok.png
+share/nagios/images/thermwarn.png
+share/nagios/images/trends.gif
+share/nagios/images/trendshost.png
+share/nagios/images/trendssvc.png
+share/nagios/images/unknown.png
+share/nagios/images/up.gif
+share/nagios/images/warning.png
+share/nagios/images/weblogo1.png
+share/nagios/images/zoom1.gif
+share/nagios/images/zoom2.gif
+share/nagios/index.html
+share/nagios/main.html
+share/nagios/media/critical.wav
+share/nagios/media/hostdown.wav
+share/nagios/media/warning.wav
+share/nagios/robots.txt
+share/nagios/sbin/avail.cgi
+share/nagios/sbin/cmd.cgi
+share/nagios/sbin/config.cgi
+share/nagios/sbin/extinfo.cgi
+share/nagios/sbin/histogram.cgi
+share/nagios/sbin/history.cgi
+share/nagios/sbin/notifications.cgi
+share/nagios/sbin/outages.cgi
+share/nagios/sbin/showlog.cgi
+share/nagios/sbin/status.cgi
+share/nagios/sbin/statusmap.cgi
+share/nagios/sbin/statuswml.cgi
+share/nagios/sbin/statuswrl.cgi
+share/nagios/sbin/summary.cgi
+share/nagios/sbin/tac.cgi
+share/nagios/sbin/trends.cgi
+share/nagios/side.html
+share/nagios/stylesheets/avail.css
+share/nagios/stylesheets/checksanity.css
+share/nagios/stylesheets/cmd.css
+share/nagios/stylesheets/config.css
+share/nagios/stylesheets/extinfo.css
+share/nagios/stylesheets/histogram.css
+share/nagios/stylesheets/history.css
+share/nagios/stylesheets/ministatus.css
+share/nagios/stylesheets/notifications.css
+share/nagios/stylesheets/outages.css
+share/nagios/stylesheets/showlog.css
+share/nagios/stylesheets/status.css
+share/nagios/stylesheets/statusmap.css
+share/nagios/stylesheets/summary.css
+share/nagios/stylesheets/tac.css
+share/nagios/stylesheets/trends.css
+@unexec rmdir %D/etc/nagios 2>/dev/null || true
+@dirrm share/nagios/contexthelp
+@dirrm share/nagios/docs/images
+@dirrm share/nagios/docs
+@dirrm share/nagios/images/logos
+@dirrm share/nagios/images
+@dirrm share/nagios/media
+@dirrm share/nagios/sbin
+@dirrm share/nagios/ssi
+@dirrm share/nagios/stylesheets
+@dirrm share/nagios
+@unexec rmdir %D/var/nagios/archives 2>/dev/null || true
+@unexec rmdir %D/var/nagios/rw 2>/dev/null || true
+@unexec rmdir %D/var/nagios 2>/dev/null || true
 @unexec rmdir %D/var 2>/dev/null || true
diff --git a/net/netsaint/files/patch-aa b/net/netsaint/files/patch-aa
index 52e4d1752784..651c011992c2 100644
--- a/net/netsaint/files/patch-aa
+++ b/net/netsaint/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/netsaint/files/patch-ab b/net/netsaint/files/patch-ab
index 52c154d64fd0..777551a1ddc8 100644
--- a/net/netsaint/files/patch-ab
+++ b/net/netsaint/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/netsaint/files/patch-ad b/net/netsaint/files/patch-ad
index 6d8038c4bd21..57212a7fed88 100644
--- a/net/netsaint/files/patch-ad
+++ b/net/netsaint/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/netsaint/files/patch-ae b/net/netsaint/files/patch-ae
index 37f2c6d96f62..0bf8e064b3a7 100644
--- a/net/netsaint/files/patch-ae
+++ b/net/netsaint/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/netsaint/files/patch-ai b/net/netsaint/files/patch-ai
index 1820da920208..433d6d74758d 100644
--- a/net/netsaint/files/patch-ai
+++ b/net/netsaint/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/netsaint/files/patch-aj b/net/netsaint/files/patch-aj
deleted file mode 100644
index c427778f0d2b..000000000000
--- a/net/netsaint/files/patch-aj
+++ /dev/null
@@ -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/netsaint/files/patch-ak b/net/netsaint/files/patch-ak
deleted file mode 100644
index b419a9d04564..000000000000
--- a/net/netsaint/files/patch-ak
+++ /dev/null
@@ -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/netsaint/scripts/checkps b/net/netsaint/scripts/checkps
index 61a4d67baaa7..6014bfca04cb 100644
--- a/net/netsaint/scripts/checkps
+++ b/net/netsaint/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