diff --git a/databases/soci/Makefile b/databases/soci/Makefile index 259f26f4c93c..aab0665bfab0 100644 --- a/databases/soci/Makefile +++ b/databases/soci/Makefile @@ -1,61 +1,58 @@ PORTNAME= soci DISTVERSIONPREFIX= v -DISTVERSION= 4.0.3 -PORTREVISION= 13 +DISTVERSION= 4.1.2 CATEGORIES= databases MAINTAINER= jbo@FreeBSD.org COMMENT= C++ Database Access Library 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 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 OPTIONS_EXCLUDE_riscv64= FIREBIRD OPTIONS_SUB= yes BOOST_DESC= Enable support for additional types using Boost BOOST_LIB_DEPENDS= libboost_date_time.so:devel/boost-libs BOOST_CMAKE_BOOL= WITH_BOOST FIREBIRD_USES= firebird FIREBIRD_CMAKE_BOOL= WITH_FIREBIRD MYSQL_USES= mysql MYSQL_CMAKE_BOOL= WITH_MYSQL ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC ODBC_CMAKE_BOOL= WITH_ODBC ODBC_CMAKE_ON= -DODBC_LIBRARY:FILE_PATH=${LOCALBASE}/lib/libodbc.so PGSQL_USES= pgsql PGSQL_CMAKE_BOOL= WITH_POSTGRESQL SQLITE_USES= sqlite SQLITE_CMAKE_BOOL= WITH_SQLITE3 .include 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 \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: <