Re: git: 566fcf268032 - main - databases/soci: Update to 4.1.2

From: Vladimir Druzenko <vvd_at_freebsd.org>
Date: Sun, 22 Mar 2026 01:45:41 UTC
Hello!

Build on live system with option SQLITE enabled only, but with 
PostrgeSQL client installed (patch in attach):

pkg-static: Unable to access file 
/tmp/work/usr/ports/databases/soci/work/stage/usr/local/lib/cmake/soci-4.1.2/SOCIFirebirdTargets-release.cmake:No 
such file or directory
pkg-static: Unable to access file 
/tmp/work/usr/ports/databases/soci/work/stage/usr/local/lib/cmake/soci-4.1.2/SOCIFirebirdTargets.cmake:No 
such file or directory
pkg-static: Unable to access file 
/tmp/work/usr/ports/databases/soci/work/stage/usr/local/lib/cmake/soci-4.1.2/SOCIMySQLTargets-release.cmake:No 
such file or directory
pkg-static: Unable to access file 
/tmp/work/usr/ports/databases/soci/work/stage/usr/local/lib/cmake/soci-4.1.2/SOCIMySQLTargets.cmake:No 
such file or directory
pkg-static: Unable to access file 
/tmp/work/usr/ports/databases/soci/work/stage/usr/local/lib/cmake/soci-4.1.2/find_package_files/FindFirebird.cmake:No 
such file or directory
pkg-static: Unable to access file 
/tmp/work/usr/ports/databases/soci/work/stage/usr/local/lib/cmake/soci-4.1.2/find_package_files/FindMySQL.cmake:No 
such file or directory

Options renamed and probably port have to use new names:

CMake Deprecation Warning at src/backends/CMakeLists.txt:40 (message):
   Use of the WITH_FIREBIRD option is deprecated - use the new SOCI_FIREBIRD
   instead


-- Could NOT find Firebird (missing: Firebird_LIBRARIES 
Firebird_INCLUDE_DIRS)
-- Disabling SOCI backend 'Firebird' due to unsatisfied dependency on 
'Firebird'
CMake Deprecation Warning at src/backends/CMakeLists.txt:40 (message):
   Use of the WITH_MYSQL option is deprecated - use the new SOCI_MYSQL 
instead


CMake Warning at cmake/find_modules/FindMySQL.cmake:101 (message):
   Falling back to manual MySQL search -> this might miss dependencies
Call Stack (most recent call first):
   cmake/soci_define_backend_target.cmake:84 (find_package)
   src/backends/mysql/CMakeLists.txt:9 (soci_define_backend_target)


-- Could NOT find MySQL (missing: MySQL_LIBRARIES MySQL_INCLUDE_DIRS) 
(found version "")
-- Disabling SOCI backend 'MySQL' due to unsatisfied dependency on 'MySQL'
CMake Deprecation Warning at src/backends/CMakeLists.txt:40 (message):
   Use of the WITH_ODBC option is deprecated - use the new SOCI_ODBC instead


-- Found ODBC: /usr/local/lib/libodbc.so
CMake Deprecation Warning at src/backends/CMakeLists.txt:40 (message):
   Use of the WITH_ORACLE option is deprecated - use the new SOCI_ORACLE
   instead


-- Could NOT find Oracle (missing: Oracle_LIBRARIES Oracle_INCLUDE_DIRS)
-- None of the supported Oracle versions (21;20;19;18;12;11;10) could be 
found, consider updating Oracle_VERSIONS if the version you use is not 
among them.
-- Disabling SOCI backend 'Oracle' due to unsatisfied dependency on 'Oracle'
CMake Deprecation Warning at src/backends/CMakeLists.txt:40 (message):
   Use of the WITH_POSTGRESQL option is deprecated - use the new
   SOCI_POSTGRESQL instead


-- Found PostgreSQL: /usr/local/lib/libpq.so (found version "18.3")
CMake Deprecation Warning at src/backends/CMakeLists.txt:40 (message):
   Use of the WITH_SQLITE3 option is deprecated - use the new SOCI_SQLITE3
   instead


