Re: UPDATE: devel/cmake (bulk build wanted)

2023-12-18 Thread Rafael Sadowski 
On Mon Dec 18, 2023 at 10:08:14AM +, Stuart Henderson wrote:
> On 2023/12/18 01:39, Rafael Sadowski wrote:
> > Here is a cmake update diff to version 3.28.1.
> > 
> > Upstream fixed shared libraries detection on OpenBSD[1]. I can't predict
> > the impact but a handful of cmake ports build,packaged fine with that
> > update.
> > 
> > 1: https://gitlab.kitware.com/cmake/cmake/-/issues/12954
> 
> Is that correct? That ticket was closed 7 years ago with no information,
> and nothing in changelog seems relevant?

Oh thanks Stuart!

I was already wondering.  Yes, that's 11 years old:
https://gitlab.kitware.com/cmake/cmake/-/commit/afc75bb7f520b7405a08f24a25a42542d3e3c92f

> 
> > Could someone push it into the next build arm64 or amd64.
> > 
> > Thanks Rafael
> > 
> > The changelog you can find here:
> > https://cmake.org/cmake/help/v3.28/release/3.28.html
> > https://cmake.org/cmake/help/v3.28/release/3.28.html#id1
> 
> This one seems likely to cause some issues:
> 
> "The exec_program() command, which has been deprecated since CMake 3.0,
> has been removed by policy CMP0153. Use the execute_process() command
> instead."
> 
> Though it's possible cmake is using the word "removed" in a way which
> doesn't actually mean "removed".

Yes, something like is triggered, but it's just a warning.

doas -u _pbuild ninja uninstall
[1/1] cd /usr/ports/pobj/kmbox-23.08.2/build-amd64 && /usr/local/bin/cmake -P 
/usr/ports/pobj/kmbox-23.08.2/build-amd64/ecm_uninstall.cmake
FAILED: CMakeFiles/uninstall 
/usr/ports/pobj/kmbox-23.08.2/build-amd64/CMakeFiles/uninstall 
cd /usr/ports/pobj/kmbox-23.08.2/build-amd64 && /usr/local/bin/cmake -P 
/usr/ports/pobj/kmbox-23.08.2/build-amd64/ecm_uninstall.cmake
-- Uninstalling /usr/local/lib/libKPim5Mbox.so.0.0
CMake Warning (dev) at ecm_uninstall.cmake:10 (exec_program):
  Policy CMP0153 is not set: The exec_program command should not be called.
  Run "cmake --help-policy CMP0153" for policy details.  Use the cmake_policy
  command to set the policy and suppress this warning.

  Use execute_process() instead.
This warning is for project developers.  Use -Wno-dev to suppress it.

CMake Error at ecm_uninstall.cmake:16 (message):
  Problem when removing /usr/local/lib/libKPim5Mbox.so.0.0

