Index: Makefile =================================================================== RCS file: /home/pcvs/ports/databases/sqlite3/Makefile,v retrieving revision 1.28 diff -u -r1.28 Makefile --- Makefile 28 May 2007 18:21:27 -0000 1.28 +++ Makefile 16 Jul 2007 01:48:51 -0000 @@ -6,7 +6,7 @@ # PORTNAME= sqlite3 -PORTVERSION= 3.3.17 +PORTVERSION= 3.4.0 CATEGORIES= databases MASTER_SITES= http://www.sqlite.org/ .if defined(USE_THOL) @@ -31,6 +31,7 @@ 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 @@ 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 @@ .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}\"" \ Index: distinfo =================================================================== RCS file: /home/pcvs/ports/databases/sqlite3/distinfo,v retrieving revision 1.20 diff -u -r1.20 distinfo --- distinfo 28 May 2007 18:21:27 -0000 1.20 +++ distinfo 16 Jul 2007 01:48:51 -0000 @@ -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.0.tar.gz) = cee12d4b4237e48a91467e5b0fa7e5a8 +SHA256 (sqlite-3.4.0.tar.gz) = 46ef4afe1ef58c60f5a986a713d27cd74368edaec0b0d405b2ef6b9b096cd7b7 +SIZE (sqlite-3.4.0.tar.gz) = 2214061 Index: files/fts12_patch-Makefile.in =================================================================== RCS file: files/fts12_patch-Makefile.in diff -N files/fts12_patch-Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/fts12_patch-Makefile.in 16 Jul 2007 01:48:51 -0000 @@ -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 + Index: files/fts1_patch-Makefile.in =================================================================== RCS file: /home/pcvs/ports/databases/sqlite3/files/fts1_patch-Makefile.in,v retrieving revision 1.1 diff -u -r1.1 fts1_patch-Makefile.in --- files/fts1_patch-Makefile.in 12 Feb 2007 12:47:47 -0000 1.1 +++ files/fts1_patch-Makefile.in 16 Jul 2007 01:48:51 -0000 @@ -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 + Index: files/fts2_patch-Makefile.in =================================================================== RCS file: files/fts2_patch-Makefile.in diff -N files/fts2_patch-Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/fts2_patch-Makefile.in 16 Jul 2007 01:48:51 -0000 @@ -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 + Index: files/patch-ext__fts2__fts2.c =================================================================== RCS file: files/patch-ext__fts2__fts2.c diff -N files/patch-ext__fts2__fts2.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-ext__fts2__fts2.c 16 Jul 2007 01:48:51 -0000 @@ -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 Index: files/patch-ext__fts2__fts2_porter.c =================================================================== RCS file: files/patch-ext__fts2__fts2_porter.c diff -N files/patch-ext__fts2__fts2_porter.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-ext__fts2__fts2_porter.c 16 Jul 2007 01:48:51 -0000 @@ -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 Index: files/patch-ext__fts2__fts2_tokenizer1.c =================================================================== RCS file: files/patch-ext__fts2__fts2_tokenizer1.c diff -N files/patch-ext__fts2__fts2_tokenizer1.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-ext__fts2__fts2_tokenizer1.c 16 Jul 2007 01:48:51 -0000 @@ -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