22.03.2026 02:11, Joel Bodenmann пишет:
> The branch main has been updated by jbo:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=566fcf2680329e83aae1c2e51aef26656373e42e
>
> commit 566fcf2680329e83aae1c2e51aef26656373e42e
> Author:     Joel Bodenmann <jbo@FreeBSD.org>
> AuthorDate: 2026-03-20 19:32:27 +0000
> Commit:     Joel Bodenmann <jbo@FreeBSD.org>
> CommitDate: 2026-03-21 23:11:22 +0000
>
>      databases/soci: Update to 4.1.2
>      
>      Changelog: https://github.com/SOCI/soci/blob/master/RELEASING.md
> ---
>   databases/soci/Makefile                            | 15 ++---
>   databases/soci/distinfo                            |  6 +-
>   .../soci/files/patch-cmake_modules_FindMySQL.cmake | 14 -----
>   databases/soci/files/patch-tests_catch.hpp         | 11 ----
>   .../soci/files/patch-tests_common_CMakeLists.txt   | 10 ++++
>   databases/soci/files/pkg-message.in                |  8 ---
>   databases/soci/pkg-plist                           | 69 +++++++++++++---------
>   7 files changed, 60 insertions(+), 73 deletions(-)
>
> diff --git a/databases/soci/Makefile b/databases/soci/Makefile
> index 259f26f4c93c..aab0665bfab0 100644
> --- a/databases/soci/Makefile
> +++ b/databases/soci/Makefile
> @@ -1,7 +1,6 @@
>   PORTNAME=	soci
>   DISTVERSIONPREFIX=	v
> -DISTVERSION=	4.0.3
> -PORTREVISION=	13
> +DISTVERSION=	4.1.2
>   CATEGORIES=	databases
>   
>   MAINTAINER=	jbo@FreeBSD.org
> @@ -11,7 +10,7 @@ WWW=		https://soci.sourceforge.net/
>   LICENSE=	BSL
>   LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt
>   
> -USES=		cmake compiler:c++11-lang
> +USES=		cmake compiler:c++14-lang
>   
>   USE_GITHUB=	yes
>   GH_ACCOUNT=	SOCI
> @@ -20,17 +19,15 @@ USE_LDCONFIG=	yes
>   
>   CMAKE_OFF=	WITH_ORACLE
>   
> -SUB_FILES=	pkg-message
> -
>   OPTIONS_DEFINE=		BOOST FIREBIRD MYSQL ODBC PGSQL SQLITE
>   OPTIONS_DEFAULT=	BOOST FIREBIRD MYSQL ODBC PGSQL SQLITE
>   
>   # firebird is currently only available on x86.
>   OPTIONS_EXCLUDE_aarch64=	FIREBIRD
> -OPTIONS_EXCLUDE_armv6=	FIREBIRD
> -OPTIONS_EXCLUDE_armv7=	FIREBIRD
> -OPTIONS_EXCLUDE_mips=	FIREBIRD
> -OPTIONS_EXCLUDE_mips64=	FIREBIRD
> +OPTIONS_EXCLUDE_armv6=		FIREBIRD
> +OPTIONS_EXCLUDE_armv7=		FIREBIRD
> +OPTIONS_EXCLUDE_mips=		FIREBIRD
> +OPTIONS_EXCLUDE_mips64=		FIREBIRD
>   OPTIONS_EXCLUDE_powerpc=	FIREBIRD
>   OPTIONS_EXCLUDE_powerpc64=	FIREBIRD
>   OPTIONS_EXCLUDE_powerpc64le=	FIREBIRD
> diff --git a/databases/soci/distinfo b/databases/soci/distinfo
> index 89acc0debdaf..62a3ab19206c 100644
> --- a/databases/soci/distinfo
> +++ b/databases/soci/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1644601909
> -SHA256 (SOCI-soci-v4.0.3_GH0.tar.gz) = 4b1ff9c8545c5d802fbe06ee6cd2886630e5c03bf740e269bb625b45cf934928
> -SIZE (SOCI-soci-v4.0.3_GH0.tar.gz) = 508750
> +TIMESTAMP = 1773627389
> +SHA256 (SOCI-soci-v4.1.2_GH0.tar.gz) = c0974067e57242f21d9a85677c5f6cc7848fba3cbd5ec58d76c95570a5a7a15b
> +SIZE (SOCI-soci-v4.1.2_GH0.tar.gz) = 478545
> diff --git a/databases/soci/files/patch-cmake_modules_FindMySQL.cmake b/databases/soci/files/patch-cmake_modules_FindMySQL.cmake
> deleted file mode 100644
> index ed538bdaf943..000000000000
> --- a/databases/soci/files/patch-cmake_modules_FindMySQL.cmake
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -Prevent CMAKE_REQUIRED_LIBRARIES from leaking out of this module.
> -If the embedded libs are not found, we don't want to have the
> -not-found libraries required by other modules.
> -
> ---- cmake/modules/FindMySQL.cmake.orig	2013-08-21 22:40:11 UTC
> -+++ cmake/modules/FindMySQL.cmake
> -@@ -119,6 +119,7 @@ endif(MYSQL_EMBEDDED_LIBRARIES)
> - set( CMAKE_REQUIRED_INCLUDES ${MYSQL_INCLUDE_DIR} )
> - set( CMAKE_REQUIRED_LIBRARIES ${MYSQL_EMBEDDED_LIBRARIES} )
> - check_cxx_source_compiles( "#include <mysql.h>\nint main() { int i = MYSQL_OPT_USE_EMBEDDED_CONNECTION; }" HAVE_MYSQL_OPT_EMBEDDED_CONNECTION )
> -+unset( CMAKE_REQUIRED_LIBRARIES )
> -
> - if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
> -    set(MYSQL_FOUND TRUE)
> diff --git a/databases/soci/files/patch-tests_catch.hpp b/databases/soci/files/patch-tests_catch.hpp
> deleted file mode 100644
> index 97cd0e00127b..000000000000
> --- a/databases/soci/files/patch-tests_catch.hpp
> +++ /dev/null
> @@ -1,11 +0,0 @@
> ---- tests/catch.hpp.orig	2022-02-10 19:13:13 UTC
> -+++ tests/catch.hpp
> -@@ -7170,7 +7170,7 @@ namespace Catch {
> - namespace Catch {
> -
> -     struct RandomNumberGenerator {
> --        typedef std::ptrdiff_t result_type;
> -+        typedef std::size_t result_type;
> -
> -         result_type operator()( result_type n ) const { return std::rand() % n; }
> -
> diff --git a/databases/soci/files/patch-tests_common_CMakeLists.txt b/databases/soci/files/patch-tests_common_CMakeLists.txt
> new file mode 100644
> index 000000000000..0d90b2a4b2b5
> --- /dev/null
> +++ b/databases/soci/files/patch-tests_common_CMakeLists.txt
> @@ -0,0 +1,10 @@
> +--- tests/common/CMakeLists.txt.orig	2026-03-16 02:42:38 UTC
> ++++ tests/common/CMakeLists.txt
> +@@ -31,6 +31,7 @@ target_link_libraries(soci_tests_common
> +
> + target_link_libraries(soci_tests_common
> +   PUBLIC
> ++    pthread
> +     soci_compiler_interface
> +     SOCI::Core
> + )
> diff --git a/databases/soci/files/pkg-message.in b/databases/soci/files/pkg-message.in
> deleted file mode 100644
> index 362009f7d3a9..000000000000
> --- a/databases/soci/files/pkg-message.in
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -[
> -{ type: install
> -  message: <<EOM
> -If you use dynamically loaded backends, you have to set the environment variable
> -SOCI_BACKENDS_PATH to %%PREFIX%%/lib
> -EOM
> -}
> -]
> diff --git a/databases/soci/pkg-plist b/databases/soci/pkg-plist
> index f38d059e5b15..399dea57b169 100644
> --- a/databases/soci/pkg-plist
> +++ b/databases/soci/pkg-plist
> @@ -14,8 +14,11 @@ include/soci/empty/soci-empty.h
>   include/soci/error.h
>   include/soci/exchange-traits.h
>   %%FIREBIRD%%include/soci/firebird/soci-firebird.h
> +include/soci/fixed-size-ints.h
>   include/soci/into-type.h
>   include/soci/into.h
> +include/soci/is-detected.h
> +include/soci/log-context.h
>   include/soci/logger.h
>   %%MYSQL%%include/soci/mysql/soci-mysql.h
>   include/soci/noreturn.h
> @@ -33,54 +36,64 @@ include/soci/rowid-exchange.h
>   include/soci/rowid.h
>   include/soci/rowset.h
>   include/soci/session.h
> +%%SQLITE%%include/soci/sqlite3/soci-sqlite3.h
> +include/soci/transaction.h
>   include/soci/soci-backend.h
>   include/soci/soci-config.h
>   include/soci/soci-platform.h
>   include/soci/soci-simple.h
> +include/soci/soci-types.h
> +include/soci/soci-unicode.h
>   include/soci/soci.h
> -%%SQLITE%%include/soci/sqlite3/soci-sqlite3.h
>   include/soci/statement.h
> -include/soci/transaction.h
> +include/soci/std-optional.h
> +include/soci/trivial-blob-backend.h
>   include/soci/type-conversion-traits.h
>   include/soci/type-conversion.h
>   include/soci/type-holder.h
>   include/soci/type-ptr.h
>   include/soci/type-wrappers.h
> -include/soci/unsigned-types.h
>   include/soci/use-type.h
>   include/soci/use.h
>   include/soci/values-exchange.h
>   include/soci/values.h
>   include/soci/version.h
> -lib/cmake/SOCI/SOCIConfig.cmake
> -lib/cmake/SOCI/SOCIConfigVersion.cmake
> -lib/cmake/SOCI/SOCITargets-%%CMAKE_BUILD_TYPE%%.cmake
> -lib/cmake/SOCI/SOCITargets.cmake
> -lib/libsoci_core.a
> +lib/cmake/soci-4.1.2/SOCICoreTargets-%%CMAKE_BUILD_TYPE%%.cmake
> +lib/cmake/soci-4.1.2/SOCICoreTargets.cmake
> +lib/cmake/soci-4.1.2/SOCIEmptyTargets-%%CMAKE_BUILD_TYPE%%.cmake
> +lib/cmake/soci-4.1.2/SOCIEmptyTargets.cmake
> +lib/cmake/soci-4.1.2/SOCIFirebirdTargets-%%CMAKE_BUILD_TYPE%%.cmake
> +lib/cmake/soci-4.1.2/SOCIFirebirdTargets.cmake
> +lib/cmake/soci-4.1.2/SOCIMySQLTargets-%%CMAKE_BUILD_TYPE%%.cmake
> +lib/cmake/soci-4.1.2/SOCIMySQLTargets.cmake
> +lib/cmake/soci-4.1.2/SOCIODBCTargets-%%CMAKE_BUILD_TYPE%%.cmake
> +lib/cmake/soci-4.1.2/SOCIODBCTargets.cmake
> +lib/cmake/soci-4.1.2/SOCIPostgreSQLTargets-%%CMAKE_BUILD_TYPE%%.cmake
> +lib/cmake/soci-4.1.2/SOCIPostgreSQLTargets.cmake
> +lib/cmake/soci-4.1.2/SOCISQLite3Targets-%%CMAKE_BUILD_TYPE%%.cmake
> +lib/cmake/soci-4.1.2/SOCISQLite3Targets.cmake
> +lib/cmake/soci-4.1.2/find_package_files/FindFirebird.cmake
> +lib/cmake/soci-4.1.2/find_package_files/FindMySQL.cmake
> +lib/cmake/soci-4.1.2/soci-config-version.cmake
> +lib/cmake/soci-4.1.2/soci-config.cmake
>   lib/libsoci_core.so
> -lib/libsoci_core.so.4.0
> -lib/libsoci_core.so.4.0.3
> -lib/libsoci_empty.a
> +lib/libsoci_core.so.4
> +lib/libsoci_core.so.4.1.2
>   lib/libsoci_empty.so
> -lib/libsoci_empty.so.4.0
> -lib/libsoci_empty.so.4.0.3
> -%%FIREBIRD%%lib/libsoci_firebird.a
> +lib/libsoci_empty.so.4
> +lib/libsoci_empty.so.4.1.2
>   %%FIREBIRD%%lib/libsoci_firebird.so
> -%%FIREBIRD%%lib/libsoci_firebird.so.4.0
> -%%FIREBIRD%%lib/libsoci_firebird.so.4.0.3
> -%%MYSQL%%lib/libsoci_mysql.a
> +%%FIREBIRD%%lib/libsoci_firebird.so.4
> +%%FIREBIRD%%lib/libsoci_firebird.so.4.1.2
>   %%MYSQL%%lib/libsoci_mysql.so
> -%%MYSQL%%lib/libsoci_mysql.so.4.0
> -%%MYSQL%%lib/libsoci_mysql.so.4.0.3
> -%%ODBC%%lib/libsoci_odbc.a
> +%%MYSQL%%lib/libsoci_mysql.so.4
> +%%MYSQL%%lib/libsoci_mysql.so.4.1.2
>   %%ODBC%%lib/libsoci_odbc.so
> -%%ODBC%%lib/libsoci_odbc.so.4.0
> -%%ODBC%%lib/libsoci_odbc.so.4.0.3
> -%%PGSQL%%lib/libsoci_postgresql.a
> +%%ODBC%%lib/libsoci_odbc.so.4
> +%%ODBC%%lib/libsoci_odbc.so.4.1.2
>   %%PGSQL%%lib/libsoci_postgresql.so
> -%%PGSQL%%lib/libsoci_postgresql.so.4.0
> -%%PGSQL%%lib/libsoci_postgresql.so.4.0.3
> -%%SQLITE%%lib/libsoci_sqlite3.a
> +%%PGSQL%%lib/libsoci_postgresql.so.4
> +%%PGSQL%%lib/libsoci_postgresql.so.4.1.2
>   %%SQLITE%%lib/libsoci_sqlite3.so
> -%%SQLITE%%lib/libsoci_sqlite3.so.4.0
> -%%SQLITE%%lib/libsoci_sqlite3.so.4.0.3
> +%%SQLITE%%lib/libsoci_sqlite3.so.4
> +%%SQLITE%%lib/libsoci_sqlite3.so.4.1.2


-- 
Best regards,
Vladimir Druzenko