From 40ad320822647748f6e35ddc43f311713af6f46e Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Sun, 9 Jan 2000 07:16:49 +0000
Subject: [PATCH] stop hacking up the autoconf script to specify the location
 of tclConfig.sh and instead use the proper autoconf option --with-tcl instead

---
 x11/tk80/Makefile         |  4 ++--
 x11/tk80/patches/patch-aa | 13 +++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/x11/tk80/Makefile b/x11/tk80/Makefile
index 18639f0efb6..199f438104c 100644
--- a/x11/tk80/Makefile
+++ b/x11/tk80/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2000/01/07 18:17:44 brad Exp $
+# $OpenBSD: Makefile,v 1.17 2000/01/09 07:16:49 brad Exp $
 # $FreeBSD: Makefile,v 1.7 1997/12/01 16:50:58 pst Exp $
 
 DISTNAME=	tk8.0.5
@@ -16,7 +16,7 @@ LIB_DEPENDS=	tcl80.1.5:${PORTSDIR}/lang/tcl80
 SEPARATE_BUILD=	concurrent
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --enable-static
+CONFIGURE_ARGS+= --enable-static --with-tcl="${PREFIX}/lib/tcl8.0"
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} 
 
 WRKSRC=	${WRKDIR}/${DISTNAME}/unix
diff --git a/x11/tk80/patches/patch-aa b/x11/tk80/patches/patch-aa
index f6aa86e2ba1..bd7db15bf7e 100644
--- a/x11/tk80/patches/patch-aa
+++ b/x11/tk80/patches/patch-aa
@@ -1,13 +1,6 @@
---- configure.orig	Fri Mar 19 15:45:39 1999
-+++ configure	Fri Mar 19 15:50:03 1999
-@@ -874,14 +874,14 @@
-   withval="$with_tcl"
-   TCL_BIN_DIR=$withval
- else
--  TCL_BIN_DIR=`cd ../../tcl8.0$TK_PATCH_LEVEL/unix; pwd`
-+  TCL_BIN_DIR=${prefix}/lib/tcl8.0
- fi
- 
+--- configure.orig	Tue Mar  9 01:53:50 1999
++++ configure	Sun Jan  9 01:32:57 2000
+@@ -880,8 +880,8 @@
  if test ! -d $TCL_BIN_DIR; then
      { echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; }
  fi