[Midnightbsd-cvs] mports [19247] trunk/databases/sqlite3: sqlite 3.8.10.1

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat May 30 11:03:53 EDT 2015


Revision: 19247
          http://svnweb.midnightbsd.org/mports/?rev=19247
Author:   laffer1
Date:     2015-05-30 11:03:52 -0400 (Sat, 30 May 2015)
Log Message:
-----------
sqlite 3.8.10.1

Modified Paths:
--------------
    trunk/databases/sqlite3/Makefile
    trunk/databases/sqlite3/distinfo

Added Paths:
-----------
    trunk/databases/sqlite3/files/
    trunk/databases/sqlite3/files/patch-Makefile.am
    trunk/databases/sqlite3/files/patch-Makefile.in

Removed Paths:
-------------
    trunk/databases/sqlite3/pkg-plist

Modified: trunk/databases/sqlite3/Makefile
===================================================================
--- trunk/databases/sqlite3/Makefile	2015-05-30 15:01:42 UTC (rev 19246)
+++ trunk/databases/sqlite3/Makefile	2015-05-30 15:03:52 UTC (rev 19247)
@@ -1,10 +1,10 @@
 # $MidnightBSD$
 
 PORTNAME=	sqlite3
-PORTVERSION=	3.8.9.0
+PORTVERSION=	3.8.10.1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sqlite.org/2015/ http://www2.sqlite.org/2015/ http://www3.sqlite.org/2015/
-DISTNAME=	sqlite-autoconf-3080900
+DISTNAME=	sqlite-autoconf-${PORTVERSION:S|.10|10|:S|.|0|g}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	SQL database engine in a C library
@@ -13,44 +13,77 @@
 
 CONFLICTS=	sqlite34-[0-9]* sqlcipher-[0-9]*
 
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig libtool ncurses
 USE_LDCONFIG=	YES
 GNU_CONFIGURE=	YES
+INSTALL_TARGET=	install-strip
 
 MAKE_JOBS_UNSAFE=	yes
 
 # Compilation Options For SQLite http://www.sqlite.org/compile.html
-OPTIONS_DEFINE=	FTS3 ICU RTREE RAMTABLE UPD_DEL_LIMIT URI URI_AUTHORITY SOUNDEX METADATA \
-		STAT3 DIRECT_READ MEMMAN SECURE_DELETE UNLOCK_NOTIFY THREADSAFE \
-		EXTENSION
-OPTIONS_DEFAULT=	FTS3 URI METADATA SECURE_DELETE UNLOCK_NOTIFY THREADSAFE EXTENSION
-FTS3_DESC=		Enable FTS3/4 (Full Text Search) module
-ICU_DESC=		Enable built with ICU
-RTREE_DESC=		Enable R*Tree module (${RTREE_INT})
-RAMTABLE_DESC=		Store temporary tables in RAM = ${TEMP_STORE}
+OPTIONS_DEFINE=	FTS4 UPD_DEL_LIMIT URI URI_AUTHORITY SOUNDEX METADATA \
+		DIRECT_READ MEMMAN SECURE_DELETE UNLOCK_NOTIFY THREADS \
+		EXTENSION READLINE ARMOR STMT DBSTAT
+OPTIONS_SINGLE=	RAMT
+OPTIONS_RADIO=	STAT
+OPTIONS_GROUP=	UNICODE RTREEG
+
+FTS4_DESC=		Enable FTS3/4 (Full Text Search) module
 UPD_DEL_LIMIT_DESC=	ORDER BY and LIMIT on UPDATE and DELETE
 URI_DESC=		Enable use the URI filename
 URI_AUTHORITY_DESC=	Allow convert URL into a UNC
 SOUNDEX_DESC=		Enables the soundex() SQL function
 METADATA_DESC=		Enable column metadata
-STAT3_DESC=		Help SQLite to chose a better query plan
 DIRECT_READ_DESC=	File is read directly from disk
 MEMMAN_DESC=		Allows it to release unused memory
 SECURE_DELETE_DESC=	Overwrite deleted information with zeros
 UNLOCK_NOTIFY_DESC=	Enable notification on unlocking
-THREADSAFE_DESC=	Build thread-safe library
 EXTENSION_DESC=		Allow loadable extensions
 
-.include <bsd.mport.options.mk>
+# http://www.sqlite.org/compile.html#enable_api_armor
+ARMOR_DESC=		Detect misuse of the API
 
