This commit was manufactured by cvs2svn to create tag 'RELEASE_4_1_1'.release/4.1.1

7 files changed, 0 insertions, 436 deletions

diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile
deleted file mode 100644
index b80ee2d2c7f2..000000000000
--- a/net/nagios-plugins/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# New ports collection makefile for:	netsaint-plugins
-# Date created:				Wed 12 Jul 2000
-# Whom:					will
-#
-# $FreeBSD$
-#
-
-PORTNAME=	netsaint-plugins
-PORTVERSION=	1.2.8.4
-CATEGORIES=	net
-MASTER_SITES=	http://netsaintplug.sourceforge.net/src/
-DISTNAME=	${PORTNAME}-1.2.8-4
-
-MAINTAINER=	will@FreeBSD.org
-
-# make absolutely sure we have the user/group added!
-BUILD_DEPENDS=	netsaint:${PORTSDIR}/net/netsaint
-RUN_DEPENDS=	netsaint:${PORTSDIR}/net/netsaint
-.if defined(WANT_QSTAT)
-BUILD_DEPENDS+=	qstat:${PORTSDIR}/games/qstat
-RUN_DEPENDS+=	qstat:${PORTSDIR}/games/qstat
-.endif
-.if defined(WANT_FPING)
-BUILD_DEPENDS+=	fping:${PORTSDIR}/net/fping
-RUN_DEPENDS+=	fping:${PORTSDIR}/net/fping
-.endif
-.if defined(WANT_SNMP)
-BUILD_DEPENDS+=	snmpcheck:${PORTSDIR}/net/ucd-snmp
-RUN_DEPENDS+=	snmpcheck:${PORTSDIR}/net/ucd-snmp
-.endif
-
-GNU_CONFIGURE=	yes
-
-.include <bsd.port.mk>
diff --git a/net/nagios-plugins/distinfo b/net/nagios-plugins/distinfo
deleted file mode 100644
index c23159a62bc9..000000000000
--- a/net/nagios-plugins/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (netsaint-plugins-1.2.8-4.tar.gz) = a08534e928e9355a098ad73a37d1c685
diff --git a/net/nagios-plugins/files/patch-aa b/net/nagios-plugins/files/patch-aa
deleted file mode 100644
index a4e5f9a7fed9..000000000000
--- a/net/nagios-plugins/files/patch-aa
+++ /dev/null
@@ -1,238 +0,0 @@
---- configure	Mon Jun 26 11:49:40 2000
-+++ configure.new	Wed Jul 12 12:17:48 2000
-@@ -11,7 +11,7 @@
- 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_help="$ac_help
- --with-cgiurl=<dir> sets URL for cgi programs"
- ac_help="$ac_help
-@@ -47,12 +47,12 @@
- x_includes=NONE
- x_libraries=NONE
- bindir='${exec_prefix}/bin'
--sbindir='${exec_prefix}/sbin'
--libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
--sysconfdir='${prefix}/etc'
-+sbindir='${exec_prefix}/share/netsaint/sbin'
-+libexecdir='${exec_prefix}/libexec/netsaint'
-+datadir='${prefix}/share/netsaint'
-+sysconfdir='${prefix}/etc/netsaint'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstatedir='${prefix}/var/netsaint'
- libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
-@@ -3116,15 +3116,15 @@
- EOF
- 
-         echo "      ps syntax... $PATH_TO_PS -eo 's  comm vsz rss user ppid args'"
--elif ps -Ao 's comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
-+elif ps -axo 's comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
- then
-         cat >> confdefs.h <<EOF
--#define PS_RAW_COMMAND "$PATH_TO_PS -Ao 's user ppid args'"
-+#define PS_RAW_COMMAND "$PATH_TO_PS -axo 's user ppid args'"
- EOF
- 
- 	EXTRAS="$EXTRAS check_netsaint"
- 	cat >> confdefs.h <<EOF
--#define PS_COMMAND "$PATH_TO_PS -Ao 's uid ppid comm args'"
-+#define PS_COMMAND "$PATH_TO_PS -axo 's uid ppid comm args'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3132,7 +3132,7 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define VSZ_COMMAND "$PATH_TO_PS -Ao 'vsz comm'"
-+#define VSZ_COMMAND "$PATH_TO_PS -axo 'vsz comm'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3140,23 +3140,23 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define RSS_COMMAND "$PATH_TO_PS -Ao 'rss comm'"
-+#define RSS_COMMAND "$PATH_TO_PS -axo 'rss comm'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
- #define RSS_FORMAT "%d %s"
- EOF
- 
--	echo "      ps syntax... $PATH_TO_PS -Ao 's comm vsz rss'"
--elif ps -Ao 'status comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
-+	echo "      ps syntax... $PATH_TO_PS -axo 's comm vsz rss'"
-+elif ps -axo 'status comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
- then
-         cat >> confdefs.h <<EOF
--#define PS_RAW_COMMAND "$PATH_TO_PS -Ao 'status user ppid args'"
-+#define PS_RAW_COMMAND "$PATH_TO_PS -axo 'status user ppid args'"
- EOF
- 
- 	EXTRAS="$EXTRAS check_netsaint"
- 	cat >> confdefs.h <<EOF
--#define PS_COMMAND "$PATH_TO_PS -Ao 'status uid ppid comm args'"
-+#define PS_COMMAND "$PATH_TO_PS -axo 'status uid ppid comm args'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3164,7 +3164,7 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define VSZ_COMMAND "$PATH_TO_PS -Ao 'vsz comm'"
-+#define VSZ_COMMAND "$PATH_TO_PS -axo 'vsz comm'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3172,23 +3172,23 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define RSS_COMMAND "$PATH_TO_PS -Ao 'rss comm'"
-+#define RSS_COMMAND "$PATH_TO_PS -axo 'rss comm'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
- #define RSS_FORMAT "%d %s"
- EOF
- 
--	echo "      ps syntax... $PATH_TO_PS -Ao 'status comm vsz rss'"
--elif ps -Ao 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
-+	echo "      ps syntax... $PATH_TO_PS -axo 'status comm vsz rss'"
-+elif ps -axo 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
- then
-         cat >> confdefs.h <<EOF
--#define PS_RAW_COMMAND "$PATH_TO_PS -Ao 'state user ppid args'"
-+#define PS_RAW_COMMAND "$PATH_TO_PS -axo 'state user ppid args'"
- EOF
- 
- 	EXTRAS="$EXTRAS check_netsaint"
- 	cat >> confdefs.h <<EOF
--#define PS_COMMAND "$PATH_TO_PS -Ao 'state uid ppid comm args'"
-+#define PS_COMMAND "$PATH_TO_PS -axo 'state uid ppid comm args'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3196,7 +3196,7 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define VSZ_COMMAND "$PATH_TO_PS -Ao 'vsz comm'"
-+#define VSZ_COMMAND "$PATH_TO_PS -axo 'vsz comm'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3204,14 +3204,14 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define RSS_COMMAND "$PATH_TO_PS -Ao 'rss comm'"
-+#define RSS_COMMAND "$PATH_TO_PS -axo 'rss comm'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
- #define RSS_FORMAT "%d %s"
- EOF
- 
--	echo "      ps syntax... $PATH_TO_PS -Ao 'state comm vsz rss'"
-+	echo "      ps syntax... $PATH_TO_PS -axo 'state comm vsz rss'"
- elif ps -ao 'state command vsz rss user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
- then
-         cat >> confdefs.h <<EOF
-@@ -3228,7 +3228,7 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define VSZ_COMMAND "$PATH_TO_PS -ao 'vsz command'"
-+#define VSZ_COMMAND "$PATH_TO_PS -axo 'vsz command'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3243,16 +3243,16 @@
- #define RSS_FORMAT "%d %s"
- EOF
- 
--	echo "      ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'"
--elif ps waxco 'state command vsz rss uid user ppid' 2>/dev/null | egrep -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PPID" >/dev/null
-+	echo "      ps syntax... $PATH_TO_PS -axo 'state command vsz rss'"
-+elif ps waxo 'state command vsz rss uid user ppid' 2>/dev/null | egrep -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PPID" >/dev/null
- then
-         cat >> confdefs.h <<EOF
--#define PS_RAW_COMMAND "$PATH_TO_PS waxco 'state uid ppid command'"
-+#define PS_RAW_COMMAND "$PATH_TO_PS waxo 'state uid ppid command'"
- EOF
- 
- 	EXTRAS="$EXTRAS check_netsaint"
- 	cat >> confdefs.h <<EOF
--#define PS_COMMAND "$PATH_TO_PS waxco 'state uid ppid command'"
-+#define PS_COMMAND "$PATH_TO_PS waxo 'state uid ppid command'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3260,7 +3260,7 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define VSZ_COMMAND "$PATH_TO_PS waxco 'vsz command'"
-+#define VSZ_COMMAND "$PATH_TO_PS waxo 'vsz command'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3268,18 +3268,18 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define RSS_COMMAND "$PATH_TO_PS waxco 'rss command'"
-+#define RSS_COMMAND "$PATH_TO_PS waxo 'rss command'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
- #define RSS_FORMAT "%d %s"
- EOF
- 
--	echo "      ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'"
-+	echo "      ps syntax... $PATH_TO_PS -axo 'state command vsz rss'"
- elif ps waxno 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
- then
-         cat >> confdefs.h <<EOF
--#define PS_RAW_COMMAND "$PATH_TO_PS waxco 'state user ppid command'"
-+#define PS_RAW_COMMAND "$PATH_TO_PS waxo 'state user ppid command'"
- EOF
- 
- 	EXTRAS="$EXTRAS check_netsaint"
-@@ -3307,7 +3307,7 @@
- #define RSS_FORMAT "%d %s"
- EOF
- 
--	echo "      ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'"
-+	echo "      ps syntax... $PATH_TO_PS -axo 'state command vsz rss'"
- elif ps -el 2>/dev/null | egrep -i "^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+" >/dev/null
- then
- 	cat >> confdefs.h <<EOF
-@@ -3597,17 +3597,6 @@
- EOF
- 
- 	echo "      ping syntax... $PATH_TO_PING -n -h <host> -s 56 -c <count>"
--elif ping -n -s 56 -c 1 127.0.0.1 2>/dev/null | egrep -i "^round-trip" >/dev/null
--then
--	cat >> confdefs.h <<EOF
--#define PING_COMMAND "$PATH_TO_PING -n -s 56 -c %d %s"
--EOF
--
--	cat >> confdefs.h <<EOF
--#define PING_PACKETS_FIRST "$PATH_TO_PING -n -s 56 -c %d %s"
--EOF
--
--	echo "      ping syntax... $PATH_TO_PING -n -s 56 -c <count> <host>"
- elif ping -n -c 1 127.0.0.1 2>/dev/null | egrep -i "^round-trip" >/dev/null
- then
- 	cat >> confdefs.h <<EOF
diff --git a/net/nagios-plugins/files/patch-ab b/net/nagios-plugins/files/patch-ab
deleted file mode 100644
index 89a0e0278d51..000000000000
--- a/net/nagios-plugins/files/patch-ab
+++ /dev/null
@@ -1,104 +0,0 @@
---- configure.in	Wed Jul 12 12:18:15 2000
-+++ configure.in.new	Wed Jul 12 12:22:11 2000
-@@ -223,39 +223,39 @@
- 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -eo 'rss comm'")
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
-         echo "      ps syntax... $PATH_TO_PS -eo 's  comm vsz rss user ppid args'"
--elif [ps -Ao 's comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
-+elif [ps -axo 's comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
- then
--        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 's user ppid args'")
-+        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 's user ppid args'")
- 	EXTRAS="$EXTRAS check_netsaint"
--	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 's uid ppid comm args'")
-+	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axo 's uid ppid comm args'")
- 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s")
--	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'")
-+	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axo 'vsz comm'")
- 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
--	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'")
-+	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axo 'rss comm'")
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
--	echo "      ps syntax... $PATH_TO_PS -Ao 's comm vsz rss'"
--elif [ps -Ao 'status comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
-+	echo "      ps syntax... $PATH_TO_PS -axo 's comm vsz rss'"
-+elif [ps -axo 'status comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
- then
--        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 'status user ppid args'")
-+        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 'status user ppid args'")
- 	EXTRAS="$EXTRAS check_netsaint"
--	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 'status uid ppid comm args'")
-+	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axo 'status uid ppid comm args'")
- 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s")
--	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'")
-+	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axo 'vsz comm'")
- 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
--	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'")
-+	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axo 'rss comm'")
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
--	echo "      ps syntax... $PATH_TO_PS -Ao 'status comm vsz rss'"
--elif [ps -Ao 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
-+	echo "      ps syntax... $PATH_TO_PS -axo 'status comm vsz rss'"
-+elif [ps -axo 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
- then
--        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 'state user ppid args'")
-+        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 'state user ppid args'")
- 	EXTRAS="$EXTRAS check_netsaint"
--	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 'state uid ppid comm args'")
-+	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axo 'state uid ppid comm args'")
- 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s")
--	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'")
-+	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axo 'vsz comm'")
- 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
--	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'")
-+	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axo 'rss comm'")
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
--	echo "      ps syntax... $PATH_TO_PS -Ao 'state comm vsz rss'"
-+	echo "      ps syntax... $PATH_TO_PS -axo 'state comm vsz rss'"
- elif [ps -ao 'state command vsz rss user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
- then
-         AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -ao 'state user ppid args'")
-@@ -266,23 +266,23 @@
- 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
- 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -ao 'rss command'")
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
--	echo "      ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'"
-+	echo "      ps syntax... $PATH_TO_PS -axo 'state command vsz rss'"
- dnl FreeBSD
--elif [ps waxco 'state command vsz rss uid user ppid' 2>/dev/null | egrep -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PPID" >/dev/null]
-+elif [ps waxo 'state command vsz rss uid user ppid' 2>/dev/null | egrep -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PPID" >/dev/null]
- then
--        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxco 'state uid ppid command'")
-+        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'")
- 	EXTRAS="$EXTRAS check_netsaint"
--	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxco 'state uid ppid command'")
-+	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'")
- 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s")
--	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxco 'vsz command'")
-+	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxo 'vsz command'")
- 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
--	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxco 'rss command'")
-+	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxo 'rss command'")
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
--	echo "      ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'"
-+	echo "      ps syntax... $PATH_TO_PS -axo 'state command vsz rss'"
- dnl BSD-like mode in RH 6.1
- elif [ps waxno 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
- then
--        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxco 'state user ppid command'")
-+        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxo 'state user ppid command'")
- 	EXTRAS="$EXTRAS check_netsaint"
- 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxno 'state uid ppid comm args'")
- 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s")
-@@ -386,11 +386,6 @@
- then
- 	AC_DEFINE_UNQUOTED(PING_COMMAND,"$PATH_TO_PING -n -h %s -s 56 -c %d")
- 	echo "      ping syntax... $PATH_TO_PING -n -h <host> -s 56 -c <count>"
--elif [ping -n -s 56 -c 1 127.0.0.1 2>/dev/null | egrep -i "^round-trip" >/dev/null]
--then
--	AC_DEFINE_UNQUOTED(PING_COMMAND,"$PATH_TO_PING -n -s 56 -c %d %s")
--	AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$PATH_TO_PING -n -s 56 -c %d %s")
--	echo "      ping syntax... $PATH_TO_PING -n -s 56 -c <count> <host>"
- elif [ping -n -c 1 127.0.0.1 2>/dev/null | egrep -i "^round-trip" >/dev/null]
- then
- 	AC_DEFINE_UNQUOTED(PING_COMMAND,"$PATH_TO_PING -n -c %d %s")
diff --git a/net/nagios-plugins/pkg-comment b/net/nagios-plugins/pkg-comment
deleted file mode 100644
index e5f08464789b..000000000000
--- a/net/nagios-plugins/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Plugins for netsaint
diff --git a/net/nagios-plugins/pkg-descr b/net/nagios-plugins/pkg-descr
deleted file mode 100644
index 0abedd7de10a..000000000000
--- a/net/nagios-plugins/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-This is a plugin package for Netsaint.  Quoting from the
-main Netsaint package:
-
-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. 
-
-WWW: http://www.netsaint.org/
diff --git a/net/nagios-plugins/pkg-plist b/net/nagios-plugins/pkg-plist
deleted file mode 100644
index 854009e56233..000000000000
--- a/net/nagios-plugins/pkg-plist
+++ /dev/null
@@ -1,42 +0,0 @@
-libexec/netsaint/check_disk
-libexec/netsaint/check_dns
-libexec/netsaint/check_dummy
-libexec/netsaint/check_ftp
-libexec/netsaint/check_http
-libexec/netsaint/check_imap
-libexec/netsaint/check_load
-libexec/netsaint/check_mrtg
-libexec/netsaint/check_mrtgtraf
-libexec/netsaint/check_netsaint
-libexec/netsaint/check_nntp
-libexec/netsaint/check_nwstat
-libexec/netsaint/check_overcr
-libexec/netsaint/check_ping
-libexec/netsaint/check_pop
-libexec/netsaint/check_procs
-libexec/netsaint/check_real
-libexec/netsaint/check_reply
-libexec/netsaint/check_smtp
-libexec/netsaint/check_ssh
-libexec/netsaint/check_tcp
-libexec/netsaint/check_time
-libexec/netsaint/check_udp
-libexec/netsaint/check_ups
-libexec/netsaint/check_users
-libexec/netsaint/check_vsz
-libexec/netsaint/check_by_ssh
-libexec/netsaint/urlize
-libexec/netsaint/check_game
-libexec/netsaint/check_fping
-libexec/netsaint/check_swap
-libexec/netsaint/check_breeze
-libexec/netsaint/check_disk_smb
-libexec/netsaint/check_flexlm
-libexec/netsaint/check_ircd
-libexec/netsaint/check_log
-libexec/netsaint/check_ntp
-libexec/netsaint/check_oracle
-libexec/netsaint/check_rpc
-libexec/netsaint/check_sensors
-libexec/netsaint/check_wave
-@dirrm libexec/netsaint