Monday, April 03, 2023

UPDATE: devel/cmake BULK BUILD WANTED

Hi bulk builders,

could someone push this diff into the next amd64 bulk build for me?

Many thanks in advance,

Rafael

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.224
diff -u -p -u -p -r1.224 Makefile
--- Makefile 21 Feb 2023 23:06:55 -0000 1.224
+++ Makefile 3 Apr 2023 16:47:42 -0000
@@ -2,8 +2,7 @@ DPB_PROPERTIES = parallel

COMMENT = portable build system

-VER = 3.25.2
-REVISION = 0
+VER = 3.26.2
EPOCH = 0
DISTNAME = cmake-${VER}
CATEGORIES = devel
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.71
diff -u -p -u -p -r1.71 distinfo
--- distinfo 28 Jan 2023 16:34:11 -0000 1.71
+++ distinfo 3 Apr 2023 16:47:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.25.2.tar.gz) = wCbyLLkx3VMvZI8IfVh/B6GEPG5mo9/KT7DqIZRO0zw=
-SIZE (cmake-3.25.2.tar.gz) = 10561266
+SHA256 (cmake-3.26.2.tar.gz) = 1U8lcHMABkMI7wHU0hsPmPUI9S3aXVJ9iCudiDefiag=
+SIZE (cmake-3.26.2.tar.gz) = 10669169
Index: patches/patch-Source_cmFileCommand_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmFileCommand_cxx,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-Source_cmFileCommand_cxx
--- patches/patch-Source_cmFileCommand_cxx 3 Dec 2022 17:40:12 -0000 1.11
+++ patches/patch-Source_cmFileCommand_cxx 3 Apr 2023 16:47:42 -0000
@@ -1,7 +1,7 @@
Index: Source/cmFileCommand.cxx
--- Source/cmFileCommand.cxx.orig
+++ Source/cmFileCommand.cxx
-@@ -1744,6 +1744,13 @@ bool HandleDownloadCommand(std::vector<std::string> co
+@@ -1764,6 +1764,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;
-@@ -2150,6 +2157,12 @@ bool HandleUploadCommand(std::vector<std::string> cons
+@@ -2174,6 +2181,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.5
diff -u -p -u -p -r1.5 patch-Source_cmFindPackageCommand_cxx
--- patches/patch-Source_cmFindPackageCommand_cxx 3 Dec 2022 17:40:12 -0000 1.5
+++ patches/patch-Source_cmFindPackageCommand_cxx 3 Apr 2023 16:47:42 -0000
@@ -3,7 +3,7 @@ Disable find_package QUIET option in ope
Index: Source/cmFindPackageCommand.cxx
--- Source/cmFindPackageCommand.cxx.orig
+++ Source/cmFindPackageCommand.cxx
-@@ -648,7 +648,13 @@ bool cmFindPackageCommand::InitialPass(std::vector<std
+@@ -662,7 +662,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.22
diff -u -p -u -p -r1.22 patch-Source_cmGeneratorTarget_cxx
--- patches/patch-Source_cmGeneratorTarget_cxx 3 Dec 2022 17:40:12 -0000 1.22
+++ patches/patch-Source_cmGeneratorTarget_cxx 3 Apr 2023 16:47:42 -0000
@@ -1,9 +1,9 @@
Index: Source/cmGeneratorTarget.cxx
--- Source/cmGeneratorTarget.cxx.orig
+++ Source/cmGeneratorTarget.cxx
-@@ -5183,6 +5183,50 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
- // The library name.
- targetNames.Output = prefix + targetNames.Base + suffix;
+@@ -5259,6 +5259,50 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
+ targetNames.Output =
+ components.prefix + targetNames.Base + components.suffix;

+#if defined(__OpenBSD__)
+ // Override shared library version using LIBxxx_VERSION
@@ -17,7 +17,7 @@ Index: Source/cmGeneratorTarget.cxx
+ // Target name libXXX with PREFIX set to ""
+ auto getLibName = [&](std::string& baseName) {
+ const std::string toMatch = "lib";
-+ if (baseName.find(toMatch) == 0 && prefix == "")
++ if (baseName.find(toMatch) == 0 && components.prefix == "")
+ return baseName.substr(toMatch.length());
+ return baseName;
+ };
@@ -50,5 +50,5 @@ Index: Source/cmGeneratorTarget.cxx
+

No comments:

Post a Comment