From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 8 11:10:02 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 349C416A473 for ; Fri, 8 Jun 2007 11:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 13D4C13C458 for ; Fri, 8 Jun 2007 11:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l58BA1N0078624 for ; Fri, 8 Jun 2007 11:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l58BA1sp078623; Fri, 8 Jun 2007 11:10:01 GMT (envelope-from gnats) Resent-Date: Fri, 8 Jun 2007 11:10:01 GMT Resent-Message-Id: <200706081110.l58BA1sp078623@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Anton Berezin Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 945E416A41F for ; Fri, 8 Jun 2007 11:00:50 +0000 (UTC) (envelope-from tobez@tobez.org) Received: from heechee.tobez.org (heechee.tobez.org [194.255.56.42]) by mx1.freebsd.org (Postfix) with ESMTP id 0169413C447 for ; Fri, 8 Jun 2007 11:00:49 +0000 (UTC) (envelope-from tobez@tobez.org) Received: by heechee.tobez.org (Postfix, from userid 1001) id E2BD112542E; Fri, 8 Jun 2007 12:45:13 +0200 (CEST) Message-Id: <20070608104513.E2BD112542E@heechee.tobez.org> Date: Fri, 8 Jun 2007 12:45:13 +0200 (CEST) From: Anton Berezin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/113477: [PATCH] add support for FTS2 in sqlite3 3.3.17 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Anton Berezin List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jun 2007 11:10:02 -0000 >Number: 113477 >Category: ports >Synopsis: [PATCH] add support for FTS2 in sqlite3 3.3.17 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jun 08 11:10:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Anton Berezin >Release: FreeBSD 6.2-STABLE amd64 >Organization: >Environment: >Description: While FTS2 is marked as subject to change in sqlite3, FTS1 is marked "experimental". Yet FTS1 is available in the FreeBSD port, and FTS2 is not. This PR is here to fix this horrible injustice. :-P >How-To-Repeat: >Fix: *** Please note new files *** files/fts12_patch-Makefile.in files/fts2_patch-Makefile.in files/patch-ext__fts2__fts2.c files/patch-ext__fts2__fts2_porter.c files/patch-ext__fts2__fts2_tokenizer1.c Here's the diff. diff -u --show-c-function -ruN ../sqlite3/Makefile ./Makefile --- ../sqlite3/Makefile Mon May 28 20:21:27 2007 +++ ./Makefile Fri Jun 8 12:39:35 2007 @@ -7,6 +7,7 @@ PORTNAME= sqlite3 PORTVERSION= 3.3.17 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://www.sqlite.org/ .if defined(USE_THOL) @@ -31,6 +32,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH 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: @@ -62,7 +64,19 @@ PORTDOCS= * .if defined(WITH_FTS1) CFLAGS+= -DSQLITE_ENABLE_FTS1 +.if defined(WITH_FTS2) +EXTRA_PATCHES= ${FILESDIR}/fts12_patch-Makefile.in +.else EXTRA_PATCHES= ${FILESDIR}/fts1_patch-Makefile.in +.endif +.else +.if defined(WITH_FTS2) +EXTRA_PATCHES= ${FILESDIR}/fts2_patch-Makefile.in +.endif +.endif + +.if defined(WITH_FTS2) +CFLAGS+= -DSQLITE_ENABLE_FTS2 .endif .if defined(WITH_TCLWRAPPER) diff -u --show-c-function -ruN ../sqlite3/files/fts12_patch-Makefile.in ./files/fts12_patch-Makefile.in --- ../sqlite3/files/fts12_patch-Makefile.in Thu Jan 1 01:00:00 1970 +++ ./files/fts12_patch-Makefile.in Fri Jun 8 12:37:57 2007 @@ -0,0 +1,71 @@ +--- Makefile.in Fri Jun 8 12:21:29 2007 ++++ /tmp/Makefile.in Fri Jun 8 12:19:53 2007 +@@ -128,7 +128,9 @@ LIBOBJ = alter.lo analyze.lo attach.lo a + 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 \ ++ fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer1.lo + + # All of the source code files. + # +@@ -196,6 +198,14 @@ SRC += \ + $(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. + # +@@ -254,6 +264,11 @@ HDR += \ + $(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 = \ +@@ -468,6 +483,30 @@ vtab.lo: $(TOP)/src/vtab.c $(VDBEHDR) + + 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 -u --show-c-function -ruN ../sqlite3/files/fts2_patch-Makefile.in ./files/fts2_patch-Makefile.in --- ../sqlite3/files/fts2_patch-Makefile.in Thu Jan 1 01:00:00 1970 +++ ./files/fts2_patch-Makefile.in Fri Jun 8 12:37:57 2007 @@ -0,0 +1,58 @@ +--- Makefile.in.x Fri Jun 8 12:22:54 2007 ++++ Makefile.in Fri Jun 8 12:24:03 2007 +@@ -128,7 +128,8 @@ LIBOBJ = alter.lo analyze.lo attach.lo a + 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 \ ++ fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer1.lo + + # All of the source code files. + # +@@ -196,6 +197,14 @@ SRC += \ + $(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. + # +@@ -254,6 +263,11 @@ HDR += \ + $(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 = \ +@@ -468,6 +482,18 @@ vtab.lo: $(TOP)/src/vtab.c $(VDBEHDR) + + 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 -u --show-c-function -ruN ../sqlite3/files/patch-ext__fts2__fts2.c ./files/patch-ext__fts2__fts2.c --- ../sqlite3/files/patch-ext__fts2__fts2.c Thu Jan 1 01:00:00 1970 +++ ./files/patch-ext__fts2__fts2.c Fri Jun 8 12:37:57 2007 @@ -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 +-#if !defined(__APPLE__) +-#include +-#endif + #include + #include + #include diff -u --show-c-function -ruN ../sqlite3/files/patch-ext__fts2__fts2_porter.c ./files/patch-ext__fts2__fts2_porter.c --- ../sqlite3/files/patch-ext__fts2__fts2_porter.c Thu Jan 1 01:00:00 1970 +++ ./files/patch-ext__fts2__fts2_porter.c Fri Jun 8 12:37:57 2007 @@ -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 +-#if !defined(__APPLE__) +-#include +-#else + #include +-#endif + #include + #include + #include diff -u --show-c-function -ruN ../sqlite3/files/patch-ext__fts2__fts2_tokenizer1.c ./files/patch-ext__fts2__fts2_tokenizer1.c --- ../sqlite3/files/patch-ext__fts2__fts2_tokenizer1.c Thu Jan 1 01:00:00 1970 +++ ./files/patch-ext__fts2__fts2_tokenizer1.c Fri Jun 8 12:37:57 2007 @@ -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 +-#if !defined(__APPLE__) +-#include +-#else + #include +-#endif + #include + #include + #include >Release-Note: >Audit-Trail: >Unformatted: