Attachment #239184 for bug #267872

Lines 50-56 _INCLUDE_USES_CMAKE_MK= yes Link Here

(-)Mk/Uses/cmake.mk (-1 / +1 lines)
50		50
51	_valid_ARGS= insource run noninja testing _internal	51	_valid_ARGS= insource run noninja testing _internal
52		52
53	_CMAKE_VERSION= 3.24.3	53	_CMAKE_VERSION= 3.25.1
54		54
55	# Sanity check	55	# Sanity check
56	. for arg in ${cmake_ARGS}	56	. for arg in ${cmake_ARGS}




PORTNAME=	cmake
# Remember to update devel/cmake-doc and devel/cmake-gui as well.
DISTVERSION=	${_CMAKE_VERSION}
PORTREVISION=	2
CATEGORIES=	devel
PKGNAMESUFFIX=	-core


		--init="${WRKSRC}/InitialCache.cmake"

OPTIONS_DEFINE=	DOCS CPACK
OPTIONS_DEFAULT=	CPACK
OPTIONS_SUB=	yes

CPACK_DESC=		Enable FreeBSD generator in CPack (experimental)
CPACK_LIB_DEPENDS=	libpkg.so:${PKG_ORIGIN}
# CPACK_USES_OFF=		libarchive
# When CPACK is on, uses base libarchive and won't pass stage-qa

CXXFLAGS+=	-D__BSD_VISIBLE


Lines 1-3 Link Here

(-)devel/cmake-core/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1667324304	1	TIMESTAMP = 1672089061
2	SHA256 (cmake-3.24.3.tar.gz) = b53aa10fa82bff84ccdb59065927b72d3bee49f4d86261249fc0984b3b367291	2	SHA256 (cmake-3.25.1.tar.gz) = 1c511d09516af493694ed9baf13c55947a36389674d657a2d5e0ccedc6b291d8
3	SIZE (cmake-3.24.3.tar.gz) = 10399876	3	SIZE (cmake-3.25.1.tar.gz) = 10561054

Lines 24-29 set(CPACK_ENABLE_FREEBSD_PKG @@CPACK_OPTION_VALUE@@ CACHE BOOL "Enable pkg(8) ge Link Here

(-)devel/cmake-core/files/InitialCache.cmake (-1 / +1 lines)
24	@@CPACK_OPTION_COMMENT@@ "Directory where LibArchive headers are located.")	24	@@CPACK_OPTION_COMMENT@@ "Directory where LibArchive headers are located.")
25	# Hack to (a) prevent using either ports libarchive or the bundled version	25	# Hack to (a) prevent using either ports libarchive or the bundled version
26	# and (b) libpkg links to base libarchive.	26	# and (b) libpkg links to base libarchive.
27	@@CPACK_OPTION_COMMENT@@set(LibArchive_LIBRARY "/usr/lib/libthr.so;/usr/lib/libarchive.so" CACHE PATH	27	@@CPACK_OPTION_COMMENT@@set(LibArchive_LIBRARY "/usr/lib/libarchive.so" CACHE PATH
28	@@CPACK_OPTION_COMMENT@@ "LibArchive library to link against.")	28	@@CPACK_OPTION_COMMENT@@ "LibArchive library to link against.")
29		29




if those are necessary. Also use OpenMP flags when linking.
PR 223678 and PR 234050.

--- Modules/FindOpenMP.cmake.orig	2022-11-17 13:55:41 UTC
+++ Modules/FindOpenMP.cmake
@@ -97,6 +97,33 @@ cmake_policy(SET CMP0012 NEW) # if() recognizes number
 cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced

 function(_OPENMP_FLAG_CANDIDATES LANG)
   if(NOT OpenMP_${LANG}_FLAG)
     unset(OpenMP_FLAG_CANDIDATES)
@@ -211,6 +238,15 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_
     if(OpenMP_VERBOSE_COMPILE_OPTIONS)
       string(APPEND OPENMP_FLAGS_TEST " ${OpenMP_VERBOSE_COMPILE_OPTIONS}")
     endif()

+    set(_need_extra FALSE)
+
     string(REGEX REPLACE "[-/=+]" "" OPENMP_PLAIN_FLAG "${OPENMP_FLAG}")
     try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG}
       SOURCE_FROM_VAR "${_OPENMP_TEST_SRC_NAME}" _OPENMP_TEST_SRC_CONTENT
@@ -219,8 +255,23 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_
       OUTPUT_VARIABLE OpenMP_TRY_COMPILE_OUTPUT
     )

 
       if(CMAKE_${LANG}_VERBOSE_FLAG)
         unset(OpenMP_${LANG}_IMPLICIT_LIBRARIES)
