<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/44c085bfacc1d8163d7bcf57a3c499e0bef4ce1b">https://github.com/macports/macports-ports/commit/44c085bfacc1d8163d7bcf57a3c499e0bef4ce1b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 44c085bfacc1d8163d7bcf57a3c499e0bef4ce1b
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Jun 7 23:46:45 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> mysql56: move VERSION files
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> there is a conflict with c++17, which
</span><span style='display:block; white-space:pre;color:#404040;'> uses a header called version
</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/60400
</span>---
databases/mysql56/Portfile | 12 ++++++++++++
.../files/patch-mysql56-version-change.diff | 22 ++++++++++++++++++++++
2 files changed, 34 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql56/Portfile b/databases/mysql56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8afa539..585fcee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +49,11 @@ if {$subport eq $name} {
</span> patchfiles-append patch-scripts-mysql_install_db.pl.in.diff \
patch-scripts-mysql_secure_installation.pl.in.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we have to slightly alter this script as we change the name of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # VERSION file to VERSION.txt below (c++17 conflict)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-mysql56-version-change.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums rmd160 c580c4bab8c81db0bc9eac19223fb2b260e35f55 \
sha256 0919096705784c62af831bb607e99345083edd76967c8c65966728742a9127fe \
size 32388152
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +73,13 @@ if {$subport eq $name} {
</span> copy ${filespath}/macports-default.cnf \
${filespath}/my.cnf \
${cmake.build_dir}/macports/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # c++17 has a header conflict with VERSION files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/VERSION \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/VERSION.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/storage/ndb/VERSION \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/storage/ndb/VERSION.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql56/files/patch-mysql56-version-change.diff b/databases/mysql56/files/patch-mysql56-version-change.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..89796a2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql56/files/patch-mysql56-version-change.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 34ed6f4..89e238c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/mysql_version.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/mysql_version.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@ SET(DOT_FRM_VERSION "6")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Generate "something" to trigger cmake rerun when VERSION changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIGURE_FILE(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${CMAKE_SOURCE_DIR}/VERSION.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_BINARY_DIR}/VERSION.dep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@ CONFIGURE_FILE(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACRO(MYSQL_GET_CONFIG_VALUE keyword var)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(NOT ${var})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION.txt str REGEX "^[ ]*${keyword}=")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(str)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRING(REPLACE "${keyword}=" "" str ${str})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRING(REGEX REPLACE "[ ].*" "" str "${str}")
</span></pre><pre style='margin:0'>
</pre>