<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d478d58f2cdcafe1d93b55340b0ff26bc3d15c78">https://github.com/macports/macports-ports/commit/d478d58f2cdcafe1d93b55340b0ff26bc3d15c78</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 d478d58f2cd mysql8: fix configure on macOS 12.0
</span>d478d58f2cd is described below

<span style='display:block; white-space:pre;color:#808000;'>commit d478d58f2cdcafe1d93b55340b0ff26bc3d15c78
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Thu Nov 4 16:21:02 2021 -0500

<span style='display:block; white-space:pre;color:#404040;'>    mysql8: fix configure on macOS 12.0
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/63726
</span>---
 databases/mysql8/Portfile                          |  1 +
 .../mysql8/files/patch-package_name.cmake.diff     | 27 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/Portfile b/databases/mysql8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f8728c739e6..8f4272cc9a1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,6 +153,7 @@ if {$subport eq $name} {
</span>                     patch-cmake-install_layout.cmake.diff \
                     patch-cmake-sasl-disable-platform-check.diff \
                     patch-mysql8-workaround-no-SC_PHYS_PAGES.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-package_name.cmake.diff \
</span>                     patch-scripts-cmakelists.diff \
                     patch-sql-local-boost.diff \
                     patch-mysql8-ffsll-apple.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/files/patch-package_name.cmake.diff b/databases/mysql8/files/patch-package_name.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..00bea7af9e3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql8/files/patch-package_name.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1af75f2c4e8058f5f64a045a81008c40a3faba65 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Christopher Chavez <chrischavez@gmx.us>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 4 Nov 2021 16:07:20 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix configure on macOS x.y.z when y is 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The "Could not run sw_vers" error is output when building on macOS x.y.z
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+when y is 0 (example: macOS 12.0.1) because CMAKE_MATCH_2 is set to "0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+which when used as a condition evaluates to false.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Check `CMAKE_MATCH_COUNT EQUAL 2` instead to know whether CMAKE_MATCH_1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and CMAKE_MATCH_2 are properly set.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake/package_name.cmake | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 058b0bcbd8cb..be1af896d515 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/package_name.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/package_name.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -88,7 +88,7 @@ MACRO(GET_PACKAGE_FILE_NAME Var)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       STRING(REGEX MATCH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "ProductVersion:[\n\t ]*([0-9]+)\\.([0-9]+)" UNUSED ${SW_VERS_PRODUCTVERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      IF(NOT CMAKE_MATCH_1 OR NOT CMAKE_MATCH_2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      IF(NOT CMAKE_MATCH_COUNT EQUAL 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         MESSAGE(FATAL_ERROR "Could not run sw_vers")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>