<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/b808dbdbc3abd2831c434bf98e71d7a0171b4766">https://github.com/macports/macports-ports/commit/b808dbdbc3abd2831c434bf98e71d7a0171b4766</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 b808dbd cmake: update release to 3.17.0 and devel to 20200323 (8638c49f)
</span>b808dbd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b808dbdbc3abd2831c434bf98e71d7a0171b4766
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Mar 23 13:19:03 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmake: update release to 3.17.0 and devel to 20200323 (8638c49f)
</span>---
devel/cmake/Portfile | 23 +++++++++++-----------
.../patch-CMakeFindFrameworks.cmake.devel.diff | 17 ++++++++--------
.../files/patch-fix-feature-test.release.diff | 11 -----------
.../files/patch-fix_cxx14_17_checks.release.diff | 8 ++++----
devel/cmake/files/patch-qt4gui.release.diff | 10 +++++-----
devel/cmake/files/patch-qt5gui.release.diff | 10 +++++-----
6 files changed, 34 insertions(+), 45 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 f25230a..0b695c7 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;'>@@ -45,16 +45,16 @@ dist_subdir cmake
</span>
subport cmake-devel {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch 3.16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch 3.17
</span>
if {${subport} eq ${name}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version ${branch}.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 84404714f203e0c0a0c53165b151043a84f9d380 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5f760b50b8ecc9c0c37135fae5fbf00a2fef617059aa9d61c1bb91653e5a8bfc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9111262
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version ${branch}.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 9373c0524092bec9db3bd8e9259c7cb545c5a0d6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b74c05b55115eacc4fa2b77a814981dbda05cdc95a53e279fe16b7b272f00847 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9466484
</span> revision 0
master_sites ${homepage}/files/v${branch}/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,8 +70,7 @@ if {${subport} eq ${name}} {
</span> patch-Source_Modules_FindLibUV.cmake.release.diff \
patch-fix_cxx14_17_checks.release.diff \
patch-fix-system-prefix-path.release.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake-leopard-tiger.release.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-feature-test.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-leopard-tiger.release.diff
</span>
livecheck.type regex
livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,11 +80,11 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit 6e9eaca24f86500c10e0f5d7399d04deb009a2b4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20200302-[string range ${commit} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 36ca0253d605ca90609e48dab22aa0d7d8f73e83 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a1a3463bcbc6a975f4e8d3cd3b96354236c30e81664cb367fc20e4d82c329a53 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6697762
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit 8638c49f2a0b87c131be8f4d3147a2617938e30a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20200323-[string range ${commit} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 3dcc07bbc4166bdfc5ed3ed0c63738c62c22cdf6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9827cc7ea13654e7f2819e76f239018edfdb6abbdb2b6580a300445329d3c70d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6732894
</span> revision 0
use_bzip2 yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff b/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9261a14..4d26bd8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> --- Modules/CMakeFindFrameworks.cmake.orig
+++ Modules/CMakeFindFrameworks.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,6 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach(dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ~/Library/Frameworks/${fwk}.framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __PREFIX__/Library/Frameworks/${fwk}.framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /usr/local/Frameworks/${fwk}.framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /Library/Frameworks/${fwk}.framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /System/Library/Frameworks/${fwk}.framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_FRAMEWORK_PATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${_cmff_CMAKE_FRAMEWORK_PATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~/Library/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __PREFIX__/Library/Frameworks/${fwk}.framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /Library/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /System/Library/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /Network/Library/Frameworks
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-fix-feature-test.release.diff b/devel/cmake/files/patch-fix-feature-test.release.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e2feeb0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-fix-feature-test.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/Checks/cm_cxx_features.cmake.orig 2019-10-30 07:00:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/Checks/cm_cxx_features.cmake 2019-11-21 03:20:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string(REGEX REPLACE "[^\n]*warning:[^\n]*sprintf\\(\\) is often misused, please use snprintf[^\n]*" "" check_output "${check_output}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Filter out xcodebuild warnings.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string(REGEX REPLACE "[^\n]* xcodebuild\\[[0-9]*:[0-9]*\\] warning: [^\n]*" "" check_output "${check_output}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Filter out ld warnings.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string(REGEX REPLACE "[^\n]*ld: warning: [^\n]*" "" check_output "${check_output}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If using the feature causes warnings, treat it as broken/unavailable.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(check_output MATCHES "(^|[ :])[Ww][Aa][Rr][Nn][Ii][Nn][Gg]")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMake_HAVE_CXX_${FEATURE} OFF CACHE INTERNAL "TRY_COMPILE" FORCE)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-fix_cxx14_17_checks.release.diff b/devel/cmake/files/patch-fix_cxx14_17_checks.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 36d420e..931fedd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-fix_cxx14_17_checks.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-fix_cxx14_17_checks.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,9 @@
</span> #include <cstdio>
#include <iterator>
#include <memory>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,6 +14,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <comdef.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +21,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return item.get();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
+std::optional < std::string >
+create
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@
</span> int main()
{
int a[] = { 0, 1, 2 };
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,6 +43,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,6 +53,13 @@
</span> IDispatchPtr disp(ptr);
#endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt4gui.release.diff b/devel/cmake/files/patch-qt4gui.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8ebd30e..6265971 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt4gui.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt4gui.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,7 +128,7 @@
</span> target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
if(WIN32)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -197,7 +101,7 @@ Checks: '-*,llvm-twine-local'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -201,7 +105,7 @@ Checks: '-*,llvm-twine-local'
</span> ...
")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,7 +137,7 @@
</span> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -243,7 +147,7 @@ if(UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -247,7 +151,7 @@ if(UNIX AND NOT APPLE)
</span> ${COMPONENT})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +146,7 @@
</span> install(CODE "
execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -254,7 +158,7 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -258,7 +162,7 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
</span> # install rules for including 3rd party libs such as Qt
# if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
<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;'>-@@ -732,12 +732,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -714,12 +714,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;background:#e0e0e0;'>@@ -168,5 +168,5 @@
</span> - set(CMAKE_INSTALL_PREFIX
- "${CMAKE_INSTALL_PREFIX}CMake.app/Contents")
endif()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set(QT_NEED_RPATH FALSE)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt5gui.release.diff b/devel/cmake/files/patch-qt5gui.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6342f75..3535cb6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt5gui.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt5gui.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@
</span> target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
if(WIN32)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -197,7 +186,7 @@ Checks: '-*,llvm-twine-local'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -201,7 +190,7 @@ Checks: '-*,llvm-twine-local'
</span> ...
")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@
</span> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -243,7 +232,7 @@ if(UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -247,7 +236,7 @@ if(UNIX AND NOT APPLE)
</span> ${COMPONENT})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@
</span> install(CODE "
execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -254,7 +243,7 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -258,7 +247,7 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
</span> # install rules for including 3rd party libs such as Qt
# if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
<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;'>-@@ -732,12 +732,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -714,12 +714,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;background:#e0e0e0;'>@@ -89,5 +89,5 @@
</span> - set(CMAKE_INSTALL_PREFIX
- "${CMAKE_INSTALL_PREFIX}CMake.app/Contents")
endif()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set(QT_NEED_RPATH FALSE)
</span></pre><pre style='margin:0'>
</pre>