 @@ -1,18 +1,18 @@
-$NetBSD: patch-ab,v 1.3 2009/10/11 16:06:21 tnn Exp $
+$NetBSD: patch-ab,v 1.4 2009/10/28 16:46:51 tnn Exp $
---- sqlite3.h.orig	2009-10-11 18:02:11.000000000 +0200
+--- sqlite3.h.orig	2009-10-28 17:39:08.000000000 +0100
 +++ sqlite3.h
-@@ -0,0 +1,5759 @@
+@@ -0,0 +1,5763 @@
 +/*
 +** 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,
 @@ -114,29 +114,29 @@ $NetBSD: patch-ab,v 1.3 2009/10/11 16:06
 +** <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        "3.6.19"
-+#define SQLITE_VERSION_NUMBER 3006018
++#define SQLITE_VERSION_NUMBER 3006019
-+#define SQLITE_SOURCE_ID      "2009-09-11 14:05:07 b084828a771ec40be85f07c590ca99de4f6c24ee"
++#define SQLITE_SOURCE_ID      "2009-10-14 11:33:55 c1d499afc50d54b376945b4efb65c56c787a073d"
++
 +/*
 +** 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.
 +**
 @@ -1311,28 +1311,29 @@ $NetBSD: patch-ab,v 1.3 2009/10/11 16:06
 +** unpredictable and might not equal either the old or the new
 +** last insert [rowid].
 +*/
 +SQLITE_API sqlite3_int64 sqlite3_last_insert_rowid(sqlite3*);
++
 +/*
 +** CAPI3REF: Count The Number Of Rows Modified {H12240} <S10600>
 +**
 +** This function returns the number of database rows that were changed
 +** or inserted or deleted by the most recently completed SQL statement
 +** on the [database connection] specified by the first parameter.
 +** Only changes that are directly specified by the [INSERT], [UPDATE],
 +** or [DELETE] statement are counted.  Auxiliary changes caused by
-+** triggers are not counted. Use the [sqlite3_total_changes()] function
++** triggers or [foreign key actions] are not counted. Use the
-+** to find the total number of changes including changes caused by triggers.
++** [sqlite3_total_changes()] function to find the total number of changes
 +** including changes caused by triggers and foreign key actions.
 +**
 +** Changes to a view that are simulated by an [INSTEAD OF trigger]
 +** are not counted.  Only real table changes are counted.
 +**
 +** A "row change" is a change to a single row of a single table
 +** caused by an INSERT, DELETE, or UPDATE statement.  Rows that
 +** are changed as side effects of [REPLACE] constraint resolution,
 +** rollback, ABORT processing, [DROP TABLE], or by any other
 +** mechanisms do not count as direct row changes.
 +**
 +** A "trigger context" is a scope of execution that begins and
 +** ends with the script of a [CREATE TRIGGER | trigger].
 +** Most SQL statements are
 @@ -1364,28 +1365,28 @@ $NetBSD: patch-ab,v 1.3 2009/10/11 16:06
 +** [H12241] [H12243]
 +**
 +** If a separate thread makes changes on the same database connection
 +** while [sqlite3_changes()] is running then the value returned
 +** is unpredictable and not meaningful.
 +*/
 +SQLITE_API int sqlite3_changes(sqlite3*);
