4 files changed, 32 insertions, 25 deletions

diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index 65b52a30999c..05e91f6b90e4 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -6,29 +6,32 @@ DISTVERSION=	3.34.1
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://www.sqlite.org/2021/ https://www2.sqlite.org/2021/ https://www3.sqlite.org/2021/
-DISTNAME=	sqlite-autoconf-${PORTVERSION:C/\.([[:digit:]])[[:>:]]/0\1/g:S/.//g}00
+DISTNAME=	sqlite-src-${PORTVERSION:C/\.([[:digit:]])[[:>:]]/0\1/g:S/.//g}00
 
 MAINTAINER=	pavelivolkov@gmail.com
 COMMENT=	SQL database engine in a C library
 
 LICENSE=	PD
 
-USES=		libtool pathfix
+USES=		libtool pathfix zip
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
-INSTALL_TARGET=	install-strip
+ALL_TARGET=	all
+CONFIGURE_ENV=	TCLSH_CMD="${TCLSH}"
+PLIST_SUB=	TCL_VER="${TCL_VER}"
 
 # Compilation Options For SQLite https://www.sqlite.org/compile.html
 OPTIONS_DEFINE=		FTS4 URI URI_AUTHORITY METADATA \
 			DIRECT_READ MEMMAN SECURE_DELETE UNLOCK_NOTIFY THREADS \
 			EXTENSION ARMOR STMT DBPAGE DBSTAT FTS5 RBU NULL_TRIM \
 			LIKENOTBLOB STSHELL FTS3_TOKEN UNKNOWN_SQL SORT_REF \
-			NORMALIZE DQS TRUSTED_SCHEMA
+			NORMALIZE DQS TRUSTED_SCHEMA TCL
 OPTIONS_SINGLE=		RAMT
 OPTIONS_RADIO=		STAT RL
 OPTIONS_GROUP=		OPT_EXT OPT_FUNC UNICODE RTREEG
+OPTIONS_SUB=		yes
 
 OPTIONS_GROUP_OPT_EXT=	JSON1 SESSION
 OPTIONS_GROUP_OPT_FUNC=	OFFSET SER1 SOUNDEX
@@ -46,6 +49,7 @@ UNLOCK_NOTIFY_DESC=	Enable notification on unlocking
 EXTENSION_DESC=		Allow loadable extensions
 STSHELL_DESC=		Statically link libsqlite3 into shell
 NORMALIZE_DESC=		Enable normalized sql function
+TCL_DESC=		Enable tcl extension and sqlite_analyzer
 
 # https://www.sqlite.org/compile.html#dqs
 DQS_DESC=		Double-quoted String Literals
@@ -142,11 +146,6 @@ OPTIONS_DEFAULT=	FTS4 URI METADATA SECURE_DELETE UNLOCK_NOTIFY THREADS \
 # FTS5 used by sysutils/tracker
 # JSON1 used by net-im/py-matrix-synapse
 
-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.
@@ -229,6 +228,11 @@ NORMALIZE_CPPFLAGS=	-DSQLITE_ENABLE_NORMALIZE=1
 DQS_CPPFLAGS=	-DSQLITE_DQS=3
 DQS_CPPFLAGS_OFF=	-DSQLITE_DQS=0
 
+TCL_CONFIGURE_ENABLE=	tcl
+TCL_ALL_TARGET=		sqlite3_analyzer
+TCL_USES=		tcl
+TCL_USES_OFF=		tcl:build
+
 .include <bsd.port.options.mk>
 
 # Platform Configuration
@@ -251,9 +255,13 @@ post-stage:
 	${SETENV} LD_LIBMAP_DISABLE=1 ldd -a "${STAGEDIR}${PREFIX}/bin/${PORTNAME}"
 
 post-install:
+	${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${STAGEDIR}${PREFIX}/man/man1
 	${RM} ${STAGEDIR}${PREFIX}/include/msvc.h
 	${SETENV} LD_LIBMAP_DISABLE=1 ldd -a "${STAGEDIR}${PREFIX}/bin/${PORTNAME}" "${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so"
 
+post-install-TCL-on:
+	${INSTALL_PROGRAM} ${WRKSRC}/sqlite3_analyzer ${STAGEDIR}${PREFIX}/bin
+
 # for compares with checksum from of the site
 sha1: checksum
 .if defined(SHA1) && !empty(SHA1)
diff --git a/databases/sqlite3/distinfo b/databases/sqlite3/distinfo
index 0da7287dd694..66638235612a 100644
--- a/databases/sqlite3/distinfo
+++ b/databases/sqlite3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611464266
-SHA256 (sqlite-autoconf-3340100.tar.gz) = 2a3bca581117b3b88e5361d0ef3803ba6d8da604b1c1a47d902ef785c1b53e89
-SIZE (sqlite-autoconf-3340100.tar.gz) = 2930089
+TIMESTAMP = 1613478280
+SHA256 (sqlite-src-3340100.zip) = dddd237996b096dee8b37146c7a37a626a80306d6695103d2ec16ee3b852ff49
+SIZE (sqlite-src-3340100.zip) = 12623711
diff --git a/databases/sqlite3/files/patch-configure b/databases/sqlite3/files/patch-configure
deleted file mode 100644
index 1a1adae0f0dd..000000000000
--- a/databases/sqlite3/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	2020-12-11 13:58:21 UTC
-+++ configure
-@@ -13335,7 +13335,9 @@ else
-   enable_threadsafe=yes
- fi
- 
--if test x"$enable_threadsafe" != "xno"; then
-+if test x"$enable_threadsafe" == "xno"; then
-+  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_THREADSAFE=0"
-+else
-   BUILD_CFLAGS="$BUILD_CFLAGS -D_REENTRANT=1 -DSQLITE_THREADSAFE=1"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5
- $as_echo_n "checking for library containing pthread_create... " >&6; }
diff --git a/databases/sqlite3/pkg-plist b/databases/sqlite3/pkg-plist
new file mode 100644
index 000000000000..82438018ddb6
--- /dev/null
+++ b/databases/sqlite3/pkg-plist
@@ -0,0 +1,12 @@
+bin/sqlite3
+%%TCL%%bin/sqlite3_analyzer
+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
+%%TCL%%lib/tcl%%TCL_VER%%/sqlite3/libtclsqlite3.so
+%%TCL%%lib/tcl%%TCL_VER%%/sqlite3/pkgIndex.tcl