- Update to 3.4.1

- Make sqlite3 respect CC [1]
- Add support for FTS2 [2]

PR:		112286 [1], 113477 [2]
Submitted by:	Sergey Prikhodko <sergey___network-asp.biz> [1],
		Anton Berezin <tobez___FreeBSD.org> [2]

16 files changed, 386 insertions, 28 deletions

diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index 1b4fb811a80b..7d255af7d8b0 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sqlite3
-PORTVERSION=	3.3.17
+PORTVERSION=	3.4.1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sqlite.org/
 .if defined(USE_THOL)
@@ -31,6 +31,7 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 OPTIONS=	DEBUG		"Enable debugging & verbose explain"	off \
 		DOCS		"Building docs (depends on TCL)"	on \
 		FTS1		"Enable FTS1 (Full Text Search) module"	off \
+		FTS2		"Enable FTS2 (Full Text Search) module"	off \
 		TCLWRAPPER	"TCL wrapper for SQLITE"		off
 
 # Defaults, for building the docs:
@@ -60,9 +61,15 @@ ALL_TARGET+=		all doc
 PORTDOCS=		*
 .endif
 
-.if defined(WITH_FTS1)
+.if defined(WITH_FTS1) && defined(WITH_FTS2)
+CFLAGS+=		-DSQLITE_ENABLE_FTS1 -DSQLITE_ENABLE_FTS2
+EXTRA_PATCHES+=		${FILESDIR}/fts12_patch-Makefile.in
+.elif defined(WITH_FTS1) && !defined(WITH_FTS2)
 CFLAGS+=		-DSQLITE_ENABLE_FTS1
-EXTRA_PATCHES=		${FILESDIR}/fts1_patch-Makefile.in
+EXTRA_PATCHES+=		${FILESDIR}/fts1_patch-Makefile.in
+.elif defined(WITH_FTS2) && !defined(WITH_FTS1)
+CFLAGS+=		-DSQLITE_ENABLE_FTS2
+EXTRA_PATCHES+=		${FILESDIR}/fts2_patch-Makefile.in
 .endif
 
 .if defined(WITH_TCLWRAPPER)
@@ -80,8 +87,11 @@ CONFIGURE_ARGS+=	--enable-threadsafe
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -E -e "s|^(TLIBS.*)|\1 -lm|g" \
+		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|tclsh \$$(TOP)|\$$(TCLSH) \$$(TOP)|g" \
 		-e "s|./libtool|${LIBTOOL}|g" \
+		-e "s|--mode=link|--mode=link --tag=CC|g" \
 		-e "s|\$${HAVE_TCL:1=tcl_install}||" \
 			${WRKSRC}/Makefile.in
 	@${ECHO} "config_TARGET_TCL_INC=\"-I${PREFIX}/include/tcl${TCL_V}\"" \
