Long awaited upgrade to version 1.2a

It lastet so long, because of personal time constraints and based
on the fact, that I had to do the very time consuming task, to
revamp the whole big brother installation heavily.

This could be avoided, if Sean could provide a Makefile with a real
install: target and not the drainbamaged
	"unpack, compile and let the whole sh**^H^H^H^Hbunch
	 remain here(tm)" philosophy."
(me lucky one, that apsfilter has changed about 1-2 years ago ;-)

- make install target now copies the workdir to ${PREFIX}/bb
  and then moves or removes files and directories as needed

- revamped client configuration and introduced a
	${PREFIX}/share/bb/bbclients
  directory.

Hope you like it this way ;-)

10 files changed, 173 insertions, 66 deletions

diff --git a/net/bb/Makefile b/net/bb/Makefile
index d9788f49db89..0df82cdc6aa2 100644
--- a/net/bb/Makefile
+++ b/net/bb/Makefile
@@ -3,7 +3,7 @@
 # Date created:         So  17 Nov 1996 16:59:23 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.30 1998/10/10 04:11:25 steve Exp $
+# $Id: Makefile,v 1.31 1999/06/26 12:01:23 andreas Exp $
 #
 
 DISTNAME=	bb-1.2a
@@ -32,10 +32,21 @@ post-configure:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 do-install:
-	cd ${WRKDIR}; tar cf - bb | ( cd ${PREFIX}; tar xpf - )
+	@cd ${WRKDIR} && find . -name "*.orig" | xargs ${RM}
+	@cd ${WRKDIR}; tar --exclude 'src' -c -f - bb \
+		| ( cd ${PREFIX}; tar xpf - )
 	@${LN} -fs ${PREFIX}/bb/www ${PREFIX}/share/apache/htdocs/bb
 	@${LN} -fs bb.html ${PREFIX}/bb/www/index.html
-	mv -f ${PREFIX}/bb/doc ${PREFIX}/share/doc/bb
+	@${LN} -fs ${PREFIX}/bb/web/bb-ack.sh ${PREFIX}/share/apache/cgi-bin
+	@mv -f ${PREFIX}/bb/doc/bbclient ${PREFIX}/bb/bin
+	@mv -f ${PREFIX}/bb/doc/bbconfig ${PREFIX}/bb/bin
+	@mv -f ${PREFIX}/bb/doc ${PREFIX}/share/doc/bb
+	@${MKDIR} ${PREFIX}/share/bb/bbclients
+	@${TOUCH} ${PREFIX}/share/bb/bbclients/.keep_me
+	@${RM} ${PREFIX}/bb/KNOWN.BUGS
+	@${RM} ${PREFIX}/bb/README
+	@${RM} ${PREFIX}/bb/README.CHANGES
+	@${RM} ${PREFIX}/bb/README.INSTALL
 	@echo ""
 	@echo "================================================================"
 	@echo "==== Configuration Notes:                                    ==="
@@ -44,16 +55,12 @@ do-install:
 	@echo "a) your hosts 'full qualified domain name' and IP-address"
 	@echo "b) 'watched' hosts 'full qualified domain name' and IP-address"
 	@echo "go here -> ${PREFIX}/bb/etc/bb-hosts"
-	@echo ""
 	@echo "c) configure -> ${PREFIX}/bb/etc/bbdef.sh"
 	@echo "d) configure -> ${PREFIX}/bb/etc/bbinc.sh"
-	@echo ""
 	@echo "e) You need to have a running WWW server (apache)"
 	@echo "f) You need kermit or qpage for pager functionality"
-	@echo ""
 	@echo "After that, you can startup the big brother service by typing"
 	@echo "        ${PREFIX}/bb/runbb.sh &"
-	@echo ""
 	@echo "and watching your systems status by viewing this URL with"
 	@echo "Netscape or another WWW browser"
 	@echo "        http://localhost/bb"
diff --git a/net/bb/files/patch-aa b/net/bb/files/patch-aa
index 2742d7bdb5a1..caa97e526443 100644
--- a/net/bb/files/patch-aa
+++ b/net/bb/files/patch-aa
@@ -1,11 +1,11 @@
---- src/Makefile.freebsd.orig	Mon May 18 23:18:48 1998
-+++ src/Makefile.freebsd	Mon May 18 23:19:26 1998
+--- src/Makefile.freebsd.orig	Sun Jun 27 12:02:36 1999
++++ src/Makefile.freebsd	Sun Jun 27 12:03:08 1999
 @@ -1,6 +1,6 @@
  SHELL = /bin/sh
 -MAKE = make
 -CC = gcc
