diff -u -r ../../../orig/WebStone/bin/WebStone-common.pl ../bin/WebStone-common.pl
--- ../../../orig/WebStone/bin/WebStone-common.pl	Tue Jun  4 19:24:25 1996
+++ ../bin/WebStone-common.pl	Tue Mar 25 14:53:57 1997
@@ -1,4 +1,4 @@
-#!/bin/perl5
+#!/usr/local/bin/perl
 #
 
 1;
diff -u -r ../../../orig/WebStone/bin/WebStone-manage.pl ../bin/WebStone-manage.pl
--- ../../../orig/WebStone/bin/WebStone-manage.pl	Tue Jun  4 19:24:25 1996
+++ ../bin/WebStone-manage.pl	Tue Mar 25 14:54:11 1997
@@ -1,4 +1,4 @@
-#!/bin/perl5
+#!/usr/local/bin/perl
 #
 
 push(@INC, "$wd/bin");
diff -u -r ../../../orig/WebStone/bin/WebStone-run.pl ../bin/WebStone-run.pl
--- ../../../orig/WebStone/bin/WebStone-run.pl	Tue Jun  4 19:24:25 1996
+++ ../bin/WebStone-run.pl	Tue Mar 25 14:54:21 1997
@@ -1,4 +1,4 @@
-#!/bin/perl5
+#!/usr/local/bin/perl
 #
 
 $testbed = "conf/testbed";
diff -u -r ../../../orig/WebStone/bin/WebStone-setup.pl ../bin/WebStone-setup.pl
--- ../../../orig/WebStone/bin/WebStone-setup.pl	Tue Jun  4 19:24:25 1996
+++ ../bin/WebStone-setup.pl	Tue Mar 25 14:54:33 1997
@@ -1,4 +1,4 @@
-#!/bin/perl5
+#!/usr/local/bin/perl
 #
 
 push(@INC, "$wd/bin");
diff -u -r ../../../orig/WebStone/bin/genfiles ../bin/genfiles
--- ../../../orig/WebStone/bin/genfiles	Tue Jun  4 19:24:25 1996
+++ ../bin/genfiles	Thu Mar  6 17:41:15 1997
@@ -5,7 +5,7 @@
 . $WEBSTONEROOT/conf/testbed
 
 cat $WEBSTONEROOT/conf/fileset |
