[Midnightbsd-cvs] mports: databases/sqlite3: Update to 3.5.3, remove FTS1/2 support, add
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Dec 5 18:49:23 EST 2007
Log Message:
-----------
Update to 3.5.3, remove FTS1/2 support, add FTS3
Modified Files:
--------------
mports/databases/sqlite3:
Makefile (r1.3 -> r1.4)
distinfo (r1.3 -> r1.4)
Removed Files:
-------------
mports/databases/sqlite3/files:
fts12_patch-Makefile.in
fts1_patch-Makefile.in
fts2_patch-Makefile.in
patch-ext__fts1__fts1.c
patch-ext__fts1__fts1_porter.c
patch-ext__fts1__fts1_tokenizer1.c
patch-ext__fts2__fts2.c
patch-ext__fts2__fts2_porter.c
patch-ext__fts2__fts2_tokenizer1.c
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/databases/sqlite3/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L databases/sqlite3/Makefile -L databases/sqlite3/Makefile -u -r1.3 -r1.4
--- databases/sqlite3/Makefile
+++ databases/sqlite3/Makefile
@@ -8,7 +8,7 @@
#
PORTNAME= sqlite
-PORTVERSION= 3.4.1
+PORTVERSION= 3.5.3
CATEGORIES= databases
MASTER_SITES= http://www.sqlite.org/
.if defined(USE_THOL)
@@ -18,6 +18,7 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= An SQL database engine in a C library w/ Tcl wrapper
+LICENSE= publicdom
SLAVEDIRS= databases/sqlite3-threads
@@ -35,8 +36,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 \
+ FTS3 "Enable FTS3 (Full Text Search) module" off \
TCLWRAPPER "TCL wrapper for SQLITE" off
# Defaults, for building the docs:
@@ -66,18 +66,13 @@
PORTDOCS= *
.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_FTS3)
+CFLAGS+= -DSQLITE_ENABLE_FTS3
+#EXTRA_PATCHES+= ${FILESDIR}/fts2_patch-Makefile.in
.endif
.if defined(WITH_TCLWRAPPER)
+ALL_TARGET+= tclsqlite3
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}
@@ -91,6 +86,9 @@
CONFIGURE_ARGS+= --enable-threadsafe
.endif
+post-extract:
+ @${FIND} ${WRKSRC} -type d -name 'CVS' | ${XARGS} rm -r
+
post-patch:
@${REINPLACE_CMD} -E -e "s|^(TLIBS.*)|\1 -lm|g" \
${WRKSRC}/Makefile.in
@@ -125,7 +123,7 @@
.endif
.if !defined(NOPORTDOCS) && !defined(WITHOUT_DOCS)
@${MKDIR} ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
.endif
.if defined(USE_THOL)
@${MKDIR} ${DATADIR}
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/databases/sqlite3/distinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -L databases/sqlite3/distinfo -L databases/sqlite3/distinfo -u -r1.3 -r1.4
--- databases/sqlite3/distinfo
+++ databases/sqlite3/distinfo
@@ -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.3.tar.gz) = dadd617ebb08ef61e725f374ba2993c1
+SHA256 (sqlite-3.5.3.tar.gz) = 92aa1ebbbbaef542f9416e7bfd3ba266e4436bb5514f8833915459e888205cb1
+SIZE (sqlite-3.5.3.tar.gz) = 2072419
--- databases/sqlite3/files/patch-ext__fts1__fts1_tokenizer1.c
+++ /dev/null
@@ -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 <assert.h>
--#if !defined(__APPLE__)
--#include <malloc.h>
--#else
- #include <stdlib.h>
--#endif
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
--- databases/sqlite3/files/patch-ext__fts1__fts1_porter.c
+++ /dev/null
@@ -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 <assert.h>
--#if !defined(__APPLE__)
--#include <malloc.h>
--#else
- #include <stdlib.h>
--#endif
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
--- databases/sqlite3/files/patch-ext__fts2__fts2_tokenizer1.c
+++ /dev/null
@@ -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 <assert.h>
--#if !defined(__APPLE__)
--#include <malloc.h>
--#else
- #include <stdlib.h>
--#endif
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
--- databases/sqlite3/files/fts2_patch-Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
---- 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
-
--- databases/sqlite3/files/patch-ext__fts1__fts1.c
+++ /dev/null
@@ -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 <assert.h>
--#if !defined(__APPLE__)
--#include <malloc.h>
--#else
- #include <stdlib.h>
--#endif
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
--- databases/sqlite3/files/fts12_patch-Makefile.in
+++ /dev/null
@@ -1,71 +0,0 @@
---- 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
-
--- databases/sqlite3/files/fts1_patch-Makefile.in
+++ /dev/null
@@ -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
-
--- databases/sqlite3/files/patch-ext__fts2__fts2_porter.c
+++ /dev/null
@@ -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 <assert.h>
--#if !defined(__APPLE__)
--#include <malloc.h>
--#else
- #include <stdlib.h>
--#endif
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
--- databases/sqlite3/files/patch-ext__fts2__fts2.c
+++ /dev/null
@@ -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 <assert.h>
--#if !defined(__APPLE__)
--#include <malloc.h>
--#endif
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
More information about the Midnightbsd-cvs
mailing list