-+MAKE?= make
-+CC?= gcc
++MAKE ?= make
++CC ?= gcc
  
  # FLAGS REQUIRED FOR PORTING
  # SUNOS 4.1.4, HPUX 10.0, and LINUX NEED NOTHING DEFINED
diff --git a/net/bb/files/patch-ac b/net/bb/files/patch-ac
index b4c69249edc8..eb3814d3c3d9 100644
--- a/net/bb/files/patch-ac
+++ b/net/bb/files/patch-ac
@@ -1,11 +1,20 @@
---- runbb.sh.orig	Mon May 18 23:22:46 1998
-+++ runbb.sh	Mon May 18 23:23:15 1998
-@@ -16,7 +16,7 @@
- #
+--- runbb.sh.orig	Sun Jun 27 12:08:56 1999
++++ runbb.sh	Sun Jun 27 12:09:57 1999
+@@ -17,7 +17,7 @@
  # BBHOME IS THE ROOT DIRECTORY OF BIG BROTHER!!!
  # YOU MUST SET THE NEXT LINE TO WHERE BB LIVES
+ 
 -BBHOME="" 
 +BBHOME="!!PREFIX!!/bb" 
- 
  export BBHOME
  
+ if test "$BBHOME" = ""
+@@ -35,7 +35,7 @@
+ 
+ . $BBHOME/etc/bbdef.sh		# GET STANDARD INCLUDES
+ 
+-BBSLEEP=300			# HOW OFTEN TO UPDATE (IN SECONDS)
++BBSLEEP=!!BBSLEEP!!		# HOW OFTEN TO UPDATE (IN SECONDS)
+ export BBSLEEP
+ 
+ 
diff --git a/net/bb/files/patch-ad b/net/bb/files/patch-ad
index 66d3574695d8..d6042ddcf9b5 100644
--- a/net/bb/files/patch-ad
+++ b/net/bb/files/patch-ad
@@ -1,28 +1,31 @@
---- etc/bb-hosts.orig	Sun Aug  9 03:46:51 1998
-+++ etc/bb-hosts	Sat Aug 29 13:11:02 1998
-@@ -1,14 +1,14 @@
- #
- # THE BIG BROTHER HOSTS FILE
+--- etc/bb-hosts.orig	Sun Jun 27 12:23:17 1999
++++ etc/bb-hosts	Sun Jun 27 12:25:25 1999
+@@ -3,16 +3,15 @@
  #
+ # This file should be identical on both the display server and paging server
+ #	if they reside on different hosts
 -192.168.116.1	iti-s01.iti.qc.com # BBPAGER BBNET BBDISPLAY ftp smtp pop3 http://iti-s01/
 -192.168.117.1	ns.iti.qc.com # ftp smtp dns
 -group-compress <H3><I>Web Servers</I></H3>
 -192.168.117.2	ns2.iti.qc.com # ftp smtp noping
 -192.168.117.3	ns3.iti.qc.com # ftp smtp 
 -192.168.117.4	ns4.iti.qc.com # ftp smtp 
+-page modem Modem page
 -group <H3><I>Modem Banks</I></H3>
 -dialup	modem-bank1 192.168.117.1 16
 -dialup	modem-bank2 192.168.117.17 16
 -dialup	modem-bank3 192.168.117.33 16
+-# Summaries are always displayed on the main page
 -summary	canada.bc 192.168.116.1 http://www.iti.qc.com/iti/users/sean/bb/