> 
> > +https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9085
> ...
> > +-  this->OpenBSD = this->Makefile->GetState()->GetGlobalPropertyAsBool(
> > ++  this->IsOpenBSD = this->Makefile->GetState()->GetGlobalPropertyAsBool(
> 
> This has been there for a *long* time. Any idea why they started pulling
> in param.h such that it became a problem?
> 

Not on the quick, it's not obvious.

Re: UPDATE: devel/cmake (bulk build wanted)

2023-12-18 Thread Stuart Henderson 
On 2023/12/18 01:39, Rafael Sadowski wrote:
> Here is a cmake update diff to version 3.28.1.
> 
> Upstream fixed shared libraries detection on OpenBSD[1]. I can't predict
> the impact but a handful of cmake ports build,packaged fine with that
> update.
> 
> 1: https://gitlab.kitware.com/cmake/cmake/-/issues/12954

Is that correct? That ticket was closed 7 years ago with no information,
and nothing in changelog seems relevant?

> Could someone push it into the next build arm64 or amd64.
> 
> Thanks Rafael
> 
> The changelog you can find here:
> https://cmake.org/cmake/help/v3.28/release/3.28.html
> https://cmake.org/cmake/help/v3.28/release/3.28.html#id1

This one seems likely to cause some issues:

"The exec_program() command, which has been deprecated since CMake 3.0,
has been removed by policy CMP0153. Use the execute_process() command
instead."

Though it's possible cmake is using the word "removed" in a way which
doesn't actually mean "removed".

> +https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9085
...
> +-  this->OpenBSD = this->Makefile->GetState()->GetGlobalPropertyAsBool(
> ++  this->IsOpenBSD = this->Makefile->GetState()->GetGlobalPropertyAsBool(

This has been there for a *long* time. Any idea why they started pulling
in param.h such that it became a problem?

UPDATE: devel/cmake (bulk build wanted)

2023-12-17 Thread Rafael Sadowski 
Here is a cmake update diff to version 3.28.1.

Upstream fixed shared libraries detection on OpenBSD[1]. I can't predict
the impact but a handful of cmake ports build,packaged fine with that
update.

Could someone push it into the next build arm64 or amd64.

Thanks Rafael

The changelog you can find here:
https://cmake.org/cmake/help/v3.28/release/3.28.html
https://cmake.org/cmake/help/v3.28/release/3.28.html#id1

1: https://gitlab.kitware.com/cmake/cmake/-/issues/12954

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index d87c0496312..52ad4eaf2c4 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -2,7 +2,7 @@ DPB_PROPERTIES =parallel
 
 COMMENT =  portable build system
 
-VER =  3.27.7
+VER =  3.28.1
 EPOCH =0
 DISTNAME = cmake-${VER}
 CATEGORIES =   devel
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 02ec28068c3..3204b7eb5b7 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.27.7.tar.gz) = CPcaEGA2vwUfaSdg75VYwFd8Qqw56Wugl+dmK9QVjY4=
-SIZE (cmake-3.27.7.tar.gz) = 10982558
+SHA256 (cmake-3.28.1.tar.gz) = FelPg+ZH99YgoUCnpdp2NJ/Eehv+1m0PXN7o5zRAea0=
+SIZE (cmake-3.28.1.tar.gz) = 11065923
diff --git a/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx 
b/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx
new file mode 100644
index 000..48a483a3632
--- /dev/null
+++ b/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx
@@ -0,0 +1,23 @@
+https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9085
+
+Index: Source/cmComputeLinkInformation.cxx
+--- Source/cmComputeLinkInformation.cxx.orig
 Source/cmComputeLinkInformation.cxx
+@@ -260,7 +260,7 @@ cmComputeLinkInformation::cmComputeLinkInformation(
+   , Config(config)
+ {
+   // Check whether to recognize OpenBSD-style library versioned names.
+-  this->OpenBSD = this->Makefile->GetState()->GetGlobalPropertyAsBool(
++  this->IsOpenBSD = this->Makefile->GetState()->GetGlobalPropertyAsBool(
+ "FIND_LIBRARY_USE_OPENBSD_VERSIONING");
+ 
+   // Allocate internals.
+@@ -1574,7 +1574,7 @@ std::string cmComputeLinkInformation::CreateExtensionR
+   libext += ')';
+ 
+   // Add an optional OpenBSD-style version or major.minor.version component.
+-  if (this->OpenBSD || type == LinkShared) {
++  if (this->IsOpenBSD || type == LinkShared) {
+ libext += "(\\.[0-9]+)*";
+   }
+ 
diff --git a/devel/cmake/patches/patch-Source_cmComputeLinkInformation_h 
b/devel/cmake/patches/patch-Source_cmComputeLinkInformation_h
new file mode 100644
index 000..0e7b2bba1d6
--- /dev/null
+++ b/devel/cmake/patches/patch-Source_cmComputeLinkInformation_h
@@ -0,0 +1,14 @@
+https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9085
+
+Index: Source/cmComputeLinkInformation.h
+--- Source/cmComputeLinkInformation.h.orig
 Source/cmComputeLinkInformation.h
+@@ -254,7 +254,7 @@ class cmComputeLinkInformation (private)
+   std::unique_ptr OrderRuntimeSearchPath;
+ 
+   bool OldLinkDirMode;
+-  bool OpenBSD;
++  bool IsOpenBSD;
+   bool LinkDependsNoShared;
+   bool RuntimeUseChrpath;
+   bool NoSONameUsesPath;
diff --git a/devel/cmake/patches/patch-Source_cmFileCommand_cxx 
b/devel/cmake/patches/patch-Source_cmFileCommand_cxx
index 5477e386d64..ee1b85893ad 100644
--- a/devel/cmake/patches/patch-Source_cmFileCommand_cxx
+++ b/devel/cmake/patches/patch-Source_cmFileCommand_cxx
@@ -1,7 +1,7 @@
 Index: Source/cmFileCommand.cxx
 --- Source/cmFileCommand.cxx.orig
 +++ Source/cmFileCommand.cxx
-@@ -1763,6 +1763,13 @@ bool HandleDownloadCommand(std::vector co
+@@ -1816,6 +1816,13 @@ bool HandleDownloadCommand(std::vector co
++i;
std::string file;
  
@@ -15,7 +15,7 @@ Index: Source/cmFileCommand.cxx
long timeout = 0;
long inactivity_timeout = 0;
std::string logVar;
-@@ -2173,6 +2180,12 @@ bool HandleUploadCommand(std::vector cons
+@@ -2226,6 +2233,12 @@ bool HandleUploadCommand(std::vector cons
   cmExecutionStatus& status)
  {
  #if !defined(CMAKE_BOOTSTRAP)
diff --git a/devel/cmake/patches/patch-Source_cmFindLibraryCommand_cxx 
b/devel/cmake/patches/patch-Source_cmFindLibraryCommand_cxx
new file mode 100644
index 000..41204c1e05d
--- /dev/null
+++ b/devel/cmake/patches/patch-Source_cmFindLibraryCommand_cxx
@@ -0,0 +1,41 @@
+https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9085
+
+Index: Source/cmFindLibraryCommand.cxx
+--- Source/cmFindLibraryCommand.cxx.orig
 Source/cmFindLibraryCommand.cxx
+@@ -207,7 +207,7 @@ struct cmFindLibraryHelper
+   std::string BestPath;
+ 
+   // Support for OpenBSD shared library naming: lib.so..
+-  bool OpenBSD;
++  bool IsOpenBSD;
+ 
+   bool DebugMode;
+ 
+@@ -320,7 +320,7 @@ cmFindLibraryHelper::cmFindLibraryHelper(std::string d
+   this->RegexFromList(this->SuffixRegexStr, this->Suffixes);
+ 
+   // Check whether to use OpenBSD-style library version comparisons.
+-  this->OpenBSD =

Re: UPDATE: devel/cmake BULK BUILD WANTED

2023-04-05 Thread Rafael Sadowski 
On Mon Apr 03, 2023 at 06:50:44PM +0200, Rafael Sadowski wrote:
> Hi bulk builders,
> 
> could someone push this diff into the next amd64 bulk build for me?
> 
> Many thanks in advance,
> 
> Rafael
> 

Update to 3.26.3.

Index: Makefile
===
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.224
diff -u -p -u -p -r1.224 Makefile
--- Makefile21 Feb 2023 23:06:55 -  1.224
+++ Makefile5 Apr 2023 10:10:55 -
@@ -2,8 +2,7 @@ DPB_PROPERTIES =parallel
 
 COMMENT =  portable build system
 
-VER =  3.25.2
-REVISION = 0
+VER =  3.26.3
 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
--- distinfo28 Jan 2023 16:34:11 -  1.71
+++ distinfo5 Apr 2023 10:10:55 -
@@ -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.3.tar.gz) = u9jTkhdQnRY8tUSkDWQorGZt3IPiKQXT5SySV4Hw9lk=
+SIZE (cmake-3.26.3.tar.gz) = 10668855
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 -   
1.11
+++ patches/patch-Source_cmFileCommand_cxx  5 Apr 2023 10:10:55 -
@@ -1,7 +1,7 @@
 Index: Source/cmFileCommand.cxx
 --- Source/cmFileCommand.cxx.orig
 +++ Source/cmFileCommand.cxx
-@@ -1744,6 +1744,13 @@ bool HandleDownloadCommand(std::vector co
+@@ -1764,6 +1764,13 @@ bool HandleDownloadCommand(std::vector 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 cons
+@@ -2174,6 +2181,12 @@ bool HandleUploadCommand(std::vector 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 
-   1.5
+++ patches/patch-Source_cmFindPackageCommand_cxx   5 Apr 2023 10:10:55 
-
@@ -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 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 -   
1.22
+++ patches/patch-Source_cmGeneratorTarget_cxx  5 Apr 2023 10:10:55 -
@@ -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
 +#endif
 +
if (this->IsFrameworkOnApple()) {
- targetNames.Real = prefix;
+ targetNames.Real = components.prefix;
  if (!this->Makefile->PlatformIsAppleEmbedded()) {
Index: patches/patch-Source_cmGlobalGenerator_cxx
===
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx,v
retrieving revision 1.22
diff -u -p -u -p

UPDATE: devel/cmake BULK BUILD WANTED

2023-04-03 Thread Rafael Sadowski 
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
--- Makefile21 Feb 2023 23:06:55 -  1.224
+++ Makefile3 Apr 2023 16:47:42 -
@@ -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
--- distinfo28 Jan 2023 16:34:11 -  1.71
+++ distinfo3 Apr 2023 16:47:42 -
@@ -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 -   
1.11
+++ patches/patch-Source_cmFileCommand_cxx  3 Apr 2023 16:47:42 -
@@ -1,7 +1,7 @@
 Index: Source/cmFileCommand.cxx
 --- Source/cmFileCommand.cxx.orig
 +++ Source/cmFileCommand.cxx
-@@ -1744,6 +1744,13 @@ bool HandleDownloadCommand(std::vector co
+@@ -1764,6 +1764,13 @@ bool HandleDownloadCommand(std::vector 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 cons
+@@ -2174,6 +2181,12 @@ bool HandleUploadCommand(std::vector 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 
-   1.5
+++ patches/patch-Source_cmFindPackageCommand_cxx   3 Apr 2023 16:47:42 
-
@@ -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 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 -   
1.22
+++ patches/patch-Source_cmGeneratorTarget_cxx  3 Apr 2023 16:47:42 -
@@ -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
 +#endif
 +
if (this->IsFrameworkOnApple()) {
- targetNames.Real = prefix;
+ targetNames.Real = components.prefix;
  if (!this->Makefile->PlatformIsAppleEmbedded()) {
Index: patches/patch-Source_cmGlobalGenerator_cxx
===
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 patch-Source_cmGlobalGenerator_cxx
--- patches/patch-Source_cmGlobalGenerator_cxx  3 Dec 2022

Re: UPDATE: devel/cmake (bulk build)

2022-08-18 Thread Rafael Sadowski 
On Thu Aug 18, 2022 at 09:29:36AM +0200, Theo Buehler wrote:
> On Wed, Aug 10, 2022 at 09:34:51AM +0200, Theo Buehler wrote:
> > On Mon, Aug 08, 2022 at 07:45:16AM +0200, Rafael Sadowski wrote:
> > > Update CMake to the latest version. Could someone throw it into a bulk
> > > build for me?
> > 
> > This looks pretty good to me:
> > 
> > I=11286 B=10 Q=0 T=8 F=0 !=83
> > E=x11/kde-applications/grantlee-editor x11/kde-applications/akonadiconsole 
> > devel/kreport geo/kgeotag x11/kde-applications/mailcommon
> > 
> > Some of these have already been fixed. rsadowski has the detailed logs.
> > Failures look something like this:
> 
> Since no-one else seems to be testing this, I think we can land this and
> sort out the remaining issues in tree.
> 
> ok tb

Thanks for the bulks. I'll wait for the next KDE update (I see here the
most impact) and commit it together.

Rafael

Re: UPDATE: devel/cmake (bulk build)

2022-08-18 Thread Theo Buehler 
On Wed, Aug 10, 2022 at 09:34:51AM +0200, Theo Buehler wrote:
> On Mon, Aug 08, 2022 at 07:45:16AM +0200, Rafael Sadowski wrote:
> > Update CMake to the latest version. Could someone throw it into a bulk
> > build for me?
> 
> This looks pretty good to me:
> 
> I=11286 B=10 Q=0 T=8 F=0 !=83
> E=x11/kde-applications/grantlee-editor x11/kde-applications/akonadiconsole 
> devel/kreport geo/kgeotag x11/kde-applications/mailcommon
> 
> Some of these have already been fixed. rsadowski has the detailed logs.
> Failures look something like this:

Since no-one else seems to be testing this, I think we can land this and
sort out the remaining issues in tree.

ok tb

Re: UPDATE: devel/cmake (bulk build)

2022-08-10 Thread Theo Buehler 
On Mon, Aug 08, 2022 at 07:45:16AM +0200, Rafael Sadowski wrote:
> Update CMake to the latest version. Could someone throw it into a bulk
> build for me?

This looks pretty good to me:

I=11286 B=10 Q=0 T=8 F=0 !=83
E=x11/kde-applications/grantlee-editor x11/kde-applications/akonadiconsole 
devel/kreport geo/kgeotag x11/kde-applications/mailcommon

Some of these have already been fixed. rsadowski has the detailed logs.
Failures look something like this:

CMake Warning at src/plugins/CMakeLists.txt:7 (find_package):
  Found package configuration file:

/usr/local/lib/cmake/Marble/MarbleConfig.cmake

  but it set Marble_FOUND to FALSE so package "Marble" is considered to be
  NOT FOUND.  Reason given by package:

  The following imported targets are referenced, but are missing: Astro

Re: UPDATE: devel/cmake (bulk build)

2022-08-08 Thread Theo Buehler 
On Mon, Aug 08, 2022 at 07:45:16AM +0200, Rafael Sadowski wrote:
> Update CMake to the latest version. Could someone throw it into a bulk
> build for me?

I have started a bulk with this diff.

UPDATE: devel/cmake (bulk build)

2022-08-07 Thread Rafael Sadowski 
Update CMake to the latest version. Could someone throw it into a bulk
build for me?

Thanks, Rafael

Index: Makefile
===
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.215
diff -u -p -u -p -r1.215 Makefile
--- Makefile31 Jul 2022 20:40:36 -  1.215
+++ Makefile8 Aug 2022 05:43:15 -
@@ -2,7 +2,7 @@ DPB_PROPERTIES =parallel
 
 COMMENT =  portable build system
 
-VER =  3.23.3
+VER =  3.24.0
 EPOCH =0
 DISTNAME = cmake-${VER}
 CATEGORIES =   devel
Index: distinfo
===
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.65
diff -u -p -u -p -r1.65 distinfo
--- distinfo31 Jul 2022 20:40:36 -  1.65
+++ distinfo8 Aug 2022 05:43:15 -
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.23.3.tar.gz) = Bv768K2UmJcktW9zMJPCYj9vhDVuW+uVWVf5zj7iiAk=
-SIZE (cmake-3.23.3.tar.gz) = 9988050
+SHA256 (cmake-3.24.0.tar.gz) = wrYffN7LFXbK0l+Rio9CuGhdiKgy/UtiueD6MukVplg=
+SIZE (cmake-3.24.0.tar.gz) = 10395167
Index: patches/patch-Modules_Compiler_GNU_cmake
===
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 patch-Modules_Compiler_GNU_cmake
--- patches/patch-Modules_Compiler_GNU_cmake11 Mar 2022 18:49:50 -  
1.18
+++ patches/patch-Modules_Compiler_GNU_cmake8 Aug 2022 05:43:15 -
@@ -1,7 +1,7 @@
 Index: Modules/Compiler/GNU.cmake
 --- Modules/Compiler/GNU.cmake.orig
 +++ Modules/Compiler/GNU.cmake
-@@ -53,10 +53,17 @@ macro(__compiler_gnu lang)
+@@ -54,10 +54,17 @@ macro(__compiler_gnu lang)
  
# Initial configuration flags.
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
Index: patches/patch-Source_cmFileCommand_cxx
===
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmFileCommand_cxx,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-Source_cmFileCommand_cxx
--- patches/patch-Source_cmFileCommand_cxx  29 May 2022 00:30:31 -  
1.8
+++ patches/patch-Source_cmFileCommand_cxx  8 Aug 2022 05:43:15 -
@@ -1,7 +1,7 @@
 Index: Source/cmFileCommand.cxx
 --- Source/cmFileCommand.cxx.orig
 +++ Source/cmFileCommand.cxx
-@@ -1761,6 +1761,13 @@ bool HandleDownloadCommand(std::vector co
+@@ -1762,6 +1762,13 @@ bool HandleDownloadCommand(std::vector co
++i;
std::string file;
  
@@ -15,7 +15,7 @@ Index: Source/cmFileCommand.cxx
long timeout = 0;
long inactivity_timeout = 0;
std::string logVar;
-@@ -2135,6 +2142,12 @@ bool HandleUploadCommand(std::vector cons
+@@ -2166,6 +2173,12 @@ bool HandleUploadCommand(std::vector 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.3
diff -u -p -u -p -r1.3 patch-Source_cmFindPackageCommand_cxx
--- patches/patch-Source_cmFindPackageCommand_cxx   28 May 2022 06:18:52 
-  1.3
+++ patches/patch-Source_cmFindPackageCommand_cxx   8 Aug 2022 05:43:15 
-
@@ -3,7 +3,7 @@ Disable find_package QUIET option in ope
 Index: Source/cmFindPackageCommand.cxx
 --- Source/cmFindPackageCommand.cxx.orig
 +++ Source/cmFindPackageCommand.cxx
-@@ -257,7 +257,13 @@ bool cmFindPackageCommand::InitialPass(std::vector moduleArgs;
for (unsigned int i = 1; i < args.size(); ++i) {
  if (args[i] == "QUIET") {
@@ -16,5 +16,5 @@ Index: Source/cmFindPackageCommand.cxx
 +  }
 +  this->Quiet = quiet;
doing = DoingNone;
- } else if (args[i] == "EXACT") {
-   this->VersionExact = true;
+ } else if (args[i] == "BYPASS_PROVIDER") {
+   bypassProvider = true;
Index: patches/patch-Source_cmGeneratorTarget_cxx
===
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 patch-Source_cmGeneratorTarget_cxx
--- patches/patch-Source_cmGeneratorTarget_cxx  14 Jun 2022 10:26:13 -  
1.20
+++ patches/patch-Source_cmGeneratorTarget_cxx  8 Aug 2022 05:43:15 -
@@ -1,7 +1,7 @@
 Index: Source/cmGeneratorTarget.cxx
 --- Source/cmGeneratorTarget.cxx.orig
 +++ Source/cmGeneratorTarget.cxx
-@@ -5115,6 +5115,50 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
+@@ -5139,6 +5139,50 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
// The library name.
targetNames.Output = prefix + targetNames.Base + suffix;
  
Index: patches/patch-Source_cmGlobalGenerator_cxx
===
RCS file: