Attachment 226342 Details for Bug 256646 – patch databases/sqlite3

[patch] patch databases/sqlite3

sqlite3-20210710.diff (text/plain), 5.44 KB, created by Pavel Volkov on 2021-07-10 12:31:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Volkov

Created: 2021-07-10 12:31:59 UTC

Size: 5.44 KB

patch

obsolete

>diff -urNd databases/sqlite3.orig/Makefile databases/sqlite3/Makefile
>--- databases/sqlite3.orig/Makefile	2021-07-08 11:35:08.047092000 +0300
>+++ databases/sqlite3/Makefile	2021-07-10 14:32:00.363500000 +0300
>@@ -2,10 +2,13 @@
> 
> PORTNAME=	sqlite3
> DISTVERSION=	3.35.5
>-PORTREVISION=	3
>+PORTREVISION=	4
> PORTEPOCH=	1
> CATEGORIES=	databases
> MASTER_SITES=	https://www.sqlite.org/${%Y:L:gmtime}/ https://www2.sqlite.org/${%Y:L:gmtime}/ https://www3.sqlite.org/${%Y:L:gmtime}/
>+.if defined(TEA)
>+PKGNAMEPREFIX=	tcl-
>+.endif
> DISTNAME=	sqlite-src-${PORTVERSION:C/\.([[:digit:]])[[:>:]]/0\1/g:S/.//g}00
> 
> MAINTAINER=	pavelivolkov@gmail.com
>@@ -16,22 +19,35 @@
> .if ${FLAVOR:U} == tcl
> COMMENT+=	(TCL flavor)
> .endif
>+.if defined(TEA)
>+COMMENT=	SQLite extension for Tcl using the Tcl Extension Architecture (TEA)
>+.endif
> 
> LICENSE=	PD
> 
>+.if !defined(TEA)
> FLAVORS=	default icu tcl
> FLAVOR?=	${FLAVORS:[1]}
>+default_CONFLICTS_INSTALL=	${PORTNAME}-icu ${PORTNAME}-tcl
> icu_PKGNAMESUFFIX=	-${FLAVOR}	# databases/p5-DBD-SQLite with ICU support
> icu_CONFLICTS_INSTALL=	${PORTNAME} ${PORTNAME}-tcl
> tcl_PKGNAMESUFFIX=	-${FLAVOR}	# lang/tcl* support
> tcl_CONFLICTS_INSTALL=	${PORTNAME} ${PORTNAME}-icu
>+.endif
> 
> USES=	libtool pathfix zip
>+.if defined(TEA)
>+USES+=	sqlite
>+.endif
> USE_LDCONFIG=	yes
> 
> GNU_CONFIGURE=	yes
> 
> MAKE_JOBS_UNSAFE=	yes
>+
>+.if defined(TEA)
>+INSTALL_TARGET=	tcl_install
>+.endif
> TEST_TARGET=	test
> 
> # The default numeric file permissions for newly created database files under unix.
>@@ -41,16 +57,35 @@
> CPPFLAGS+=	-DSQLITE_DEFAULT_FILE_PERMISSIONS=${DEFAULT_FILE_PERMISSIONS}
> .endif
> 
>+.if defined(TEA)
>+CONFLICTS_INSTALL=	${PORTNAME}-tcl
>+.endif
>+
> SUB_FILES=	example.tcl
> SUB_LIST=	TCLSH_CMD="${TCLSH}"
> 
>+.if defined(TEA)
>+DESCR=	${MASTERDIR}/pkg-descr-tea
>+.endif
>+
> PLIST_SUB=	TCLVER=tcl${TCL_VER} TCLSUF=tcl${TCL_VER:S/.//g}
> 
>+.if defined(TEA)
>+SUB_LIST+=	TEA="" NO_TEA="@comment "
>+PLIST_SUB+=	TEA="" NO_TEA="@comment "
>+.else
>+SUB_LIST+=	TEA="@comment " NO_TEA=""
>+PLIST_SUB+=	TEA="@comment " NO_TEA=""
>+.endif
>+
> # Compilation Options For SQLite https://www.sqlite.org/compile.html
>-OPTIONS_DEFINE=		ARMOR DBPAGE DBSTAT DIRECT_READ DQS EXAMPLES EXTENSION FTS3_TOKEN \
>+OPTIONS_DEFINE=		EXAMPLES STRIP TCL THREADS
>+.if !defined(TEA)
>+OPTIONS_DEFINE+=	ARMOR DBPAGE DBSTAT DIRECT_READ DQS EXTENSION FTS3_TOKEN \
> 			FTS4 FTS5 LIKENOTBLOB MEMMAN METADATA NORMALIZE NULL_TRIM RBU SECURE_DELETE \
>-			SORT_REF STATIC STMT STRIP TCL THREADS TRUSTED_SCHEMA UNKNOWN_SQL UNLOCK_NOTIFY \
>+			SORT_REF STATIC STMT TRUSTED_SCHEMA UNKNOWN_SQL UNLOCK_NOTIFY \
> 			UPDATE_LIMIT URI URI_AUTHORITY
>+.endif
> OPTIONS_DEFAULT=	DBPAGE DBSTAT DQS EXTENSION FTS3_TOKEN FTS4 FTS5 JSON1 LIBEDIT METADATA \
> 			RTREE SECURE_DELETE STRIP THREADS TS1 UNICODE61 UNLOCK_NOTIFY URI
> # SECURE_DELETE, UNLOCK_NOTIFY, DBSTAT (since 41.0) used by www/firefox et al.
>@@ -60,21 +95,27 @@
> # JSON1 used by net-im/py-matrix-synapse
> # DBPAGE used by audio/audacity (since 3.0.0)
> #
>+.if !defined(TEA)
> OPTIONS_GROUP=		OPT_EXT OPT_FUNC RTREEG UNICODE
>+.endif
> OPTIONS_GROUP_OPT_EXT=	JSON1 SESSION
> OPTIONS_GROUP_OPT_FUNC=	OFFSET SER1 SOUNDEX
> OPTIONS_GROUP_RTREEG=	GEOPOLY RTREE RTREE_INT
> OPTIONS_GROUP_UNICODE=	ICU UNICODE61
>+.if !defined(TEA)
> OPTIONS_RADIO=		STAT RL
>+.endif
> OPTIONS_RADIO_RL=	LIBEDIT READLINE
> OPTIONS_RADIO_STAT=	STAT3 STAT4
>+.if !defined(TEA)
> OPTIONS_SINGLE=		RAMT
>+.endif
> OPTIONS_SINGLE_RAMT=	TS0 TS1 TS2 TS3
> .if ${FLAVOR:U} == icu
> OPTIONS_EXCLUDE=	UNICODE61
> OPTIONS_SLAVE=		ICU
> .endif
>-.if ${FLAVOR:U} == tcl
>+.if ${FLAVOR:U} == tcl || defined(TEA)
> OPTIONS_SLAVE=		TCL
> .endif
> OPTIONS_SUB=		yes
>@@ -221,12 +262,18 @@
> 	@${ECHO_MSG} "===> LIBS=${LIBS}"
> 
> post-install:
>+.if !defined(TEA)
> 	${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"
>+.else
>+	${RM} ${STAGEDIR}${PREFIX}/lib/libsqlite3.so.0.8.6 ${STAGEDIR}${PREFIX}/lib/libsqlite3.a
>+.endif
> 
> post-install-STRIP-on:
>+.if !defined(TEA)
> 	${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/${PORTNAME}" "${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so"
>+.endif
> .if ${PORT_OPTIONS:MTCL}
> 	${STRIP_CMD} "${STAGEDIR}${PREFIX}/lib/tcl${TCL_VER}/${PORTNAME}/libtcl${PORTNAME}.so"
> .endif
>diff -urNd databases/sqlite3.orig/pkg-descr-tea databases/sqlite3/pkg-descr-tea
>--- databases/sqlite3.orig/pkg-descr-tea	1970-01-01 03:00:00.000000000 +0300
>+++ databases/sqlite3/pkg-descr-tea	2021-07-08 11:35:36.591442000 +0300
>@@ -0,0 +1,4 @@
>+This is the SQLite extension for Tcl using the Tcl Extension
>+Architecture (TEA).
>+
>+WWW: https://www.sqlite.org/
>diff -urNd databases/sqlite3.orig/pkg-plist databases/sqlite3/pkg-plist
>--- databases/sqlite3.orig/pkg-plist	2021-07-08 11:35:08.047277000 +0300
>+++ databases/sqlite3/pkg-plist	2021-07-08 18:46:01.251279000 +0300
>@@ -1,13 +1,13 @@
>-bin/sqlite3
>+%%NO_TEA%%bin/sqlite3
> %%TCL%%bin/sqlite3_analyzer
>-include/sqlite3.h
>-include/sqlite3ext.h
>-%%STATIC%%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
>+%%NO_TEA%%include/sqlite3.h
>+%%NO_TEA%%include/sqlite3ext.h
>+%%NO_TEA%%%%STATIC%%lib/libsqlite3.a
>+%%NO_TEA%%lib/libsqlite3.so
>+%%NO_TEA%%lib/libsqlite3.so.0
>+%%NO_TEA%%lib/libsqlite3.so.0.8.6
>+%%NO_TEA%%libdata/pkgconfig/sqlite3.pc
>+%%NO_TEA%%man/man1/sqlite3.1.gz
> %%TCL%%man/mann/sqlite3.%%TCLSUF%%.n.gz
> %%TCL%%lib/%%TCLVER%%/sqlite3/libtclsqlite3.so
> %%TCL%%lib/%%TCLVER%%/sqlite3/pkgIndex.tcl

Flags:

pavelivolkov: maintainer-approval+

Actions: View | Diff

Attachments on bug 256646: 225963 | 226342 | 226343 | 226344 | 226345 | 226346 | 226347