++
 +/*
 +** CAPI3REF: Total Number Of Rows Modified {H12260} <S10600>
 +**
 +** This function returns the number of row changes caused by [INSERT],
 +** [UPDATE] or [DELETE] statements since the [database connection] was opened.
-+** The count includes all changes from all
++** The count includes all changes from all [CREATE TRIGGER | trigger]
-+** [CREATE TRIGGER | trigger] contexts.  However,
++** contexts and changes made by [foreign key actions]. However,
 +** the count does not include changes used to implement [REPLACE] constraints,
 +** do rollbacks or ABORT processing, or [DROP TABLE] processing.  The
 +** count does not include rows of views that fire an [INSTEAD OF trigger],
 +** though if the INSTEAD OF trigger makes changes of its own, those changes
 +** are counted.
 +** The changes are counted as soon as the statement that makes them is
 +** completed (when the statement handle is passed to [sqlite3_reset()] or
 +** [sqlite3_finalize()]).
 +**
 +** See also the [sqlite3_changes()] interface and the
 +** [count_changes pragma].
 +**
 +** Requirements:
 @@ -4506,26 +4507,29 @@ $NetBSD: patch-ab,v 1.3 2009/10/11 16:06
 +/*
 +** CAPI3REF: Open A BLOB For Incremental I/O {H17810} <S30230>
 +**
 +** This interfaces opens a [BLOB handle | handle] to the BLOB located
 +** in row iRow, column zColumn, table zTable in database zDb;
 +** in other words, the same BLOB that would be selected by:
 +**
 +** <pre>
 +**     SELECT zColumn FROM zDb.zTable WHERE [rowid] = iRow;
 +** </pre> {END}
 +**
 +** If the flags parameter is non-zero, then the BLOB is opened for read
 +** and write access. If it is zero, the BLOB is opened for read access.
 +** It is not possible to open a column that is part of an index or primary
 +** key for writing. ^If [foreign key constraints] are enabled, it is
 +** not possible to open a column that is part of a [child key] for writing.
 +**
 +** Note that the database name is not the filename that contains
 +** the database but rather the symbolic name of the database that
 +** is assigned when the database is connected using [ATTACH].
 +** For the main database file, the database name is "main".
 +** For TEMP tables, the database name is "temp".
 +**
 +** On success, [SQLITE_OK] is returned and the new [BLOB handle] is written
 +** to *ppBlob. Otherwise an [error code] is returned and *ppBlob is set
 +** to be a null pointer.
 +** This function sets the [database connection] error code and message
 +** accessible via [sqlite3_errcode()] and [sqlite3_errmsg()] and related
 +** functions.  Note that the *ppBlob variable is always initialized in a

 @@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.19 2009/05/21 11:44:42 adam Exp $
+# $NetBSD: Makefile,v 1.20 2009/10/28 16:46:51 tnn Exp $
 PKGREVISION=		1
 PKG_DESTDIR_SUPPORT=	user-destdir
 .include "Makefile.common"
 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=
 # Uses dlopen and friends but doesn't use -ldl on Linux.
 # See http://www.sqlite.org/cvstrac/tktview?tn=3555
 LIBS+=			${BUILDLINK_LDADD.dl}

 @@ -1,17 +1,19 @@
-# $NetBSD: Makefile.common,v 1.45 2009/10/28 06:42:37 adam Exp $
+# $NetBSD: Makefile.common,v 1.46 2009/10/28 16:46:51 tnn Exp $
 # used by databases/sqlite3-tcl/Makefile
 # When updating this package, you must regenerate patch-ab!
 # It's required to avoid a build dependency on tcl.
 DISTNAME=	sqlite-3.6.19
 PKGNAME=	${DISTNAME:S/-/3-/}
 CATEGORIES=	databases
 MASTER_SITES=	http://www.hwaci.com/sw/sqlite/ \
 		http://www.sqlite.org/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.sqlite.org/
 COMMENT=	SQL Database Engine in a C Library
 LICENSE=	public-domain
 DISTINFO_FILE=	${.CURDIR}/../../databases/sqlite3/distinfo
 PATCHDIR=	${.CURDIR}/../../databases/sqlite3/patches

 @@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.43 2009/10/28 06:42:37 adam Exp $
+$NetBSD: distinfo,v 1.44 2009/10/28 16:46:51 tnn Exp $
 SHA1 (sqlite-3.6.19.tar.gz) = 1f85a324edfb42ec00bb6dbbec5a178346c950ee
 RMD160 (sqlite-3.6.19.tar.gz) = 119db76399eca04f21051c6ff156ccbb0c8d35b5
 Size (sqlite-3.6.19.tar.gz) = 2942005 bytes
 SHA1 (patch-aa) = bc0670df079e1a49422ba540d8272e503d20a33f
-SHA1 (patch-ab) = ef83eef8bd79efe40d4a8eb6408c148653925f21
+SHA1 (patch-ab) = 0abd0c57bcdcd1132ed546cf6128112f9b1101fe