Date: Wed, 12 Apr 2023 22:29:43 GMT From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2f35240f67b5 - main - devel/cmake: update to 3.26.1, latest upstream Message-ID: <202304122229.33CMTh3A078247@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f35240f67b54feb5c212d35cae3b80d24bf52ff commit 2f35240f67b54feb5c212d35cae3b80d24bf52ff Author: Adriaan de Groot <adridg@FreeBSD.org> AuthorDate: 2023-03-16 21:21:10 +0000 Commit: Adriaan de Groot <adridg@FreeBSD.org> CommitDate: 2023-04-12 22:27:28 +0000 devel/cmake: update to 3.26.1, latest upstream See release notes at https://cmake.org/cmake/help/v3.26/release/3.26.html Some "while we're at it" changes: - remove obsolete patch, reported by: diizzy (PR 270337) - set LOCALSTATEDIR to /var (PR 267748) Thanks antoine@ for the exp-run. PR: 270491 270337 267748 --- Mk/Uses/cmake.mk | 2 +- devel/cmake-core/distinfo | 6 +++--- .../files/patch-Modules_GNUInstallDirs.cmake | 15 +++++++++++++++ .../files/patch-Utilities_cmcurl_lib_url.c | 13 ------------- devel/cmake-core/pkg-plist | 21 +++++++++++++++++++++ devel/cmake-man/pkg-plist | 1 + devel/cmake-modules-webos/distinfo | 1 + 7 files changed, 42 insertions(+), 17 deletions(-) diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk index d2063468fea0..784e67bfaf50 100644 --- a/Mk/Uses/cmake.mk +++ b/Mk/Uses/cmake.mk @@ -50,7 +50,7 @@ _INCLUDE_USES_CMAKE_MK= yes _valid_ARGS= insource run noninja testing _internal -_CMAKE_VERSION= 3.25.1 +_CMAKE_VERSION= 3.26.1 # Sanity check . for arg in ${cmake_ARGS} diff --git a/devel/cmake-core/distinfo b/devel/cmake-core/distinfo index 31e39a49030c..a49c428c1fcd 100644 --- a/devel/cmake-core/distinfo +++ b/devel/cmake-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672089061 -SHA256 (cmake-3.25.1.tar.gz) = 1c511d09516af493694ed9baf13c55947a36389674d657a2d5e0ccedc6b291d8 -SIZE (cmake-3.25.1.tar.gz) = 10561054 +TIMESTAMP = 1679872416 +SHA256 (cmake-3.26.1.tar.gz) = f29964290ad3ced782a1e58ca9fda394a82406a647e24d6afd4e6c32e42c412f +SIZE (cmake-3.26.1.tar.gz) = 10667838 diff --git a/devel/cmake-core/files/patch-Modules_GNUInstallDirs.cmake b/devel/cmake-core/files/patch-Modules_GNUInstallDirs.cmake new file mode 100644 index 000000000000..b935d2cd3855 --- /dev/null +++ b/devel/cmake-core/files/patch-Modules_GNUInstallDirs.cmake @@ -0,0 +1,15 @@ +--- Modules/GNUInstallDirs.cmake.orig 2023-03-27 21:42:13 UTC ++++ Modules/GNUInstallDirs.cmake +@@ -408,6 +408,12 @@ macro(GNUInstallDirs_get_absolute_install_dir absvar v + else() + set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}") + endif() ++ elseif(CMAKE_SYSTEM_NAME MATCHES "^FreeBSD$") ++ if("${GGAID_dir}" STREQUAL "LOCALSTATEDIR") ++ set(${absvar} "/${${var}}") ++ else() ++ set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}") ++ endif() + else() + set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}") + endif() diff --git a/devel/cmake-core/files/patch-Utilities_cmcurl_lib_url.c b/devel/cmake-core/files/patch-Utilities_cmcurl_lib_url.c deleted file mode 100644 index bfb9c287ed71..000000000000 --- a/devel/cmake-core/files/patch-Utilities_cmcurl_lib_url.c +++ /dev/null @@ -1,13 +0,0 @@ ---- Utilities/cmcurl/lib/url.c.orig 2022-08-04 13:53:57 UTC -+++ Utilities/cmcurl/lib/url.c -@@ -626,6 +626,10 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) - CURL_HTTP_VERSION_1_1 - #endif - ; -+#if defined(__FreeBSD_version) -+ /* different handling of signals and threads */ -+ set->no_signal = TRUE; -+#endif - Curl_http2_init_userset(set); - return result; - } diff --git a/devel/cmake-core/pkg-plist b/devel/cmake-core/pkg-plist index 5834a007fb34..6803fa47fef9 100644 --- a/devel/cmake-core/pkg-plist +++ b/devel/cmake-core/pkg-plist @@ -7,8 +7,10 @@ bin/ctest %%DATADIR%%/Help/command/FIND_XXX_ORDER.txt %%DATADIR%%/Help/command/FIND_XXX_REGISTRY_VIEW.txt %%DATADIR%%/Help/command/FIND_XXX_ROOT.txt +%%DATADIR%%/Help/command/GENEX_NOTE.txt %%DATADIR%%/Help/command/LINK_OPTIONS_LINKER.txt %%DATADIR%%/Help/command/OPTIONS_SHELL.txt +%%DATADIR%%/Help/command/SUPPORTED_LANGUAGES.txt %%DATADIR%%/Help/command/add_compile_definitions.rst %%DATADIR%%/Help/command/add_compile_options.rst %%DATADIR%%/Help/command/add_custom_command.rst @@ -177,6 +179,7 @@ bin/ctest %%DATADIR%%/Help/envvar/CMAKE_TOOLCHAIN_FILE.rst %%DATADIR%%/Help/envvar/CSFLAGS.rst %%DATADIR%%/Help/envvar/CTEST_INTERACTIVE_DEBUG_MODE.rst +%%DATADIR%%/Help/envvar/CTEST_NO_TESTS_ACTION.rst %%DATADIR%%/Help/envvar/CTEST_OUTPUT_ON_FAILURE.rst %%DATADIR%%/Help/envvar/CTEST_PARALLEL_LEVEL.rst %%DATADIR%%/Help/envvar/CTEST_PROGRESS_OUTPUT.rst @@ -250,6 +253,7 @@ bin/ctest %%DATADIR%%/Help/manual/cmake-buildsystem.7.rst %%DATADIR%%/Help/manual/cmake-commands.7.rst %%DATADIR%%/Help/manual/cmake-compile-features.7.rst +%%DATADIR%%/Help/manual/cmake-configure-log.7.rst %%DATADIR%%/Help/manual/cmake-developer.7.rst %%DATADIR%%/Help/manual/cmake-env-variables.7.rst %%DATADIR%%/Help/manual/cmake-file-api.7.rst @@ -683,6 +687,7 @@ bin/ctest %%DATADIR%%/Help/policy/CMP0140.rst %%DATADIR%%/Help/policy/CMP0141.rst %%DATADIR%%/Help/policy/CMP0142.rst +%%DATADIR%%/Help/policy/CMP0143.rst %%DATADIR%%/Help/policy/DEPRECATED.txt %%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt %%DATADIR%%/Help/prop_cache/ADVANCED.rst @@ -781,6 +786,7 @@ bin/ctest %%DATADIR%%/Help/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst %%DATADIR%%/Help/prop_sf/COMPILE_FLAGS.rst %%DATADIR%%/Help/prop_sf/COMPILE_OPTIONS.rst +%%DATADIR%%/Help/prop_sf/CXX_SCAN_FOR_MODULES.rst %%DATADIR%%/Help/prop_sf/EXTERNAL_OBJECT.rst %%DATADIR%%/Help/prop_sf/Fortran_FORMAT.rst %%DATADIR%%/Help/prop_sf/Fortran_PREPROCESS.rst @@ -941,6 +947,7 @@ bin/ctest %%DATADIR%%/Help/prop_tgt/CXX_MODULE_SET.rst %%DATADIR%%/Help/prop_tgt/CXX_MODULE_SETS.rst %%DATADIR%%/Help/prop_tgt/CXX_MODULE_SET_NAME.rst +%%DATADIR%%/Help/prop_tgt/CXX_SCAN_FOR_MODULES.rst %%DATADIR%%/Help/prop_tgt/CXX_STANDARD.rst %%DATADIR%%/Help/prop_tgt/CXX_STANDARD_REQUIRED.rst %%DATADIR%%/Help/prop_tgt/C_EXTENSIONS.rst @@ -1051,6 +1058,7 @@ bin/ctest %%DATADIR%%/Help/prop_tgt/JOB_POOL_PRECOMPILE_HEADER.rst %%DATADIR%%/Help/prop_tgt/LABELS.rst %%DATADIR%%/Help/prop_tgt/LANG_CLANG_TIDY.rst +%%DATADIR%%/Help/prop_tgt/LANG_CLANG_TIDY_EXPORT_FIXES_DIR.rst %%DATADIR%%/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst %%DATADIR%%/Help/prop_tgt/LANG_CPPCHECK.rst %%DATADIR%%/Help/prop_tgt/LANG_CPPLINT.rst @@ -1262,6 +1270,7 @@ bin/ctest %%DATADIR%%/Help/release/3.23.rst %%DATADIR%%/Help/release/3.24.rst %%DATADIR%%/Help/release/3.25.rst +%%DATADIR%%/Help/release/3.26.rst %%DATADIR%%/Help/release/3.3.rst %%DATADIR%%/Help/release/3.4.rst %%DATADIR%%/Help/release/3.5.rst @@ -1387,6 +1396,7 @@ bin/ctest %%DATADIR%%/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst %%DATADIR%%/Help/variable/CMAKE_CXX_COMPILE_FEATURES.rst %%DATADIR%%/Help/variable/CMAKE_CXX_EXTENSIONS.rst +%%DATADIR%%/Help/variable/CMAKE_CXX_SCAN_FOR_MODULES.rst %%DATADIR%%/Help/variable/CMAKE_CXX_STANDARD.rst %%DATADIR%%/Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst %%DATADIR%%/Help/variable/CMAKE_C_COMPILE_FEATURES.rst @@ -1530,6 +1540,7 @@ bin/ctest %%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_FINISH.rst %%DATADIR%%/Help/variable/CMAKE_LANG_BYTE_ORDER.rst %%DATADIR%%/Help/variable/CMAKE_LANG_CLANG_TIDY.rst +%%DATADIR%%/Help/variable/CMAKE_LANG_CLANG_TIDY_EXPORT_FIXES_DIR.rst %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER.rst %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_ABI.rst %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_AR.rst @@ -1783,6 +1794,8 @@ bin/ctest %%DATADIR%%/Help/variable/CMAKE_VS_TARGET_FRAMEWORK_IDENTIFIER.rst %%DATADIR%%/Help/variable/CMAKE_VS_TARGET_FRAMEWORK_TARGETS_VERSION.rst %%DATADIR%%/Help/variable/CMAKE_VS_TARGET_FRAMEWORK_VERSION.rst +%%DATADIR%%/Help/variable/CMAKE_VS_VERSION_BUILD_NUMBER.rst +%%DATADIR%%/Help/variable/CMAKE_VS_VERSION_BUILD_NUMBER_COMPONENTS.txt %%DATADIR%%/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst %%DATADIR%%/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM.rst %%DATADIR%%/Help/variable/CMAKE_VS_WINRT_BY_DEFAULT.rst @@ -1977,6 +1990,7 @@ bin/ctest %%DATADIR%%/Modules/CMakeASM-ATTInformation.cmake %%DATADIR%%/Modules/CMakeASMCompiler.cmake.in %%DATADIR%%/Modules/CMakeASMInformation.cmake +%%DATADIR%%/Modules/CMakeASM_MARMASMInformation.cmake %%DATADIR%%/Modules/CMakeASM_MASMInformation.cmake %%DATADIR%%/Modules/CMakeASM_NASMInformation.cmake %%DATADIR%%/Modules/CMakeAddFortranSubdirectory.cmake @@ -2010,6 +2024,7 @@ bin/ctest %%DATADIR%%/Modules/CMakeDependentOption.cmake %%DATADIR%%/Modules/CMakeDetermineASM-ATTCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineASMCompiler.cmake +%%DATADIR%%/Modules/CMakeDetermineASM_MARMASMCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineASM_MASMCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineASM_NASMCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineCCompiler.cmake @@ -2097,6 +2112,7 @@ bin/ctest %%DATADIR%%/Modules/CMakeSystemSpecificInitialize.cmake %%DATADIR%%/Modules/CMakeTestASM-ATTCompiler.cmake %%DATADIR%%/Modules/CMakeTestASMCompiler.cmake +%%DATADIR%%/Modules/CMakeTestASM_MARMASMCompiler.cmake %%DATADIR%%/Modules/CMakeTestASM_MASMCompiler.cmake %%DATADIR%%/Modules/CMakeTestASM_NASMCompiler.cmake %%DATADIR%%/Modules/CMakeTestCCompiler.cmake @@ -3010,6 +3026,10 @@ bin/ctest %%DATADIR%%/Modules/Platform/Windows-df.cmake %%DATADIR%%/Modules/Platform/Windows-windres.cmake %%DATADIR%%/Modules/Platform/Windows.cmake +%%DATADIR%%/Modules/Platform/Windows3x-OpenWatcom-C.cmake +%%DATADIR%%/Modules/Platform/Windows3x-OpenWatcom-CXX.cmake +%%DATADIR%%/Modules/Platform/Windows3x-OpenWatcom.cmake +%%DATADIR%%/Modules/Platform/Windows3x.cmake %%DATADIR%%/Modules/Platform/WindowsCE-MSVC-C.cmake %%DATADIR%%/Modules/Platform/WindowsCE-MSVC-CXX.cmake %%DATADIR%%/Modules/Platform/WindowsCE.cmake @@ -3103,6 +3123,7 @@ bin/ctest %%DATADIR%%/Templates/MSBuild/FlagTables/v10_CudaHost.json %%DATADIR%%/Templates/MSBuild/FlagTables/v10_LIB.json %%DATADIR%%/Templates/MSBuild/FlagTables/v10_Link.json +%%DATADIR%%/Templates/MSBuild/FlagTables/v10_MARMASM.json %%DATADIR%%/Templates/MSBuild/FlagTables/v10_MASM.json %%DATADIR%%/Templates/MSBuild/FlagTables/v10_NASM.json %%DATADIR%%/Templates/MSBuild/FlagTables/v10_RC.json diff --git a/devel/cmake-man/pkg-plist b/devel/cmake-man/pkg-plist index b6c2bf8ae976..9297f1634711 100644 --- a/devel/cmake-man/pkg-plist +++ b/devel/cmake-man/pkg-plist @@ -5,6 +5,7 @@ man/man1/ctest.1.gz man/man7/cmake-buildsystem.7.gz man/man7/cmake-commands.7.gz man/man7/cmake-compile-features.7.gz +man/man7/cmake-configure-log.7.gz man/man7/cmake-developer.7.gz man/man7/cmake-env-variables.7.gz man/man7/cmake-file-api.7.gz diff --git a/devel/cmake-modules-webos/distinfo b/devel/cmake-modules-webos/distinfo index 03fb77c0d9ba..ad6c97d22484 100644 --- a/devel/cmake-modules-webos/distinfo +++ b/devel/cmake-modules-webos/distinfo @@ -1,2 +1,3 @@ +TIMESTAMP = 1678990905 SHA256 (FreeWebOS-cmake-modules-webos-1.0b-submissions-19_GH0.tar.gz) = 2d4e23eb4c18180e6117cd05cb5447ae6e10882af7298d85ac8d0a6b5dcc8e08 SIZE (FreeWebOS-cmake-modules-webos-1.0b-submissions-19_GH0.tar.gz) = 30271
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304122229.33CMTh3A078247>