From pol@opk.ru  Thu Dec  9 15:27:24 2010
Return-Path: <pol@opk.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D4B73106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  9 Dec 2010 15:27:24 +0000 (UTC)
	(envelope-from pol@opk.ru)
Received: from fire.iib.ru (bl-1-83.eds.ru [213.234.195.83])
	by mx1.freebsd.org (Postfix) with ESMTP id 26BF58FC21
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  9 Dec 2010 15:27:20 +0000 (UTC)
Received: from orion.iib.ru (dlp-smtp1.iib.ru [192.168.0.30])
        by fire.iib.ru (8.9/8.9) with ESMTP id oB9FQj0b076885
        for <FreeBSD-gnats-submit@freebsd.org>; Thu, 9 Dec 2010 18:26:50 +0300 (MSK)
	(envelope-from pol@opk.ru)
Received: from pol.iib.ru (pol.iib.ru [192.168.0.45])
	by orion.iib.ru (8.14.4/8.14.4) with ESMTP id oB9FQiui074321
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 9 Dec 2010 18:26:45 +0300 (MSK)
	(envelope-from pol@opk.ru)
Received: from pol.iib.ru (localhost [127.0.0.1])
	by pol.iib.ru (8.14.4/8.14.4) with ESMTP id oB9FQdEJ055372
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 9 Dec 2010 18:26:44 +0300 (MSK)
	(envelope-from pol@pol.iib.ru)
Received: (from pol@localhost)
	by pol.iib.ru (8.14.4/8.14.4/Submit) id oB9FQYSe055371;
	Thu, 9 Dec 2010 18:26:34 +0300 (MSK)
	(envelope-from pol)
Message-Id: <201012091526.oB9FQYSe055371@pol.iib.ru>
Date: Thu, 9 Dec 2010 18:26:34 +0300 (MSK)
From: Pavel I Volkov <pavelivolkov@googlemail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: databases/sqlite3: update to 3.7.4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         152961
>Category:       ports
>Synopsis:       databases/sqlite3: update to 3.7.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 09 15:30:11 UTC 2010
>Closed-Date:    Fri Dec 10 23:08:00 UTC 2010
>Last-Modified:  Fri Dec 10 23:10:47 UTC 2010
>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.4
- Added test target

Added file(s):
- files/patch-test-backup2.test

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

--- sqlite3-3.7.4.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-11-29 18:36:55.000000000 +0300
+++ /usr/ports/databases/sqlite3/Makefile	2010-12-09 17:45:08.000000000 +0300
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	sqlite3
-PORTVERSION=	3.7.3
-PORTREVISION=	1
+PORTVERSION=	3.7.4
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sqlite.org/ http://www2.sqlite.org/
-DISTNAME=	sqlite-${PORTVERSION}
+DISTNAME=	sqlite-src-3070400
 
 MAINTAINER=	pavelivolkov@googlemail.com
 COMMENT=	An SQL database engine in a C library
@@ -22,6 +21,7 @@
 
 CONFLICTS=	sqlite34-[0-9]*
 
+USE_ZIP=	YES
 USE_GMAKE=	YES
 USE_GNOME=	pkgconfig gnomehack
 USE_LDCONFIG=	YES
@@ -38,7 +38,7 @@
 
 # Compilation Options For SQLite http://www.sqlite.org/compile.html
 OPTIONS=	\
-		FTS3		"Enable FTS3 (Full Text Search) module"	on \
+		FTS3		"Enable FTS3/4 (Full Text Search) module" on \
 		ICU		"Enable built with \"ICU\""		off \
 		RTREE		"Enable R*Tree module"			off \
 		RAMTABLE	"Store temporary tables in RAM = ${RAMTABLE}" off \
@@ -80,6 +80,12 @@
 LDFLAGS+=		-fstack-protector
 .endif
 
+# This macro sets the default size of the page-cache for temporary files
+# created by SQLite to store intermediate results, in pages.
+.ifdef TEMP_CACHE_SIZE
+CFLAGS+=		-DSQLITE_DEFAULT_TEMP_CACHE_SIZE=${TEMP_CACHE_SIZE}
+.endif
+
 .if defined(WITH_MEMMAN)
 CFLAGS+=		-DSQLITE_ENABLE_MEMORY_MANAGEMENT=1
 .endif
@@ -161,12 +167,29 @@
 .include <bsd.port.pre.mk>
 
 .if ${TCL_VER} > 8.4