@@ -603,9 +654,16 @@ foreach(LANG IN LISTS OpenMP_FINDLIST)
         add_library(OpenMP::OpenMP_${LANG} INTERFACE IMPORTED)
       endif()
       if(OpenMP_${LANG}_FLAGS)

+          INTERFACE_COMPILE_OPTIONS "$<$<COMPILE_LANGUAGE:${LANG}>:${_OpenMP_${LANG}_COMPILE_OPTIONS}>")
+        set_property(TARGET OpenMP::OpenMP_${LANG} PROPERTY
+          INTERFACE_LINK_OPTIONS "$<$<COMPILE_LANGUAGE:${LANG}>:${_OpenMP_${LANG}_LINK_OPTIONS}>")
         if(CMAKE_${LANG}_COMPILER_ID STREQUAL "Fujitsu"
           OR ${CMAKE_${LANG}_COMPILER_ID} STREQUAL "IntelLLVM")
           set_property(TARGET OpenMP::OpenMP_${LANG} PROPERTY
             INTERFACE_LINK_OPTIONS "${OpenMP_${LANG}_FLAGS}")

Removed Link Here

(-)devel/cmake-core/files/patch-Modules_Platform_FreeBSD-CXX.cmake (-11 lines)
1	This prefers c++ over CC as the C++ compiler command. See PR 203793.
2
3	Upstreamed as 6f666f4335c7f6b44fc4ccdc886590094fdfa16d
4	Will be included in CMake 3.10
5
6	--- Modules/Platform/FreeBSD-CXX.cmake.orig 2017-06-14 21:54:30 UTC
7	+++ Modules/Platform/FreeBSD-CXX.cmake
8	@@ -0,0 +1,3 @@
9	+if(NOT CMAKE_CXX_COMPILER_NAMES)
10	+ set(CMAKE_CXX_COMPILER_NAMES c++)
11	+endif()




