Re: UPDATE: devel/cmake

On Wed Jul 19, 2023 at 03:05:06PM +0200, Rafael Sadowski wrote:
> Please find below a simple update diff for cmake to 3.27.0. CMake 3.27
> comes with a new feature:
>
> "cmake(1)" now supports interactive debugging of the CMake language.
> See the "–debugger" option."
>
> ... which depends on cppdap. It's not possible for us to use system
> cppdap which create a "Chicken-or-Egg" problem because upstream cppdap
> depends on cmake.
>
> Cloud anyone throw the diff in a bulk build? Thanks in advice!
>
> Rafael
>

New diff cmake 3.27.1

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.226
diff -u -p -u -p -r1.226 Makefile
--- Makefile 20 May 2023 08:22:36 -0000 1.226
+++ Makefile 29 Jul 2023 08:54:46 -0000
@@ -2,7 +2,7 @@ DPB_PROPERTIES = parallel

COMMENT = portable build system

-VER = 3.26.4
+VER = 3.27.1
EPOCH = 0
DISTNAME = cmake-${VER}
CATEGORIES = devel
@@ -41,8 +41,9 @@ CONFIGURE_ARGS = --datadir=share/cmake \
--parallel=${MAKE_JOBS} \
--prefix=${PREFIX} \
--sphinx-html \
- --sphinx-man \
--system-libs \
+ --no-system-cppdap \
+ --sphinx-man \
--verbose

CONFIGURE_ENV += MAKE=${MAKE_PROGRAM}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.73
diff -u -p -u -p -r1.73 distinfo
--- distinfo 20 May 2023 08:22:36 -0000 1.73
+++ distinfo 29 Jul 2023 08:54:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.26.4.tar.gz) = MTtogMKRvU/jHAqlHW5iZZKCpSHmlfMNXMDSWrvVwgg=
-SIZE (cmake-3.26.4.tar.gz) = 10669686
+SHA256 (cmake-3.27.1.tar.gz) = saawE1+hG5RHbpD1syxMj61IC/kc8i0N7ZjOIsUTIAQ=
+SIZE (cmake-3.27.1.tar.gz) = 10977868
Index: patches/patch-Modules_Compiler_GNU_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 patch-Modules_Compiler_GNU_cmake
--- patches/patch-Modules_Compiler_GNU_cmake 25 Aug 2022 20:06:36 -0000 1.19
+++ patches/patch-Modules_Compiler_GNU_cmake 29 Jul 2023 08:54:46 -0000
@@ -1,7 +1,7 @@
Index: Modules/Compiler/GNU.cmake
--- Modules/Compiler/GNU.cmake.orig
+++ Modules/Compiler/GNU.cmake
-@@ -54,10 +54,17 @@ macro(__compiler_gnu lang)
+@@ -100,10 +100,17 @@ macro(__compiler_gnu lang)

# Initial configuration flags.
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
Index: patches/patch-Modules_Platform_OpenBSD_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_Platform_OpenBSD_cmake,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 patch-Modules_Platform_OpenBSD_cmake
--- patches/patch-Modules_Platform_OpenBSD_cmake 3 Dec 2022 17:40:12 -0000 1.20
+++ patches/patch-Modules_Platform_OpenBSD_cmake 29 Jul 2023 08:54:46 -0000
@@ -1,7 +1,7 @@
Index: Modules/Platform/OpenBSD.cmake
--- Modules/Platform/OpenBSD.cmake.orig
+++ Modules/Platform/OpenBSD.cmake
-@@ -42,3 +42,4 @@ else()
+@@ -41,3 +41,4 @@ else()
endif()

