From a176a4a606440cf0f946bd975848215a6fee0ca9 Mon Sep 17 00:00:00 2001
From: steven <steven@openbsd.org>
Date: Mon, 27 Oct 2008 23:20:39 +0000
Subject: [PATCH] switch to use tcl 8.5.

inputs from and looks good to bernd and simon
---
 databases/sqlite3/Makefile                  | 11 ++++++-----
 databases/sqlite3/patches/patch-Makefile_in | 11 +----------
 databases/sqlite3/patches/patch-configure   | 13 +++++++++++--
 databases/sqlite3/pkg/PFRAG.shared-tcl      |  4 ++--
 databases/sqlite3/pkg/PLIST-tcl             |  8 ++++----
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index dfa23133900..aab1a18b3d0 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.36 2008/10/27 17:14:18 simon Exp $
+# $OpenBSD: Makefile,v 1.37 2008/10/27 23:20:39 steven Exp $
 
 COMMENT-main=	embedded SQL implementation
 COMMENT-tcl=	TCL bindings for Sqlite3
 V=		3.6.4
 DISTNAME=	sqlite-${V}
 PKGNAME-main=	sqlite3-${V}
-PKGNAME-tcl=	sqlite3-tcl-${V}
+PKGNAME-tcl=	sqlite3-tcl-${V}p0
 CATEGORIES=	databases
 SHARED_LIBS +=	sqlite3              12.0      # .8.6
 SHARED_LIBS +=	tclsqlite3           11.0      # .8.6
@@ -43,20 +43,21 @@ FLAVOR=	no_tcl
 MULTI_PACKAGES=-main
 .if !${FLAVOR:L:Mno_tcl}
 MULTI_PACKAGES+=-tcl
+MODULES+=	lang/tcl
 .endif
 
-BUILD_DEPENDS= :tcl-8.4.*:lang/tcl/8.4
+BUILD_DEPENDS=	${MODTCL_BUILD_DEPENDS}
 LIB_DEPENDS-tcl = sqlite3::${BASE_PKGPATH},-main
 
 .if ${MULTI_PACKAGES:M-tcl}
-CONFIGURE_ARGS+=--with-tcl=${LOCALBASE}/lib/tcl8.4
+CONFIGURE_ARGS+=--with-tcl=${MODTCL_LIBDIR}
 # Can't pass all its regress tests, because tcl doesn't handle NaN
 # (strtod doesn't work in an IEEE way)
 
 REGRESS_TARGET=	test
 
 pre-configure:
-	@perl -pi -e s,'tclsh','tclsh8.4',g ${WRKSRC}/Makefile.in
+	@perl -pi -e s,'tclsh',${MODTCL_BIN},g ${WRKSRC}/Makefile.in
 # XXX libtool issue
 pre-install:
 	@cp -p ${WRKSRC}/.libs/libtclsqlite3.so.$(LIBtclsqlite3_VERSION) ${WRKSRC}/.libs/libtclsqlite3.so
diff --git a/databases/sqlite3/patches/patch-Makefile_in b/databases/sqlite3/patches/patch-Makefile_in
index a4ad954fdb3..b10ac7e0b18 100644
--- a/databases/sqlite3/patches/patch-Makefile_in
+++ b/databases/sqlite3/patches/patch-Makefile_in
@@ -1,15 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.9 2008/10/27 17:14:18 simon Exp $
+$OpenBSD: patch-Makefile_in,v 1.10 2008/10/27 23:20:39 steven Exp $
 --- Makefile.in.orig	Tue Oct 14 20:07:37 2008
 +++ Makefile.in	Sun Oct 26 10:19:40 2008
-@@ -101,7 +101,7 @@ TEXE = @TARGET_EXEEXT@
- #
- HAVE_TCL = @HAVE_TCL@
- 
--# This is the command to use for tclsh - normally just "tclsh", but we may
-+# This is the command to use for tclsh8.48.4 - normally just "tclsh8.48.4", but we may
- # know the specific version we want to use
- #
- TCLSH_CMD = @TCLSH_CMD@
 @@ -167,11 +167,11 @@ OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.l
          table.lo tokenize.lo trigger.lo update.lo \
          util.lo vacuum.lo \
diff --git a/databases/sqlite3/patches/patch-configure b/databases/sqlite3/patches/patch-configure
index a3e4b50fb12..6e116873c6b 100644
--- a/databases/sqlite3/patches/patch-configure
+++ b/databases/sqlite3/patches/patch-configure
@@ -1,6 +1,15 @@
-$OpenBSD: patch-configure,v 1.4 2008/10/27 17:14:18 simon Exp $
+$OpenBSD: patch-configure,v 1.5 2008/10/27 23:20:39 steven Exp $
 --- configure.orig	Tue Oct 14 20:07:39 2008
-+++ configure	Sat Oct 25 19:39:50 2008
++++ configure	Mon Oct 27 18:30:05 2008
+@@ -10793,7 +10793,7 @@ USE_AMALGAMATION=1
+ # if not, then we fall back to plain tclsh.
+ # TODO: try other versions before falling back?
+ #
+-for ac_prog in tclsh8.4 tclsh
++for ac_prog in tclsh8.5 tclsh8.4 tclsh
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
 @@ -11089,7 +11089,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
diff --git a/databases/sqlite3/pkg/PFRAG.shared-tcl b/databases/sqlite3/pkg/PFRAG.shared-tcl
index fe683b68153..447970db4a4 100644
--- a/databases/sqlite3/pkg/PFRAG.shared-tcl
+++ b/databases/sqlite3/pkg/PFRAG.shared-tcl
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared-tcl,v 1.1 2005/04/28 22:58:28 jolan Exp $
-lib/tcl8.4/sqlite3/libtclsqlite3.so
+@comment $OpenBSD: PFRAG.shared-tcl,v 1.2 2008/10/27 23:20:39 steven Exp $
+lib/tcl${MODTCL_VERSION}/sqlite3/libtclsqlite3.so
diff --git a/databases/sqlite3/pkg/PLIST-tcl b/databases/sqlite3/pkg/PLIST-tcl
index d90b6449653..aaddf68ae43 100644
--- a/databases/sqlite3/pkg/PLIST-tcl
+++ b/databases/sqlite3/pkg/PLIST-tcl
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST-tcl,v 1.1 2005/04/28 22:58:28 jolan Exp $
+@comment $OpenBSD: PLIST-tcl,v 1.2 2008/10/27 23:20:39 steven Exp $
 %%SHARED%%
-lib/tcl8.4/
-lib/tcl8.4/sqlite3/
-lib/tcl8.4/sqlite3/pkgIndex.tcl
+lib/tcl${MODTCL_VERSION}/
+lib/tcl${MODTCL_VERSION}/sqlite3/
+lib/tcl${MODTCL_VERSION}/sqlite3/pkgIndex.tcl