<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4c0ec16c0bace1d91e3cb243b363cd90c6cf1fac">https://github.com/macports/macports-ports/commit/4c0ec16c0bace1d91e3cb243b363cd90c6cf1fac</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 4c0ec16c0ba cmake-devel: remove homebrewisms (#20758)
</span>4c0ec16c0ba is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 4c0ec16c0bace1d91e3cb243b363cd90c6cf1fac
</span>Author: Ken <21211439+kencu@users.noreply.github.com>
AuthorDate: Sat Oct 7 13:12:01 2023 -0700

<span style='display:block; white-space:pre;color:#404040;'>    cmake-devel: remove homebrewisms (#20758)
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - There are some hardcoded references to homebrew paths, that have crept into cmake over time. Remove these.
</span><span style='display:block; white-space:pre;color:#404040;'>    - Prevents homebrew-installed software like python from being detected over the settings in PATH and PREFIX, if the user happens to have homebrew installed in /opt/homebrew
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/64111
</span>---
 devel/cmake-devel/Portfile                         |  5 +-
 .../files/patch-remove-homebrew-references.diff    | 58 ++++++++++++++++++++++
 2 files changed, 61 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/Portfile b/devel/cmake-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 12f5a4c54f2..ef0d9a3f9ac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@ version             20230810-3.27.6-[string range ${gitlab.version} 0 7]
</span> checksums           rmd160  0fbaa779dd6cc2300acf0497fa128218847ccd9b \
                     sha256  5bc96186235343be9e948b233dd6c58ffad3a097b35c7331645b45d90ee6b7d3 \
                     size    8425873
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> 
 epoch               1
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +77,8 @@ patchfiles-append \
</span>     patch-qt5gui.diff \
     patch-cmake-cmInstallRuntime-initializer-fix.diff \
     patch-uv_spawn.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patch-cmakeroot-with-app.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patch-cmakeroot-with-app.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patch-remove-homebrew-references.diff
</span> 
 depends_lib-append \
     port:curl \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/patch-remove-homebrew-references.diff b/devel/cmake-devel/files/patch-remove-homebrew-references.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e6303bb60d3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/files/patch-remove-homebrew-references.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,58 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Modules/CMakeFindFrameworks.cmake Modules/CMakeFindFrameworks.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8b9d803b..1da2fb7e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/CMakeFindFrameworks.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/CMakeFindFrameworks.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,12 +17,6 @@ if(NOT CMAKE_FIND_FRAMEWORKS_INCLUDED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   macro(CMAKE_FIND_FRAMEWORKS fwk)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(${fwk}_FRAMEWORKS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      # 'Frameworks' directory from Brew (Apple Silicon and Intel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        set(_brew_framework_path /opt/homebrew/Frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        set(_brew_framework_path /usr/local/Frameworks)
</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;'>+       file(TO_CMAKE_PATH "$ENV{CMAKE_FRAMEWORK_PATH}" _cmff_CMAKE_FRAMEWORK_PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       set(_cmff_search_paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Modules/FindGTK2.cmake Modules/FindGTK2.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 46348768..00bfc29c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/FindGTK2.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/FindGTK2.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -313,7 +313,6 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             /usr/openwin/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             /sw/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             /opt/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            /opt/homebrew/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             /usr/pkg/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             /usr/pkg/include/glib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             $ENV{GTKMM_BASEPATH}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Modules/FindPython/Support.cmake Modules/FindPython/Support.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d483d7f8..7a015bc3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/FindPython/Support.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/FindPython/Support.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,7 +116,6 @@ macro (_PYTHON_FIND_FRAMEWORKS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                          ${_pff_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;'>+-                         /opt/homebrew/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                          ${CMAKE_SYSTEM_FRAMEWORK_PATH})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     list (REMOVE_DUPLICATES _pff_frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     foreach (_pff_implementation IN LISTS _${_PYTHON_PREFIX}_FIND_IMPLEMENTATIONS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Modules/Platform/Darwin.cmake Modules/Platform/Darwin.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7955c3ba..c9d71283 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/Platform/Darwin.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/Platform/Darwin.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -245,12 +245,6 @@ unset(_apps_paths)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(Platform/UnixPaths)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  list(PREPEND CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    /opt/homebrew # Brew on Apple Silicon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    )
</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;'>+ 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;'>+     list(INSERT CMAKE_SYSTEM_PREFIX_PATH 0 ${_CMAKE_OSX_SYSROOT_PATH}/usr)
</span></pre><pre style='margin:0'>

</pre>