--- configure.orig	Sat Nov 28 18:36:04 1998
+++ configure	Wed Dec  8 21:56:00 1999
@@ -875,8 +875,8 @@
 test -n "$AWK" && break
 done
 
-# Extract the first word of "tclsh8.0", so it can be a program name with args.
-set dummy tclsh8.0; ac_word=$2
+# Extract the first word of "tclsh8.2", so it can be a program name with args.
+set dummy tclsh8.2; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo "configure:882: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then
@@ -938,8 +938,8 @@
 fi
 
 if test "x$wish" = "x"; then
-    # Extract the first word of "wish8.0", so it can be a program name with args.
-set dummy wish8.0; ac_word=$2
+    # Extract the first word of "wish8.2", so it can be a program name with args.
+set dummy wish8.2; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo "configure:945: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then
@@ -2074,7 +2074,7 @@
 for i in $tcl_dirs ; do
     tcl_include_dirs="$tcl_include_dirs $i/include"
 done
-tcl_include_dirs="$tcl_include_dirs /usr/include/tcl /usr/include"
+tcl_include_dirs="$tcl_include_dirs /usr/local/include/tcl8.2 /usr/local/include/tkstep8.2 /usr/local/include/tk8.2 /usr/include"
 tcl_dir=0
 for i in $tcl_include_dirs ; do
     if test -r $i/tcl.h ; then
@@ -2586,8 +2586,11 @@
     MP-RAS-*)
 	OSTYPE=Unkown
 	;;
-    NetBSD-*|FreeBSD-*)
+    NetBSD-*)
 	OSTYPE=neb
+	;;
+    FreeBSD-*)
+	OSTYPE=bsf
 	;;
     NEXTSTEP-*)
 	OSTYPE=nxt