diff --git Source/CPack/cmCPackFreeBSDGenerator.cxx Source/CPack/cmCPackFreeBSDGenerator.cxx
index 162dfc7346..206f2d06a0 100644
--- Source/CPack/cmCPackFreeBSDGenerator.cxx
+++ Source/CPack/cmCPackFreeBSDGenerator.cxx
@@ -245,8 +245,15 @@ public:
   void write_value(cmGeneratedFileStream& s) const override
   {
     s << "{\n";
-    for (std::string const& elem : value) {
-      s << "  \"" << elem << R"(": {"origin": ")" << elem << "\"},\n";
+    for (std::string const& origin : value) {
+      // Split the origin into its category and name components.
+      // Treat it like a path (which it sort-of is, in the ports tree).
+      // Because it is a "cat/name" style relative path, it gets split
+      // into "" "cat" and "name" parts.
+      std::vector<std::string> originComponents;
+      cmSystemTools::SplitPath(origin, originComponents);
+      const std::string name = (originComponents.size() == 3) ? originComponents[2] : origin;
+      s << "  \"" << name << R"(": {"origin": ")" << origin << "\"},\n";
     }
     s << '}';
   }




bin/cmake
bin/cpack
bin/ctest
share/aclocal/cmake.m4
share/bash-completion/completions/cmake
share/bash-completion/completions/cpack
share/bash-completion/completions/ctest
%%DATADIR%%/Help/command/DEVICE_LINK_OPTIONS.txt
%%DATADIR%%/Help/command/FIND_XXX.txt
%%DATADIR%%/Help/command/FIND_XXX_ORDER.txt

%%DATADIR%%/Help/command/add_subdirectory.rst
%%DATADIR%%/Help/command/add_test.rst
%%DATADIR%%/Help/command/aux_source_directory.rst
%%DATADIR%%/Help/command/block.rst
%%DATADIR%%/Help/command/break.rst
%%DATADIR%%/Help/command/build_command.rst
%%DATADIR%%/Help/command/build_name.rst

%%DATADIR%%/Help/command/elseif.rst
%%DATADIR%%/Help/command/enable_language.rst
%%DATADIR%%/Help/command/enable_testing.rst
%%DATADIR%%/Help/command/endblock.rst
%%DATADIR%%/Help/command/endforeach.rst
%%DATADIR%%/Help/command/endfunction.rst
%%DATADIR%%/Help/command/endif.rst

%%DATADIR%%/Help/envvar/HIPFLAGS.rst
%%DATADIR%%/Help/envvar/ISPC.rst
%%DATADIR%%/Help/envvar/ISPCFLAGS.rst
%%DATADIR%%/Help/envvar/LANG_FLAGS.txt
%%DATADIR%%/Help/envvar/LDFLAGS.rst
%%DATADIR%%/Help/envvar/MACOSX_DEPLOYMENT_TARGET.rst
%%DATADIR%%/Help/envvar/OBJC.rst

%%DATADIR%%/Help/envvar/PackageName_ROOT.rst
%%DATADIR%%/Help/envvar/RC.rst
%%DATADIR%%/Help/envvar/RCFLAGS.rst
%%DATADIR%%/Help/envvar/SSL_CERT_DIR.rst
%%DATADIR%%/Help/envvar/SSL_CERT_FILE.rst
%%DATADIR%%/Help/envvar/SWIFTC.rst
%%DATADIR%%/Help/envvar/VERBOSE.rst
%%DATADIR%%/Help/generator/Borland Makefiles.rst

%%DATADIR%%/Help/module/FindOpenCL.rst
%%DATADIR%%/Help/module/FindOpenGL.rst
%%DATADIR%%/Help/module/FindOpenMP.rst
%%DATADIR%%/Help/module/FindOpenSP.rst
%%DATADIR%%/Help/module/FindOpenSSL.rst
%%DATADIR%%/Help/module/FindOpenSceneGraph.rst
%%DATADIR%%/Help/module/FindOpenThreads.rst

%%DATADIR%%/Help/module/FindRTI.rst
%%DATADIR%%/Help/module/FindRuby.rst
%%DATADIR%%/Help/module/FindSDL.rst
%%DATADIR%%/Help/module/FindSDL_gfx.rst
%%DATADIR%%/Help/module/FindSDL_image.rst
%%DATADIR%%/Help/module/FindSDL_mixer.rst
%%DATADIR%%/Help/module/FindSDL_net.rst

%%DATADIR%%/Help/policy/CMP0137.rst
%%DATADIR%%/Help/policy/CMP0138.rst
%%DATADIR%%/Help/policy/CMP0139.rst
%%DATADIR%%/Help/policy/CMP0140.rst
%%DATADIR%%/Help/policy/CMP0141.rst
%%DATADIR%%/Help/policy/CMP0142.rst
%%DATADIR%%/Help/policy/DEPRECATED.txt
%%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
%%DATADIR%%/Help/prop_cache/ADVANCED.rst

%%DATADIR%%/Help/prop_dir/RULE_LAUNCH_LINK.rst
%%DATADIR%%/Help/prop_dir/SOURCE_DIR.rst
%%DATADIR%%/Help/prop_dir/SUBDIRECTORIES.rst
%%DATADIR%%/Help/prop_dir/SYSTEM.rst
%%DATADIR%%/Help/prop_dir/TESTS.rst
%%DATADIR%%/Help/prop_dir/TEST_INCLUDE_FILE.rst
%%DATADIR%%/Help/prop_dir/TEST_INCLUDE_FILES.rst

%%DATADIR%%/Help/prop_tgt/CUDA_STANDARD.rst
%%DATADIR%%/Help/prop_tgt/CUDA_STANDARD_REQUIRED.rst
%%DATADIR%%/Help/prop_tgt/CXX_EXTENSIONS.rst
%%DATADIR%%/Help/prop_tgt/CXX_MODULE_DIRS.rst
%%DATADIR%%/Help/prop_tgt/CXX_MODULE_DIRS_NAME.rst
%%DATADIR%%/Help/prop_tgt/CXX_MODULE_HEADER_UNIT_DIRS.rst
%%DATADIR%%/Help/prop_tgt/CXX_MODULE_HEADER_UNIT_DIRS_NAME.rst
%%DATADIR%%/Help/prop_tgt/CXX_MODULE_HEADER_UNIT_SET.rst
%%DATADIR%%/Help/prop_tgt/CXX_MODULE_HEADER_UNIT_SETS.rst
%%DATADIR%%/Help/prop_tgt/CXX_MODULE_HEADER_UNIT_SET_NAME.rst
%%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_STANDARD.rst
%%DATADIR%%/Help/prop_tgt/CXX_STANDARD_REQUIRED.rst
%%DATADIR%%/Help/prop_tgt/C_EXTENSIONS.rst

%%DATADIR%%/Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD_CONFIG.rst
%%DATADIR%%/Help/prop_tgt/EXPORT_COMPILE_COMMANDS.rst
%%DATADIR%%/Help/prop_tgt/EXPORT_NAME.rst
%%DATADIR%%/Help/prop_tgt/EXPORT_NO_SYSTEM.rst
%%DATADIR%%/Help/prop_tgt/EXPORT_PROPERTIES.rst
%%DATADIR%%/Help/prop_tgt/EchoString.rst
%%DATADIR%%/Help/prop_tgt/FOLDER.rst

%%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_DEFINITIONS.rst
%%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_FEATURES.rst
%%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_OPTIONS.rst
%%DATADIR%%/Help/prop_tgt/INTERFACE_CXX_MODULE_HEADER_UNIT_SETS.rst
%%DATADIR%%/Help/prop_tgt/INTERFACE_CXX_MODULE_SETS.rst
%%DATADIR%%/Help/prop_tgt/INTERFACE_HEADER_SETS.rst
%%DATADIR%%/Help/prop_tgt/INTERFACE_HEADER_SETS_TO_VERIFY.rst
%%DATADIR%%/Help/prop_tgt/INTERFACE_INCLUDE_DIRECTORIES.rst

%%DATADIR%%/Help/prop_tgt/MACOSX_RPATH.rst
%%DATADIR%%/Help/prop_tgt/MANUALLY_ADDED_DEPENDENCIES.rst
%%DATADIR%%/Help/prop_tgt/MAP_IMPORTED_CONFIG_CONFIG.rst
%%DATADIR%%/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT-VALUES.txt
%%DATADIR%%/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT.rst
%%DATADIR%%/Help/prop_tgt/MSVC_RUNTIME_LIBRARY-VALUES.txt
%%DATADIR%%/Help/prop_tgt/MSVC_RUNTIME_LIBRARY.rst
%%DATADIR%%/Help/prop_tgt/NAME.rst

%%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS_CONFIG.rst
%%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_OPTIONS.rst
%%DATADIR%%/Help/prop_tgt/SUFFIX.rst
%%DATADIR%%/Help/prop_tgt/SYSTEM.rst
%%DATADIR%%/Help/prop_tgt/Swift_DEPENDENCIES_FILE.rst
%%DATADIR%%/Help/prop_tgt/Swift_LANGUAGE_VERSION.rst
%%DATADIR%%/Help/prop_tgt/Swift_MODULE_DIRECTORY.rst

%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ENABLE_GPU_API_VALIDATION.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ENABLE_GPU_SHADER_VALIDATION.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ENVIRONMENT.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_EXECUTABLE.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_GUARD_MALLOC.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_LAUNCH_CONFIGURATION.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_LAUNCH_MODE.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_MALLOC_GUARD_EDGES.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_MALLOC_SCRIBBLE.rst

%%DATADIR%%/Help/release/3.22.rst
%%DATADIR%%/Help/release/3.23.rst
%%DATADIR%%/Help/release/3.24.rst
%%DATADIR%%/Help/release/3.25.rst
%%DATADIR%%/Help/release/3.3.rst
%%DATADIR%%/Help/release/3.4.rst
%%DATADIR%%/Help/release/3.5.rst

%%DATADIR%%/Help/variable/ANDROID.rst
%%DATADIR%%/Help/variable/APPLE.rst
%%DATADIR%%/Help/variable/BORLAND.rst
%%DATADIR%%/Help/variable/BSD.rst
%%DATADIR%%/Help/variable/BUILD_SHARED_LIBS.rst
%%DATADIR%%/Help/variable/CACHE.rst
%%DATADIR%%/Help/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.rst

%%DATADIR%%/Help/variable/CMAKE_HIP_STANDARD_REQUIRED.rst
%%DATADIR%%/Help/variable/CMAKE_HOME_DIRECTORY.rst
%%DATADIR%%/Help/variable/CMAKE_HOST_APPLE.rst
%%DATADIR%%/Help/variable/CMAKE_HOST_BSD.rst
%%DATADIR%%/Help/variable/CMAKE_HOST_LINUX.rst
%%DATADIR%%/Help/variable/CMAKE_HOST_SOLARIS.rst
%%DATADIR%%/Help/variable/CMAKE_HOST_SYSTEM.rst
%%DATADIR%%/Help/variable/CMAKE_HOST_SYSTEM_NAME.rst

%%DATADIR%%/Help/variable/CMAKE_MODULE_LINKER_FLAGS_INIT.rst
%%DATADIR%%/Help/variable/CMAKE_MODULE_PATH.rst
%%DATADIR%%/Help/variable/CMAKE_MSVCIDE_RUN_PATH.rst
%%DATADIR%%/Help/variable/CMAKE_MSVC_DEBUG_INFORMATION_FORMAT.rst
%%DATADIR%%/Help/variable/CMAKE_MSVC_RUNTIME_LIBRARY.rst
%%DATADIR%%/Help/variable/CMAKE_NETRC.rst
%%DATADIR%%/Help/variable/CMAKE_NETRC_FILE.rst

%%DATADIR%%/Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst
%%DATADIR%%/Help/variable/CMAKE_Swift_MODULE_DIRECTORY.rst
%%DATADIR%%/Help/variable/CMAKE_Swift_NUM_THREADS.rst
%%DATADIR%%/Help/variable/CMAKE_TASKING_TOOLSET.rst
%%DATADIR%%/Help/variable/CMAKE_TLS_CAINFO.rst
%%DATADIR%%/Help/variable/CMAKE_TLS_VERIFY.rst
%%DATADIR%%/Help/variable/CMAKE_TOOLCHAIN_FILE.rst

%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER.rst
%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS.rst
%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE.rst
%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_ENABLE_GPU_API_VALIDATION.rst
%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE.rst
%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_ENABLE_GPU_SHADER_VALIDATION.rst
%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_ENVIRONMENT.rst
%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_GUARD_MALLOC.rst
%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_LAUNCH_CONFIGURATION.rst
%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_LAUNCH_MODE.rst
%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP.rst
%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_MALLOC_GUARD_EDGES.rst
%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_MALLOC_SCRIBBLE.rst

%%DATADIR%%/Help/variable/LIBRARY_OUTPUT_PATH.rst
%%DATADIR%%/Help/variable/LINK_GROUP_PREDEFINED_FEATURES.txt
%%DATADIR%%/Help/variable/LINK_LIBRARY_PREDEFINED_FEATURES.txt
%%DATADIR%%/Help/variable/LINUX.rst
%%DATADIR%%/Help/variable/MINGW.rst
%%DATADIR%%/Help/variable/MSVC.rst
%%DATADIR%%/Help/variable/MSVC10.rst

%%DATADIR%%/Modules/Compiler/IntelLLVM-C.cmake
%%DATADIR%%/Modules/Compiler/IntelLLVM-CXX.cmake
%%DATADIR%%/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/IntelLLVM-FindBinUtils.cmake
%%DATADIR%%/Modules/Compiler/IntelLLVM-Fortran.cmake
%%DATADIR%%/Modules/Compiler/IntelLLVM.cmake
%%DATADIR%%/Modules/Compiler/LCC-C-DetermineCompiler.cmake

%%DATADIR%%/Modules/Compiler/TI-CXX.cmake
%%DATADIR%%/Modules/Compiler/TI-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/TI.cmake
%%DATADIR%%/Modules/Compiler/Tasking-ASM.cmake
%%DATADIR%%/Modules/Compiler/Tasking-C.cmake
%%DATADIR%%/Modules/Compiler/Tasking-CXX.cmake
%%DATADIR%%/Modules/Compiler/Tasking-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/Tasking-FindBinUtils.cmake
%%DATADIR%%/Modules/Compiler/Tasking.cmake
%%DATADIR%%/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/TinyCC-C.cmake
%%DATADIR%%/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake

%%DATADIR%%/Modules/FindOpenCL.cmake
%%DATADIR%%/Modules/FindOpenGL.cmake
%%DATADIR%%/Modules/FindOpenMP.cmake
%%DATADIR%%/Modules/FindOpenSP.cmake
%%DATADIR%%/Modules/FindOpenSSL.cmake
%%DATADIR%%/Modules/FindOpenSceneGraph.cmake
%%DATADIR%%/Modules/FindOpenThreads.cmake

%%DATADIR%%/Modules/FindRTI.cmake
%%DATADIR%%/Modules/FindRuby.cmake
%%DATADIR%%/Modules/FindSDL.cmake
%%DATADIR%%/Modules/FindSDL_gfx.cmake
%%DATADIR%%/Modules/FindSDL_image.cmake
%%DATADIR%%/Modules/FindSDL_mixer.cmake
%%DATADIR%%/Modules/FindSDL_net.cmake

%%DATADIR%%/Modules/Platform/Darwin.cmake
%%DATADIR%%/Modules/Platform/DragonFly.cmake
%%DATADIR%%/Modules/Platform/Euros.cmake
%%DATADIR%%/Modules/Platform/FreeBSD-CXX.cmake
%%DATADIR%%/Modules/Platform/FreeBSD-Determine-CXX.cmake
%%DATADIR%%/Modules/Platform/FreeBSD.cmake
%%DATADIR%%/Modules/Platform/Fuchsia.cmake

%%DATADIR%%/Modules/Platform/RISCos.cmake
%%DATADIR%%/Modules/Platform/SCO_SV.cmake
%%DATADIR%%/Modules/Platform/SINIX.cmake
%%DATADIR%%/Modules/Platform/SerenityOS-Clang-ASM.cmake
%%DATADIR%%/Modules/Platform/SerenityOS-Clang-C.cmake
%%DATADIR%%/Modules/Platform/SerenityOS-Clang-CXX.cmake
%%DATADIR%%/Modules/Platform/SerenityOS-GNU-ASM.cmake
%%DATADIR%%/Modules/Platform/SerenityOS-GNU-C.cmake
%%DATADIR%%/Modules/Platform/SerenityOS-GNU-CXX.cmake
%%DATADIR%%/Modules/Platform/SerenityOS-GNU.cmake
%%DATADIR%%/Modules/Platform/SerenityOS.cmake
%%DATADIR%%/Modules/Platform/SunOS-Clang-C.cmake
%%DATADIR%%/Modules/Platform/SunOS-Clang-CXX.cmake
%%DATADIR%%/Modules/Platform/SunOS-GNU-C.cmake

%%DATADIR%%/Modules/Platform/Windows-Clang-ASM.cmake
%%DATADIR%%/Modules/Platform/Windows-Clang-C.cmake
%%DATADIR%%/Modules/Platform/Windows-Clang-CXX.cmake
%%DATADIR%%/Modules/Platform/Windows-Clang-HIP.cmake
%%DATADIR%%/Modules/Platform/Windows-Clang.cmake
%%DATADIR%%/Modules/Platform/Windows-Determine-CXX.cmake
%%DATADIR%%/Modules/Platform/Windows-Embarcadero-C.cmake

%%PORTDOCS%%%%DOCSDIR%%/cmcurl/COPYING
%%PORTDOCS%%%%DOCSDIR%%/cmnghttp2/COPYING
%%PORTDOCS%%%%DOCSDIR%%/cmsys/Copyright.txt
share/aclocal/cmake.m4
share/bash-completion/completions/cmake
share/bash-completion/completions/cpack
share/bash-completion/completions/ctest
share/emacs/site-lisp/cmake-mode.el
share/vim/vimfiles/indent/cmake.vim
share/vim/vimfiles/syntax/cmake.vim

Lines 72-78 USE_GL= gl Link Here

(-)net-im/telegram-desktop/Makefile (-1 / +2 lines)
72	USE_GNOME= glib20 glibmm26	72	USE_GNOME= glib20 glibmm26
73	USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst	73	USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst
74		74
75	CMAKE_ARGS= -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH}	75	CMAKE_ARGS= -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \
		76	-DLINUX=1
76	CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \	77	CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \
77	DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION	78	DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
78	CMAKE_OFF= DESKTOP_APP_USE_PACKAGED_FONTS	79	CMAKE_OFF= DESKTOP_APP_USE_PACKAGED_FONTS

Added Link Here

(-)net-im/telegram-desktop/files/patch-CMakeLists.txt (+10 lines)
1	--- CMakeLists.txt.orig 2022-12-25 22:21:34.522573000 +0100
2	+++ CMakeLists.txt 2022-12-25 22:21:42.197358000 +0100
3	@@ -31,6 +31,7 @@
4	HOMEPAGE_URL "https://desktop.telegram.org"
5	)
6	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Telegram)
7	+set(LINUX 1)
8
9	get_filename_component(third_party_loc "Telegram/ThirdParty" REALPATH)
10	get_filename_component(submodules_loc "Telegram" REALPATH)