-#		NAME83		"Enable use 8.3 filename for temp files" off \
-# Some devices are compelled to use an older file system with 8+3 filename
-# restrictions for backwards compatibility, or due to other non-technical factors.
-# http://www.sqlite.org/shortnames.html
-.if ${PORT_OPTIONS:MNAME83}
-CPPFLAGS+=		-DSQLITE_ENABLE_8_3_NAMES=1
-.endif
+# http://www.sqlite.org/c3ref/stmt_scanstatus.html
+STMT_DESC=		Prepared Statement Scan Status
 
+# http://www.sqlite.org/tempfiles.html#tempstore
+OPTIONS_SINGLE_RAMT=	TS0 TS1 TS2 TS3
+RAMT_DESC=		Where to store temporary file
+TS0_DESC=		Always use temporary file
+TS1_DESC=		File by default, change allowed PRAGMA
+TS2_DESC=		Memory by default, change allowed PRAGMA
+TS3_DESC=		Always use memory
+
+# http://www.sqlite.org/queryplanner-ng.html#qpstab
+OPTIONS_RADIO_STAT=	STAT3 STAT4
+STAT_DESC=		Which query planner to use
+STAT3_DESC=		collect histogram data from leftmost column
+STAT4_DESC=		collect histogram data from all columns
+
+# http://www.sqlite.org/dbstat.html
+DBSTAT_DESC=		Enable DBSTAT Virtual Table
+
+# http://www.sqlite.org/fts3.html#tokenizer
+OPTIONS_GROUP_UNICODE=	ICU UNICODE61
+UNICODE_DESC=		Unicode support
+UNICODE61_DESC=		Unicode Version 6.1 tokenizer
+
+# http://www.sqlite.org/rtree.html
+OPTIONS_GROUP_RTREEG=	RTREE RTREE_INT
+RTREEG_DESC=		Index type for range queries
+RTREE_DESC=		Enable R*Tree module
+RTREE_INT_DESC=		Store 32-bit sig int (no float) coordinates
+
+OPTIONS_DEFAULT=	FTS4 URI METADATA SECURE_DELETE UNLOCK_NOTIFY THREADS \
+			EXTENSION TS1 UNICODE61 RTREE READLINE
+# SECURE_DELETE, UNLOCK_NOTIFY used by www/firefox, www/libxul
+# RTREE used by graphics/mapnik, databases/spatialite
+
+PLIST_FILES=	bin/sqlite3 include/sqlite3.h include/sqlite3ext.h \
+		lib/libsqlite3.a lib/libsqlite3.so lib/libsqlite3.so.0 \
+		lib/libsqlite3.so.0.8.6 libdata/pkgconfig/sqlite3.pc \
+		man/man1/sqlite3.1.gz
+
 # The default numeric file permissions for newly created database files under unix.
 # If not specified, the default is 0644 which means that the files is globally
 # readable but only writable by the creator.
@@ -64,88 +97,53 @@
 CPPFLAGS+=		-DSQLITE_DEFAULT_TEMP_CACHE_SIZE=${TEMP_CACHE_SIZE}
 .endif
 
-.if ${PORT_OPTIONS:MMEMMAN}
-CPPFLAGS+=		-DSQLITE_ENABLE_MEMORY_MANAGEMENT=1
-.endif
+# Use an in-ram database for temporary tables (never,no,yes,always),
+TS0_CPPFLAGS=	-DSQLITE_TEMP_STORE=0
+TS1_CPPFLAGS=	-DSQLITE_TEMP_STORE=1
+TS2_CPPFLAGS=	-DSQLITE_TEMP_STORE=2
+TS3_CPPFLAGS=	-DSQLITE_TEMP_STORE=3
 
-.if ${PORT_OPTIONS:MUPD_DEL_LIMIT}
-CPPFLAGS+=		-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1
-.endif
+RTREE_CPPFLAGS=	-DSQLITE_ENABLE_RTREE=1
+RTREE_INT_CPPFLAGS=	-DSQLITE_RTREE_INT_ONLY=1
 
