From owner-freebsd-ports  Wed Aug 27 00:42:07 1997
Return-Path: <owner-freebsd-ports>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id AAA17111
          for ports-outgoing; Wed, 27 Aug 1997 00:42:07 -0700 (PDT)
Received: from silvia.HIP.Berkeley.EDU (wck-ca9-08.ix.netcom.com [204.31.231.104])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id AAA17105;
          Wed, 27 Aug 1997 00:42:03 -0700 (PDT)
Received: (from asami@localhost) by silvia.HIP.Berkeley.EDU (8.8.7/8.6.9) id AAA13595; Wed, 27 Aug 1997 00:42:01 -0700 (PDT)
Date: Wed, 27 Aug 1997 00:42:01 -0700 (PDT)
Message-Id: <199708270742.AAA13595@silvia.HIP.Berkeley.EDU>
To: jmz@freebsd.org
CC: ports@freebsd.org
Subject: XFree86 port
From: asami@cs.berkeley.edu (Satoshi Asami)
Sender: owner-freebsd-ports@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

There is no tcl-7.5 in /usr anymore.  Also, the tcl-7/tk-4 line has
ended at 7.6/4.2.

Satoshi
-------
Index: scripts/configure
===================================================================
RCS file: /usr/cvs/ports/x11/XFree86/scripts/configure,v
retrieving revision 1.29
diff -u -r1.29 configure
--- configure	1997/06/18 20:50:30	1.29
+++ configure	1997/08/26 05:13:34
@@ -21,7 +21,7 @@
 
 # Tk detection
 tkversion=
-for v in 1 2 3 4; do
+for v in 1 2; do
   if [ -f /usr/local/lib/libtk4$v.a ]; then
     tkversion=$v
   fi
@@ -30,12 +30,20 @@
   echo "Using tk-4.$tkversion"
   echo "#define HasTk			YES" >>$F
   echo "#define TkLibDir		/usr/local/lib" >>$F
-  echo "#define TkIncDir		/usr/local/include" >>$F
+  echo "#define TkIncDir		/usr/local/include/tk4.$tkversion" >>$F
   echo "#define TkLibName		tk4$tkversion" >>$F
   echo "#define HasTcl			YES" >>$F
-  echo "#define TclLibDir		/usr/lib" >>$F
-  echo "#define TclIncDir		/usr/include" >>$F
-  echo "#define TclLibName		tcl75" >>$F
+  echo "#define TclLibDir		/usr/local/lib" >>$F
+  case $tkversion in
+    1)
+      tclversion=5
+      ;;
+    2)
+      tclversion=6
+      ;;
+  esac
+  echo "#define TclIncDir		/usr/local/include/tcl7.$tclversion" >>$F
+  echo "#define TclLibName		tcl7$tclversion" >>$F
 else
 cat <<EOF
 *** I don't see the static library for tk version 4 in /usr/local/lib.