- Finally, update to 3.5.6

- Enable THREADS by default

PS: See UPDATING if you have problems.

Requested by:	many

11 files changed, 90 insertions, 250 deletions

diff --git a/databases/sqlite3/files/fts12_patch-Makefile.in b/databases/sqlite3/files/fts12_patch-Makefile.in
deleted file mode 100644
index bfc34a1f9415..000000000000
--- a/databases/sqlite3/files/fts12_patch-Makefile.in
+++ /dev/null
@@ -1,75 +0,0 @@
---- Makefile.in.orig	2007-06-28 09:46:18.000000000 -0300
-+++ Makefile.in	2007-08-10 08:52:27.000000000 -0300
-@@ -128,7 +128,9 @@
-          select.lo table.lo tokenize.lo trigger.lo update.lo \
-          util.lo vacuum.lo \
-          vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \
--         where.lo utf.lo legacy.lo vtab.lo
-+         where.lo utf.lo legacy.lo vtab.lo \
-+         fts1.lo fts1_hash.lo fts1_porter.lo fts1_tokenizer1.lo \
-+         fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer.lo fts2_tokenizer1.lo
- 
- # All of the source code files.
- #
-@@ -198,6 +200,15 @@
-   $(TOP)/ext/fts1/fts1_tokenizer.h \
-   $(TOP)/ext/fts1/fts1_tokenizer1.c
- 
-+SRC += \
-+  $(TOP)/ext/fts2/fts2.c \
-+  $(TOP)/ext/fts2/fts2.h \
-+  $(TOP)/ext/fts2/fts2_hash.c \
-+  $(TOP)/ext/fts2/fts2_hash.h \
-+  $(TOP)/ext/fts2/fts2_porter.c \
-+  $(TOP)/ext/fts2/fts2_tokenizer.c \
-+  $(TOP)/ext/fts2/fts2_tokenizer.h \
-+  $(TOP)/ext/fts2/fts2_tokenizer1.c
- 
- # Source code to the test files.
- #
-@@ -261,6 +272,11 @@
-   $(TOP)/ext/fts1/fts1_hash.h \
-   $(TOP)/ext/fts1/fts1_tokenizer.h
- 
-+HDR += \
-+  $(TOP)/ext/fts2/fts2.h \
-+  $(TOP)/ext/fts2/fts2_hash.h \
-+  $(TOP)/ext/fts2/fts2_tokenizer.h
-+
- # Header files used by the VDBE submodule
- #
- VDBEHDR = \
-@@ -482,6 +498,33 @@
- where.lo:	$(TOP)/src/where.c $(HDR)
- 	$(LTCOMPILE) -c $(TOP)/src/where.c
- 
-+fts1.lo:		$(TOP)/ext/fts1/fts1.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1.c
-+
-+fts1_hash.lo:		$(TOP)/ext/fts1/fts1_hash.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_hash.c
-+
-+fts1_porter.lo:		$(TOP)/ext/fts1/fts1_porter.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_porter.c
-+
-+fts1_tokenizer1.lo:	$(TOP)/ext/fts1/fts1_tokenizer1.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_tokenizer1.c
-+
-+fts2.lo:		$(TOP)/ext/fts2/fts2.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2.c
-+
-+fts2_hash.lo:		$(TOP)/ext/fts2/fts2_hash.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_hash.c
-+
-+fts2_porter.lo:		$(TOP)/ext/fts2/fts2_porter.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_porter.c
-+
-+fts2_tokenizer.lo:	$(TOP)/ext/fts2/fts2_tokenizer.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer.c
-+
-+fts2_tokenizer1.lo:	$(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer1.c
-+
- tclsqlite-shell.lo:	$(TOP)/src/tclsqlite.c $(HDR)
- 	$(LTCOMPILE) -DTCLSH=1 -o $@ -c $(TOP)/src/tclsqlite.c
- 
diff --git a/databases/sqlite3/files/fts1_patch-Makefile.in b/databases/sqlite3/files/fts1_patch-Makefile.in
deleted file mode 100644
index a84838c25fef..000000000000
--- a/databases/sqlite3/files/fts1_patch-Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.in.orig	2007-06-14 17:54:38.000000000 -0300
-+++ Makefile.in	2007-07-04 19:24:47.000000000 -0300
-@@ -128,7 +128,8 @@
-          select.lo table.lo tokenize.lo trigger.lo update.lo \
-          util.lo vacuum.lo \
-          vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \
--         where.lo utf.lo legacy.lo vtab.lo
-+         where.lo utf.lo legacy.lo vtab.lo \
-+         fts1.lo fts1_hash.lo fts1_porter.lo fts1_tokenizer1.lo
- 
- # All of the source code files.
- #
-@@ -482,6 +483,18 @@
- where.lo:	$(TOP)/src/where.c $(HDR)
- 	$(LTCOMPILE) -c $(TOP)/src/where.c
- 
-+fts1.lo:		$(TOP)/ext/fts1/fts1.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1.c
-+
-+fts1_hash.lo:		$(TOP)/ext/fts1/fts1_hash.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_hash.c
-+
-+fts1_porter.lo:	$(TOP)/ext/fts1/fts1_porter.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_porter.c
-+
-+fts1_tokenizer1.lo:	$(TOP)/ext/fts1/fts1_tokenizer1.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_tokenizer1.c
-+
- tclsqlite-shell.lo:	$(TOP)/src/tclsqlite.c $(HDR)
- 	$(LTCOMPILE) -DTCLSH=1 -o $@ -c $(TOP)/src/tclsqlite.c
- 
diff --git a/databases/sqlite3/files/fts2_patch-Makefile.in b/databases/sqlite3/files/fts2_patch-Makefile.in
deleted file mode 100644
index b079a8501121..000000000000
--- a/databases/sqlite3/files/fts2_patch-Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
---- Makefile.in.orig	2007-06-28 09:46:18.000000000 -0300
-+++ Makefile.in	2007-08-10 08:47:35.000000000 -0300
-@@ -128,7 +128,8 @@
-          select.lo table.lo tokenize.lo trigger.lo update.lo \
-          util.lo vacuum.lo \
-          vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \
--         where.lo utf.lo legacy.lo vtab.lo
-+         where.lo utf.lo legacy.lo vtab.lo \
-+         fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer.lo fts2_tokenizer1.lo
- 
- # All of the source code files.
- #
-@@ -198,6 +199,15 @@
-   $(TOP)/ext/fts1/fts1_tokenizer.h \
-   $(TOP)/ext/fts1/fts1_tokenizer1.c
- 
-+SRC += \
-+  $(TOP)/ext/fts2/fts2.c \
-+  $(TOP)/ext/fts2/fts2.h \
-+  $(TOP)/ext/fts2/fts2_hash.c \
-+  $(TOP)/ext/fts2/fts2_hash.h \
-+  $(TOP)/ext/fts2/fts2_porter.c \
-+  $(TOP)/ext/fts2/fts2_tokenizer.c \
-+  $(TOP)/ext/fts2/fts2_tokenizer.h \
-+  $(TOP)/ext/fts2/fts2_tokenizer1.c
- 
- # Source code to the test files.
- #
-@@ -261,6 +271,11 @@
-   $(TOP)/ext/fts1/fts1_hash.h \
-   $(TOP)/ext/fts1/fts1_tokenizer.h
- 
-+HDR += \
-+  $(TOP)/ext/fts2/fts2.h \
-+  $(TOP)/ext/fts2/fts2_hash.h \
-+  $(TOP)/ext/fts2/fts2_tokenizer.h
-+
- # Header files used by the VDBE submodule
- #
- VDBEHDR = \
-@@ -482,6 +497,21 @@
- where.lo:	$(TOP)/src/where.c $(HDR)
- 	$(LTCOMPILE) -c $(TOP)/src/where.c
- 
-+fts2.lo:		$(TOP)/ext/fts2/fts2.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2.c
-+
-+fts2_hash.lo:		$(TOP)/ext/fts2/fts2_hash.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_hash.c
-+
-+fts2_porter.lo:	$(TOP)/ext/fts2/fts2_porter.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_porter.c
-+
-+fts2_tokenizer.lo:	$(TOP)/ext/fts2/fts2_tokenizer.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer.c
-+
-+fts2_tokenizer1.lo:	$(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer1.c
-+
- tclsqlite-shell.lo:	$(TOP)/src/tclsqlite.c $(HDR)
- 	$(LTCOMPILE) -DTCLSH=1 -o $@ -c $(TOP)/src/tclsqlite.c
- 
diff --git a/databases/sqlite3/files/fts3_patch-Makefile.in b/databases/sqlite3/files/fts3_patch-Makefile.in
new file mode 100644
index 000000000000..3d144ee5c313
--- /dev/null
+++ b/databases/sqlite3/files/fts3_patch-Makefile.in
@@ -0,0 +1,79 @@
+--- Makefile.in.orig	2008-01-22 16:42:50.000000000 -0200
++++ Makefile.in	2008-03-04 23:43:03.000000000 -0300
+@@ -116,7 +116,7 @@
+ 
+ # You should not have to change anything below this line
+ ###############################################################################
+-TCC += -DSQLITE_OMIT_LOAD_EXTENSION=1
++#TCC += -DSQLITE_OMIT_LOAD_EXTENSION=1
+ 
+ # Object files for the SQLite library.
+ #
+@@ -133,6 +133,8 @@
+          vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \
+          where.lo utf.lo legacy.lo vtab.lo
+ 
++LIBOBJ += fts3.lo fts3_hash.lo fts3_porter.lo fts3_tokenizer.lo fts3_tokenizer1.lo
++
+ # All of the source code files.
+ #
+ SRC = \
+@@ -204,13 +206,15 @@
+ # Source code for extensions
+ #
+ SRC += \
+-  $(TOP)/ext/fts1/fts1.c \
+-  $(TOP)/ext/fts1/fts1.h \
+-  $(TOP)/ext/fts1/fts1_hash.c \
+-  $(TOP)/ext/fts1/fts1_hash.h \
+-  $(TOP)/ext/fts1/fts1_porter.c \
+-  $(TOP)/ext/fts1/fts1_tokenizer.h \
+-  $(TOP)/ext/fts1/fts1_tokenizer1.c
++  $(TOP)/ext/fts3/fts3.c \
++  $(TOP)/ext/fts3/fts3.h \
++  $(TOP)/ext/fts3/fts3_hash.c \
++  $(TOP)/ext/fts3/fts3_hash.h \
++  $(TOP)/ext/fts3/fts3_icu.c \
++  $(TOP)/ext/fts3/fts3_porter.c \
++  $(TOP)/ext/fts3/fts3_tokenizer.h \
++  $(TOP)/ext/fts3/fts3_tokenizer.c \
++  $(TOP)/ext/fts3/fts3_tokenizer1.c
+ 
+ 
+ # Source code to the test files.
+@@ -286,9 +290,9 @@
+ # Header files used by extensions
+ #
+ HDR += \
+-  $(TOP)/ext/fts1/fts1.h \
+-  $(TOP)/ext/fts1/fts1_hash.h \
+-  $(TOP)/ext/fts1/fts1_tokenizer.h
++  $(TOP)/ext/fts3/fts3.h \
++  $(TOP)/ext/fts3/fts3_hash.h \
++  $(TOP)/ext/fts3/fts3_tokenizer.h
+ 
+ # Header files used by the VDBE submodule
+ #
+@@ -561,6 +565,22 @@
+ 		libsqlite3.la $(LIBTCL)
+ 
+ 
++fts3.lo:	$(TOP)/ext/fts3/fts3.c $(HDR)
++	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3.c
++
++fts3_hash.lo:	$(TOP)/ext/fts3/fts3_hash.c $(HDR)
++	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_hash.c
++
++fts3_porter.lo:	$(TOP)/ext/fts3/fts3_porter.c $(HDR)
++	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_porter.c
++
++fts3_tokenizer.lo:	$(TOP)/ext/fts3/fts3_tokenizer.c $(HDR)
++	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer.c
++
++fts3_tokenizer1.lo:	$(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR)
++	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer1.c
++
++
+ fulltest:	testfixture$(TEXE) sqlite3$(TEXE)
+ 	./testfixture $(TOP)/test/all.test
+ 
diff --git a/databases/sqlite3/files/patch-ext__fts1__fts1.c b/databases/sqlite3/files/patch-ext__fts1__fts1.c
deleted file mode 100644
index 8357e5832668..000000000000
--- a/databases/sqlite3/files/patch-ext__fts1__fts1.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ext/fts1/fts1.c.orig	Sun Oct  8 06:16:32 2006
-+++ ext/fts1/fts1.c	Sun Dec  3 14:44:46 2006
-@@ -19,11 +19,7 @@
- #endif
- 
- #include <assert.h>
--#if !defined(__APPLE__)
--#include <malloc.h>
--#else
- #include <stdlib.h>
--#endif
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
diff --git a/databases/sqlite3/files/patch-ext__fts1__fts1_porter.c b/databases/sqlite3/files/patch-ext__fts1__fts1_porter.c
deleted file mode 100644
index 6185bf94dcd5..000000000000
--- a/databases/sqlite3/files/patch-ext__fts1__fts1_porter.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ext/fts1/fts1_porter.c.orig	Sun Oct  1 13:01:13 2006
-+++ ext/fts1/fts1_porter.c	Sun Dec  3 14:45:17 2006
-@@ -26,11 +26,7 @@
- 
- 
- #include <assert.h>
--#if !defined(__APPLE__)
--#include <malloc.h>
--#else
- #include <stdlib.h>
--#endif
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
diff --git a/databases/sqlite3/files/patch-ext__fts1__fts1_tokenizer1.c b/databases/sqlite3/files/patch-ext__fts1__fts1_tokenizer1.c
deleted file mode 100644
index 438019e54f9d..000000000000
--- a/databases/sqlite3/files/patch-ext__fts1__fts1_tokenizer1.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ext/fts1/fts1_tokenizer1.c.orig	Sat Sep 30 08:57:33 2006
-+++ ext/fts1/fts1_tokenizer1.c	Sun Dec  3 14:45:56 2006
-@@ -18,11 +18,7 @@
- 
- 
- #include <assert.h>
--#if !defined(__APPLE__)
--#include <malloc.h>
--#else
- #include <stdlib.h>
--#endif
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
diff --git a/databases/sqlite3/files/patch-ext__fts2__fts2.c b/databases/sqlite3/files/patch-ext__fts2__fts2.c
deleted file mode 100644
index b68f8f3a4a64..000000000000
--- a/databases/sqlite3/files/patch-ext__fts2__fts2.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ext/fts2/fts2.c.orig	Fri Jun  8 12:31:37 2007
-+++ ext/fts2/fts2.c	Fri Jun  8 12:32:16 2007
-@@ -269,9 +269,6 @@
- #endif
- 
- #include <assert.h>
--#if !defined(__APPLE__)
--#include <malloc.h>
--#endif
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
diff --git a/databases/sqlite3/files/patch-ext__fts2__fts2_porter.c b/databases/sqlite3/files/patch-ext__fts2__fts2_porter.c
deleted file mode 100644
index 0ed308c4f012..000000000000
--- a/databases/sqlite3/files/patch-ext__fts2__fts2_porter.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ext/fts2/fts2_porter.c.orig	Fri Jun  8 12:31:44 2007
-+++ ext/fts2/fts2_porter.c	Fri Jun  8 12:32:21 2007
-@@ -26,11 +26,7 @@
- 
- 
- #include <assert.h>
--#if !defined(__APPLE__)
--#include <malloc.h>
--#else
- #include <stdlib.h>
--#endif
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
diff --git a/databases/sqlite3/files/patch-ext__fts2__fts2_tokenizer1.c b/databases/sqlite3/files/patch-ext__fts2__fts2_tokenizer1.c
deleted file mode 100644
index 1f539b950b31..000000000000
--- a/databases/sqlite3/files/patch-ext__fts2__fts2_tokenizer1.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ext/fts2/fts2_tokenizer1.c.orig	Fri Jun  8 12:31:51 2007
-+++ ext/fts2/fts2_tokenizer1.c	Fri Jun  8 12:32:26 2007
-@@ -18,11 +18,7 @@
- 
- 
- #include <assert.h>
--#if !defined(__APPLE__)
--#include <malloc.h>
--#else
- #include <stdlib.h>
--#endif
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
diff --git a/databases/sqlite3/files/patch-src__main.c b/databases/sqlite3/files/patch-src__main.c
new file mode 100644
index 000000000000..251c4fa9cc68
--- /dev/null
+++ b/databases/sqlite3/files/patch-src__main.c
@@ -0,0 +1,11 @@
+--- src/main.c.orig	2008-03-04 00:22:33.000000000 -0300
++++ src/main.c	2008-03-04 00:22:45.000000000 -0300
+@@ -19,7 +19,7 @@
+ #include "sqliteInt.h"
+ #include <ctype.h>
+ #ifdef SQLITE_ENABLE_FTS3
+-# include "fts3.h"
++# include "../ext/fts3/fts3.h"
+ #endif
+ 
+ /*