--- cmake/CheckIncludes.cmake.orig	2022-12-24 21:43:32 UTC
+++ cmake/CheckIncludes.cmake
@@ -3,7 +3,9 @@ include(CheckIncludeFiles)
 function(check_includes INCLUDES)
   set(INCLUDE_MISSING FALSE)
   foreach(INCLUDE_FILE ${INCLUDES})
-    check_include_files(${INCLUDE_FILE} ${INCLUDE_FILE}_FOUND)
+    string(MAKE_C_IDENTIFIER "${INCLUDE_FILE}" c_include)
+    check_include_files(${INCLUDE_FILE} ${c_include}_FOUND)
+    set(${INCLUDE_FILE}_FOUND ${${c_include}_FOUND})
     if(NOT ${INCLUDE_FILE}_FOUND)
       set(INCLUDE_MISSING TRUE)
       set(MISSING_INCLUDES ${MISSING_INCLUDES} ${INCLUDE_FILE})

Return to bug 267872

Lines 1-7 Link Here

(-)devel/cmake-core/Makefile (-3 / +1 lines)
1	PORTNAME= cmake	1	PORTNAME= cmake
2	# Remember to update devel/cmake-doc and devel/cmake-gui as well.	2	# Remember to update devel/cmake-doc and devel/cmake-gui as well.
3	DISTVERSION= ${_CMAKE_VERSION}	3	DISTVERSION= ${_CMAKE_VERSION}
4	PORTREVISION= 2
5	CATEGORIES= devel	4	CATEGORIES= devel
6	PKGNAMESUFFIX= -core	5	PKGNAMESUFFIX= -core
7		6
Lines 40-51 CONFIGURE_ARGS= --prefix=${PREFIX} \ Link Here
40	--init="${WRKSRC}/InitialCache.cmake"	39	--init="${WRKSRC}/InitialCache.cmake"
41		40
42	OPTIONS_DEFINE= DOCS CPACK	41	OPTIONS_DEFINE= DOCS CPACK
		42	OPTIONS_DEFAULT= CPACK
