6 files changed, 60 insertions, 44 deletions

diff --git a/databases/sqlite3/files/fts12_patch-Makefile.in b/databases/sqlite3/files/fts12_patch-Makefile.in
index 942500cc29fa..bfc34a1f9415 100644
--- a/databases/sqlite3/files/fts12_patch-Makefile.in
+++ b/databases/sqlite3/files/fts12_patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2007-06-14 17:54:38.000000000 -0300
-+++ Makefile.in	2007-07-04 19:23:03.000000000 -0300
+--- 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 \
@@ -7,11 +7,11 @@
 -         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
++         fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer.lo fts2_tokenizer1.lo
  
  # All of the source code files.
  #
-@@ -198,6 +200,14 @@
+@@ -198,6 +200,15 @@
    $(TOP)/ext/fts1/fts1_tokenizer.h \
    $(TOP)/ext/fts1/fts1_tokenizer1.c
  
@@ -21,12 +21,13 @@
 +  $(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 @@
+@@ -261,6 +272,11 @@
    $(TOP)/ext/fts1/fts1_hash.h \
    $(TOP)/ext/fts1/fts1_tokenizer.h
  
@@ -38,31 +39,34 @@
  # Header files used by the VDBE submodule
  #
  VDBEHDR = \
-@@ -482,6 +497,30 @@
+@@ -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)
++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)
++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)
++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)
++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)
++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)
++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
 +
diff --git a/databases/sqlite3/files/fts1_patch-Makefile.in b/databases/sqlite3/files/fts1_patch-Makefile.in
index d4935c4ba134..a84838c25fef 100644
--- a/databases/sqlite3/files/fts1_patch-Makefile.in
+++ b/databases/sqlite3/files/fts1_patch-Makefile.in
@@ -14,10 +14,10 @@
  where.lo:	$(TOP)/src/where.c $(HDR)
  	$(LTCOMPILE) -c $(TOP)/src/where.c
  
-+fts1.lo:	$(TOP)/ext/fts1/fts1.c $(HDR)
++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)
++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)
diff --git a/databases/sqlite3/files/fts2_patch-Makefile.in b/databases/sqlite3/files/fts2_patch-Makefile.in
index 3a9472cdc0d2..b079a8501121 100644
--- a/databases/sqlite3/files/fts2_patch-Makefile.in
+++ b/databases/sqlite3/files/fts2_patch-Makefile.in
@@ -1,16 +1,16 @@
---- Makefile.in.orig	2007-06-14 17:54:38.000000000 -0300
-+++ Makefile.in	2007-07-04 19:24:04.000000000 -0300
+--- 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_tokenizer1.lo
++         fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer.lo fts2_tokenizer1.lo
  
  # All of the source code files.
  #
-@@ -198,6 +199,14 @@
+@@ -198,6 +199,15 @@
    $(TOP)/ext/fts1/fts1_tokenizer.h \
    $(TOP)/ext/fts1/fts1_tokenizer1.c
  
@@ -20,12 +20,13 @@
 +  $(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 +270,11 @@
+@@ -261,6 +271,11 @@
    $(TOP)/ext/fts1/fts1_hash.h \
    $(TOP)/ext/fts1/fts1_tokenizer.h
  
@@ -37,19 +38,22 @@
  # Header files used by the VDBE submodule
  #
  VDBEHDR = \
-@@ -482,6 +496,18 @@
+@@ -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)
++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)
++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
 +
diff --git a/databases/sqlite34/files/fts12_patch-Makefile.in b/databases/sqlite34/files/fts12_patch-Makefile.in
index 942500cc29fa..bfc34a1f9415 100644
--- a/databases/sqlite34/files/fts12_patch-Makefile.in
+++ b/databases/sqlite34/files/fts12_patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2007-06-14 17:54:38.000000000 -0300
-+++ Makefile.in	2007-07-04 19:23:03.000000000 -0300
+--- 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 \
@@ -7,11 +7,11 @@
 -         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
++         fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer.lo fts2_tokenizer1.lo
  
  # All of the source code files.
  #
-@@ -198,6 +200,14 @@
+@@ -198,6 +200,15 @@
    $(TOP)/ext/fts1/fts1_tokenizer.h \
    $(TOP)/ext/fts1/fts1_tokenizer1.c
  
@@ -21,12 +21,13 @@
 +  $(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 @@
+@@ -261,6 +272,11 @@
    $(TOP)/ext/fts1/fts1_hash.h \
    $(TOP)/ext/fts1/fts1_tokenizer.h
  
@@ -38,31 +39,34 @@
  # Header files used by the VDBE submodule
  #
  VDBEHDR = \
-@@ -482,6 +497,30 @@
+@@ -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)
++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)
++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)
++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)
++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)
++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)
++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
 +
diff --git a/databases/sqlite34/files/fts1_patch-Makefile.in b/databases/sqlite34/files/fts1_patch-Makefile.in
index d4935c4ba134..a84838c25fef 100644
--- a/databases/sqlite34/files/fts1_patch-Makefile.in
+++ b/databases/sqlite34/files/fts1_patch-Makefile.in
@@ -14,10 +14,10 @@
  where.lo:	$(TOP)/src/where.c $(HDR)
  	$(LTCOMPILE) -c $(TOP)/src/where.c
  
-+fts1.lo:	$(TOP)/ext/fts1/fts1.c $(HDR)
++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)
++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)
diff --git a/databases/sqlite34/files/fts2_patch-Makefile.in b/databases/sqlite34/files/fts2_patch-Makefile.in
index 3a9472cdc0d2..b079a8501121 100644
--- a/databases/sqlite34/files/fts2_patch-Makefile.in
+++ b/databases/sqlite34/files/fts2_patch-Makefile.in
@@ -1,16 +1,16 @@
---- Makefile.in.orig	2007-06-14 17:54:38.000000000 -0300
-+++ Makefile.in	2007-07-04 19:24:04.000000000 -0300
+--- 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_tokenizer1.lo
++         fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer.lo fts2_tokenizer1.lo
  
  # All of the source code files.
  #
-@@ -198,6 +199,14 @@
+@@ -198,6 +199,15 @@
    $(TOP)/ext/fts1/fts1_tokenizer.h \
    $(TOP)/ext/fts1/fts1_tokenizer1.c
  
@@ -20,12 +20,13 @@
 +  $(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 +270,11 @@
+@@ -261,6 +271,11 @@
    $(TOP)/ext/fts1/fts1_hash.h \
    $(TOP)/ext/fts1/fts1_tokenizer.h
  
@@ -37,19 +38,22 @@
  # Header files used by the VDBE submodule
  #
  VDBEHDR = \
-@@ -482,6 +496,18 @@
+@@ -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)
++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)
++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
 +