<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c86a1e8e7068a30e543f4ad83b835aaedf7fdaed">https://github.com/macports/macports-ports/commit/c86a1e8e7068a30e543f4ad83b835aaedf7fdaed</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c86a1e8e706 cmake: update to 3.20.5
</span>c86a1e8e706 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c86a1e8e7068a30e543f4ad83b835aaedf7fdaed
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Jun 29 09:01:03 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmake: update to 3.20.5
</span>---
devel/cmake/Portfile | 8 ++++----
devel/cmake/files/patch-cmake-leopard-tiger.diff | 8 ++++----
devel/cmake/files/patch-fix-system-prefix-path.diff | 4 ++--
devel/cmake/files/patch-qt5gui.diff | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/Portfile b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6d015003167..b66d45200c1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,10 +43,10 @@ subport cmake-devel {
</span>
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gitlab.setup cmake cmake 3.19.8 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 052886bb4ebbc72db12d501eca21ebe7639329d3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 25488ebb26b588acd5b63d8ccf3722909b3b2206ab2b2180086a2202fa3fbc3c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7150690
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gitlab.setup cmake cmake 3.20.5 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 f0f13ae525878d7929dcc95f322d224e7b47443d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 54dd3e0dcd64e27ff8442071aacc4f5a9605896b5701de46d76f22d686238eba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7264123
</span> revision 0
gitlab.livecheck.regex {([0-9.]+)}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-cmake-leopard-tiger.diff b/devel/cmake/files/patch-cmake-leopard-tiger.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c2dbdbd3788..aadcdb2b6c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-cmake-leopard-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-cmake-leopard-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,13 @@
</span> --- Source/cmMachO.h
+++ Source/cmMachO.h
@@ -6,6 +6,7 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #include <iosfwd>
#include <string>
+#include <memory>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !defined(CMAKE_USE_MACH_PARSER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # error "This file may be included only if CMAKE_USE_MACH_PARSER is enabled."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(CMake_USE_MACH_PARSER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # error "This file may be included only if CMake_USE_MACH_PARSER is enabled."
</span> --- Utilities/cmlibuv/src/unix/core.c
+++ Utilities/cmlibuv/src/unix/core.c
@@ -530,10 +530,24 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-fix-system-prefix-path.diff b/devel/cmake/files/patch-fix-system-prefix-path.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 56779511f7a..beefedca1bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-fix-system-prefix-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-fix-system-prefix-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Modules/Platform/Darwin.cmake.orig
+++ Modules/Platform/Darwin.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -237,7 +237,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -233,7 +233,9 @@
</span> endforeach()
endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@
</span> +# prepend the MacPorts prefix to CMAKE_SYSTEM_PREFIX_PATH
+# might already exist after this if the user has specified it
+list(INSERT CMAKE_SYSTEM_PREFIX_PATH 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __PREFIX__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /opt/local
</span> +)
--- Modules/Platform/UnixPaths.cmake.orig
+++ Modules/Platform/UnixPaths.cmake
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt5gui.diff b/devel/cmake/files/patch-qt5gui.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c03805e96e9..303cdb7c1e2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt5gui.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt5gui.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -206,7 +206,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -288,7 +288,8 @@
</span> OUTPUT_NAME CMake
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in"
MACOSX_BUNDLE_SHORT_VERSION_STRING "${CMAKE_BUNDLE_VERSION}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span> MACOSX_BUNDLE_COPYRIGHT "${copyright_line}"
MACOSX_BUNDLE_GUI_IDENTIFIER "org.cmake.cmake"
)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -245,8 +246,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -327,8 +328,12 @@
</span> endif()
if(APPLE)
</pre><pre style='margin:0'>
</pre>