- Update to 3.3.12 [1]

- Fix FTS1 build [2]

Notified by:	Max Khitrov <mkhitrov___umd.edu> [1],
		Jeroen Ruigrok/asmodai <asmodai___in-nomine.org> [2]

5 files changed, 80 insertions, 7 deletions

diff --git a/databases/sqlite34/files/fts1_patch-Makefile.in b/databases/sqlite34/files/fts1_patch-Makefile.in
new file mode 100644
index 000000000000..0ee9a993a0ac
--- /dev/null
+++ b/databases/sqlite34/files/fts1_patch-Makefile.in
@@ -0,0 +1,31 @@
+--- Makefile.in.orig	Sun Dec  3 16:16:05 2006
++++ Makefile.in	Sun Dec  3 16:15:40 2006
+@@ -130,7 +130,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 \
+-         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 @@
+ 
+ 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/sqlite34/files/patch-Makefile.in b/databases/sqlite34/files/patch-Makefile.in
index b66fd8181372..1b7d46e8a134 100644
--- a/databases/sqlite34/files/patch-Makefile.in
+++ b/databases/sqlite34/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Fri Mar 11 14:50:32 2005
-+++ Makefile.in	Sat Mar 19 16:06:28 2005
-@@ -212,7 +212,7 @@
+--- Makefile.in.orig	Mon Jan  8 11:39:27 2007
++++ Makefile.in	Mon Feb 12 10:18:02 2007
+@@ -260,7 +260,7 @@
  # This is the default Makefile target.  The objects listed here
  # are what get build when you type just "make" with no arguments.
  #
@@ -9,14 +9,14 @@
  
  Makefile: $(TOP)/Makefile.in
  	./config.status
-@@ -611,8 +611,8 @@
- 	$(LTINSTALL) sqlite3 $(DESTDIR)$(exec_prefix)/bin
+@@ -666,8 +666,8 @@
  	$(INSTALL) -d $(DESTDIR)$(prefix)/include
  	$(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(prefix)/include
+ 	$(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(prefix)/include
 -	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig; 
 -	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(libdir)/pkgconfig; 
-+	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/libdata/pkgconfig; 
-+	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(exec_prefix)/libdata/pkgconfig; 
++	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/libdata/pkgconfig;
++	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(exec_prefix)/libdata/pkgconfig;
  
  tcl_install:	libtclsqlite3.la
  	tclsh $(TOP)/tclinstaller.tcl $(VERSION)
diff --git a/databases/sqlite34/files/patch-ext__fts1__fts1.c b/databases/sqlite34/files/patch-ext__fts1__fts1.c
new file mode 100644
index 000000000000..8357e5832668
--- /dev/null
+++ b/databases/sqlite34/files/patch-ext__fts1__fts1.c
@@ -0,0 +1,14 @@
+--- 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/sqlite34/files/patch-ext__fts1__fts1_porter.c b/databases/sqlite34/files/patch-ext__fts1__fts1_porter.c
new file mode 100644
index 000000000000..6185bf94dcd5
--- /dev/null
+++ b/databases/sqlite34/files/patch-ext__fts1__fts1_porter.c
@@ -0,0 +1,14 @@
+--- 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/sqlite34/files/patch-ext__fts1__fts1_tokenizer1.c b/databases/sqlite34/files/patch-ext__fts1__fts1_tokenizer1.c
new file mode 100644
index 000000000000..438019e54f9d
--- /dev/null
+++ b/databases/sqlite34/files/patch-ext__fts1__fts1_tokenizer1.c
@@ -0,0 +1,14 @@
+--- 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>