-+127.0.0.1 !!HOSTNAME!! # BBPAGER BBNET BBDISPLAY ftp smtp pop3 http://!!HOSTNAME!!/
-+# 192.168.117.1	ns.iti.qc.com # ftp smtp dns
-+# group-compress <H3><I>Web Servers</I></H3>
-+# 192.168.117.2	ns2.iti.qc.com # ftp smtp noping
-+# 192.168.117.3	ns3.iti.qc.com # ftp smtp 
-+# 192.168.117.4	ns4.iti.qc.com # ftp smtp 
-+# group <H3><I>Modem Banks</I></H3>
-+# dialup	modem-bank1 192.168.117.1 16
-+# dialup	modem-bank2 192.168.117.17 16
-+# dialup	modem-bank3 192.168.117.33 16
-+# summary	canada.bc 192.168.116.1 http://www.iti.qc.com/iti/users/sean/bb/
++127.0.0.1	!!HOSTNAME!! # BBPAGER BBNET BBDISPLAY dns ftp smtp pop3 http://!!HOSTNAME!!/
++#group-compress <H3><I>Web Servers</I></H3>
++#192.168.117.2	ns2.iti.qc.com # ftp smtp noping
++#192.168.117.3	ns3.iti.qc.com # ftp smtp 
++#192.168.117.4	ns4.iti.qc.com # ftp smtp 
++#page modem Modem page
++#group <H3><I>Modem Banks</I></H3>
++#dialup	modem-bank1 192.168.117.1 16
++#dialup	modem-bank2 192.168.117.17 16
++#dialup	modem-bank3 192.168.117.33 16
++## Summaries are always displayed on the main page
++#summary	canada.bc 192.168.116.1 http://www.iti.qc.com/iti/users/sean/bb/
diff --git a/net/bb/files/patch-ae b/net/bb/files/patch-ae
new file mode 100644
index 000000000000..02cfcbde8323
--- /dev/null
+++ b/net/bb/files/patch-ae
@@ -0,0 +1,12 @@
+--- web/bb-ack.sh.orig	Sun Jun 27 12:16:54 1999
++++ web/bb-ack.sh	Sun Jun 27 12:18:05 1999
+@@ -30,7 +30,8 @@
+ # ************* NOTICE!!! ************
+ # BBWEB MUST BE SET CORRECTLY FOR THIS TO WORK
+ 
+-BBWEB="http://INSERT-WEB-HOST-HERE/bb/";
++#BBWEB="http://INSERT-WEB-HOST-HERE/bb/";
++BBWEB="http://!!WEBHOST!!/bb/";
+ 
+ 
+ . $BBHOME/etc/bbdef.sh
diff --git a/net/bb/files/patch-af b/net/bb/files/patch-af
new file mode 100644
index 000000000000..81b88c2a0430
--- /dev/null
+++ b/net/bb/files/patch-af
@@ -0,0 +1,12 @@
+--- web/bb-hist.sh.orig	Sun Jun 27 12:17:15 1999
++++ web/bb-hist.sh	Sun Jun 27 12:18:22 1999
+@@ -13,7 +13,8 @@
+ # ************* NOTICE!!! ************
+ # BBWEB MUST BE SET CORRECTLY FOR THIS TO WORK
+ #
+-BBWEB="http://INSERT-WEB-HOST-HERE/bb/"
++#BBWEB="http://INSERT-WEB-HOST-HERE/bb/"
++BBWEB="http://!!WEBHOST!!/bb/"
+ export BBWEB
+ 
+ # BBHOME IS THE ROOT DIRECTORY OF BIG BROTHER!!!
diff --git a/net/bb/files/patch-ag b/net/bb/files/patch-ag
new file mode 100644
index 000000000000..c75b4b7890fe
--- /dev/null
+++ b/net/bb/files/patch-ag
@@ -0,0 +1,20 @@
+--- doc/bbclient.orig	Sun Jun 27 15:33:09 1999
++++ doc/bbclient	Sun Jun 27 15:35:28 1999
+@@ -95,13 +95,15 @@
+ 
+ cd ../..
+ echo "*** Creating tar file for Big Brother on $CLIENT"
+-tar cvf bb-${CLIENT}.tar `cat /tmp/BBLIST`
++# this might be better then polluting ../.. which would be ${PREFIX}
++mkdir -p !!PREFIX!!/share/bb/bbclients
++tar cvzf !!PREFIX!!/share/bb/bbclients/bb-${CLIENT}.tar.gz `cat /tmp/BBLIST`
+ rm -f /tmp/BBLIST
+ 
+ echo "*** Done.
+ 
+ The Big Brother Client archive has been created.  It's called:
+ 	bb-${CLIENT}.tar
+-and lives in the directory above the bb directory.
++and lives in the directory !!PREFIX!!/share/bb/bbclients
+ 
+ You can now install Big Brother on ${CLIENT}"
diff --git a/net/bb/pkg-descr b/net/bb/pkg-descr
index 27fc07ce3f36..b63325c9c538 100644
--- a/net/bb/pkg-descr
+++ b/net/bb/pkg-descr
@@ -1,22 +1,23 @@
---- Big Brother ---
-	a Web-based Unix Network Monitoring and Notification System
-	by Sean MacGuire <sean@iti.qc.ca>
+*** Web-based Monitoring & Notification for Systems and Networks ***
 