list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${OPENBSD_LOCALBASE})
Index: patches/patch-Source_cmFileCommand_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmFileCommand_cxx,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-Source_cmFileCommand_cxx
--- patches/patch-Source_cmFileCommand_cxx 10 Apr 2023 05:43:30 -0000 1.12
+++ patches/patch-Source_cmFileCommand_cxx 29 Jul 2023 08:54:46 -0000
@@ -1,7 +1,7 @@
Index: Source/cmFileCommand.cxx
--- Source/cmFileCommand.cxx.orig
+++ Source/cmFileCommand.cxx
-@@ -1764,6 +1764,13 @@ bool HandleDownloadCommand(std::vector<std::string> co
+@@ -1763,6 +1763,13 @@ bool HandleDownloadCommand(std::vector<std::string> co
++i;
std::string file;

@@ -15,7 +15,7 @@ Index: Source/cmFileCommand.cxx
long timeout = 0;
long inactivity_timeout = 0;
std::string logVar;
-@@ -2174,6 +2181,12 @@ bool HandleUploadCommand(std::vector<std::string> cons
+@@ -2173,6 +2180,12 @@ bool HandleUploadCommand(std::vector<std::string> cons
cmExecutionStatus& status)
{
#if !defined(CMAKE_BOOTSTRAP)
Index: patches/patch-Source_cmFindPackageCommand_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmFindPackageCommand_cxx,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Source_cmFindPackageCommand_cxx
--- patches/patch-Source_cmFindPackageCommand_cxx 10 Apr 2023 05:43:30 -0000 1.6
+++ patches/patch-Source_cmFindPackageCommand_cxx 29 Jul 2023 08:54:46 -0000
@@ -3,7 +3,7 @@ Disable find_package QUIET option in ope
Index: Source/cmFindPackageCommand.cxx
--- Source/cmFindPackageCommand.cxx.orig
+++ Source/cmFindPackageCommand.cxx
-@@ -662,7 +662,13 @@ bool cmFindPackageCommand::InitialPass(std::vector<std
+@@ -712,7 +712,13 @@ bool cmFindPackageCommand::InitialPass(std::vector<std
std::vector<std::size_t> moduleArgs;
for (std::size_t i = 1u; i < args.size(); ++i) {
if (args[i] == "QUIET") {
Index: patches/patch-Source_cmGeneratorTarget_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 patch-Source_cmGeneratorTarget_cxx
--- patches/patch-Source_cmGeneratorTarget_cxx 10 Apr 2023 05:43:30 -0000 1.23
+++ patches/patch-Source_cmGeneratorTarget_cxx 29 Jul 2023 08:54:46 -0000
@@ -1,9 +1,9 @@
Index: Source/cmGeneratorTarget.cxx
--- Source/cmGeneratorTarget.cxx.orig
+++ Source/cmGeneratorTarget.cxx
-@@ -5259,6 +5259,50 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
+@@ -5186,6 +5186,50 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
targetNames.Output =
- components.prefix + targetNames.Base + components.suffix;
+ cmStrCat(components.prefix, targetNames.Base, components.suffix);

+#if defined(__OpenBSD__)
+ // Override shared library version using LIBxxx_VERSION
Index: patches/patch-Source_cmGlobalGenerator_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 patch-Source_cmGlobalGenerator_cxx
--- patches/patch-Source_cmGlobalGenerator_cxx 10 Apr 2023 05:43:30 -0000 1.23
+++ patches/patch-Source_cmGlobalGenerator_cxx 29 Jul 2023 08:54:46 -0000
@@ -1,13 +1,13 @@
Index: Source/cmGlobalGenerator.cxx
--- Source/cmGlobalGenerator.cxx.orig
+++ Source/cmGlobalGenerator.cxx
-@@ -2777,6 +2777,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
+@@ -2798,6 +2798,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
cmCustomCommandLine singleLine;
singleLine.push_back(cmSystemTools::GetCTestCommand());
singleLine.push_back("--force-new-ctest-process");
+ // Skip tests requiring internet access
+ singleLine.push_back("--exclude-regex");
+ singleLine.push_back("\"CMake.FileDownload|CTestTestUpload|RunCMake.ctest_submit\"");
- std::vector<std::string> args;
- if (mf->GetDefExpandList("CMAKE_CTEST_ARGUMENTS", args)) {
- for (auto const& arg : args) {
+ cmList args(mf->GetDefinition("CMAKE_CTEST_ARGUMENTS"));
+ for (auto const& arg : args) {
+ singleLine.push_back(arg);
Index: patches/patch-Source_cmInstallCommand_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmInstallCommand_cxx,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 patch-Source_cmInstallCommand_cxx
--- patches/patch-Source_cmInstallCommand_cxx 3 Dec 2022 17:40:12 -0000 1.22
+++ patches/patch-Source_cmInstallCommand_cxx 29 Jul 2023 08:54:46 -0000
@@ -1,7 +1,7 @@
Index: Source/cmInstallCommand.cxx
--- Source/cmInstallCommand.cxx.orig
+++ Source/cmInstallCommand.cxx
-@@ -665,6 +665,9 @@ bool HandleTargetsMode(std::vector<std::string> const&
+@@ -669,6 +669,9 @@ bool HandleTargetsMode(std::vector<std::string> const&
}

// Select the mode for installing symlinks to versioned shared libraries.
@@ -11,12 +11,14 @@ Index: Source/cmInstallCommand.cxx
cmInstallTargetGenerator::NamelinkModeType namelinkMode =
cmInstallTargetGenerator::NamelinkModeNone;
if (libraryArgs.GetNamelinkOnly()) {
-@@ -672,6 +675,10 @@ bool HandleTargetsMode(std::vector<std::string> const&
- } else if (libraryArgs.GetNamelinkSkip()) {
- namelinkMode = cmInstallTargetGenerator::NamelinkModeSkip;
+@@ -684,6 +687,12 @@ bool HandleTargetsMode(std::vector<std::string> const&
+ } else if (archiveArgs.GetNamelinkSkip()) {
+ importlinkMode = cmInstallTargetGenerator::NamelinkModeSkip;
}
+#else
+ cmInstallTargetGenerator::NamelinkModeType namelinkMode =
++ cmInstallTargetGenerator::NamelinkModeSkip;
++ cmInstallTargetGenerator::NamelinkModeType importlinkMode =
+ cmInstallTargetGenerator::NamelinkModeSkip;
+