Date: Mon, 23 Feb 2026 00:14:37 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0ddb96793365 - main - databases/sqlcipher: Fix consumers Message-ID: <699b9bed.3ba4a.e93ec95@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ddb9679336517939e465eaa4798408656ba6322 commit 0ddb9679336517939e465eaa4798408656ba6322 Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2026-02-23 00:09:02 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-02-23 00:09:02 +0000 databases/sqlcipher: Fix consumers Rename installed files from *sqlite3* back to *sqlcipher*. Unbreak consumers: - finance/kmymoney - finance/skrooge - net-im/gurk-rs - net-im/qTox - net-p2p/retroshare - databases/py-sqlcipher3 While here improve port: - Use USES=localbase instead of CFLAGS+=-I${LOCALBASE}/include and LDFLAGS+=-L${LOCALBASE}/lib. - Split long lines. - Fix warnings from portclippy. - Sort CONFIGURE_ARGS and CPPFLAGS. PR: 292688 Approved by: portmgr (blanket - fix consumers) Fixes: 06c78b76ff27 (Update to 4.13.0) --- databases/sqlcipher/Makefile | 39 ++++++++++++++++------ .../files/patch-autosetup_sqlite-config.tcl | 17 ++++++++++ databases/sqlcipher/pkg-plist | 18 +++++----- 3 files changed, 54 insertions(+), 20 deletions(-) diff --git a/databases/sqlcipher/Makefile b/databases/sqlcipher/Makefile index e7fb8b9280a1..dbb403601fb7 100644 --- a/databases/sqlcipher/Makefile +++ b/databases/sqlcipher/Makefile @@ -10,25 +10,42 @@ WWW= https://www.zetetic.net/sqlcipher/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md -USES= cpe libedit libtool ssl tcl:86,build +USES= cpe libedit libtool localbase:ldflags ssl tcl:86,build CPE_VENDOR= zetetic -USE_LDCONFIG= yes USE_GITHUB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-tempstore=yes --disable-tcl --disable-readline --soname=legacy -CPPFLAGS+= -DSQLITE_HAS_CODEC -DSQLITE_ENABLE_UNLOCK_NOTIFY \ - -DOMIT_MEMLOCK -DSQLITE_ENABLE_COLUMN_METADATA=1 \ - -DSQLITE_EXTRA_INIT=sqlcipher_extra_init \ - -DSQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown -LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} -lcrypto -CFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} - -CONFLICTS_INSTALL= sqlite3 +CONFIGURE_ARGS= --disable-readline \ + --disable-tcl \ + --dll-basename=libsqlcipher \ + --includedir=${PREFIX}/include/sqlcipher \ + --soname=libsqlcipher.so.0 \ + --with-tempstore=yes TEST_TARGET= test # tests fail to run, see https://github.com/sqlcipher/sqlcipher/issues/527 +CFLAGS+= -I${OPENSSLINC} +CPPFLAGS+= -DOMIT_MEMLOCK \ + -DSQLITE_ENABLE_COLUMN_METADATA=1 \ + -DSQLITE_ENABLE_UNLOCK_NOTIFY \ + -DSQLITE_EXTRA_INIT=sqlcipher_extra_init \ + -DSQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown \ + -DSQLITE_HAS_CODEC +LDFLAGS+= -L${OPENSSLLIB} -lcrypto + post-install: + ${MV} ${STAGEDIR}${PREFIX}/bin/sqlite3 \ + ${STAGEDIR}${PREFIX}/bin/sqlcipher + ${MV} ${STAGEDIR}${PREFIX}/lib/libsqlite3.a \ + ${STAGEDIR}${PREFIX}/lib/libsqlcipher.a + ${MV} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/sqlite3.pc \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/sqlcipher.pc + ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/sqlite3.1 \ + ${STAGEDIR}${PREFIX}/share/man/man1/sqlcipher.1 + ${REINPLACE_CMD} -i "" -e 's|sqlite3|sqlcipher|g; \ + s|/usr/local/include|$${prefix}/include|g' \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/sqlcipher.pc @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so ${STAGEDIR}${PREFIX}/bin/* .include <bsd.port.mk> diff --git a/databases/sqlcipher/files/patch-autosetup_sqlite-config.tcl b/databases/sqlcipher/files/patch-autosetup_sqlite-config.tcl new file mode 100644 index 000000000000..22ec9bf2a057 --- /dev/null +++ b/databases/sqlcipher/files/patch-autosetup_sqlite-config.tcl @@ -0,0 +1,17 @@ +--- autosetup/sqlite-config.tcl.orig 2026-01-19 17:01:34 UTC ++++ autosetup/sqlite-config.tcl +@@ -884,12 +884,11 @@ proc sqlite-handle-soname {} { + none - "" { return 0 } + legacy { set soname libsqlite3.so.0 } + default { +- if {[string match libsqlite3.* $soname]} { +- # use it as-is +- } else { ++ if {[string match {[0-9]*} $soname]} { + # Assume it's a suffix + set soname "libsqlite3.so.${soname}" + } ++ # else use it as-is + } + } + proc-debug "soname=$soname" diff --git a/databases/sqlcipher/pkg-plist b/databases/sqlcipher/pkg-plist index f823c17abf48..a0125345276e 100644 --- a/databases/sqlcipher/pkg-plist +++ b/databases/sqlcipher/pkg-plist @@ -1,9 +1,9 @@ -bin/sqlite3 -include/sqlite3.h -include/sqlite3ext.h -lib/libsqlite3.a -lib/libsqlite3.so -lib/libsqlite3.so.0 -lib/libsqlite3.so.3.51.2 -libdata/pkgconfig/sqlite3.pc -share/man/man1/sqlite3.1.gz +bin/sqlcipher +include/sqlcipher/sqlite3.h +include/sqlcipher/sqlite3ext.h +lib/libsqlcipher.a +lib/libsqlcipher.so +lib/libsqlcipher.so.0 +lib/libsqlcipher.so.3.51.2 +libdata/pkgconfig/sqlcipher.pc +share/man/man1/sqlcipher.1.gzhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?699b9bed.3ba4a.e93ec95>