-nawk '
+awk '
 ($1 ~ /^[0-9][0-9]*[kK][bB]*$/) {
 	sub(/[kK][bB]*/, "", $1);
 	cmd = "$WEBSTONEROOT/bin/genrand " $1*1024 " " $2
diff -u -r ../../../orig/WebStone/bin/killbench.pl ../bin/killbench.pl
--- ../../../orig/WebStone/bin/killbench.pl	Tue Jun  4 19:24:25 1996
+++ ../bin/killbench.pl	Tue Mar 25 14:55:11 1997
@@ -1,4 +1,4 @@
-#!/bin/perl5
+#!/usr/local/bin/perl
 #
 
 push(@INC, "$wd/bin");
diff -u -r ../../../orig/WebStone/bin/mine-logs.pl ../bin/mine-logs.pl
--- ../../../orig/WebStone/bin/mine-logs.pl	Tue Jun  4 19:24:25 1996
+++ ../bin/mine-logs.pl	Tue Mar 25 14:57:26 1997
@@ -1,4 +1,4 @@
-#!/bin/perl
+#!/usr/local/bin/perl
 #
 #  mine-logs.pl:
 #       script to transform access logs into WebStone workload
diff -u -r ../../../orig/WebStone/bin/move-filelist.pl ../bin/move-filelist.pl
--- ../../../orig/WebStone/bin/move-filelist.pl	Tue Jun  4 19:24:25 1996
+++ ../bin/move-filelist.pl	Tue Mar 25 14:57:39 1997
@@ -1,4 +1,4 @@
-#!/bin/perl5
+#!/usr/local/bin/perl
 #
 
 push(@INC, "$wd/bin");
diff -u -r ../../../orig/WebStone/bin/move-runs.pl ../bin/move-runs.pl
--- ../../../orig/WebStone/bin/move-runs.pl	Tue Jun  4 19:24:25 1996
+++ ../bin/move-runs.pl	Tue Mar 25 14:57:50 1997
@@ -1,4 +1,4 @@
-#!/bin/perl5
+#!/usr/local/bin/perl
 #
 
 push(@INC, "$wd/bin");
diff -u -r ../../../orig/WebStone/bin/runbench.pl ../bin/runbench.pl
--- ../../../orig/WebStone/bin/runbench.pl	Tue Jun  4 19:24:25 1996
+++ ../bin/runbench.pl	Tue Mar 25 14:58:02 1997
@@ -1,4 +1,4 @@
-#!/bin/perl5
+#!/usr/local/bin/perl
 #
 
 push(@INC, "$wd/bin");
diff -u -r ../../../orig/WebStone/bin/view-results.pl ../bin/view-results.pl
--- ../../../orig/WebStone/bin/view-results.pl	Tue Jun  4 19:24:25 1996
+++ ../bin/view-results.pl	Tue Mar 25 14:58:29 1997
@@ -1,4 +1,4 @@
-#!/bin/perl5
+#!/usr/local/bin/perl
 #
 push(@INC, "$wd/bin");
 require('WebStone-common.pl');
diff -u -r ../../../orig/WebStone/bin/webstone-gui.pl ../bin/webstone-gui.pl
--- ../../../orig/WebStone/bin/webstone-gui.pl	Tue Jun  4 19:24:25 1996
+++ ../bin/webstone-gui.pl	Tue Mar 25 14:58:42 1997
@@ -1,4 +1,4 @@
-#!/bin/perl5
+#!/usr/local/bin/perl
 
 require 'conf/paths.pl';
 
diff -u -r ../../../orig/WebStone/bin/write-testbed.pl ../bin/write-testbed.pl
--- ../../../orig/WebStone/bin/write-testbed.pl	Tue Jun  4 19:24:25 1996
+++ ../bin/write-testbed.pl	Tue Mar 25 14:59:10 1997
@@ -1,4 +1,4 @@
-#!/bin/perl5
+#!/usr/local/bin/perl
 #
 # write new values from form to $wd/conf/testbed, and run WebStone
 #
diff -u -r ../../../orig/WebStone/bin/wscollect.pl ../bin/wscollect.pl
--- ../../../orig/WebStone/bin/wscollect.pl	Tue Jun  4 19:24:26 1996
+++ ../bin/wscollect.pl	Tue Mar 25 14:59:42 1997
@@ -1,4 +1,4 @@
-#!/usr/bin/perl5
+#!/usr/local/bin/perl
 # $Header: /home/ncvs/ports/www/webstone/patches/patch-aa,v 1.1.1.1 1997/06/04 05:47:00 asami Exp $
 # updated version of the old wscollect script which goes through
 # webstone run directories and summarizes the output in tabular
diff -u -r ../../../orig/WebStone/conf/filelist ../conf/filelist
--- ../../../orig/WebStone/conf/filelist	Tue Jun  4 19:24:26 1996
+++ ../conf/filelist	Wed Mar 26 12:06:32 1997
@@ -1,2 +1,6 @@
-# home page /index.html only
-/index.html
+# Sample filelist, abstracted from access logs
+/file500.html	350	#500
+/file5k.html	500	#5125
+/file50k.html	140	#51250
+/file500k.html	9	#512500
+/file5m.html	1	#5248000
Only in ../conf: filelist.index
diff -u -r ../../../orig/WebStone/conf/testbed ../conf/testbed
--- ../../../orig/WebStone/conf/testbed	Tue Jun  4 19:24:26 1996
+++ ../conf/testbed	Tue Mar 25 15:37:20 1997
@@ -9,18 +9,18 @@
 PROXYSERVER=
 SERVER="www"
 PORTNO=80
-SERVERINFO=hinv
-OSTUNINGFILES="/var/sysgen/master.d/bsd"
-WEBSERVERDIR="/usr/ns-home"
-WEBDOCDIR="$WEBSERVERDIR/docs"
-WEBSERVERTUNINGFILES="$WEBSERVERDIR/httpd-80/config/magnus.conf $WEBSERVERDIR/httpd-80/config/obj.conf"
+SERVERINFO="/etc/sysconfig"
+OSTUNINGFILES=""
+WEBSERVERDIR="/usr/local/www"
+WEBDOCDIR="$WEBSERVERDIR/data"
+WEBSERVERTUNINGFILES=""
 
 # WE NEED AN ACCOUNT WITH A FIXED PASSWORD, SO WE CAN REXEC
 # THE WEBSTONE CLIENTS
 CLIENTS="webstone1 webstone2 webstone3 webstone4 webstone5"
 CLIENTACCOUNT=guest
 CLIENTPASSWORD=guest
-CLIENTINFO=hinv
+CLIENTINFO="/etc/sysconfig"
 TMPDIR=/tmp
 
 # Possibly system-specific
diff -u -r ../../../orig/WebStone/src/get.c ../src/get.c
--- ../../../orig/WebStone/src/get.c	Tue Jun  4 19:24:27 1996
+++ ../src/get.c	Tue Mar 25 15:11:23 1997
@@ -82,7 +82,7 @@
 
 /*#define ABORTIVE_CLOSE 1*/
 #ifdef ABORTIVE_CLOSE
-#error don't enable this option
+#error do not enable this option
     struct linger {
 	int l_onoff;
 	int l_linger;
@@ -112,7 +112,7 @@
     }
 
 #ifdef ABORTIVE_CLOSE    
-#error don't enable this option
+#error do not enable this option
     /* set up for abortive close */
     linger_opt.l_onoff = 1;
     linger_opt.l_linger = 0;
diff -u -r ../../../orig/WebStone/src/sysdep.h ../src/sysdep.h
--- ../../../orig/WebStone/src/sysdep.h	Tue Jun  4 19:24:27 1996
+++ ../src/sysdep.h	Tue Mar 25 15:11:55 1997
@@ -45,7 +45,7 @@
 #define S_ADDR				S_un.S_addr
 
 #ifdef USE_TIMEZONE
-#error  NT gettimeofday() doesn't support USE_TIMEZONE (yet)
+#error  NT gettimeofday() does not support USE_TIMEZONE (yet)
 #else
 #define	GETTIMEOFDAY(timeval, tz)	gettimeofday(timeval)
 #endif /* USE_TIMEZONE */
