<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/33927d6e899167f60bae7a7f11dc5d9b14f0bda5">https://github.com/macports/macports-ports/commit/33927d6e899167f60bae7a7f11dc5d9b14f0bda5</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 33927d6e899 cmake: update to 3.18.0
</span>33927d6e899 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 33927d6e899167f60bae7a7f11dc5d9b14f0bda5
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Jul 21 09:39:09 2020 -0400

<span style='display:block; white-space:pre;color:#404040;'>    cmake: update to 3.18.0
</span>---
 devel/cmake/Portfile                               | 13 +++++---
 .../files/patch-CMakeFindFrameworks.cmake.diff     | 17 +++++-----
 devel/cmake/files/patch-cmake-leopard-tiger.diff   | 39 ++++------------------
 .../cmake/files/patch-fix-system-prefix-path.diff  | 16 ++++-----
 devel/cmake/files/patch-qt4gui.diff                |  2 +-
 devel/cmake/files/patch-qt5gui.diff                |  2 +-
 6 files changed, 34 insertions(+), 55 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 628e6e23bea..99ab7b2c64b 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;'>@@ -36,12 +36,12 @@ subport cmake-devel {
</span> 
 if {${subport} eq ${name}} {
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    gitlab.setup cmake cmake 3.17.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    gitlab.setup cmake cmake 3.18.0 v
</span>     gitlab.livecheck.regex {([0-9.]+)}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums rmd160 2685b4af1404ed723440c0839f56b9023e6307fe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              sha256 efcfe42468e0dfa047afa85a7d92c2489598f2b39c24eb7d7884763fbac48374 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              size   7425589
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums rmd160 a96e04ae896f7255aa7a807a519624d1cc6482ef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              sha256 757c9644ec8b0d1a0fbeb5d48743f615efd2861571be40b659e3cca21ffb9105 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              size   6951421
</span>     revision  0
 
     compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -181,8 +181,11 @@ if {${subport} eq ${name}} {
</span>         # patch PREFIX
         reinplace "s|__PREFIX__|${prefix}|g" \
             ${worksrcpath}/macports.cmake \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/Modules/CMakeFindFrameworks.cmake \
</span>             ${worksrcpath}/Modules/Platform/Darwin.cmake
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # patch FRAMEWORKS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|__FRAMEWORKS_DIR__|${frameworks_dir}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/Modules/CMakeFindFrameworks.cmake
</span>     }
 
     post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff b/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9261a14d394..d0e0df01251 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-CMakeFindFrameworks.cmake.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;'>++            __FRAMEWORKS_DIR__
</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-cmake-leopard-tiger.diff b/devel/cmake/files/patch-cmake-leopard-tiger.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ce704860a83..ff16af9da08 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,10 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-kencu@macports.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The <memory> header seems to be needed if building with gcc/libstdc++ on MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-adding it does no harm to clang/libc++ builds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-it must be somehow automatically included with the libc++ headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Source/cmMachO.h Source/cmMachO.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0c44b55..06c39db 100644
</span> --- Source/cmMachO.h
 +++ Source/cmMachO.h
 @@ -7,6 +7,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,23 +8,9 @@ index 0c44b55..06c39db 100644
</span>  
  #if !defined(CMAKE_USE_MACH_PARSER)
  #  error "This file may be included only if CMAKE_USE_MACH_PARSER is enabled."
<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;'>-kencu@macports.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The patches below match the tiger patches in the libuv port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Although cmake is configured to use the system libuv, it appears that the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bootstrap version of cmake uses a more current version, and that is a moving
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-target as libuv advances.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-At some point we may have to switch to an older bootstrap version of cmake,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if libuv becomes too difficult to keep up-to-date.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Utilities/cmlibuv/src/unix/core.c Utilities/cmlibuv/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cf7dea0..b48ca73 100644
</span> --- Utilities/cmlibuv/src/unix/core.c
 +++ Utilities/cmlibuv/src/unix/core.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -525,10 +525,24 @@ skip:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -518,10 +518,24 @@
</span>   * will unwind the thread when it's in the cancel state. Work around that
   * by making the system call directly. Musl libc is unaffected.
   */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,10 +33,10 @@ index cf7dea0..b48ca73 100644
</span>  #pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
 +#endif
 +
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(__LP64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__LP64__) || TARGET_OS_IPHONE
</span>    extern int close$NOCANCEL(int);
    return close$NOCANCEL(fd);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -536,7 +550,11 @@ int uv__close_nocancel(int fd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -529,7 +543,11 @@
</span>    extern int close$NOCANCEL$UNIX2003(int);
    return close$NOCANCEL$UNIX2003(fd);
  #endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +48,7 @@ index cf7dea0..b48ca73 100644
</span>  #elif defined(__linux__)
    return syscall(SYS_close, fd);
  #else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1306,8 +1324,12 @@ int uv_os_unsetenv(const char* name) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1347,8 +1365,12 @@
</span>    if (name == NULL)
      return UV_EINVAL;
  
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,11 +61,9 @@ index cf7dea0..b48ca73 100644
</span>  
    return 0;
  }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Utilities/cmlibuv/src/unix/fs.c Utilities/cmlibuv/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5fb34f1..7453980 100644
</span> --- Utilities/cmlibuv/src/unix/fs.c
 +++ Utilities/cmlibuv/src/unix/fs.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -743,7 +743,7 @@ static ssize_t uv__fs_sendfile(uv_fs_t* req) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -919,7 +919,7 @@
</span>  
      return -1;
    }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,7 +72,7 @@ index 5fb34f1..7453980 100644
