[pkgsrc/trunk]: pkgsrc/databases/sqlite3 Fix:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c563cbb597fb
branches:  trunk
changeset: 400130:c563cbb597fb
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Oct 11 16:06:21 2009 +0000

description:
Fix:
===> Building for sqlite3-3.6.18
tclsh ./tool/mksqlite3h.tcl . >sqlite3.h
tclsh: not found
gmake: *** [sqlite3.h] Error 127

Upstream didn't ship a pregenerated sqlite3.h. Committed as patch-ab.

diffstat:

 databases/sqlite3/Makefile.common  |     9 +-
 databases/sqlite3/distinfo         |     3 +-
 databases/sqlite3/patches/patch-ab |  5764 ++++++++++++++++++++++++++++++++++++
 3 files changed, 5767 insertions(+), 9 deletions(-)

diffs (truncated from 5800 to 300 lines):

diff -r a1b360153462 -r c563cbb597fb databases/sqlite3/Makefile.common
--- a/databases/sqlite3/Makefile.common Sun Oct 11 16:04:13 2009 +0000
+++ b/databases/sqlite3/Makefile.common Sun Oct 11 16:06:21 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.43 2009/10/11 09:14:14 adam Exp $
+# $NetBSD: Makefile.common,v 1.44 2009/10/11 16:06:21 tnn Exp $
 
 # used by databases/sqlite3-tcl/Makefile
 
@@ -21,10 +21,3 @@
 USE_LIBTOOL=           yes
 
 PKGCONFIG_OVERRIDE+=   sqlite3.pc.in
-
-# XXX remove in future releases, if fixed
-SUBST_CLASSES+=                fixver
-SUBST_STAGE.fixver=    post-patch
-SUBST_MESSAGE.fixver=  Fixing version in configure script.
-SUBST_FILES.fixver=    configure
-SUBST_SED.fixver=      -e 's,3.6.13,${PKGVERSION_NOREV},g'
diff -r a1b360153462 -r c563cbb597fb databases/sqlite3/distinfo
--- a/databases/sqlite3/distinfo        Sun Oct 11 16:04:13 2009 +0000
+++ b/databases/sqlite3/distinfo        Sun Oct 11 16:06:21 2009 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.41 2009/10/11 09:14:14 adam Exp $
+$NetBSD: distinfo,v 1.42 2009/10/11 16:06:21 tnn Exp $
 
 SHA1 (sqlite-3.6.18.tar.gz) = 0200f366657b00396bdc45ebd5b9ab6891ff825e
 RMD160 (sqlite-3.6.18.tar.gz) = 6894127ae650cf9745709338b57754681c0863cd
 Size (sqlite-3.6.18.tar.gz) = 2892345 bytes
 SHA1 (patch-aa) = bc0670df079e1a49422ba540d8272e503d20a33f