-WWW:	http://www.iti.qc.ca/iti/users/sean/bb-dnld/
-A Life Example:	http://www.menet.umn.edu/bb/bb.html (44 machines)
-
-d e s i g n	- Web-based status display
-		- Notification via Pager
-		- Modular Client-server design
-		- Configurable warning and panic levels
-		- Multi-platform
-		- Easily integrated with other packages
-		- Includes all Source Code
-		- And it's Free
-
-m o n i t o r s	- connectivity via ping or telnet
-		- http servers up and running
-		- disk space usage
-		- cpu usage
-		- essential processes are still running
-		- system-generated messages and warnings
+Big Brother is a combination of monitoring methods.
+Unlike SNMP where information is just collected and devices polled,
+Big Brother is designed in such a way that each local system broadcasts it's
+own information to a central location. Simultaneously, Big Brother also polls
+all networked systems from a central location. This creates a highly efficient
+and redundant method for proactive network monitoring.
+Features:				Monitors:
+- Web-based status display		- dns nntp ftp smtp and pop3 testing
+- Configurable warning and panic levels	- connectivity via ping
+- Notification via Pager or email	- http servers up and running
+- Support for grouping of machines	- disk space usage
+- Support for modem monitoring		- uptime and cpu usage
+- Selectable paging delays		- essential processes are still running
+- Heterogeneous Network Support		- messages and warnings
+Author:			sean@maclawran.ca 
+Homepage:		http://maclawran.ca/~sean/bb-dnld/index.html
+License:		http://maclawran.ca/cgi-bin/newbb.pl
+Demo:			http://maclawran.ca/~sean/bb-dnld/new-demo.html
+Mailing list:		MajorDomo@taex001.tamu.edu / in body: subscribe bb
+Mailing list archive:	http://www.fusioni.com/~bb/
+Contributed scripts:	ftp://ftp.deadcat.net/pub/BB
diff --git a/net/bb/pkg-plist b/net/bb/pkg-plist
index bf6be9e91928..1483bf15416c 100644
--- a/net/bb/pkg-plist
+++ b/net/bb/pkg-plist
@@ -1,17 +1,30 @@
-bb/README
-bb/runbb.sh
+bb/LICENSE
+bb/Makefile
 bb/bin/bb
+bb/bin/bb-display.sh
+bb/bin/bb-doack.sh
 bb/bin/bb-local.sh
 bb/bin/bb-network.sh
 bb/bin/bb-page.sh
+bb/bin/bb-page1.sh
+bb/bin/bbclient
+bb/bin/bbconfig
 bb/bin/bbd
 bb/bin/bbnet
+bb/bin/bbrun
 bb/bin/sendmsg
 bb/bin/touchtime
+bb/etc/bb-dftab.INFO
 bb/etc/bb-hosts
+bb/etc/bbchkcfg.sh
+bb/etc/bbchkhosts.sh
 bb/etc/bbdef.sh
 bb/etc/bbinc.sh
 bb/etc/bbsys.aix
+bb/etc/bbsys.bsdi
+bb/etc/bbsys.debian
+bb/etc/bbsys.dgux
+bb/etc/bbsys.dynix
 bb/etc/bbsys.freebsd
 bb/etc/bbsys.hpux
 bb/etc/bbsys.hpux9
@@ -28,29 +41,43 @@ bb/etc/bbsys.solaris
 bb/etc/bbsys.sunos
 bb/etc/bbsys.ultrix
 bb/etc/bbsys.unixware
+bb/etc/bbwarnrules.cfg
+bb/etc/bbwarnsetup.cfg
+bb/etc/numeric-k6.scr
 bb/etc/numeric.scr
 bb/etc/security.INFO
 bb/etc/sms.scr
-bb/tmp/.keep_me
+bb/ext/.helloworld
+bb/runbb.sh
+bb/tmp/.helloworld
+bb/web/bb-ack.sh
+bb/web/bb-hist.sh
+bb/web/footer
+bb/web/header
 bb/web/mkbb.bkg
 bb/web/mkbb.cols
 bb/web/mkbb.comp
+bb/web/mkbb.page
 bb/web/mkbb.sh
 bb/web/mkbb2.sh
+bb/www/acks/.helloworld
 bb/www/bb-faq.html
 bb/www/bb-help.html
 bb/www/bb-info.html