diff --git a/databases/sqlite3/distinfo b/databases/sqlite3/distinfo
index 9ebb94d93bf1..0a33511ac3c0 100644
--- a/databases/sqlite3/distinfo
+++ b/databases/sqlite3/distinfo
@@ -1,3 +1,3 @@
-MD5 (sqlite-3.3.17.tar.gz) = 549eac1ee0b6ff4615f16e0ef0eb68fb
-SHA256 (sqlite-3.3.17.tar.gz) = ee667dcc41c001229b93efff4ae489236934fd590c7c3d6664105ed50d6f899c
-SIZE (sqlite-3.3.17.tar.gz) = 2111281
+MD5 (sqlite-3.4.1.tar.gz) = 0f06955b18da295fecb62d4bf9ded3c6
+SHA256 (sqlite-3.4.1.tar.gz) = d604a4db7781db3d8dda0bb30c4a35bbee184d48e72d9c0de855cf55170ee1be
+SIZE (sqlite-3.4.1.tar.gz) = 2237515
diff --git a/databases/sqlite3/files/fts12_patch-Makefile.in b/databases/sqlite3/files/fts12_patch-Makefile.in
new file mode 100644
index 000000000000..942500cc29fa
--- /dev/null
+++ b/databases/sqlite3/files/fts12_patch-Makefile.in
@@ -0,0 +1,71 @@
+--- Makefile.in.orig	2007-06-14 17:54:38.000000000 -0300
++++ Makefile.in	2007-07-04 19:23:03.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_tokenizer1.lo
+ 
+ # All of the source code files.
+ #
+@@ -198,6 +200,14 @@
+   $(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.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,30 @@
+ 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_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
index 0ee9a993a0ac..d4935c4ba134 100644
--- a/databases/sqlite3/files/fts1_patch-Makefile.in
+++ b/databases/sqlite3/files/fts1_patch-Makefile.in
@@ -1,20 +1,19 @@
---- Makefile.in.orig	Sun Dec  3 16:16:05 2006
-+++ Makefile.in	Sun Dec  3 16:15:40 2006
-@@ -130,7 +130,8 @@
+--- 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 vdbefifo.lo vdbemem.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.
  #
-@@ -464,6 +465,18 @@
- 
+@@ -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
 +
@@ -26,6 +25,7 @@
 +
 +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
new file mode 100644
index 000000000000..3a9472cdc0d2
--- /dev/null
+++ b/databases/sqlite3/files/fts2_patch-Makefile.in
@@ -0,0 +1,58 @@
+--- Makefile.in.orig	2007-06-14 17:54:38.000000000 -0300
++++ Makefile.in	2007-07-04 19:24:04.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_tokenizer1.lo
+ 
+ # All of the source code files.
+ #
+@@ -198,6 +199,14 @@
+   $(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.h \
++  $(TOP)/ext/fts2/fts2_tokenizer1.c
+ 
+ # Source code to the test files.
+ #
+@@ -261,6 +270,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 +496,18 @@
+ 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_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/patch-ext__fts2__fts2.c b/databases/sqlite3/files/patch-ext__fts2__fts2.c
new file mode 100644
index 000000000000..b68f8f3a4a64
--- /dev/null
+++ b/databases/sqlite3/files/patch-ext__fts2__fts2.c
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 000000000000..0ed308c4f012
--- /dev/null
+++ b/databases/sqlite3/files/patch-ext__fts2__fts2_porter.c
@@ -0,0 +1,14 @@
+--- 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
new file mode 100644
index 000000000000..1f539b950b31
--- /dev/null
+++ b/databases/sqlite3/files/patch-ext__fts2__fts2_tokenizer1.c
@@ -0,0 +1,14 @@
+--- 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/sqlite34/Makefile b/databases/sqlite34/Makefile
index 1b4fb811a80b..7d255af7d8b0 100644
--- a/databases/sqlite34/Makefile
+++ b/databases/sqlite34/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sqlite3
-PORTVERSION=	3.3.17
+PORTVERSION=	3.4.1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sqlite.org/
 .if defined(USE_THOL)
@@ -31,6 +31,7 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 OPTIONS=	DEBUG		"Enable debugging & verbose explain"	off \
 		DOCS		"Building docs (depends on TCL)"	on \
 		FTS1		"Enable FTS1 (Full Text Search) module"	off \
+		FTS2		"Enable FTS2 (Full Text Search) module"	off \
 		TCLWRAPPER	"TCL wrapper for SQLITE"		off
 
 # Defaults, for building the docs:
@@ -60,9 +61,15 @@ ALL_TARGET+=		all doc
 PORTDOCS=		*
 .endif
 
-.if defined(WITH_FTS1)
+.if defined(WITH_FTS1) && defined(WITH_FTS2)
+CFLAGS+=		-DSQLITE_ENABLE_FTS1 -DSQLITE_ENABLE_FTS2
+EXTRA_PATCHES+=		${FILESDIR}/fts12_patch-Makefile.in
+.elif defined(WITH_FTS1) && !defined(WITH_FTS2)
 CFLAGS+=		-DSQLITE_ENABLE_FTS1
-EXTRA_PATCHES=		${FILESDIR}/fts1_patch-Makefile.in
+EXTRA_PATCHES+=		${FILESDIR}/fts1_patch-Makefile.in
+.elif defined(WITH_FTS2) && !defined(WITH_FTS1)
+CFLAGS+=		-DSQLITE_ENABLE_FTS2
+EXTRA_PATCHES+=		${FILESDIR}/fts2_patch-Makefile.in
 .endif
 
 .if defined(WITH_TCLWRAPPER)
@@ -80,8 +87,11 @@ CONFIGURE_ARGS+=	--enable-threadsafe
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -E -e "s|^(TLIBS.*)|\1 -lm|g" \
+		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|tclsh \$$(TOP)|\$$(TCLSH) \$$(TOP)|g" \
 		-e "s|./libtool|${LIBTOOL}|g" \
+		-e "s|--mode=link|--mode=link --tag=CC|g" \
 		-e "s|\$${HAVE_TCL:1=tcl_install}||" \
 			${WRKSRC}/Makefile.in
 	@${ECHO} "config_TARGET_TCL_INC=\"-I${PREFIX}/include/tcl${TCL_V}\"" \
diff --git a/databases/sqlite34/distinfo b/databases/sqlite34/distinfo
index 9ebb94d93bf1..0a33511ac3c0 100644
--- a/databases/sqlite34/distinfo
+++ b/databases/sqlite34/distinfo
@@ -1,3 +1,3 @@
-MD5 (sqlite-3.3.17.tar.gz) = 549eac1ee0b6ff4615f16e0ef0eb68fb
-SHA256 (sqlite-3.3.17.tar.gz) = ee667dcc41c001229b93efff4ae489236934fd590c7c3d6664105ed50d6f899c
-SIZE (sqlite-3.3.17.tar.gz) = 2111281
+MD5 (sqlite-3.4.1.tar.gz) = 0f06955b18da295fecb62d4bf9ded3c6
+SHA256 (sqlite-3.4.1.tar.gz) = d604a4db7781db3d8dda0bb30c4a35bbee184d48e72d9c0de855cf55170ee1be
+SIZE (sqlite-3.4.1.tar.gz) = 2237515
diff --git a/databases/sqlite34/files/fts12_patch-Makefile.in b/databases/sqlite34/files/fts12_patch-Makefile.in
new file mode 100644
index 000000000000..942500cc29fa
--- /dev/null
+++ b/databases/sqlite34/files/fts12_patch-Makefile.in
@@ -0,0 +1,71 @@
+--- Makefile.in.orig	2007-06-14 17:54:38.000000000 -0300
++++ Makefile.in	2007-07-04 19:23:03.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_tokenizer1.lo
+ 
+ # All of the source code files.
+ #
+@@ -198,6 +200,14 @@
+   $(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.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,30 @@
+ 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_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/sqlite34/files/fts1_patch-Makefile.in b/databases/sqlite34/files/fts1_patch-Makefile.in
index 0ee9a993a0ac..d4935c4ba134 100644
--- a/databases/sqlite34/files/fts1_patch-Makefile.in
+++ b/databases/sqlite34/files/fts1_patch-Makefile.in
@@ -1,20 +1,19 @@
---- Makefile.in.orig	Sun Dec  3 16:16:05 2006
-+++ Makefile.in	Sun Dec  3 16:15:40 2006
-@@ -130,7 +130,8 @@
+--- 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 vdbefifo.lo vdbemem.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.
  #
-@@ -464,6 +465,18 @@
- 
+@@ -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
 +
@@ -26,6 +25,7 @@
 +
 +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/sqlite34/files/fts2_patch-Makefile.in b/databases/sqlite34/files/fts2_patch-Makefile.in
new file mode 100644
index 000000000000..3a9472cdc0d2
--- /dev/null
+++ b/databases/sqlite34/files/fts2_patch-Makefile.in
@@ -0,0 +1,58 @@
+--- Makefile.in.orig	2007-06-14 17:54:38.000000000 -0300
++++ Makefile.in	2007-07-04 19:24:04.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_tokenizer1.lo
+ 
+ # All of the source code files.
+ #
+@@ -198,6 +199,14 @@
+   $(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.h \
++  $(TOP)/ext/fts2/fts2_tokenizer1.c
+ 
+ # Source code to the test files.
+ #
+@@ -261,6 +270,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 +496,18 @@
+ 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_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/sqlite34/files/patch-ext__fts2__fts2.c b/databases/sqlite34/files/patch-ext__fts2__fts2.c
new file mode 100644
index 000000000000..b68f8f3a4a64
--- /dev/null
+++ b/databases/sqlite34/files/patch-ext__fts2__fts2.c
@@ -0,0 +1,12 @@
+--- 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/sqlite34/files/patch-ext__fts2__fts2_porter.c b/databases/sqlite34/files/patch-ext__fts2__fts2_porter.c
new file mode 100644
index 000000000000..0ed308c4f012
--- /dev/null
+++ b/databases/sqlite34/files/patch-ext__fts2__fts2_porter.c
@@ -0,0 +1,14 @@
+--- 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/sqlite34/files/patch-ext__fts2__fts2_tokenizer1.c b/databases/sqlite34/files/patch-ext__fts2__fts2_tokenizer1.c
new file mode 100644
index 000000000000..1f539b950b31
--- /dev/null
+++ b/databases/sqlite34/files/patch-ext__fts2__fts2_tokenizer1.c
@@ -0,0 +1,14 @@
+--- 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>