* databases/Makefile

- Add sqlite3-threads port

* databases/sqlite3

- Upgrade to 3.3.13 [1]

* databases/sqlite3-threads

- Create a slave port for threads-override-locks. [2]

PR:		110446 [1], 110104 [2]
Submitted by:	Michael Scheidell <scheidell___secnap.net> [1], thierry [2]

3 files changed, 41 insertions, 22 deletions

diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index d645f4c38d01..64575979b125 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -1,18 +1,21 @@
-# ex:ts=8
-# New ports collection makefile for:	sqlite
-# Date created:			Feb 21, 2001
-# Whom:				Ying-Chieh Liao <ijliao@FreeBSD.org>
+# New ports collection makefile for:	sqlite3
+# Date created:				Feb 21, 2001
+# Whom:					Ying-Chieh Liao <ijliao@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	sqlite
-PORTVERSION=	3.3.12
+PORTNAME=	sqlite3
+PORTVERSION=	3.3.13
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sqlite.org/
+.if defined(USE_THOL)
+PKGNAMESUFFIX=	-threads
+.endif
+DISTNAME=	sqlite-${PORTVERSION}
 
 MAINTAINER=	mnag@FreeBSD.org
-COMMENT=	An SQL database engine in a C library w/ Tcl wrapper
+COMMENT?=	An SQL database engine in a C library w/ Tcl wrapper
 
 USE_GMAKE=	YES
 USE_GNOME=	pkgconfig
@@ -23,20 +26,28 @@ GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=		--prefix=${PREFIX} --with-hints=freebsd.hints
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-DOCSDIR=	${PREFIX}/share/doc/sqlite3
-EXAMPLESDIR=	${PREFIX}/share/examples/sqlite3
-
 OPTIONS=	DEBUG		"Enable debugging & verbose explain"	off \
 		DOCS		"Building docs (depends on TCL)"	on \
 		FTS1		"Enable FTS1 (Full Text Search) module"	off \
-		TCLWRAPPER	"TCL wrapper for SQLITE"		off \
-		THREADS		"Enable threads support"		off
+		TCLWRAPPER	"TCL wrapper for SQLITE"		off
 
 # Defaults, for building the docs:
 TCL_V?=		8.4
 MAKE_ARGS+=	TCLSH=tclsh${TCL_V}
 MAKE_ENV+=	TCL_VER=${TCL_V}
 
+.if !defined(USE_THOL)
+OPTIONS+=	THREADS		"Enable threads support"		off
+PLIST_SUB+=	THOL="@comment "
+CONFLICTS=	sqlite-threads-3*
+.else
+CONFIGURE_ARGS+=	--enable-threadsafe --enable-threads-override-locks
+PLIST_SUB+=	THOL=""
+CONFLICTS=	sqlite-3*
+.endif
+
+SLAVEDIRS=	databases/sqlite3-threads
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DEBUG)
@@ -69,13 +80,6 @@ CONFIGURE_ARGS+=	--enable-threadsafe
 .endif
 
 post-patch:
-.if defined(WITH_THREADS)
-	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -E -e "s|(Libs:.*)|\1 ${PTHREAD_LIBS}|" \
-		-e "s|(Cflags:.*)|\1 ${PTHREAD_CFLAGS}|" \
-		${WRKSRC}/sqlite.pc.in ${WRKSRC}/sqlite3.pc.in
-.endif
 	@${REINPLACE_CMD} -e "s|tclsh \$$(TOP)|\$$(TCLSH) \$$(TOP)|g" \
 		-e "s|./libtool|${LIBTOOL}|g" \
 		-e "s|\$${HAVE_TCL:1=tcl_install}||" \
@@ -85,6 +89,15 @@ post-patch:
 	@${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_V:S/.//}\"" \
 		>> ${WRKSRC}/freebsd.hints
 
+pre-configure:
+.if defined(WITH_THREADS) || defined(USE_THOL)
+	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -E -e "s|(Libs:.*)|\1 ${PTHREAD_LIBS}|" \
+		-e "s|(Cflags:.*)|\1 ${PTHREAD_CFLAGS}|" \
+		${WRKSRC}/sqlite.pc.in ${WRKSRC}/sqlite3.pc.in
+.endif
+
 post-install:
 .if defined(WITH_TCLWRAPPER)
 	@${MKDIR} ${PREFIX}/lib/sqlite
@@ -99,5 +112,9 @@ post-install:
 .endif
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
+.if defined(USE_THOL)
+	@${MKDIR} ${DATADIR}
+	@${TOUCH} ${DATADIR}/sqlite3_with_threads-override-locks
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/sqlite3/distinfo b/databases/sqlite3/distinfo
index e5bf1ed35ea3..523a3b9e1950 100644
--- a/databases/sqlite3/distinfo
+++ b/databases/sqlite3/distinfo
@@ -1,3 +1,3 @@
-MD5 (sqlite-3.3.12.tar.gz) = ae251cc7a4b54b80941d400ed5af01b7
-SHA256 (sqlite-3.3.12.tar.gz) = e005781cb0356f65200c05979c04fea533b9a7d873e0060672a4d384468b7186
-SIZE (sqlite-3.3.12.tar.gz) = 2021696
+MD5 (sqlite-3.3.13.tar.gz) = 6b24d9c364215fba82242a86f54e0ad1
+SHA256 (sqlite-3.3.13.tar.gz) = 930144d92e91ef7b3a7edbbe768cc539db95c06cf05cb156350f8d35bb56625c
+SIZE (sqlite-3.3.13.tar.gz) = 2054971
diff --git a/databases/sqlite3/pkg-plist b/databases/sqlite3/pkg-plist
index a5a53a4db283..56be73a19985 100644
--- a/databases/sqlite3/pkg-plist
+++ b/databases/sqlite3/pkg-plist
@@ -15,3 +15,5 @@ libdata/pkgconfig/sqlite3.pc
 %%WITH_TCLWRAPPER%%@dirrm lib/sqlite
 %%EXAMPLESDIR%%/example.tcl
 @dirrm %%EXAMPLESDIR%%
+%%THOL%%%%DATADIR%%/sqlite3_with_threads-override-locks
+%%THOL%%@dirrm %%DATADIR%%