43	OPTIONS_SUB= yes	43	OPTIONS_SUB= yes
44		44
45	CPACK_DESC= Enable FreeBSD generator in CPack (experimental)	45	CPACK_DESC= Enable FreeBSD generator in CPack (experimental)
46	CPACK_LIB_DEPENDS= libpkg.so:${PKG_ORIGIN}	46	CPACK_LIB_DEPENDS= libpkg.so:${PKG_ORIGIN}
47	# CPACK_USES_OFF= libarchive
48	# When CPACK is on, uses base libarchive and won't pass stage-qa
49		47
50	CXXFLAGS+= -D__BSD_VISIBLE	48	CXXFLAGS+= -D__BSD_VISIBLE
51		49

Lines 7-13 Look for omp.h in LOCALBASE and pass suitable -I and -L flags Link Here

(-)devel/cmake-core/files/patch-Modules_FindOpenMP.cmake (-7 / +7 lines)
7	if those are necessary. Also use OpenMP flags when linking.	7	if those are necessary. Also use OpenMP flags when linking.
8	PR 223678 and PR 234050.	8	PR 223678 and PR 234050.
9		9
10	--- Modules/FindOpenMP.cmake.orig 2021-07-14 14:10:23 UTC	10	--- Modules/FindOpenMP.cmake.orig 2022-11-17 13:55:41 UTC
11	+++ Modules/FindOpenMP.cmake	11	+++ Modules/FindOpenMP.cmake
12	@@ -97,6 +97,33 @@ cmake_policy(SET CMP0012 NEW) # if() recognizes number	12	@@ -97,6 +97,33 @@ cmake_policy(SET CMP0012 NEW) # if() recognizes number
13	cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced	13	cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
Lines 43-49 PR 223678 and PR 234050. Link Here
43	function(_OPENMP_FLAG_CANDIDATES LANG)	43	function(_OPENMP_FLAG_CANDIDATES LANG)
44	if(NOT OpenMP_${LANG}_FLAG)	44	if(NOT OpenMP_${LANG}_FLAG)
45	unset(OpenMP_FLAG_CANDIDATES)	45	unset(OpenMP_FLAG_CANDIDATES)
46	@@ -212,6 +239,15 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_	46	@@ -211,6 +238,15 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_
47	if(OpenMP_VERBOSE_COMPILE_OPTIONS)	47	if(OpenMP_VERBOSE_COMPILE_OPTIONS)
48	string(APPEND OPENMP_FLAGS_TEST " ${OpenMP_VERBOSE_COMPILE_OPTIONS}")	48	string(APPEND OPENMP_FLAGS_TEST " ${OpenMP_VERBOSE_COMPILE_OPTIONS}")
49	endif()	49	endif()
Lines 57-64 PR 223678 and PR 234050. Link Here
57	+ set(_need_extra FALSE)	57	+ set(_need_extra FALSE)
58	+	58	+
59	string(REGEX REPLACE "[-/=+]" "" OPENMP_PLAIN_FLAG "${OPENMP_FLAG}")	59	string(REGEX REPLACE "[-/=+]" "" OPENMP_PLAIN_FLAG "${OPENMP_FLAG}")
60	try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} ${CMAKE_BINARY_DIR} ${_OPENMP_TEST_SRC}	60	try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG}
61	CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OPENMP_FLAGS_TEST}"	61	SOURCE_FROM_VAR "${_OPENMP_TEST_SRC_NAME}" _OPENMP_TEST_SRC_CONTENT
62	@@ -219,8 +255,23 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_	62	@@ -219,8 +255,23 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_
63	OUTPUT_VARIABLE OpenMP_TRY_COMPILE_OUTPUT	63	OUTPUT_VARIABLE OpenMP_TRY_COMPILE_OUTPUT
64	)	64	)
Lines 84-90 PR 223678 and PR 234050. Link Here
84		84
85	if(CMAKE_${LANG}_VERBOSE_FLAG)	85	if(CMAKE_${LANG}_VERBOSE_FLAG)
86	unset(OpenMP_${LANG}_IMPLICIT_LIBRARIES)	86	unset(OpenMP_${LANG}_IMPLICIT_LIBRARIES)
87	@@ -567,9 +618,16 @@ foreach(LANG IN LISTS OpenMP_FINDLIST)	87	@@ -603,9 +654,16 @@ foreach(LANG IN LISTS OpenMP_FINDLIST)
88	add_library(OpenMP::OpenMP_${LANG} INTERFACE IMPORTED)	88	add_library(OpenMP::OpenMP_${LANG} INTERFACE IMPORTED)
89	endif()	89	endif()
90	if(OpenMP_${LANG}_FLAGS)	90	if(OpenMP_${LANG}_FLAGS)
Lines 100-105 PR 223678 and PR 234050. Link Here
100	+ INTERFACE_COMPILE_OPTIONS "$<$<COMPILE_LANGUAGE:${LANG}>:${_OpenMP_${LANG}_COMPILE_OPTIONS}>")	100	+ INTERFACE_COMPILE_OPTIONS "$<$<COMPILE_LANGUAGE:${LANG}>:${_OpenMP_${LANG}_COMPILE_OPTIONS}>")
101	+ set_property(TARGET OpenMP::OpenMP_${LANG} PROPERTY	101	+ set_property(TARGET OpenMP::OpenMP_${LANG} PROPERTY
102	+ INTERFACE_LINK_OPTIONS "$<$<COMPILE_LANGUAGE:${LANG}>:${_OpenMP_${LANG}_LINK_OPTIONS}>")	102	+ INTERFACE_LINK_OPTIONS "$<$<COMPILE_LANGUAGE:${LANG}>:${_OpenMP_${LANG}_LINK_OPTIONS}>")
103	if(CMAKE_${LANG}_COMPILER_ID STREQUAL "Fujitsu")	103	if(CMAKE_${LANG}_COMPILER_ID STREQUAL "Fujitsu"
		104	OR ${CMAKE_${LANG}_COMPILER_ID} STREQUAL "IntelLLVM")