-.if ${PORT_OPTIONS:MURI}
-CPPFLAGS+=		-DSQLITE_USE_URI=1
-.endif
+FTS4_CPPFLAGS=	-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1
+SOUNDEX_CPPFLAGS=	-DSQLITE_SOUNDEX=1
+MEMMAN_CPPFLAGS=	-DSQLITE_ENABLE_MEMORY_MANAGEMENT=1
+UPD_DEL_LIMIT_CPPFLAGS=	-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1
+SECURE_DELETE_CPPFLAGS=	-DSQLITE_SECURE_DELETE=1
+UNLOCK_NOTIFY_CPPFLAGS=	-DSQLITE_ENABLE_UNLOCK_NOTIFY=1
+METADATA_CPPFLAGS=	-DSQLITE_ENABLE_COLUMN_METADATA=1
+STAT3_CPPFLAGS=	-DSQLITE_ENABLE_STAT3=1
+STAT4_CPPFLAGS=	-DSQLITE_ENABLE_STAT4=1
+DBSTAT_CPPFLAGS=	-DSQLITE_ENABLE_DBSTAT_VTAB=1
+URI_CPPFLAGS=	-DSQLITE_USE_URI=1
+URI_AUTHORITY_CPPFLAGS=	-DSQLITE_ALLOW_URI_AUTHORITY=1
+DIRECT_READ_CPPFLAGS=	-DSQLITE_DIRECT_OVERFLOW_READ=1
+ARMOR_CPPFLAGS=	-DSQLITE_ENABLE_API_ARMOR=1
+STMT_CPPFLAGS=	-DSQLITE_ENABLE_STMT_SCANSTATUS=1
 
-.if ${PORT_OPTIONS:MURI_AUTHORITY}
-CPPFLAGS+=		-DSQLITE_ALLOW_URI_AUTHORITY=1
-.endif
+EXTENSION_CONFIGURE_ENABLE=	dynamic-extensions
 
-.if ${PORT_OPTIONS:MSOUNDEX}
-CPPFLAGS+=		-DSQLITE_SOUNDEX=1
-.endif
+THREADS_CONFIGURE_ENABLE=	threadsafe
+THREADS_LDFLAGS=		-lpthread
 
-.if ${PORT_OPTIONS:MSTAT3}
-CPPFLAGS+=		-DSQLITE_ENABLE_STAT3=1
-.endif
+ICU_BUILD_DEPENDS=	${LOCALBASE}/bin/icu-config:${PORTSDIR}/devel/icu
+ICU_LIB_DEPENDS=	libicudata.so:${PORTSDIR}/devel/icu
+ICU_CPPFLAGS=	`${LOCALBASE}/bin/icu-config --cppflags` -DSQLITE_ENABLE_ICU=1
+ICU_LDFLAGS=	`${LOCALBASE}/bin/icu-config --ldflags`
 
-.if ${PORT_OPTIONS:MDIRECT_READ}
-CPPFLAGS+=		-DSQLITE_DIRECT_OVERFLOW_READ=1
-.endif
+UNICODE61_CPPFLAGS_OFF=	-DSQLITE_DISABLE_FTS3_UNICODE=1
 
-.if ${PORT_OPTIONS:MFTS3}
-CPPFLAGS+=		-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1
-.endif
+READLINE_CONFIGURE_ENABLE=	readline
+READLINE_USES=	readline
 
-.if ${PORT_OPTIONS:MRTREE}
-CPPFLAGS+=		-DSQLITE_ENABLE_RTREE=1
-.ifdef RTREE_INT
-CPPFLAGS+=		-DSQLITE_RTREE_INT_ONLY=1
-RTREE_INT=		"int"
-.else
-RTREE_INT=		"float"
-.endif
-.endif
+.include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MICU}
-BUILD_DEPENDS+=		${LOCALBASE}/bin/icu-config:${PORTSDIR}/devel/icu
-LIB_DEPENDS+=		icudata:${PORTSDIR}/devel/icu
-CPPFLAGS+=		-DSQLITE_ENABLE_ICU=1
-CPPFLAGS+=		`${LOCALBASE}/bin/icu-config --cppflags`
-LDFLAGS+=		`${LOCALBASE}/bin/icu-config --ldflags`
-.endif
+post-configure:
+	@${ECHO_MSG} "===> CONFIGURE_ARGS=${CONFIGURE_ARGS}"
+	@${ECHO_MSG} "===> CPPFLAGS=${CPPFLAGS}"
+	@${ECHO_MSG} "===> LDFLAGS=${LDFLAGS}"
 
