[Midnightbsd-cvs] mports: databases/sqlite3: Update to 3.5.6

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update to 3.5.6

Modified Files:
--------------
    mports/databases/sqlite3:
        Makefile (r1.5 -> r1.6)
        distinfo (r1.5 -> r1.6)

Added Files:
-----------
    mports/databases/sqlite3/files:
        patch-src__main.c (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/databases/sqlite3/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L databases/sqlite3/Makefile -L databases/sqlite3/Makefile -u -r1.5 -r1.6
--- databases/sqlite3/Makefile
+++ databases/sqlite3/Makefile
@@ -8,8 +8,8 @@
 #
 
 PORTNAME=	sqlite
-PORTVERSION=	3.5.4
-CATEGORIES=	databases
+PORTVERSION=	3.5.6
+CATEGORIES=	databases lang tcl
 MASTER_SITES=	http://www.sqlite.org/
 .if defined(USE_THOL)
 PKGNAMESUFFIX=  -threads
@@ -37,6 +37,7 @@
 OPTIONS=	DEBUG		"Enable debugging & verbose explain"	off \
 		DOCS		"Building docs (depends on TCL)"	on \
 		FTS3            "Enable FTS3 (Full Text Search) module" off \
+		RAMTABLE	"Store temporary tables in RAM"		off \
 		TCLWRAPPER	"TCL wrapper for SQLITE"		off 
 
 # Defaults, for building the docs:
@@ -48,8 +49,10 @@
 OPTIONS+=	THREADS		"Enable threads support"		off
 PLIST_SUB+=	THOL="@comment "
 CONFLICTS=	sqlite-threads-3*
+CONFIGURE_ARGS+=	--disable-threadsafe
 .else
-CONFIGURE_ARGS+=	--enable-threadsafe --enable-threads-override-locks
+CONFIGURE_ARGS+=	--enable-threadsafe --enable-threads-override-locks \
+			--enable-cross-thread-connections
 PLIST_SUB+=	THOL=""
 CONFLICTS=	sqlite-3*
 .endif
@@ -67,13 +70,15 @@
 .endif
 
 .if defined(WITH_FTS3)
-CFLAGS+=		-DSQLITE_ENABLE_FTS3
-#EXTRA_PATCHES+=		${FILESDIR}/fts2_patch-Makefile.in
+CFLAGS+=		-DSQLITE_CORE=1 -DSQLITE_ENABLE_FTS3
+.endif
+
+.if defined(WITH_RAMTABLE)
+CONFIGURE_ARGS+=        --enable-tempstore=yes
 .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}
 PLIST_SUB+=		WITH_TCLWRAPPER=""
@@ -82,10 +87,6 @@
 PLIST_SUB+=		WITH_TCLWRAPPER="@comment "
 .endif
 
-.if defined(WITH_THREADS)
-CONFIGURE_ARGS+=	--enable-threadsafe
-.endif
-
 post-extract:
 	@${FIND} ${WRKSRC} -type d -name 'CVS' | ${XARGS} rm -r
 
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/databases/sqlite3/distinfo,v
retrieving revision 1.5
retrieving revision 1.6
diff -L databases/sqlite3/distinfo -L databases/sqlite3/distinfo -u -r1.5 -r1.6
--- databases/sqlite3/distinfo
+++ databases/sqlite3/distinfo
@@ -1,3 +1,3 @@
-MD5 (sqlite-3.5.4.tar.gz) = f17da840eed792e896c3408d0ce97718
-SHA256 (sqlite-3.5.4.tar.gz) = 47daba209bd3bcffa1c5fcd5fdfc4f524eae619b4fa855aeeb1bbbc8bd2bb04f
-SIZE (sqlite-3.5.4.tar.gz) = 2092372
+MD5 (sqlite-3.5.6.tar.gz) = 903c9e935c538af392364a9172a3d98d
+SHA256 (sqlite-3.5.6.tar.gz) = 1673b9218ec318067a662315c161ae123088cad319231ec079018acb4717e8bb
+SIZE (sqlite-3.5.6.tar.gz) = 2543979
--- /dev/null
+++ databases/sqlite3/files/patch-src__main.c
@@ -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 <ctype.h>
+ #ifdef SQLITE_ENABLE_FTS3
+-# include "fts3.h"
++# include "../ext/fts3/fts3.h"
+ #endif
+ 
+ /*