</span>        defined(__DragonFly__)       || \
        defined(__FreeBSD__)         || \
        defined(__FreeBSD_kernel__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1055,7 +1055,7 @@ static void uv__to_stat(struct stat* src, uv_stat_t* dst) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1286,7 +1286,7 @@
</span>    dst->st_blksize = src->st_blksize;
    dst->st_blocks = src->st_blocks;
  
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,11 +81,9 @@ index 5fb34f1..7453980 100644
</span>    dst->st_atim.tv_sec = src->st_atimespec.tv_sec;
    dst->st_atim.tv_nsec = src->st_atimespec.tv_nsec;
    dst->st_mtim.tv_sec = src->st_mtimespec.tv_sec;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Utilities/cmlibuv/src/unix/tty.c Utilities/cmlibuv/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index db479d6..5a7a86b 100644
</span> --- Utilities/cmlibuv/src/unix/tty.c
 +++ Utilities/cmlibuv/src/unix/tty.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,7 +44,7 @@ static int uv__tty_is_slave(const int fd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,7 +72,7 @@
</span>    int dummy;
  
    result = ioctl(fd, TIOCGPTN, &dummy) != 0;
<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 0b2221ec60e..5d630bdc366 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;'>-@@ -207,6 +207,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -215,6 +215,12 @@
</span>    ${_apps_paths})
  unset(_apps_paths)
  
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,11 +11,11 @@
</span> +)
 +
  include(Platform/UnixPaths)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if(_CMAKE_OSX_SYSROOT_PATH AND EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${_CMAKE_OSX_SYSROOT_PATH}/usr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -214,7 +220,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     list(APPEND _CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES_INIT ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   endforeach()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(_CMAKE_OSX_SYSROOT_PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if(EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -230,7 +236,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     endforeach()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   endif()
</span>  endif()
 -list(APPEND CMAKE_SYSTEM_PREFIX_PATH
 -  /sw        # Fink
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,8 +23,8 @@
</span> -  )
 --- Modules/Platform/UnixPaths.cmake.orig
 +++ Modules/Platform/UnixPaths.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,22 +23,39 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # search types.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,22 +27,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # synchronized
</span>  list(APPEND CMAKE_SYSTEM_PREFIX_PATH
    # Standard
 -  /usr/local /usr /
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt4gui.diff b/devel/cmake/files/patch-qt4gui.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6265971bcd2..9d4059c61e1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt4gui.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt4gui.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;'>+@@ -768,12 +768,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.diff b/devel/cmake/files/patch-qt5gui.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3535cb66660..c72fbe905a7 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;'>@@ -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;'>+@@ -768,12 +768,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>