-# Use an in-ram database for temporary tables (never,no,yes,always),
-# which is equivalent of TEMP_STORE=[0,1,2,3], default = 1.
-.if ${PORT_OPTIONS:MRAMTABLE}
-TEMP_STORE?=		2
-CPPFLAGS+=		-DSQLITE_TEMP_STORE=${TEMP_STORE}
-.endif
-
-.if ${PORT_OPTIONS:MSECURE_DELETE}
-CPPFLAGS+=		-DSQLITE_SECURE_DELETE=1
-.endif
-
-.if ${PORT_OPTIONS:MUNLOCK_NOTIFY}
-CPPFLAGS+=		-DSQLITE_ENABLE_UNLOCK_NOTIFY=1
-.endif
-
-.if ${PORT_OPTIONS:MMETADATA}
-CPPFLAGS+=		-DSQLITE_ENABLE_COLUMN_METADATA=1
-.endif
-
-.if ${PORT_OPTIONS:MTHREADSAFE}
-CONFIGURE_ARGS+=	--enable-threadsafe
-LDFLAGS+=		${PTHREAD_LIBS}
-.else
-CONFIGURE_ARGS+=	--disable-threadsafe
-.endif
-
-.if ${PORT_OPTIONS:MEXTENSION}
-CONFIGURE_ARGS+=	--enable-dynamic-extensions
-.else
-CONFIGURE_ARGS+=	--disable-dynamic-extensions
-.endif
-
 post-build:
 .if ${ARCH}=="i386"
 	@${ECHO_MSG} "===> WARNING: on ${ARCH} don't pass atof1-* tests"

Modified: trunk/databases/sqlite3/distinfo
===================================================================
--- trunk/databases/sqlite3/distinfo	2015-05-30 15:01:42 UTC (rev 19246)
+++ trunk/databases/sqlite3/distinfo	2015-05-30 15:03:52 UTC (rev 19247)
@@ -1,2 +1,2 @@
-SHA256 (sqlite-autoconf-3080900.tar.gz) = 76ebb6392cd2289fbff903af7ff67f3e49bd01ff30544b8028ecededd60269a2
-SIZE (sqlite-autoconf-3080900.tar.gz) = 2037200
+SHA256 (sqlite-autoconf-3081001.tar.gz) = 5f8f2ae6461e637ff63e50fef10b6962764dfc3b81a8c0f80a19794b9d59f7ca
+SIZE (sqlite-autoconf-3081001.tar.gz) = 2049377

Added: trunk/databases/sqlite3/files/patch-Makefile.am
===================================================================
--- trunk/databases/sqlite3/files/patch-Makefile.am	                        (rev 0)
+++ trunk/databases/sqlite3/files/patch-Makefile.am	2015-05-30 15:03:52 UTC (rev 19247)
@@ -0,0 +1,9 @@
+--- Makefile.am.orig	2015-05-09 12:23:20 UTC
++++ Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
++AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@
+ 
+ lib_LTLIBRARIES = libsqlite3.la
+ libsqlite3_la_SOURCES = sqlite3.c


Property changes on: trunk/databases/sqlite3/files/patch-Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/sqlite3/files/patch-Makefile.in
===================================================================
--- trunk/databases/sqlite3/files/patch-Makefile.in	                        (rev 0)
+++ trunk/databases/sqlite3/files/patch-Makefile.in	2015-05-30 15:03:52 UTC (rev 19247)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2015-05-12 14:38:01 UTC
++++ Makefile.in
+@@ -269,7 +269,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
++AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@
+ lib_LTLIBRARIES = libsqlite3.la
+ libsqlite3_la_SOURCES = sqlite3.c
+ libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8


Property changes on: trunk/databases/sqlite3/files/patch-Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/databases/sqlite3/pkg-plist
===================================================================
--- trunk/databases/sqlite3/pkg-plist	2015-05-30 15:01:42 UTC (rev 19246)
+++ trunk/databases/sqlite3/pkg-plist	2015-05-30 15:03:52 UTC (rev 19247)
@@ -1,8 +0,0 @@
-bin/sqlite3
-include/sqlite3.h
-include/sqlite3ext.h
-lib/libsqlite3.a
-lib/libsqlite3.la
-lib/libsqlite3.so
-lib/libsqlite3.so.8
-libdata/pkgconfig/sqlite3.pc



More information about the Midnightbsd-cvs mailing list