<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/bc5236adc362f024aebd41ca198130bc40db49d0">https://github.com/macports/macports-ports/commit/bc5236adc362f024aebd41ca198130bc40db49d0</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 bc5236adc36 cmake: tweak patch to more appropriately set CMAKE_SYSTEM_PREFIX_PATH
</span>bc5236adc36 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit bc5236adc362f024aebd41ca198130bc40db49d0
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Aug 5 15:22:31 2020 -0400

<span style='display:block; white-space:pre;color:#404040;'>    cmake: tweak patch to more appropriately set CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    ==> prepend MacPorts' prefix instead of appending it
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Should fix issues such as https://trac.macports.org/ticket/60951 , https://trac.macports.org/ticket/60938 , https://trac.macports.org/ticket/60896 ; without having to set ZLIB_ROOT and other variables
</span>---
 devel/cmake/Portfile                                |  2 +-
 devel/cmake/files/patch-fix-system-prefix-path.diff | 21 +++++++--------------
 2 files changed, 8 insertions(+), 15 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 6d305c6f72c..9471c7be57b 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;'>@@ -42,7 +42,7 @@ if {${subport} eq ${name}} {
</span>     checksums rmd160 ada86c6ea82aa111d496e592fbeaa494ff118dc6 \
               sha256 e8f0074858750c9761d5fa9948b3ceece5d1ce50a4e0ad6e58c9e816e4cfd282 \
               size   6953205
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision  0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision  1
</span> 
     compiler.cxx_standard 2011
 
<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 5d630bdc366..6464e76d1a1 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,19 +1,6 @@
</span> --- Modules/Platform/Darwin.cmake.orig
 +++ Modules/Platform/Darwin.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -215,6 +215,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   ${_apps_paths})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unset(_apps_paths)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# add to CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# might already exist before this if the user has specified it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+list(APPEND CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  __PREFIX__ # MacPorts
</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;'>- include(Platform/UnixPaths)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(_CMAKE_OSX_SYSROOT_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   if(EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -230,7 +236,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -230,7 +230,9 @@ if(_CMAKE_OSX_SYSROOT_PATH)
</span>      endforeach()
    endif()
  endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,6 +8,12 @@
</span> -  /sw        # Fink
 -  /opt/local # MacPorts
 -  )
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# prepend the MacPorts prefix to CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# might already exist after this if the user has specified it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++list(INSERT CMAKE_SYSTEM_PREFIX_PATH 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  __PREFIX__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span> --- Modules/Platform/UnixPaths.cmake.orig
 +++ Modules/Platform/UnixPaths.cmake
 @@ -27,22 +27,39 @@
</pre><pre style='margin:0'>

</pre>