svn commit: r411118 - head/databases/sqlite3

[Mark Felder]

Author: feld
Date: Mon Mar 14 21:31:37 2016
New Revision: 411118
URL: https://svnweb.freebsd.org/changeset/ports/411118

Log:
  databases/sqlite3: Update to 3.11.1
  
  - Update port to version 3.11.1
  - Added use of system functions:
       isnan() - added in FreeBSD 5.1
       malloc_usable_size() - first appeared in FreeBSD 7.0
  - New option FTS3_TOKEN, added for backwards compatibility, see:
    https://www.sqlite.org/compile.html#enable_fts3_tokenizer
  - Added preventing message for option UPT_DEL_LIMIT.
    This port building from amalgamation source and this option actually don't work.
    See http://www.sqlite.org/compile.html#enable_update_delete_limit, and
    PR#207383 (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=207383).
  
  PR:		207924

Modified:
  head/databases/sqlite3/Makefile
  head/databases/sqlite3/distinfo

Modified: head/databases/sqlite3/Makefile
==============================================================================
--- head/databases/sqlite3/Makefile	Mon Mar 14 21:25:42 2016	(r411117)
+++ head/databases/sqlite3/Makefile	Mon Mar 14 21:31:37 2016	(r411118)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sqlite3
-PORTVERSION=	3.10.2
-PORTREVISION=	2
+PORTVERSION=	3.11.1
 CATEGORIES=	databases
 MASTER_SITES=	https://www.sqlite.org/2016/ http://www2.sqlite.org/2016/ http://www3.sqlite.org/2016/
 DISTNAME=	sqlite-autoconf-${PORTVERSION:C/\.([[:digit:]])[[:>:]]/0\1/g:S/.//g}00
@@ -18,6 +17,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 CFLAGS+=	-Os
+CPPFLAGS+=	-DHAVE_ISNAN=1 -DHAVE_MALLOC_USABLE_SIZE=1
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -25,7 +25,7 @@ MAKE_JOBS_UNSAFE=	yes
 OPTIONS_DEFINE=	FTS4 UPD_DEL_LIMIT URI URI_AUTHORITY SOUNDEX METADATA \
 		DIRECT_READ MEMMAN SECURE_DELETE UNLOCK_NOTIFY THREADS \
 		EXTENSION ARMOR STMT DBSTAT FTS5 JSON1 RBU \
-		LIKENOTBLOB STSHELL
+		LIKENOTBLOB STSHELL FTS3_TOKEN
 OPTIONS_SINGLE=	RAMT
 OPTIONS_RADIO=	STAT
 OPTIONS_GROUP=	UNICODE RTREEG RL
@@ -55,6 +55,10 @@ FTS4_DESC=		Enable FTS3/4 (Full Text Sea
 # https://www.sqlite.org/fts5.html
 FTS5_DESC=		Enable version 5 full-text search engine
 
+# https://www.sqlite.org/compile.html#enable_fts3_tokenizer
+# https://www.sqlite.org/fts3.html#f3tknzr
+FTS3_TOKEN_DESC=	Enable two-args version fts3_tokenizer
+
 # https://www.sqlite.org/json1.html
 JSON1_DESC=		Enable the JSON1 extension
 
@@ -128,9 +132,14 @@ RTREE_CPPFLAGS=	-DSQLITE_ENABLE_RTREE=1
 RTREE_INT_CPPFLAGS=	-DSQLITE_RTREE_INT_ONLY=1
 
 FTS4_CPPFLAGS=	-DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1
+FTS5_CONFIGURE_ENABLE=	fts5
+FTS3_TOKEN_CPPFLAGS=	-DSQLITE_ENABLE_FTS3_TOKENIZER=1
+
 SOUNDEX_CPPFLAGS=	-DSQLITE_SOUNDEX=1
 MEMMAN_CPPFLAGS=	-DSQLITE_ENABLE_MEMORY_MANAGEMENT=1
 UPD_DEL_LIMIT_CPPFLAGS=	-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1
+UPD_DEL_LIMIT_PREVENTS=	UPD_DEL_LIMIT
+UPD_DEL_LIMIT_PREVENTS_MSG=	this option may only be used when the library is built from source, not from the amalgamation. Please, do not select it with this port.
 SECURE_DELETE_CPPFLAGS=	-DSQLITE_SECURE_DELETE=1
 UNLOCK_NOTIFY_CPPFLAGS=	-DSQLITE_ENABLE_UNLOCK_NOTIFY=1
 METADATA_CPPFLAGS=	-DSQLITE_ENABLE_COLUMN_METADATA=1
@@ -162,8 +171,6 @@ READLINEP_USES=	readline:port
 EDITLINE_CONFIGURE_ENABLE=	editline
 EDITLINE_USES=	libedit
 
-FTS5_CONFIGURE_ENABLE=	fts5
-
 JSON1_CONFIGURE_ENABLE=	json1
 
 RBU_CPPFLAGS=	-DSQLITE_ENABLE_RBU=1

Modified: head/databases/sqlite3/distinfo
==============================================================================
--- head/databases/sqlite3/distinfo	Mon Mar 14 21:25:42 2016	(r411117)
+++ head/databases/sqlite3/distinfo	Mon Mar 14 21:31:37 2016	(r411118)
@@ -1,2 +1,2 @@
-SHA256 (sqlite-autoconf-3100200.tar.gz) = a2b3b4bd1291ea7d6c8252f7edff36a4362f2f0e5d5370444ba6cbe313ae2971
-SIZE (sqlite-autoconf-3100200.tar.gz) = 2332013
+SHA256 (sqlite-autoconf-3110100.tar.gz) = 533ff1d0271c2e666f01591271cef01a31648563affa0c95e80ef735077d4377
+SIZE (sqlite-autoconf-3110100.tar.gz) = 2359545