Update to 4.3.1nb1

    - Modify webnocol.cgi to find traceroute in /usr/sbin
    - Install the images and audio files in $PREFIX/share/nocol for later use

6 files changed, 79 insertions, 98 deletions

diff --git a/net/nocol/Makefile b/net/nocol/Makefile
index 0fb51f53226..d4db32f40d4 100644
--- a/net/nocol/Makefile
+++ b/net/nocol/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2000/07/13 11:09:16 abs Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/13 15:34:10 abs Exp $
 #
 
 DISTNAME=	nocol-4.3.1
+PKGNAME=	nocol-4.3.1nb1
 CATEGORIES=	net
 MASTER_SITES= 	http://www.netplex-tech.com/software/nocol/downloads/
 
@@ -29,6 +30,22 @@ post-patch:
 	${SED} -e 's|@prefix@|${PREFIX}|g' -e "s|@FQDN@|$$fqdn|g" 	\
 			${FILESDIR}/answers > ${WRKSRC}/answers)
 
+post-install:
+	# Ensure webnocol audio and images files are available if needed
+	#
+	${MKDIR} ${PREFIX}/share/nocol/gifs
+
+	for f in critical.wav error.wav warning.wav ; do		\
+	    ${INSTALL_DATA} ${WRKSRC}/webnocol/$$f ${PREFIX}/share/nocol; \
+	done
+
+	for f in bluesq.gif critical.jpg empty.gif error.jpg		\
+		greensq.gif help.jpg info.jpg redsq.gif warning.jpg	\
+		yellowsq.gif ; do					\
+	    ${INSTALL_DATA} ${WRKSRC}/webnocol/gifs/$$f			\
+			    ${PREFIX}/share/nocol/gifs;			\
+	done
+
 do-configure:
 	(cd ${WRKSRC}; ./Configure < answers)
 
diff --git a/net/nocol/files/patch-sum b/net/nocol/files/patch-sum
index a84a78a2c7e..1d1f9d1ed47 100644
--- a/net/nocol/files/patch-sum
+++ b/net/nocol/files/patch-sum
@@ -1,6 +1,7 @@
-$NetBSD: patch-sum,v 1.3 2000/07/13 11:09:17 abs Exp $
+$NetBSD: patch-sum,v 1.4 2000/07/13 15:34:12 abs Exp $
 
-MD5 (patch-aa) = a8be5ffe066d39833ce92464615250b1
-MD5 (patch-ab) = 03afd4c3309bd3c138dce2dc85fc03a2
-MD5 (patch-ac) = b849c9ba9dd69eec016911366801701a
-MD5 (patch-ad) = 3494652584a368850da02761541b4f81
+MD5 (patch-aa) = 2d8cfe2d094992d4f26f20b0e5f0fa59
+MD5 (patch-ab) = a88f3f0672a5409d5aa8a9acdecf8400
+MD5 (patch-ac) = 4d742274106e5bc6aaa07ee1a33ee79e
+MD5 (patch-ad) = ffd1b88e39704817d4d9f08428a79996
+MD5 (patch-ae) = b3c73c4a5e6a1a174aee8f97eda90680
diff --git a/net/nocol/patches/patch-ad b/net/nocol/patches/patch-ad
index 136dbe122ee..3029ac4f8e4 100644
--- a/net/nocol/patches/patch-ad
+++ b/net/nocol/patches/patch-ad
@@ -1,13 +1,27 @@
-$NetBSD: patch-ad,v 1.1 2000/07/13 11:09:18 abs Exp $
+$NetBSD: patch-ad,v 1.2 2000/07/13 15:34:13 abs Exp $
 
