<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/4c91e055624062e0142081a494cb6b788ee287d8">https://github.com/macports/macports-ports/commit/4c91e055624062e0142081a494cb6b788ee287d8</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 4c91e05 cmake-devel: update to c1e9b1c2 (20190106)
</span>4c91e05 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4c91e055624062e0142081a494cb6b788ee287d8
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Jan 7 10:26:57 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> cmake-devel: update to c1e9b1c2 (20190106)
</span>---
devel/cmake/Portfile | 11 ++++---
.../files/patch-Modules-noArchCheck.devel.diff | 36 ++++++++++++++++------
.../files/patch-Source_CMakeLists.txt.devel.diff | 2 +-
devel/cmake/files/patch-qt4gui.devel.diff | 2 +-
devel/cmake/files/patch-qt5gui.devel.diff | 2 +-
5 files changed, 35 insertions(+), 18 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 07cfd0e..d6f2835 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;'>@@ -64,11 +64,12 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20181128
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit 772edffbf0c08fc0a6fcf74fb98545b7afcfee13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 c704c91148b44a5092b9ea19b71107265f8d7ccf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0d26b360414f477ed50a5305b61634cc86f09e9e6ffdea19ce17d8cf5d9189fb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6506100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190106
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit c1e9b1c283caccd468adfafd0496edd63964b899
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 87c31ec4d0f0cfe054f8c6d52504b9fbbf698290 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 58243006bb7edfd91926fa6a8c32e4de7d356826433099c4d7d1fea1714bb9c3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6574007
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
use_bzip2 yes
master_sites https://gitlab.kitware.com/cmake/cmake/repository/archive${extract.suffix}?ref=${commit}&
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Modules-noArchCheck.devel.diff b/devel/cmake/files/patch-Modules-noArchCheck.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 373f0b6..5d79d80 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Modules-noArchCheck.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-Modules-noArchCheck.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> --- Modules/BasicConfigVersion-AnyNewerVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,15 +17,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(PACKAGE_VERSION_EXACT TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,15 +23,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if("@CVF_ARCH_INDEPENDENT@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return()
</span> endif()
-
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,12 +18,11 @@
</span> -endif()
--- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-ExactVersion.cmake.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,16 +32,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(PACKAGE_VERSION_EXACT TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,15 +38,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if("@CVF_ARCH_INDEPENDENT@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return()
</span> endif()
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span> -# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
- return()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,11 +36,28 @@
</span> -endif()
--- Modules/BasicConfigVersion-SameMajorVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-SameMajorVersion.cmake.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,16 +31,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(PACKAGE_VERSION_EXACT TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,15 +37,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if("@CVF_ARCH_INDEPENDENT@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return()
</span> endif()
-
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PACKAGE_VERSION_UNSUITABLE TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/BasicConfigVersion-SameMinorVersion.cmake.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/BasicConfigVersion-SameMinorVersion.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,15 +41,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if("@CVF_ARCH_INDEPENDENT@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span> -
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Source_CMakeLists.txt.devel.diff b/devel/cmake/files/patch-Source_CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 26611cd..70747a6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Source_CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-Source_CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Source/CMakeLists.txt.orig
+++ Source/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -795,9 +795,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -808,9 +808,9 @@
</span> endif()
endif()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt4gui.devel.diff b/devel/cmake/files/patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c6c6ea5..9b88a58 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,7 +157,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -714,12 +714,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -696,12 +696,6 @@
</span> set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt5gui.devel.diff b/devel/cmake/files/patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f47248..f41d2f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -714,12 +714,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -696,12 +696,6 @@
</span> set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</pre><pre style='margin:0'>
</pre>