Date: Mon, 30 Aug 2010 19:39:32 +0400 (MSD) From: Pavel I Volkov <pol@opk.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/150119: [MAINTAINER] databases/sqlite3: update to 3.7.2 Message-ID: <201008301539.o7UFdWkx084294@pol.iib.ru> Resent-Message-ID: <201008301540.o7UFe1hf063813@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 150119 >Category: ports >Synopsis: [MAINTAINER] databases/sqlite3: update to 3.7.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Aug 30 15:40:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Pavel I Volkov >Release: FreeBSD 8.1-RELEASE i386 >Organization: >Environment: System: FreeBSD pol.iib.ru 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Tue Jul 27 11:56:19 MSD 2010 >Description: - Update to 3.7.2 - This patch is replace for ports/149472, please close it. Removed file(s): - pkg-plist Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- sqlite3-3.7.2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/databases/sqlite3.orig/Makefile /usr/ports/databases/sqlite3/Makefile --- /usr/ports/databases/sqlite3.orig/Makefile 2010-08-24 04:02:30.000000000 +0400 +++ /usr/ports/databases/sqlite3/Makefile 2010-08-30 19:04:20.000000000 +0400 @@ -6,15 +6,19 @@ # PORTNAME= sqlite3 -PORTVERSION= 3.6.23.1 -PORTREVISION= 3 +PORTVERSION= 3.7.2 CATEGORIES= databases -MASTER_SITES= http://www.sqlite.org/ +MASTER_SITES= http://www.sqlite.org/ http://www2.sqlite.org/ DISTNAME= sqlite-${PORTVERSION} MAINTAINER= pol@opk.ru COMMENT= An SQL database engine in a C library +LICENSE= unknown +LICENSE_NAME= Public Domain +LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT} +LICENSE_TEXT= Description of the license can be obtained from the following URL: http://www.sqlite.org/copyright.html + CONFLICTS= sqlite34-[0-9]* USE_GMAKE= YES @@ -26,16 +30,32 @@ TCLLIBDIR="${PREFIX}/lib/${PORTNAME}" \ ac_cv_search_pthread_create="" -OPTIONS= DEBUG "Enable debugging & verbose explain" off \ - FTS3 "Enable FTS3 (Full Text Search) module" off \ +# Compilation Options For SQLite http://www.sqlite.org/compile.html +OPTIONS= \ + FTS3 "Enable FTS3 (Full Text Search) module" on \ + ICU "Enable built with \"ICU\"" off \ RTREE "Enable R*Tree module" off \ RAMTABLE "Store temporary tables in RAM" off \ - TCLWRAPPER "Enable TCL wrapper" off \ + UPD_DEL_LIMIT "ORDER BY and LIMIT on UPDATE and DELETE" off \ + SOUNDEX "Enables the soundex() SQL function" off \ METADATA "Enable column metadata" on \ + STAT2 "Help SQLite to chose a better query plan" off \ + MEMMAN "Allows it to release unused memory" off \ + SECURE_DELETE "Overwrite deleted information with zeros" on \ + UNLOCK_NOTIFY "Enable notification on unlocking" on \ THREADSAFE "Build thread-safe library" on \ - EXTENSION "Allow loadable extensions" on + OVERRIDE_LOCK "Threads can override each others locks" on \ + XTHREAD "Allow connection sharing across threads" off \ + EXTENSION "Allow loadable extensions" on \ + TCLWRAPPER "Enable TCL wrapper" off \ + DEBUG "Enable debugging & verbose explain" off \ + GCOV "Enable coverage testing using gcov" off \ + +.include <bsd.port.options.mk> -.include <bsd.port.pre.mk> +PLIST_FILES+= 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 .if !defined(NO_INSTALL_MANPAGES) MAN1= sqlite3.1 @@ -49,30 +69,76 @@ CONFIGURE_ARGS+= --enable-debug .endif +.if defined(WITH_GCOV) +CONFIGURE_ARGS+= --enable-gcov +.endif + +.if defined(WITH_MEMMAN) +CFLAGS+= -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1 +.endif + +.if defined(WITH_UPD_DEL_LIMIT) +CFLAGS+= -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 +.endif + +.if defined(WITH_SOUNDEX) +CFLAGS+= -DSQLITE_SOUNDEX=1 +.endif + +.if defined(WITH_STAT2) +CFLAGS+= -DSQLITE_ENABLE_STAT2=1 +.endif + .if defined(WITH_FTS3) -CFLAGS+= -DSQLITE_ENABLE_FTS3=1 +CFLAGS+= -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 +.ifndef NOPORTDOCS +PORTDOCS+= README.syntax README.tokenizers +.endif .endif .if defined(WITH_RTREE) CFLAGS+= -DSQLITE_ENABLE_RTREE=1 +.ifndef NOPORTDOCS +PORTDOCS+= README +.endif +.endif + +.if defined(WITH_ICU) +BUILD_DEPENDS+= ${LOCALBASE}/bin/icu-config:${PORTSDIR}/devel/icu +LIB_DEPENDS+= icudata.38:${PORTSDIR}/devel/icu +CFLAGS+= -DSQLITE_ENABLE_ICU=1 +CPPFLAGS+= `${LOCALBASE}/bin/icu-config --cppflags` +LDFLAGS+= `${LOCALBASE}/bin/icu-config --ldflags` +.ifndef NOPORTDOCS +PORTDOCS+= README.txt +.endif .endif .if defined(WITH_RAMTABLE) CONFIGURE_ARGS+= --enable-tempstore=yes .endif +.if defined(WITH_SECURE_DELETE) +CFLAGS+= -DSQLITE_SECURE_DELETE=1 +.endif + +.if defined(WITH_UNLOCK_NOTIFY) +CFLAGS+= -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 +.endif + .if defined(WITH_TCLWRAPPER) CATEGORIES+= lang tcl COMMENT+= with TCL Wrapper -USE_TCL_BUILD= 84+ USE_TCL_RUN= 84+ -CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR} -PLIST_SUB+= WITH_TCLWRAPPER="" ALL_TARGET= all tclsqlite3 INSTALL_TARGET= install tcl_install +CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR} +PORTEXAMPLES+= example.tcl +PLIST_DIRS+= lib/sqlite3 +PLIST_FILES+= bin/tclsqlite3 lib/sqlite3/libtclsqlite3.so \ + lib/sqlite3/pkgIndex.tcl .else CONFIGURE_ARGS+= --disable-tcl -PLIST_SUB+= WITH_TCLWRAPPER="@comment " .endif .if !defined(WITHOUT_METADATA) @@ -80,8 +146,13 @@ .endif .if !defined(WITHOUT_THREADSAFE) -CONFIGURE_ARGS+= --enable-threadsafe \ - --enable-threads-override-locks +CONFIGURE_ARGS+= --enable-threadsafe +.if !defined(WITHOUT_XTHREAD) +CONFIGURE_ARGS+= --enable-threads-override-locks +.endif +.if !defined(WITHOUT_OVERRIDE_LOCK) +CONFIGURE_ARGS+= --enable-cross-thread-connections +.endif .else CONFIGURE_ARGS+= --disable-threadsafe .endif @@ -92,6 +163,9 @@ CONFIGURE_ARGS+= --disable-load-extension .endif +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" + post-install: .if defined(WITH_TCLWRAPPER) @${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin @@ -101,5 +175,19 @@ .if !defined(NO_INSTALL_MANPAGES) @${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${MANPREFIX}/man/man1 .endif +.ifndef NOPORTDOCS +.ifdef WITH_FTS3 + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/ext/fts3/README.syntax ${WRKSRC}/ext/fts3/README.tokenizers ${DOCSDIR} +.endif +.ifdef WITH_RTREE + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/ext/rtree/README ${DOCSDIR} +.endif +.ifdef WITH_ICU + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/ext/icu/README.txt ${DOCSDIR} +.endif +.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -ruN --exclude=CVS /usr/ports/databases/sqlite3.orig/distinfo /usr/ports/databases/sqlite3/distinfo --- /usr/ports/databases/sqlite3.orig/distinfo 2010-04-21 03:45:57.000000000 +0400 +++ /usr/ports/databases/sqlite3/distinfo 2010-08-30 12:42:02.000000000 +0400 @@ -1,3 +1,3 @@ -MD5 (sqlite-3.6.23.1.tar.gz) = d99f1b31da0eb33271464bee15cec701 -SHA256 (sqlite-3.6.23.1.tar.gz) = 1a0517438a573a68ab73e8ed75d194086d55d75883542ab1d5ae1080bbddd492 -SIZE (sqlite-3.6.23.1.tar.gz) = 3086807 +MD5 (sqlite-3.7.2.tar.gz) = 5f1853c4c1eba3330b6104f274918673 +SHA256 (sqlite-3.7.2.tar.gz) = bb53cad58f1c502662644d88e24a552dc8de982d650f80d8debaf13b15bb3b8a +SIZE (sqlite-3.7.2.tar.gz) = 3309139 diff -ruN --exclude=CVS /usr/ports/databases/sqlite3.orig/pkg-plist /usr/ports/databases/sqlite3/pkg-plist --- /usr/ports/databases/sqlite3.orig/pkg-plist 2009-11-02 13:11:48.000000000 +0300 +++ /usr/ports/databases/sqlite3/pkg-plist 1970-01-01 03:00:00.000000000 +0300 @@ -1,14 +0,0 @@ -bin/sqlite3 -%%WITH_TCLWRAPPER%%bin/tclsqlite3 -include/sqlite3.h -include/sqlite3ext.h -lib/libsqlite3.a -lib/libsqlite3.la -lib/libsqlite3.so -lib/libsqlite3.so.8 -libdata/pkgconfig/sqlite3.pc -%%WITH_TCLWRAPPER%%lib/sqlite3/libtclsqlite3.so -%%WITH_TCLWRAPPER%%lib/sqlite3/pkgIndex.tcl -%%WITH_TCLWRAPPER%%@dirrm lib/sqlite3 -%%WITH_TCLWRAPPER%%%%EXAMPLESDIR%%/example.tcl -%%WITH_TCLWRAPPER%%@dirrm %%EXAMPLESDIR%% --- sqlite3-3.7.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008301539.o7UFdWkx084294>