---- Makefile.head.orig	Wed Jan 19 04:08:32 2000
-+++ Makefile.head	Thu Jul 13 11:07:09 2000
-@@ -45,7 +45,7 @@
- DATADIR=	$(ROOTDIR)/data
- MSGSDIR=	$(ROOTDIR)/msgs
- HELPDIR=	$(ROOTDIR)/help
--EXAMPLESDIR=	$(ETCDIR)/samples
-+EXAMPLESDIR=	${ROOTDIR}/share/examples/nocol
+--- webnocol/webnocol.cgi.orig	Thu Jul 13 15:46:34 2000
++++ webnocol/webnocol.cgi	Thu Jul 13 15:45:49 2000
+@@ -646,11 +646,21 @@
+ # e.g. on Sun's use '/usr/sbin/ping -s DEVICE 500 3' if you are not using
+ # multiping
+ sub doTroubleShoot {
+-  local ($traceroute) = "/usr/local/bin/traceroute -m 15 DEVICE";
++  local (@traceroutepaths) = ('/usr/sbin', '/usr/local/bin');
++  local ($traceroute) = "traceroute -m 15 DEVICE";
+   local ($ping) = "$nocolroot/bin/multiping -c 3 -i 2 DEVICE";	# check_this
+   local ($nslookup) = "nslookup -query=any DEVICE";
+   local ($nslookup) = ($siteaddr =~ /^[\d\.]+$/) ?
+                          "nslookup DEVICE" : "nslookup -query=any DEVICE";
++
++  foreach (@traceroutepaths)
++  {
++    if ( -x "$_/traceroute")
++    {
++      $traceroute = "$_/traceroute";
++      last;
++    }
++  }
  
- ##
- # NOCOL specific definitions:
+   local ($subcmd);
+   local (%cmdlist) = ("ping", $ping, "traceroute", $traceroute,
diff --git a/net/nocol/patches/patch-ae b/net/nocol/patches/patch-ae
new file mode 100644
index 00000000000..db4192d71dd
--- /dev/null
+++ b/net/nocol/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2000/07/13 15:34:13 abs Exp $
+
+--- Makefile.head.orig	Wed Jan 19 04:08:32 2000
++++ Makefile.head	Thu Jul 13 15:46:48 2000
+@@ -45,7 +45,7 @@
+ DATADIR=	$(ROOTDIR)/data
+ MSGSDIR=	$(ROOTDIR)/msgs
+ HELPDIR=	$(ROOTDIR)/help
+-EXAMPLESDIR=	$(ETCDIR)/samples
++EXAMPLESDIR=	${ROOTDIR}/share/examples/nocol
+ 
+ ##
+ # NOCOL specific definitions:
diff --git a/net/nocol/pkg/DESCR b/net/nocol/pkg/DESCR
index 1c1754c8972..8e75186e366 100644
--- a/net/nocol/pkg/DESCR
+++ b/net/nocol/pkg/DESCR
@@ -1,11 +1,4 @@
-This document is taken from:
-
-Header: /home/vikas/src/nocol/RCS/README,v 4.0 1994/11/29 20:21:33 vikas Exp vikas
-
-README for NOCOL/NetConsole v4.2
-===========================
-
-NOCOL/NetConsole (Network Operation Center On-Line) is a network monitoring 
+NOCOL/SNIPS (Network Operation Center On-Line) is a network monitoring 
 package that runs on Unix platforms and is capable of monitoring network and
 system variables such as ICMP or RPC reachability, RMON variables,
 nameservers, ethernet load, port reachability, host performance, SNMP traps,
@@ -24,75 +17,3 @@ customized priority notification based on the severity. There are four
 severity levels ranging from Critical thru Info, and each event typically
 steps through each one of these severities until it reaches its maximum
 allowed level.
-
-The display uses UNIX 'curses' screen management and can thus run on a large
-variety of terminals. The user running the display can select the minimum
-display severity- only events above this minimum severity level are displayed.
-
-A Web interface has also been added which uses the HTML REFRESH meta tag for
-displaying the nocol events.
-
-To date, the various monitoring agents developed are:
-
-	- IP ICMP monitor (using IP 'multiping')
-	- OSI reachability monitor (using OSI ping)
-	- RPC portmapper monitor (using 'rpcping')
-	- Ethernet load (bandwidth & pps)
-	- TCP port monitor
-	- Unix host performance (disks, memory, swap, load, nfs, collisions)
-	- SNMP variables monitor (RMON, Cisco router, terminal server)
-	- TCP data throughput monitor
-	- Nameserver (named)
-	- SNMP traps
-	- Syslog logfile monitor (for specified patterns)
-	- NTP stratum of hosts (Network Time Protocol)
-	- UPS (APC) battery level monitor
-	- Usage of terminal server modem lines (busy lines)
-	- Appletalk route monitor (for cisco routers)
-	- Novell service monitor
-	- BGP peer status
-	
-A PERL interface is available for developing additional monitors in the PERL
-programming language (it is fairly easy to add additional monitors to the
-package).
-
-The logging daemon can be interfaced with a paging program such as
-'sendpage' (ftp://ftp.net.ohio-state.edu/pub/pagers/).
-
-New features in v4.2 are:
-------------------------
-
- - Unix syslog file monitor (match any specified regular expression)
- - NTP (Network Time Protocol) stratum monitor
- - 'mailmon' merged in with 'hostmon-client'
- - 'nsmon' can monitor multiple domains
- - 'apcmon' for monitoring APC Smart UPS's
- - 'ciscomon' for monitoring Cisco router specific parameters
- - Web interface for displaying events (www/webnocol)
-
-New features in v4.0 were:
-
- - Unix host performance monitor (distributed client)
- - SNMP variables monitor
- - Ethernet load and packet rate monitor.
- - 'rpcpingmon' for checking status of RPC on hosts.
- - 'logstats' for generating reports from the log file.
- - Major rewrite of large portions of the code.
-
-New features in v3.0 were:
-
- - Logging facility (similar to syslogd)
- - Perl interface
- - TCP port monitor
- - Perl appletalk, Novell, BGP, modem line monitors.
-
-Has been compiled on Solaris2.2, SunOS4.1.1, Ultrix4.2, BSDI/386. Linux.
-
-Please send a message to 'nocol-users-request@navya.com' to be added to the
-'nocol-users' mailing list for updates and bug fixes. Mail comments and
-bugs to 'vikas@navya.com'.
-
-	Vikas Aggarwal
-	(vikas@navya.com)
-	Jan 1997
-	--------
diff --git a/net/nocol/pkg/PLIST b/net/nocol/pkg/PLIST
index 1ce6227a341..ac856f6a98f 100644
--- a/net/nocol/pkg/PLIST
+++ b/net/nocol/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/07/13 11:09:19 abs Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/07/13 15:34:14 abs Exp $
 bin/apcmon
 bin/armon
 bin/bgpmon
@@ -107,7 +107,22 @@ share/examples/nocol/snmpmon-confg
 share/examples/nocol/sqlmon-confg
 share/examples/nocol/syslogmon-confg
 share/examples/nocol/tpmon-confg
+share/nocol/critical.wav
+share/nocol/error.wav
+share/nocol/gifs/bluesq.gif
+share/nocol/gifs/critical.jpg
+share/nocol/gifs/empty.gif
+share/nocol/gifs/error.jpg
+share/nocol/gifs/greensq.gif
+share/nocol/gifs/help.jpg
+share/nocol/gifs/info.jpg
+share/nocol/gifs/redsq.gif
+share/nocol/gifs/warning.jpg
+share/nocol/gifs/yellowsq.gif
+share/nocol/warning.wav
 @dirrm bin/hostmon-osclients
 @dirrm share/examples/nocol
 @dirrm run
 @dirrm msgs
+@dirrm share/nocol/gifs
+@dirrm share/nocol