Index: Makefile =================================================================== RCS file: /home/pcvs/ports/databases/Makefile,v retrieving revision 1.666 diff -u -r1.666 Makefile --- Makefile 21 Mar 2008 07:42:58 -0000 1.666 +++ Makefile 24 Mar 2008 15:10:09 -0000 @@ -527,6 +527,7 @@ SUBDIR += sqlite2 SUBDIR += sqlite3 SUBDIR += sqlite3-threads + SUBDIR += sqlite34 SUBDIR += sqlitemanager SUBDIR += sqlrelay SUBDIR += sqsh Index: sqlite3/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/sqlite3/Makefile,v retrieving revision 1.29 diff -u -r1.29 Makefile --- sqlite3/Makefile 1 Aug 2007 14:22:13 -0000 1.29 +++ sqlite3/Makefile 24 Mar 2008 15:10:09 -0000 @@ -6,18 +6,15 @@ # PORTNAME= sqlite3 -PORTVERSION= 3.4.1 +PORTVERSION= 3.5.6 CATEGORIES= databases MASTER_SITES= http://www.sqlite.org/ -.if defined(USE_THOL) -PKGNAMESUFFIX= -threads -.endif DISTNAME= sqlite-${PORTVERSION} MAINTAINER= mnag@FreeBSD.org -COMMENT?= An SQL database engine in a C library w/ Tcl wrapper +COMMENT= An SQL database engine in a C library w/ Tcl wrapper -SLAVEDIRS= databases/sqlite3-threads +CONFLICTS= sqlite34-[0-9]* USE_GMAKE= YES USE_GNOME= pkgconfig @@ -25,29 +22,14 @@ USE_DOS2UNIX= *.pc.in USE_LDCONFIG= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints +CONFIGURE_ARGS= --prefix=${PREFIX} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} 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: -TCL_V?= 8.4 -MAKE_ARGS+= TCLSH=tclsh${TCL_V} -MAKE_ENV+= TCL_VER=${TCL_V} - -.if !defined(USE_THOL) -OPTIONS+= THREADS "Enable threads support" off -PLIST_SUB+= THOL="@comment " -CONFLICTS= sqlite-threads-3* -.else -CONFIGURE_ARGS+= --enable-threadsafe --enable-threads-override-locks -PLIST_SUB+= THOL="" -CONFLICTS= sqlite-3* -.endif + FTS3 "Enable FTS3 (Full Text Search) module" off \ + RAMTABLE "Store temporary tables in RAM" off \ + TCLWRAPPER "TCL wrapper for SQLITE" off \ + THREADS "Enable threads support" on .include @@ -55,24 +37,19 @@ CONFIGURE_ARGS+= --enable-debug .endif -.if !defined(NOPORTDOCS) && !defined(WITHOUT_DOCS) -BUILD_DEPENDS+= tclsh${TCL_V}:${PORTSDIR}/lang/tcl${TCL_V:S/.//} -ALL_TARGET+= all doc -PORTDOCS= * +.if defined(WITH_FTS3) +CFLAGS+= -DSQLITE_CORE=1 -DSQLITE_ENABLE_FTS3=1 +EXTRA_PATCHES+= ${FILESDIR}/fts3_patch-Makefile.in .endif -.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 -.elif defined(WITH_FTS2) && !defined(WITH_FTS1) -CFLAGS+= -DSQLITE_ENABLE_FTS2 -EXTRA_PATCHES+= ${FILESDIR}/fts2_patch-Makefile.in +.if defined(WITH_RAMTABLE) +CONFIGURE_ARGS+= --enable-tempstore=yes .endif .if defined(WITH_TCLWRAPPER) +TCL_V?= 8.4 +MAKE_ARGS+= TCLSH=tclsh${TCL_V} +MAKE_ENV+= TCL_VER=${TCL_V} CATEGORIES+= lang tcl${TCL_V:S/.//} LIB_DEPENDS+= tcl${TCL_V:S/.//}:${PORTSDIR}/lang/tcl${TCL_V:S/.//} CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl${TCL_V} @@ -82,29 +59,26 @@ PLIST_SUB+= WITH_TCLWRAPPER="@comment " .endif -.if defined(WITH_THREADS) -CONFIGURE_ARGS+= --enable-threadsafe +.if !defined(WITHOUT_THREADS) +CONFIGURE_ARGS+= --enable-threadsafe \ + --enable-cross-thread-connections \ + --enable-threads-override-locks +.else +CONFIGURE_ARGS+= --disable-threadsafe .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}\"" \ - > ${WRKSRC}/freebsd.hints - @${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_V:S/.//}\"" \ - >> ${WRKSRC}/freebsd.hints - -pre-configure: -.if defined(WITH_THREADS) || defined(USE_THOL) +.if !defined(WITHOUT_THREADS) @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -E -e "s|(Libs:.*)|\1 ${PTHREAD_LIBS}|" \ - -e "s|(Cflags:.*)|\1 ${PTHREAD_CFLAGS}|" \ + ${WRKSRC}/configure ${WRKSRC}/sqlite.pc.in \ + ${WRKSRC}/sqlite3.pc.in +.else + @${REINPLACE_CMD} -E -e "s|-lpthread||g" \ ${WRKSRC}/sqlite.pc.in ${WRKSRC}/sqlite3.pc.in .endif @@ -118,13 +92,5 @@ @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR} .endif -.if !defined(NOPORTDOCS) && !defined(WITHOUT_DOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} -.endif -.if defined(USE_THOL) - @${MKDIR} ${DATADIR} - @${TOUCH} ${DATADIR}/sqlite3_with_threads-override-locks -.endif .include Index: sqlite3/distinfo =================================================================== RCS file: /home/pcvs/ports/databases/sqlite3/distinfo,v retrieving revision 1.21 diff -u -r1.21 distinfo --- sqlite3/distinfo 1 Aug 2007 14:22:13 -0000 1.21 +++ sqlite3/distinfo 24 Mar 2008 15:10:09 -0000 @@ -1,3 +1,3 @@ -MD5 (sqlite-3.4.1.tar.gz) = 0f06955b18da295fecb62d4bf9ded3c6 -SHA256 (sqlite-3.4.1.tar.gz) = d604a4db7781db3d8dda0bb30c4a35bbee184d48e72d9c0de855cf55170ee1be -SIZE (sqlite-3.4.1.tar.gz) = 2237515 +MD5 (sqlite-3.5.6.tar.gz) = 903c9e935c538af392364a9172a3d98d +SHA256 (sqlite-3.5.6.tar.gz) = 1673b9218ec318067a662315c161ae123088cad319231ec079018acb4717e8bb +SIZE (sqlite-3.5.6.tar.gz) = 2543979 Index: sqlite3/pkg-plist =================================================================== RCS file: /home/pcvs/ports/databases/sqlite3/pkg-plist,v retrieving revision 1.10 diff -u -r1.10 pkg-plist --- sqlite3/pkg-plist 10 Apr 2007 21:40:24 -0000 1.10 +++ sqlite3/pkg-plist 24 Mar 2008 15:10:09 -0000 @@ -15,5 +15,3 @@ %%WITH_TCLWRAPPER%%@dirrm lib/sqlite %%WITH_TCLWRAPPER%%%%EXAMPLESDIR%%/example.tcl %%WITH_TCLWRAPPER%%@dirrm %%EXAMPLESDIR%% -%%THOL%%%%DATADIR%%/sqlite3_with_threads-override-locks -%%THOL%%@dirrm %%DATADIR%% Index: sqlite3/files/fts12_patch-Makefile.in =================================================================== RCS file: sqlite3/files/fts12_patch-Makefile.in diff -N sqlite3/files/fts12_patch-Makefile.in --- sqlite3/files/fts12_patch-Makefile.in 10 Aug 2007 12:07:11 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,75 +0,0 @@ ---- 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 \ - 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_tokenizer.lo fts2_tokenizer1.lo - - # All of the source code files. - # -@@ -198,6 +200,15 @@ - $(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.c \ -+ $(TOP)/ext/fts2/fts2_tokenizer.h \ -+ $(TOP)/ext/fts2/fts2_tokenizer1.c - - # Source code to the test files. - # -@@ -261,6 +272,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 +498,33 @@ - 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_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 -+ - tclsqlite-shell.lo: $(TOP)/src/tclsqlite.c $(HDR) - $(LTCOMPILE) -DTCLSH=1 -o $@ -c $(TOP)/src/tclsqlite.c - Index: sqlite3/files/fts1_patch-Makefile.in =================================================================== RCS file: sqlite3/files/fts1_patch-Makefile.in diff -N sqlite3/files/fts1_patch-Makefile.in --- sqlite3/files/fts1_patch-Makefile.in 10 Aug 2007 12:07:11 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,31 +0,0 @@ ---- 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 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. - # -@@ -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 -+ -+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 - Index: sqlite3/files/fts2_patch-Makefile.in =================================================================== RCS file: sqlite3/files/fts2_patch-Makefile.in diff -N sqlite3/files/fts2_patch-Makefile.in --- sqlite3/files/fts2_patch-Makefile.in 10 Aug 2007 12:07:11 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,62 +0,0 @@ ---- 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_tokenizer.lo fts2_tokenizer1.lo - - # All of the source code files. - # -@@ -198,6 +199,15 @@ - $(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.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,21 @@ - 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_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 -+ - tclsqlite-shell.lo: $(TOP)/src/tclsqlite.c $(HDR) - $(LTCOMPILE) -DTCLSH=1 -o $@ -c $(TOP)/src/tclsqlite.c - Index: sqlite3/files/fts3_patch-Makefile.in =================================================================== RCS file: sqlite3/files/fts3_patch-Makefile.in diff -N sqlite3/files/fts3_patch-Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sqlite3/files/fts3_patch-Makefile.in 24 Mar 2008 15:10:09 -0000 @@ -0,0 +1,79 @@ +--- Makefile.in.orig 2008-01-22 16:42:50.000000000 -0200 ++++ Makefile.in 2008-03-04 23:43:03.000000000 -0300 +@@ -116,7 +116,7 @@ + + # You should not have to change anything below this line + ############################################################################### +-TCC += -DSQLITE_OMIT_LOAD_EXTENSION=1 ++#TCC += -DSQLITE_OMIT_LOAD_EXTENSION=1 + + # Object files for the SQLite library. + # +@@ -133,6 +133,8 @@ + vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \ + where.lo utf.lo legacy.lo vtab.lo + ++LIBOBJ += fts3.lo fts3_hash.lo fts3_porter.lo fts3_tokenizer.lo fts3_tokenizer1.lo ++ + # All of the source code files. + # + SRC = \ +@@ -204,13 +206,15 @@ + # Source code for extensions + # + SRC += \ +- $(TOP)/ext/fts1/fts1.c \ +- $(TOP)/ext/fts1/fts1.h \ +- $(TOP)/ext/fts1/fts1_hash.c \ +- $(TOP)/ext/fts1/fts1_hash.h \ +- $(TOP)/ext/fts1/fts1_porter.c \ +- $(TOP)/ext/fts1/fts1_tokenizer.h \ +- $(TOP)/ext/fts1/fts1_tokenizer1.c ++ $(TOP)/ext/fts3/fts3.c \ ++ $(TOP)/ext/fts3/fts3.h \ ++ $(TOP)/ext/fts3/fts3_hash.c \ ++ $(TOP)/ext/fts3/fts3_hash.h \ ++ $(TOP)/ext/fts3/fts3_icu.c \ ++ $(TOP)/ext/fts3/fts3_porter.c \ ++ $(TOP)/ext/fts3/fts3_tokenizer.h \ ++ $(TOP)/ext/fts3/fts3_tokenizer.c \ ++ $(TOP)/ext/fts3/fts3_tokenizer1.c + + + # Source code to the test files. +@@ -286,9 +290,9 @@ + # Header files used by extensions + # + HDR += \ +- $(TOP)/ext/fts1/fts1.h \ +- $(TOP)/ext/fts1/fts1_hash.h \ +- $(TOP)/ext/fts1/fts1_tokenizer.h ++ $(TOP)/ext/fts3/fts3.h \ ++ $(TOP)/ext/fts3/fts3_hash.h \ ++ $(TOP)/ext/fts3/fts3_tokenizer.h + + # Header files used by the VDBE submodule + # +@@ -561,6 +565,22 @@ + libsqlite3.la $(LIBTCL) + + ++fts3.lo: $(TOP)/ext/fts3/fts3.c $(HDR) ++ $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3.c ++ ++fts3_hash.lo: $(TOP)/ext/fts3/fts3_hash.c $(HDR) ++ $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_hash.c ++ ++fts3_porter.lo: $(TOP)/ext/fts3/fts3_porter.c $(HDR) ++ $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_porter.c ++ ++fts3_tokenizer.lo: $(TOP)/ext/fts3/fts3_tokenizer.c $(HDR) ++ $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer.c ++ ++fts3_tokenizer1.lo: $(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR) ++ $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer1.c ++ ++ + fulltest: testfixture$(TEXE) sqlite3$(TEXE) + ./testfixture $(TOP)/test/all.test + Index: sqlite3/files/patch-ext__fts1__fts1.c =================================================================== RCS file: sqlite3/files/patch-ext__fts1__fts1.c diff -N sqlite3/files/patch-ext__fts1__fts1.c --- sqlite3/files/patch-ext__fts1__fts1.c 12 Feb 2007 12:47:47 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- 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 --#if !defined(__APPLE__) --#include --#else - #include --#endif - #include - #include - #include Index: sqlite3/files/patch-ext__fts1__fts1_porter.c =================================================================== RCS file: sqlite3/files/patch-ext__fts1__fts1_porter.c diff -N sqlite3/files/patch-ext__fts1__fts1_porter.c --- sqlite3/files/patch-ext__fts1__fts1_porter.c 12 Feb 2007 12:47:47 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- 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 --#if !defined(__APPLE__) --#include --#else - #include --#endif - #include - #include - #include Index: sqlite3/files/patch-ext__fts1__fts1_tokenizer1.c =================================================================== RCS file: sqlite3/files/patch-ext__fts1__fts1_tokenizer1.c diff -N sqlite3/files/patch-ext__fts1__fts1_tokenizer1.c --- sqlite3/files/patch-ext__fts1__fts1_tokenizer1.c 12 Feb 2007 12:47:47 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- 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 --#if !defined(__APPLE__) --#include --#else - #include --#endif - #include - #include - #include Index: sqlite3/files/patch-ext__fts2__fts2.c =================================================================== RCS file: sqlite3/files/patch-ext__fts2__fts2.c diff -N sqlite3/files/patch-ext__fts2__fts2.c --- sqlite3/files/patch-ext__fts2__fts2.c 1 Aug 2007 14:22:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ ---- 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: sqlite3/files/patch-ext__fts2__fts2_porter.c =================================================================== RCS file: sqlite3/files/patch-ext__fts2__fts2_porter.c diff -N sqlite3/files/patch-ext__fts2__fts2_porter.c --- sqlite3/files/patch-ext__fts2__fts2_porter.c 1 Aug 2007 14:22:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- 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: sqlite3/files/patch-ext__fts2__fts2_tokenizer1.c =================================================================== RCS file: sqlite3/files/patch-ext__fts2__fts2_tokenizer1.c diff -N sqlite3/files/patch-ext__fts2__fts2_tokenizer1.c --- sqlite3/files/patch-ext__fts2__fts2_tokenizer1.c 1 Aug 2007 14:22:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- 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 Index: sqlite3/files/patch-src__main.c =================================================================== RCS file: sqlite3/files/patch-src__main.c diff -N sqlite3/files/patch-src__main.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sqlite3/files/patch-src__main.c 24 Mar 2008 15:10:09 -0000 @@ -0,0 +1,11 @@ +--- src/main.c.orig 2008-03-04 00:22:33.000000000 -0300 ++++ src/main.c 2008-03-04 00:22:45.000000000 -0300 +@@ -19,7 +19,7 @@ + #include "sqliteInt.h" + #include + #ifdef SQLITE_ENABLE_FTS3 +-# include "fts3.h" ++# include "../ext/fts3/fts3.h" + #endif + + /* Index: sqlite34/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/sqlite3/Makefile,v retrieving revision 1.29 diff -u -r1.29 Makefile --- sqlite34/Makefile 1 Aug 2007 14:22:13 -0000 1.29 +++ sqlite34/Makefile 24 Mar 2008 15:10:09 -0000 @@ -5,19 +5,17 @@ # $FreeBSD: ports/databases/sqlite3/Makefile,v 1.29 2007/08/01 14:22:13 mnag Exp $ # -PORTNAME= sqlite3 -PORTVERSION= 3.4.1 +PORTNAME= sqlite34 +PORTVERSION= 3.4.2 CATEGORIES= databases -MASTER_SITES= http://www.sqlite.org/ -.if defined(USE_THOL) -PKGNAMESUFFIX= -threads -.endif +MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= mnag/${PORTNAME} DISTNAME= sqlite-${PORTVERSION} MAINTAINER= mnag@FreeBSD.org -COMMENT?= An SQL database engine in a C library w/ Tcl wrapper +COMMENT= An SQL database engine in a C library w/ Tcl wrapper -SLAVEDIRS= databases/sqlite3-threads +CONFLICTS= sqlite3-[0-9]* USE_GMAKE= YES USE_GNOME= pkgconfig @@ -32,23 +30,14 @@ 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 + TCLWRAPPER "TCL wrapper for SQLITE" off \ + THREADS "Enable threads support" off # Defaults, for building the docs: TCL_V?= 8.4 MAKE_ARGS+= TCLSH=tclsh${TCL_V} MAKE_ENV+= TCL_VER=${TCL_V} -.if !defined(USE_THOL) -OPTIONS+= THREADS "Enable threads support" off -PLIST_SUB+= THOL="@comment " -CONFLICTS= sqlite-threads-3* -.else -CONFIGURE_ARGS+= --enable-threadsafe --enable-threads-override-locks -PLIST_SUB+= THOL="" -CONFLICTS= sqlite-3* -.endif - .include .if defined(WITH_DEBUG) @@ -62,13 +51,13 @@ .endif .if defined(WITH_FTS1) && defined(WITH_FTS2) -CFLAGS+= -DSQLITE_ENABLE_FTS1 -DSQLITE_ENABLE_FTS2 +CFLAGS+= -DSQLITE_CORE -DSQLITE_ENABLE_FTS1 -DSQLITE_ENABLE_FTS2 EXTRA_PATCHES+= ${FILESDIR}/fts12_patch-Makefile.in .elif defined(WITH_FTS1) && !defined(WITH_FTS2) -CFLAGS+= -DSQLITE_ENABLE_FTS1 +CFLAGS+= -DSQLITE_CORE -DSQLITE_ENABLE_FTS1 EXTRA_PATCHES+= ${FILESDIR}/fts1_patch-Makefile.in .elif defined(WITH_FTS2) && !defined(WITH_FTS1) -CFLAGS+= -DSQLITE_ENABLE_FTS2 +CFLAGS+= -DSQLITE_CORE -DSQLITE_ENABLE_FTS2 EXTRA_PATCHES+= ${FILESDIR}/fts2_patch-Makefile.in .endif @@ -83,7 +72,7 @@ .endif .if defined(WITH_THREADS) -CONFIGURE_ARGS+= --enable-threadsafe +CONFIGURE_ARGS+= --enable-threadsafe --enable-threads-override-locks .endif post-patch: @@ -100,7 +89,7 @@ >> ${WRKSRC}/freebsd.hints pre-configure: -.if defined(WITH_THREADS) || defined(USE_THOL) +.if defined(WITH_THREADS) @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \ ${WRKSRC}/configure @${REINPLACE_CMD} -E -e "s|(Libs:.*)|\1 ${PTHREAD_LIBS}|" \ @@ -122,9 +111,5 @@ @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} .endif -.if defined(USE_THOL) - @${MKDIR} ${DATADIR} - @${TOUCH} ${DATADIR}/sqlite3_with_threads-override-locks -.endif .include Index: sqlite34/distinfo =================================================================== RCS file: /home/pcvs/ports/databases/sqlite3/distinfo,v retrieving revision 1.21 diff -u -r1.21 distinfo --- sqlite34/distinfo 1 Aug 2007 14:22:13 -0000 1.21 +++ sqlite34/distinfo 24 Mar 2008 15:10:09 -0000 @@ -1,3 +1,3 @@ -MD5 (sqlite-3.4.1.tar.gz) = 0f06955b18da295fecb62d4bf9ded3c6 -SHA256 (sqlite-3.4.1.tar.gz) = d604a4db7781db3d8dda0bb30c4a35bbee184d48e72d9c0de855cf55170ee1be -SIZE (sqlite-3.4.1.tar.gz) = 2237515 +MD5 (sqlite-3.4.2.tar.gz) = 2feec9b429f9298c9f288420c8b449f8 +SHA256 (sqlite-3.4.2.tar.gz) = 0ad86c4b26cd687122b158bf848f0a07d7cd644033d15c4f43b6d643bd74cd81 +SIZE (sqlite-3.4.2.tar.gz) = 2377646 Index: sqlite34/pkg-plist =================================================================== RCS file: /home/pcvs/ports/databases/sqlite3/pkg-plist,v retrieving revision 1.10 diff -u -r1.10 pkg-plist --- sqlite34/pkg-plist 10 Apr 2007 21:40:24 -0000 1.10 +++ sqlite34/pkg-plist 24 Mar 2008 15:10:09 -0000 @@ -15,5 +15,3 @@ %%WITH_TCLWRAPPER%%@dirrm lib/sqlite %%WITH_TCLWRAPPER%%%%EXAMPLESDIR%%/example.tcl %%WITH_TCLWRAPPER%%@dirrm %%EXAMPLESDIR%% -%%THOL%%%%DATADIR%%/sqlite3_with_threads-override-locks -%%THOL%%@dirrm %%DATADIR%% Index: sqlite34/files/fts2_patch-Makefile.in =================================================================== RCS file: /home/pcvs/ports/databases/sqlite3/files/fts2_patch-Makefile.in,v retrieving revision 1.2 diff -u -r1.2 fts2_patch-Makefile.in --- sqlite34/files/fts2_patch-Makefile.in 10 Aug 2007 12:07:11 -0000 1.2 +++ sqlite34/files/fts2_patch-Makefile.in 24 Mar 2008 15:10:09 -0000 @@ -1,16 +1,16 @@ --- Makefile.in.orig 2007-06-28 09:46:18.000000000 -0300 -+++ Makefile.in 2007-08-10 08:47:35.000000000 -0300 ++++ Makefile.in 2008-03-05 22:07:49.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_tokenizer.lo fts2_tokenizer1.lo ++ fts2.lo fts2_hash.lo fts2_porter.lo fts2_icu.lo fts2_tokenizer.lo fts2_tokenizer1.lo # All of the source code files. # -@@ -198,6 +199,15 @@ +@@ -198,6 +199,16 @@ $(TOP)/ext/fts1/fts1_tokenizer.h \ $(TOP)/ext/fts1/fts1_tokenizer1.c @@ -20,13 +20,14 @@ + $(TOP)/ext/fts2/fts2_hash.c \ + $(TOP)/ext/fts2/fts2_hash.h \ + $(TOP)/ext/fts2/fts2_porter.c \ ++ $(TOP)/ext/fts2/fts2_icu.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,7 +39,7 @@ # Header files used by the VDBE submodule # VDBEHDR = \ -@@ -482,6 +497,21 @@ +@@ -482,6 +498,24 @@ where.lo: $(TOP)/src/where.c $(HDR) $(LTCOMPILE) -c $(TOP)/src/where.c @@ -51,6 +52,9 @@ +fts2_porter.lo: $(TOP)/ext/fts2/fts2_porter.c $(HDR) + $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_porter.c + ++fts2_icu.lo: $(TOP)/ext/fts2/fts2_icu.c $(HDR) ++ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_icu.c ++ +fts2_tokenizer.lo: $(TOP)/ext/fts2/fts2_tokenizer.c $(HDR) + $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer.c + Index: sqlite34/files/patch-ext__fts1__fts1.c =================================================================== RCS file: sqlite34/files/patch-ext__fts1__fts1.c diff -N sqlite34/files/patch-ext__fts1__fts1.c --- sqlite34/files/patch-ext__fts1__fts1.c 12 Feb 2007 12:47:47 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- 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 --#if !defined(__APPLE__) --#include --#else - #include --#endif - #include - #include - #include Index: sqlite34/files/patch-ext__fts1__fts1_porter.c =================================================================== RCS file: sqlite34/files/patch-ext__fts1__fts1_porter.c diff -N sqlite34/files/patch-ext__fts1__fts1_porter.c --- sqlite34/files/patch-ext__fts1__fts1_porter.c 12 Feb 2007 12:47:47 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- 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 --#if !defined(__APPLE__) --#include --#else - #include --#endif - #include - #include - #include Index: sqlite34/files/patch-ext__fts1__fts1_tokenizer1.c =================================================================== RCS file: sqlite34/files/patch-ext__fts1__fts1_tokenizer1.c diff -N sqlite34/files/patch-ext__fts1__fts1_tokenizer1.c --- sqlite34/files/patch-ext__fts1__fts1_tokenizer1.c 12 Feb 2007 12:47:47 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- 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 --#if !defined(__APPLE__) --#include --#else - #include --#endif - #include - #include - #include Index: sqlite34/files/patch-ext__fts2__fts2.c =================================================================== RCS file: sqlite34/files/patch-ext__fts2__fts2.c diff -N sqlite34/files/patch-ext__fts2__fts2.c --- sqlite34/files/patch-ext__fts2__fts2.c 1 Aug 2007 14:22:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ ---- 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: sqlite34/files/patch-ext__fts2__fts2_porter.c =================================================================== RCS file: sqlite34/files/patch-ext__fts2__fts2_porter.c diff -N sqlite34/files/patch-ext__fts2__fts2_porter.c --- sqlite34/files/patch-ext__fts2__fts2_porter.c 1 Aug 2007 14:22:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- 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: sqlite34/files/patch-ext__fts2__fts2_tokenizer1.c =================================================================== RCS file: sqlite34/files/patch-ext__fts2__fts2_tokenizer1.c diff -N sqlite34/files/patch-ext__fts2__fts2_tokenizer1.c --- sqlite34/files/patch-ext__fts2__fts2_tokenizer1.c 1 Aug 2007 14:22:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- 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