Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Aug 2010 19:40:36 +0400 (MSD)
From:      Pavel I Volkov <pol@opk.ru>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/149472: [MAINTAINER] databases/sqlite3: update to 3.7.0.1
Message-ID:  <201008091540.o79FeajW019320@pol.iib.ru>
Resent-Message-ID: <201008091550.o79Fo3nJ029040@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         149472
>Category:       ports
>Synopsis:       [MAINTAINER] databases/sqlite3: update to 3.7.0.1
>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 09 15:50:02 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.0.1

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- sqlite3-3.7.0.1.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-03 05:08:14.000000000 +0400
+++ /usr/ports/databases/sqlite3/Makefile	2010-08-09 19:35:48.000000000 +0400
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sqlite3
-PORTVERSION=	3.6.23.1
-PORTREVISION=	1
+PORTVERSION=	3.7.0.1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sqlite.org/
 DISTNAME=	sqlite-${PORTVERSION}
@@ -18,27 +17,34 @@
 CONFLICTS=	sqlite34-[0-9]*
 
 USE_GMAKE=	YES
-USE_GNOME=	pkgconfig
+USE_GNOME=	pkgconfig gnomehack
 USE_LDCONFIG=	YES
 GNU_CONFIGURE=	YES
-USE_GNOME=	gnomehack
 USE_TCL_BUILD=	84+
 CONFIGURE_ENV+=	TCLSH_CMD="${TCLSH}" \
 		TCLLIBDIR="${PREFIX}/lib/${PORTNAME}" \
 		ac_cv_search_pthread_create=""
 
-MAN1=		sqlite3.1
-
 OPTIONS=	DEBUG		"Enable debugging & verbose explain"	off \
+		GCOV		"Enable coverage testing using gcov"	off \
 		FTS3		"Enable FTS3 (Full Text Search) module"	off \
 		RTREE		"Enable R*Tree module"			off \
+		ICU		"Enable built with \"ICU\""		off \
 		RAMTABLE	"Store temporary tables in RAM"		off \
+		SECURE_DELETE	"Overwrite deleted information with zeros" on \
+		UNLOCK_NOTIFY	"Enable notification on unlocking"	on \
 		TCLWRAPPER	"Enable TCL wrapper"			off \
 		METADATA	"Enable column metadata"		on \
 		THREADSAFE	"Build thread-safe library"		on \
+		OVERRIDE_LOCK	"Threads can override each others locks" on \
+		XTHREAD		"Allow connection sharing across threads" off \
 		EXTENSION	"Allow loadable extensions"		off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
+
+.if !defined(NO_INSTALL_MANPAGES)
+MAN1=		sqlite3.1
+.endif
 
 .if ${OSVERSION} < 700000
 EXTRA_PATCHES+=		${FILESDIR}/pthread_equal_stub
@@ -48,18 +54,61 @@
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
+.if defined(WITH_GCOV)
+CONFIGURE_ARGS+=	--enable-gcov
+.endif
+
 .if defined(WITH_FTS3)
 CFLAGS+=		-DSQLITE_ENABLE_FTS3=1
+.ifndef NOPORTDOCS
+PLIST_SUB+=		WITH_FTS3=""
+.else
+PLIST_SUB+=		WITH_FTS3="@comment "
+.endif
+.else
+PLIST_SUB+=		WITH_FTS3="@comment "
 .endif
 
 .if defined(WITH_RTREE)
 CFLAGS+=		-DSQLITE_ENABLE_RTREE=1
+.ifndef NOPORTDOCS
+PLIST_SUB+=		WITH_RTREE=""
+.else
+PLIST_SUB+=		WITH_RTREE="@comment "
+.endif
+.else
+PLIST_SUB+=		WITH_RTREE="@comment "
+.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`
+CONFIGURE_ENV+=		CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV+=		CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+.ifndef NOPORTDOCS
+PLIST_SUB+=		WITH_ICU=""
+.else
+PLIST_SUB+=		WITH_ICU="@comment "
+.endif
+.else
+PLIST_SUB+=		WITH_ICU="@comment "
 .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
@@ -79,8 +128,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
@@ -91,6 +145,12 @@
 CONFIGURE_ARGS+=	--disable-load-extension
 .endif
 
+.if !defined(NOPORTDOCS) && ( defined(WITH_FTS3) || defined(WITH_RTREE) || defined(WITH_ICU) )
+PLIST_SUB+=		WITH_DOCSDIR=""
+.else
+PLIST_SUB+=		WITH_DOCSDIR="@comment "
+.endif
+
 post-install:
 .if defined(WITH_TCLWRAPPER)
 	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin
@@ -100,5 +160,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-09 18:45:27.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.0.1.tar.gz) = d25d7551ba6bb310362cb0e7d4906f25
+SHA256 (sqlite-3.7.0.1.tar.gz) = 9e2c01e581fb554b8b690b4e88af1da23d891c8b5f60e423e81ae00cf714e8fd
+SIZE (sqlite-3.7.0.1.tar.gz) = 3266205
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	2010-08-09 18:45:27.000000000 +0400
@@ -12,3 +12,8 @@
 %%WITH_TCLWRAPPER%%@dirrm lib/sqlite3
 %%WITH_TCLWRAPPER%%%%EXAMPLESDIR%%/example.tcl
 %%WITH_TCLWRAPPER%%@dirrm %%EXAMPLESDIR%%
+%%WITH_FTS3%%%%DOCSDIR%%/README.syntax
+%%WITH_FTS3%%%%DOCSDIR%%/README.tokenizers
+%%WITH_RTREE%%%%DOCSDIR%%/README
+%%WITH_ICU%%%%DOCSDIR%%/README.txt
+%%WITH_DOCSDIR%%@dirrm %%DOCSDIR%%
--- sqlite3-3.7.0.1.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?201008091540.o79FeajW019320>