Attachment #73302 for bug #106281

View | Details | Raw Unified | Return to bug 106281
Collapse All | Expand All

Lines 8-13 Link Here

(-)sqlite3/Makefile (-1 / +8 lines)
8		8
9	PORTNAME= sqlite	9	PORTNAME= sqlite
10	PORTVERSION= 3.3.8	10	PORTVERSION= 3.3.8
		11	PORTREVISION= 1
11	CATEGORIES= databases	12	CATEGORIES= databases
12	MASTER_SITES= http://www.sqlite.org/	13	MASTER_SITES= http://www.sqlite.org/
13		14
Lines 29-35 Link Here
29	OPTIONS= DEBUG "Enable debugging & verbose explain" off \	30	OPTIONS= DEBUG "Enable debugging & verbose explain" off \
30	DOCS "Building docs (depends on TCL)" on \	31	DOCS "Building docs (depends on TCL)" on \
31	TCLWRAPPER "TCL wrapper for SQLITE" off \	32	TCLWRAPPER "TCL wrapper for SQLITE" off \
32	THREADS "Enable threads support" off	33	THREADS "Enable threads support" off \
		34	FTS1 "Enable FTS1 (Full Text Search) module" off
33		35
34	# Defaults, for building the docs:	36	# Defaults, for building the docs:
35	TCL_V?= 8.4	37	TCL_V?= 8.4
Lines 60-65 Link Here
60		62
61	.if defined(WITH_THREADS)	63	.if defined(WITH_THREADS)
62	CONFIGURE_ARGS+= --enable-threadsafe	64	CONFIGURE_ARGS+= --enable-threadsafe
		65	.endif
		66
		67	.if defined(WITH_FTS1)
		68	CFLAGS+= -DSQLITE_ENABLE_FTS1
		69	EXTRA_PATCHES= ${FILESDIR}/fts1_patch-Makefile.in
63	.endif	70	.endif
64		71
65	post-patch:	72	post-patch:




--- 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




--- 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>




--- 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>




--- 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>

Return to bug 106281

Line 0 Link Here

(-)sqlite3/files/fts1_patch-Makefile.in (+31 lines)
	1	--- Makefile.in.orig Sun Dec 3 16:16:05 2006
	2	+++ Makefile.in Sun Dec 3 16:15:40 2006
	3	@@ -130,7 +130,8 @@
	4	select.lo table.lo tokenize.lo trigger.lo update.lo \
	5	util.lo vacuum.lo \
	6	vdbe.lo vdbeapi.lo vdbeaux.lo vdbefifo.lo vdbemem.lo \
	7	- where.lo utf.lo legacy.lo vtab.lo
	8	+ where.lo utf.lo legacy.lo vtab.lo \
	9	+ fts1.lo fts1_hash.lo fts1_porter.lo fts1_tokenizer1.lo
	10
	11	# All of the source code files.
	12	#
	13	@@ -464,6 +465,18 @@
	14
	15	where.lo: $(TOP)/src/where.c $(HDR)
	16	$(LTCOMPILE) -c $(TOP)/src/where.c
	17	+
	18	+fts1.lo: $(TOP)/ext/fts1/fts1.c $(HDR)
	19	+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1.c
	20	+
	21	+fts1_hash.lo: $(TOP)/ext/fts1/fts1_hash.c $(HDR)
	22	+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_hash.c
	23	+
	24	+fts1_porter.lo: $(TOP)/ext/fts1/fts1_porter.c $(HDR)
	25	+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_porter.c
	26	+
	27	+fts1_tokenizer1.lo: $(TOP)/ext/fts1/fts1_tokenizer1.c $(HDR)
	28	+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_tokenizer1.c
	29
	30	tclsqlite-shell.lo: $(TOP)/src/tclsqlite.c $(HDR)
	31	$(LTCOMPILE) -DTCLSH=1 -o $@ -c $(TOP)/src/tclsqlite.c

Line 0 Link Here

(-)sqlite3/files/patch-ext-fts1-fts1.c (+14 lines)
	1	--- ext/fts1/fts1.c.orig Sun Oct 8 06:16:32 2006
	2	+++ ext/fts1/fts1.c Sun Dec 3 14:44:46 2006
	3	@@ -19,11 +19,7 @@
	4	#endif
	5
	6	#include <assert.h>
	7	-#if !defined(__APPLE__)
	8	-#include <malloc.h>
	9	-#else
	10	#include <stdlib.h>
	11	-#endif
	12	#include <stdio.h>
	13	#include <string.h>
	14	#include <ctype.h>

Line 0 Link Here

(-)sqlite3/files/patch-ext-fts1-fts1_porter.c (+14 lines)
	1	--- ext/fts1/fts1_porter.c.orig Sun Oct 1 13:01:13 2006
	2	+++ ext/fts1/fts1_porter.c Sun Dec 3 14:45:17 2006
	3	@@ -26,11 +26,7 @@
	4
	5
	6	#include <assert.h>
	7	-#if !defined(__APPLE__)
	8	-#include <malloc.h>
	9	-#else
	10	#include <stdlib.h>
	11	-#endif
	12	#include <stdio.h>
	13	#include <string.h>
	14	#include <ctype.h>

Line 0 Link Here

(-)sqlite3/files/patch-ext-fts1-fts1_tokenizer1.c (+14 lines)
	1	--- ext/fts1/fts1_tokenizer1.c.orig Sat Sep 30 08:57:33 2006
	2	+++ ext/fts1/fts1_tokenizer1.c Sun Dec 3 14:45:56 2006
	3	@@ -18,11 +18,7 @@
	4
	5
	6	#include <assert.h>
	7	-#if !defined(__APPLE__)
	8	-#include <malloc.h>
	9	-#else
	10	#include <stdlib.h>
	11	-#endif
	12	#include <stdio.h>
	13	#include <string.h>
	14	#include <ctype.h>