104	set_property(TARGET OpenMP::OpenMP_${LANG} PROPERTY	105	set_property(TARGET OpenMP::OpenMP_${LANG} PROPERTY
105	INTERFACE_LINK_OPTIONS "${OpenMP_${LANG}_FLAGS}")

Added Link Here

(-)devel/cmake-core/files/patch-Source_CPack_cmCPackFreeBSDGenerator.cxx (+22 lines)
1	diff --git Source/CPack/cmCPackFreeBSDGenerator.cxx Source/CPack/cmCPackFreeBSDGenerator.cxx
2	index 162dfc7346..206f2d06a0 100644
3	--- Source/CPack/cmCPackFreeBSDGenerator.cxx
4	+++ Source/CPack/cmCPackFreeBSDGenerator.cxx
5	@@ -245,8 +245,15 @@ public:
6	void write_value(cmGeneratedFileStream& s) const override
7	{
8	s << "{\n";
9	- for (std::string const& elem : value) {
10	- s << " \"" << elem << R"(": {"origin": ")" << elem << "\"},\n";
11	+ for (std::string const& origin : value) {
12	+ // Split the origin into its category and name components.
13	+ // Treat it like a path (which it sort-of is, in the ports tree).
14	+ // Because it is a "cat/name" style relative path, it gets split
15	+ // into "" "cat" and "name" parts.
16	+ std::vector<std::string> originComponents;
17	+ cmSystemTools::SplitPath(origin, originComponents);
18	+ const std::string name = (originComponents.size() == 3) ? originComponents[2] : origin;
19	+ s << " \"" << name << R"(": {"origin": ")" << origin << "\"},\n";
20	}
21	s << '}';
22	}

Added Link Here

(-)sysutils/lizardfs/files/patch-cmake_CheckIncludes.cmake (+13 lines)
1	--- cmake/CheckIncludes.cmake.orig 2022-12-24 21:43:32 UTC
2	+++ cmake/CheckIncludes.cmake
3	@@ -3,7 +3,9 @@ include(CheckIncludeFiles)
4	function(check_includes INCLUDES)
5	set(INCLUDE_MISSING FALSE)
6	foreach(INCLUDE_FILE ${INCLUDES})
7	- check_include_files(${INCLUDE_FILE} ${INCLUDE_FILE}_FOUND)
8	+ string(MAKE_C_IDENTIFIER "${INCLUDE_FILE}" c_include)
9	+ check_include_files(${INCLUDE_FILE} ${c_include}_FOUND)
10	+ set(${INCLUDE_FILE}_FOUND ${${c_include}_FOUND})
11	if(NOT ${INCLUDE_FILE}_FOUND)
12	set(INCLUDE_MISSING TRUE)
13	set(MISSING_INCLUDES ${MISSING_INCLUDES} ${INCLUDE_FILE})