+SHA1 (patch-ab) = ef83eef8bd79efe40d4a8eb6408c148653925f21
diff -r a1b360153462 -r c563cbb597fb databases/sqlite3/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/sqlite3/patches/patch-ab        Sun Oct 11 16:06:21 2009 +0000
@@ -0,0 +1,5764 @@
+$NetBSD: patch-ab,v 1.3 2009/10/11 16:06:21 tnn Exp $
+
+--- sqlite3.h.orig     2009-10-11 18:02:11.000000000 +0200
++++ sqlite3.h
+@@ -0,0 +1,5759 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This header file defines the interface that the SQLite library
++** presents to client programs.  If a C-function, structure, datatype,
++** or constant definition does not appear in this file, then it is
++** not a published API of SQLite, is subject to change without
++** notice, and should not be referenced by programs that use SQLite.
++**
++** Some of the definitions that are in this file are marked as
++** "experimental".  Experimental interfaces are normally new
++** features recently added to SQLite.  We do not anticipate changes
++** to experimental interfaces but reserve the right to make minor changes
++** if experience from use "in the wild" suggest such changes are prudent.
++**
++** The official C-language API documentation for SQLite is derived
++** from comments in this file.  This file is the authoritative source
++** on how SQLite interfaces are suppose to operate.
++**
++** The name of this file under configuration management is "sqlite.h.in".
++** The makefile makes some minor changes to this file (such as inserting
++** the version number) and changes its name to "sqlite3.h" as
++** part of the build process.
++*/
++#ifndef _SQLITE3_H_
++#define _SQLITE3_H_
++#include <stdarg.h>     /* Needed for the definition of va_list */
++
++/*
++** Make sure we can call this stuff from C++.
++*/
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++
++/*
++** Add the ability to override 'extern'
++*/
++#ifndef SQLITE_EXTERN
++# define SQLITE_EXTERN extern
++#endif
++
++#ifndef SQLITE_API
++# define SQLITE_API
++#endif
++
++
++/*
++** These no-op macros are used in front of interfaces to mark those
++** interfaces as either deprecated or experimental.  New applications
++** should not use deprecated interfaces - they are support for backwards
++** compatibility only.  Application writers should be aware that
++** experimental interfaces are subject to change in point releases.
++**
++** These macros used to resolve to various kinds of compiler magic that
++** would generate warning messages when they were used.  But that
++** compiler magic ended up generating such a flurry of bug reports
++** that we have taken it all out and gone back to using simple
++** noop macros.
++*/
++#define SQLITE_DEPRECATED
++#define SQLITE_EXPERIMENTAL
++
++/*
++** Ensure these symbols were not defined by some previous header file.
++*/
++#ifdef SQLITE_VERSION
++# undef SQLITE_VERSION
++#endif
++#ifdef SQLITE_VERSION_NUMBER
++# undef SQLITE_VERSION_NUMBER
++#endif
++
++/*
++** CAPI3REF: Compile-Time Library Version Numbers {H10010} <S60100>
++**
++** The SQLITE_VERSION and SQLITE_VERSION_NUMBER #defines in
++** the sqlite3.h file specify the version of SQLite with which
++** that header file is associated.
++**
++** The "version" of SQLite is a string of the form "W.X.Y" or "W.X.Y.Z".
++** The W value is major version number and is always 3 in SQLite3.
++** The W value only changes when backwards compatibility is
++** broken and we intend to never break backwards compatibility.
++** The X value is the minor version number and only changes when
++** there are major feature enhancements that are forwards compatible
++** but not backwards compatible.
++** The Y value is the release number and is incremented with
++** each release but resets back to 0 whenever X is incremented.
++** The Z value only appears on branch releases.
++**
++** The SQLITE_VERSION_NUMBER is an integer that is computed as
++** follows:
++**
++** <blockquote><pre>
++** SQLITE_VERSION_NUMBER = W*1000000 + X*1000 + Y
++** </pre></blockquote>
++**
++** Since version 3.6.18, SQLite source code has been stored in the
++** <a href="http://www.fossil-scm.org/";>fossil configuration management
++** system</a>.  The SQLITE_SOURCE_ID
++** macro is a string which identifies a particular check-in of SQLite
++** within its configuration management system.  The string contains the
++** date and time of the check-in (UTC) and an SHA1 hash of the entire
++** source tree.
++**
++** See also: [sqlite3_libversion()],
++** [sqlite3_libversion_number()], [sqlite3_sourceid()],
++** [sqlite_version()] and [sqlite_source_id()].
++**
++** Requirements: [H10011] [H10014]
++*/
++#define SQLITE_VERSION        "3.6.18"
++#define SQLITE_VERSION_NUMBER 3006018
++#define SQLITE_SOURCE_ID      "2009-09-11 14:05:07 b084828a771ec40be85f07c590ca99de4f6c24ee"
++
++/*
++** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
++** KEYWORDS: sqlite3_version
++**
++** These interfaces provide the same information as the [SQLITE_VERSION],
++** [SQLITE_VERSION_NUMBER], and [SQLITE_SOURCE_ID] #defines in the header,
++** but are associated with the library instead of the header file.  Cautious
++** programmers might include assert() statements in their application to
++** verify that values returned by these interfaces match the macros in
++** the header, and thus insure that the application is
++** compiled with matching library and header files.
++**
++** <blockquote><pre>
++** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
++** assert( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)==0 );
++** assert( strcmp(sqlite3_libversion,SQLITE_VERSION)==0 );
++** </pre></blockquote>
++**
++** The sqlite3_libversion() function returns the same information as is
++** in the sqlite3_version[] string constant.  The function is provided
++** for use in DLLs since DLL users usually do not have direct access to string
++** constants within the DLL.  Similarly, the sqlite3_sourceid() function
++** returns the same information as is in the [SQLITE_SOURCE_ID] #define of
++** the header file.
++**
++** See also: [sqlite_version()] and [sqlite_source_id()].
++**
++** Requirements: [H10021] [H10022] [H10023]
++*/
++SQLITE_API SQLITE_EXTERN const char sqlite3_version[];
++SQLITE_API const char *sqlite3_libversion(void);
++SQLITE_API const char *sqlite3_sourceid(void);
++SQLITE_API int sqlite3_libversion_number(void);
++
++/*
++** CAPI3REF: Test To See If The Library Is Threadsafe {H10100} <S60100>
++**
++** SQLite can be compiled with or without mutexes.  When
++** the [SQLITE_THREADSAFE] C preprocessor macro is 1 or 2, mutexes
++** are enabled and SQLite is threadsafe.  When the
++** [SQLITE_THREADSAFE] macro is 0, 
++** the mutexes are omitted.  Without the mutexes, it is not safe
++** to use SQLite concurrently from more than one thread.
++**
++** Enabling mutexes incurs a measurable performance penalty.
++** So if speed is of utmost importance, it makes sense to disable
++** the mutexes.  But for maximum safety, mutexes should be enabled.
++** The default behavior is for mutexes to be enabled.
++**
++** This interface can be used by an application to make sure that the
++** version of SQLite that it is linking against was compiled with
++** the desired setting of the [SQLITE_THREADSAFE] macro.
++**
++** This interface only reports on the compile-time mutex setting
++** of the [SQLITE_THREADSAFE] flag.  If SQLite is compiled with
++** SQLITE_THREADSAFE=1 then mutexes are enabled by default but
++** can be fully or partially disabled using a call to [sqlite3_config()]
++** with the verbs [SQLITE_CONFIG_SINGLETHREAD], [SQLITE_CONFIG_MULTITHREAD],
++** or [SQLITE_CONFIG_MUTEX].  The return value of this function shows
++** only the default compile-time setting, not any run-time changes
++** to that setting.
++**
++** See the [threading mode] documentation for additional information.
++**
++** Requirements: [H10101] [H10102]
++*/
++SQLITE_API int sqlite3_threadsafe(void);
++
++/*
++** CAPI3REF: Database Connection Handle {H12000} <S40200>
++** KEYWORDS: {database connection} {database connections}
++**
++** Each open SQLite database is represented by a pointer to an instance of
++** the opaque structure named "sqlite3".  It is useful to think of an sqlite3
++** pointer as an object.  The [sqlite3_open()], [sqlite3_open16()], and
++** [sqlite3_open_v2()] interfaces are its constructors, and [sqlite3_close()]
++** is its destructor.  There are many other interfaces (such as
++** [sqlite3_prepare_v2()], [sqlite3_create_function()], and
++** [sqlite3_busy_timeout()] to name but three) that are methods on an
++** sqlite3 object.
++*/
++typedef struct sqlite3 sqlite3;
++
++/*
++** CAPI3REF: 64-Bit Integer Types {H10200} <S10110>
++** KEYWORDS: sqlite_int64 sqlite_uint64
++**
++** Because there is no cross-platform way to specify 64-bit integer types
++** SQLite includes typedefs for 64-bit signed and unsigned integers.
++**
++** The sqlite3_int64 and sqlite3_uint64 are the preferred type definitions.
++** The sqlite_int64 and sqlite_uint64 types are supported for backwards
++** compatibility only.
++**
++** Requirements: [H10201] [H10202]
++*/
++#ifdef SQLITE_INT64_TYPE
++  typedef SQLITE_INT64_TYPE sqlite_int64;
++  typedef unsigned SQLITE_INT64_TYPE sqlite_uint64;
++#elif defined(_MSC_VER) || defined(__BORLANDC__)
++  typedef __int64 sqlite_int64;
++  typedef unsigned __int64 sqlite_uint64;
++#else
++  typedef long long int sqlite_int64;
++  typedef unsigned long long int sqlite_uint64;
++#endif
++typedef sqlite_int64 sqlite3_int64;
++typedef sqlite_uint64 sqlite3_uint64;
++
++/*
++** If compiling for a processor that lacks floating point support,
++** substitute integer for floating-point.
++*/
++#ifdef SQLITE_OMIT_FLOATING_POINT
++# define double sqlite3_int64
++#endif
++
++/*
++** CAPI3REF: Closing A Database Connection {H12010} <S30100><S40200>
++**
++** This routine is the destructor for the [sqlite3] object.
++**
++** Applications should [sqlite3_finalize | finalize] all [prepared statements]
++** and [sqlite3_blob_close | close] all [BLOB handles] associated with
++** the [sqlite3] object prior to attempting to close the object.
++** The [sqlite3_next_stmt()] interface can be used to locate all
++** [prepared statements] associated with a [database connection] if desired.
++** Typical code might look like this:
++**
++** <blockquote><pre>
++** sqlite3_stmt *pStmt;
++** while( (pStmt = sqlite3_next_stmt(db, 0))!=0 ){
++** &nbsp;   sqlite3_finalize(pStmt);
++** }