<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/ecd519a47b093f77b52986a41610d17b0905de4d">https://github.com/macports/macports-ports/commit/ecd519a47b093f77b52986a41610d17b0905de4d</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 ecd519a47b0 cmake: update to 3.21.2
</span>ecd519a47b0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ecd519a47b093f77b52986a41610d17b0905de4d
</span>Author: FnControlOption <70830482+FnControlOption@users.noreply.github.com>
AuthorDate: Fri Sep 3 21:33:25 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> cmake: update to 3.21.2
</span>---
devel/cmake/Portfile | 13 ++++++-------
devel/cmake/files/patch-Modules-noArchCheck.diff | 6 +++---
devel/cmake/files/patch-fix-system-prefix-path.diff | 2 +-
devel/cmake/files/patch-qt5gui.diff | 2 +-
...atch-restore-no-default-rpath-added-on-Tiger.diff | 20 --------------------
5 files changed, 11 insertions(+), 32 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 fe21e28dc32..f502a023d89 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,11 +43,11 @@ subport cmake-devel {
</span>
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gitlab.setup cmake cmake 3.20.5 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 f0f13ae525878d7929dcc95f322d224e7b47443d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 54dd3e0dcd64e27ff8442071aacc4f5a9605896b5701de46d76f22d686238eba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7264123
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gitlab.setup cmake cmake 3.21.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 11e5a2655a4357ca39d3246dd1e29192b7f2fd15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e184f256a34eb67cb9c425a0727b15008847915cf33cbfcfb4ac162ede656868 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7418619
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
gitlab.livecheck.regex {([0-9.]+)}
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,8 +78,7 @@ if {${subport} eq ${name}} {
</span> patch-fix-system-prefix-path.diff \
patch-cmake-leopard-tiger.diff \
patch-fix-clock_gettime-test.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qt5gui.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-restore-no-default-rpath-added-on-Tiger.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qt5gui.diff
</span>
depends_lib-append \
port:curl \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Modules-noArchCheck.diff b/devel/cmake/files/patch-Modules-noArchCheck.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index aad689a4603..9f84f526092 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Modules-noArchCheck.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-Modules-noArchCheck.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> -endif()
--- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-ExactVersion.cmake.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,15 +45,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,15 +74,3 @@
</span> if("@CVF_ARCH_INDEPENDENT@")
return()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@
</span> -endif()
--- Modules/BasicConfigVersion-SameMajorVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-SameMajorVersion.cmake.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,15 +53,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,15 +56,3 @@
</span> if("@CVF_ARCH_INDEPENDENT@")
return()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@
</span> -endif()
--- Modules/BasicConfigVersion-SameMinorVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-SameMinorVersion.cmake.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,15 +62,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,15 +76,3 @@
</span> if("@CVF_ARCH_INDEPENDENT@")
return()
endif()
<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 6d66393ee7c..94479ab9e0a 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;'>-@@ -233,7 +233,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -235,7 +235,9 @@
</span> endforeach()
endif()
endif()
<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 303cdb7c1e2..0f0a2b4127b 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;'>@@ -53,7 +53,7 @@
</span> <key>CFBundleSignature</key>
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -772,13 +772,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -780,13 +780,20 @@
</span> if(APPLE)
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-restore-no-default-rpath-added-on-Tiger.diff b/devel/cmake/files/patch-restore-no-default-rpath-added-on-Tiger.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 29205eeeb62..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-restore-no-default-rpath-added-on-Tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-reverts https://gitlab.kitware.com/cmake/cmake/-/commit/4aed96e2309e64571aabfda263b3ca4c4f62d619
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-see discussion: https://trac.macports.org/ticket/63261
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./Modules/Platform/Darwin.cmake.orig 2021-07-29 21:11:46.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Modules/Platform/Darwin.cmake 2021-07-29 21:12:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,7 +47,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_SHARED_MODULE_SUFFIX ".so")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_MODULE_EXISTS 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_DL_LIBS "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Enable rpath support for 10.5 and greater where it is known to work.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if("${DARWIN_MAJOR_VERSION}" GREATER 8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach(lang C CXX OBJC OBJCXX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_${lang}_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ")
</span></pre><pre style='margin:0'>
</pre>