-BUILD_DEPENDS+=		${LOCALBASE}/lib/tcl8/8.5/msgcat-1.4.3.tm:${PORTSDIR}/lang/tcl-modules
+BUILD_DEPENDS+=		${LOCALBASE}/lib/tcl8/${TCL_VER}:${PORTSDIR}/lang/tcl-modules
 .if defined(WITH_TCLWRAPPER)
-RUN_DEPENDS+=		${LOCALBASE}/lib/tcl8/8.5/msgcat-1.4.3.tm:${PORTSDIR}/lang/tcl-modules
+RUN_DEPENDS+=		${LOCALBASE}/lib/tcl8/${TCL_VER}:${PORTSDIR}/lang/tcl-modules
 .endif
 .endif
 
+# To test you must specify the value of TESTUSER variable.
+# It must correspond to a normal (not root) user, from which it will be tested.
+# Execute: make TESTUSER=ordinary_user_login_name test
+.ifmake test
+.ifndef TESTUSER
+IGNORE=	set the value of the variable TESTUSER corresponding normal (not root) user, from which will be tested
+.endif
+.endif
+
+test: build
+	@(cd ${WRKSRC} && ${CHOWN} ${TESTUSER} ${WRKSRC} && su ${TESTUSER} -c "${MAKE} test"; ${CHOWN} ${USER} ${WRKSRC})
+
+post-build:
+	@${ECHO_CMD}
+	@${ECHO_CMD} "You can test sqlite using supplied with the him tests."
+	@${ECHO_CMD} "Execute: make TESTUSER=ordinary_user_login_name test"
+
 post-install:
 .if defined(WITH_TCLWRAPPER)
 	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin
diff -ruN --exclude=CVS /usr/ports/databases/sqlite3.orig/distinfo /usr/ports/databases/sqlite3/distinfo
--- /usr/ports/databases/sqlite3.orig/distinfo	2010-11-08 12:17:53.000000000 +0300
+++ /usr/ports/databases/sqlite3/distinfo	2010-12-08 10:57:05.000000000 +0300
@@ -1,3 +1,2 @@
-MD5 (sqlite-3.7.3.tar.gz) = 5437978aae90350cf984993091e0d695
-SHA256 (sqlite-3.7.3.tar.gz) = dbf352e8fbb74829f5e7a88f9f6ceeb80a709537f668c36e4b6cdfb271309ef6
-SIZE (sqlite-3.7.3.tar.gz) = 3410714
+SHA256 (sqlite-src-3070400.zip) = e7540069fad017a9dec374241b346570ce6c360e2960749ddcacac81f965c9b4
+SIZE (sqlite-src-3070400.zip) = 3997962
diff -ruN --exclude=CVS /usr/ports/databases/sqlite3.orig/files/patch-test-backup2.test /usr/ports/databases/sqlite3/files/patch-test-backup2.test
--- /usr/ports/databases/sqlite3.orig/files/patch-test-backup2.test	1970-01-01 03:00:00.000000000 +0300
+++ /usr/ports/databases/sqlite3/files/patch-test-backup2.test	2010-12-09 13:46:49.000000000 +0300
@@ -0,0 +1,11 @@
+--- test/backup2.test.orig	2010-12-09 13:44:49.000000000 +0300
++++ test/backup2.test	2010-12-09 13:45:39.000000000 +0300
+@@ -155,7 +155,7 @@
+     file mkdir bu3.db
+     set rc [catch {db restore temp bu3.db} res]
+     lappend rc $res
+-  } {1 {cannot open source database: disk I/O error}}
++  } {1 {restore failed: file is encrypted or is not a database}}
+ }
+ 
+ # Try to restore from something that is not a database file.
--- sqlite3-3.7.4.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Fri Dec 10 03:18:37 UTC 2010 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152961 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Fri Dec 10 23:07:59 UTC 2010 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152961 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/152961: commit references a PR
Date: Fri, 10 Dec 2010 23:07:59 +0000 (UTC)

 pgollucci    2010-12-10 23:07:55 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/sqlite3    Makefile distinfo 
   Added files:
     databases/sqlite3/files patch-test-backup2.test 
   Log:
   - Update to 3.7.4
   
   PR:             ports/152961
   Submitted by:   Pavel I Volkov <pavelivolkov@googlemail.com> (maintainer)
   
   Revision  Changes    Path
   1.52      +29 -6     ports/databases/sqlite3/Makefile
   1.32      +2 -3      ports/databases/sqlite3/distinfo
   1.1       +11 -0     ports/databases/sqlite3/files/patch-test-backup2.test (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
