Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Mar 2021 20:33:03 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r568415 - in head/databases/sqlite3: . files
Message-ID:  <202103142033.12EKX37Y061534@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sun Mar 14 20:33:03 2021
New Revision: 568415
URL: https://svnweb.freebsd.org/changeset/ports/568415

Log:
  Add sqlite_analyzer support
  
  - Switch to more complete distfile which allows to enable
    TCL extensions and sqlite_analyzer
  - Switch to pkg-plist
  
  PR:		221735
  Reported by:	lapo@lapo.it
  Approved by:	maintainer timeout (pavelivolkov@gmail.com, 3.5 years)

Added:
  head/databases/sqlite3/pkg-plist   (contents, props changed)
Deleted:
  head/databases/sqlite3/files/
Modified:
  head/databases/sqlite3/Makefile
  head/databases/sqlite3/distinfo

Modified: head/databases/sqlite3/Makefile
==============================================================================
--- head/databases/sqlite3/Makefile	Sun Mar 14 20:26:39 2021	(r568414)
+++ head/databases/sqlite3/Makefile	Sun Mar 14 20:33:03 2021	(r568415)
@@ -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 UNLOC
 # 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,8 +255,12 @@ 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

Modified: head/databases/sqlite3/distinfo
==============================================================================
--- head/databases/sqlite3/distinfo	Sun Mar 14 20:26:39 2021	(r568414)
+++ head/databases/sqlite3/distinfo	Sun Mar 14 20:33:03 2021	(r568415)
@@ -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

Added: head/databases/sqlite3/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/sqlite3/pkg-plist	Sun Mar 14 20:33:03 2021	(r568415)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103142033.12EKX37Y061534>