[pkgsrc/trunk]: pkgsrc/databases/sqlite3 patch from upstream: sqlite3 fails t...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6d106831b31d
branches:  trunk
changeset: 554874:6d106831b31d
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Feb 21 19:39:43 2009 +0000

description:
patch from upstream: sqlite3 fails to build when tcl is not installed.
Also set ac_cv_prog_TCLSH_CMD="" so the configure script won't find tcl.

diffstat:

 databases/sqlite3/Makefile         |   3 ++-
 databases/sqlite3/distinfo         |   4 ++--
 databases/sqlite3/patches/patch-aa |  21 ++++++++++++++++++++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diffs (64 lines):

diff -r aa71b37b7ef8 -r 6d106831b31d databases/sqlite3/Makefile
--- a/databases/sqlite3/Makefile        Sat Feb 21 18:54:41 2009 +0000
+++ b/databases/sqlite3/Makefile        Sat Feb 21 19:39:43 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/12/31 20:37:09 epg Exp $
+# $NetBSD: Makefile,v 1.17 2009/02/21 19:39:43 tnn Exp $
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
@@ -6,6 +6,7 @@
 
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 CONFIGURE_ARGS+=       --disable-tcl
+CONFIGURE_ENV+=                ac_cv_prog_TCLSH_CMD=""
 CONFIGURE_ARGS+=       --enable-load-extension
 CONFIGURE_ARGS+=       --with-readline-inc=
 
diff -r aa71b37b7ef8 -r 6d106831b31d databases/sqlite3/distinfo
--- a/databases/sqlite3/distinfo        Sat Feb 21 18:54:41 2009 +0000
+++ b/databases/sqlite3/distinfo        Sat Feb 21 19:39:43 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.30 2009/02/18 19:13:04 adam Exp $
+$NetBSD: distinfo,v 1.31 2009/02/21 19:39:44 tnn Exp $
 
 SHA1 (sqlite-3.6.11.tar.gz) = bd1c371784d990f7b5e99c841e58deb87fbf4b6e
 RMD160 (sqlite-3.6.11.tar.gz) = c38d82c83f5d64cfb302e3232c507bafb0b64e74
 Size (sqlite-3.6.11.tar.gz) = 2804714 bytes
-SHA1 (patch-aa) = 32d7901440c682601b58770fe5bc1f26bf4d92fe
+SHA1 (patch-aa) = f50e634e3a9de7599e84673e4989e93307ef926e
diff -r aa71b37b7ef8 -r 6d106831b31d databases/sqlite3/patches/patch-aa
--- a/databases/sqlite3/patches/patch-aa        Sat Feb 21 18:54:41 2009 +0000
+++ b/databases/sqlite3/patches/patch-aa        Sat Feb 21 19:39:43 2009 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.5 2009/02/18 19:13:04 adam Exp $
+$NetBSD: patch-aa,v 1.6 2009/02/21 19:39:44 tnn Exp $
 
 --- Makefile.in.orig   2009-02-15 14:07:08.000000000 +0100
 +++ Makefile.in
+@@ -163,7 +163,7 @@ NAWK = @AWK@
+ 
+ # Object files for the SQLite library (non-amalgamation).
+ #
+-OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.lo btmutex.lo \
++OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.lo bitvec.lo btmutex.lo \
+         btree.lo build.lo callback.lo complete.lo date.lo \
+         delete.lo expr.lo fault.lo func.lo global.lo \
+         hash.lo journal.lo insert.lo legacy.lo loadext.lo \
 @@ -466,7 +466,7 @@ libsqlite3.la:     $(LIBOBJ)
  
  libtclsqlite3.la:     tclsqlite.lo libsqlite3.la
@@ -11,3 +20,13 @@
                -rpath "$(TCLLIBDIR)" \
                -version-info "8:6:8" \
                -avoid-version
+@@ -518,6 +518,9 @@ attach.lo: $(TOP)/src/attach.c $(HDR)
+ auth.lo:      $(TOP)/src/auth.c $(HDR)
+       $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/auth.c
+ 
++backup.lo:    $(TOP)/src/backup.c $(HDR)
++      $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/backup.c
++
+ bitvec.lo:    $(TOP)/src/bitvec.c $(HDR)
+       $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/bitvec.c
+