+bb/www/bb-man.html
 bb/www/bb-page.html
 bb/www/gifs/bb-diag.gif
 bb/www/gifs/bb.gif
 bb/www/gifs/bb2.gif
 bb/www/gifs/bbbut.gif
+bb/www/gifs/bkg-clear.gif
 bb/www/gifs/bkg-green.gif
 bb/www/gifs/bkg-purple.gif
 bb/www/gifs/bkg-red.gif
 bb/www/gifs/bkg-yellow.gif
 bb/www/gifs/blue.gif
 bb/www/gifs/buthelp.gif
+bb/www/gifs/buthist.gif
 bb/www/gifs/butinfo.gif
 bb/www/gifs/butpage.gif
 bb/www/gifs/butview.gif
@@ -62,31 +89,38 @@ bb/www/gifs/nb-yellow.gif
 bb/www/gifs/purple.gif
 bb/www/gifs/red.gif
 bb/www/gifs/yellow.gif
+bb/www/hist/.helloworld
+bb/www/html/.helloworld
 @exec ln -fs bb.html %D/bb/www/index.html
 @unexec rm %D/bb/www/index.html
 bb/www/logs/later
-bb/www/notes/README
 bb/www/notes/footer
 bb/www/notes/iti-s01
 bb/www/notes/iti-s01.html
 bb/www/notes/iti-s01.iti.qc.ca
 bb/www/notes/iti-s01.iti.qc.ca.html
 bb/www/notes/router-000.htm
+share/apache/cgi-bin/bb-ack.sh
+share/bb/bbclients/.keep_me
 share/doc/bb/FAQ
 share/doc/bb/README
 share/doc/bb/README.SMS
 share/doc/bb/STRUCTURE
-share/doc/bb/bbclient
-share/doc/bb/bbconfig
-www/cgi-bin/bb-pager.sh
-@exec ln -fs %D/bb/www %D/www/data/bb
-@unexec rm %D/www/data/bb
+@exec ln -fs %D/bb/www %D/share/apache/htdocs/bb
+@unexec rm %D/share/apache/htdocs/bb
 @dirrm bb/bin
 @dirrm bb/etc
+@dirrm bb/ext
 @dirrm bb/web
+@dirrm bb/www/acks
 @dirrm bb/www/gifs
+@dirrm bb/www/hist
+@dirrm bb/www/html
 @dirrm bb/www/logs
 @dirrm bb/www/notes
 @dirrm bb/www
 @dirrm bb/tmp
 @dirrm bb
+@dirrm share/bb/bbclients
+@dirrm share/bb
+@dirrm share/doc/bb
diff --git a/net/bb/scripts/configure b/net/bb/scripts/configure
index 2ec829e1a972..16fe9538db35 100644
--- a/net/bb/scripts/configure
+++ b/net/bb/scripts/configure
@@ -1,12 +1,21 @@
 #!/bin/sh
 
-# $Id: configure,v 1.3 1997/10/13 20:19:25 andreas Exp $
+# $Id: configure,v 1.4 1998/05/18 21:52:07 andreas Exp $
 
 cd $WRKSRC || exit 1
 
-HOSTNAME=`hostname`
+# some tuneable global defines
+WEBHOST=`hostname`
+SLEEPVAL=300
 
-perl -pi -e "s=!!PREFIX!!=$PREFIX=" ${WRKSRC}/www/bb-pager.sh
-perl -pi -e "s=!!HOSTNAME!!=$HOSTNAME=" ${WRKSRC}/www/bb-pager.sh
+# globally set BBHOME here
 perl -pi -e "s=!!PREFIX!!=$PREFIX=" ${WRKSRC}/runbb.sh
+# globally adjust sleepvalue
+perl -pi -e "s=!!BBSLEEP!!=$SLEEPVAL=" ${WRKSRC}/runbb.sh
+# set paths for bbclient tar archives
+perl -pi -e "s=!!PREFIX!!=$PREFIX=g" ${WRKSRC}/doc/bbclient
+# set webhost
+perl -pi -e "s=!!WEBHOST!!=$WEBHOST=g" ${WRKSRC}/web/bb-ack.sh
+perl -pi -e "s=!!WEBHOST!!=$WEBHOST=g" ${WRKSRC}/web/bb-hist.sh
+# set hostname
 perl -pi -e "s=!!HOSTNAME!!=$HOSTNAME=g" ${WRKSRC}/etc/bb-hosts