<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/e70b418cabc5945d9cd4ecc7d0f55ab0c85d8da0">https://github.com/macports/macports-ports/commit/e70b418cabc5945d9cd4ecc7d0f55ab0c85d8da0</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 e70b418cabc mariadb-10.5: move conflicting VERSION files
</span>e70b418cabc is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e70b418cabc5945d9cd4ecc7d0f55ab0c85d8da0
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Mon Aug 24 22:29:31 2020 -0700

<span style='display:block; white-space:pre;color:#404040;'>    mariadb-10.5: move conflicting VERSION files
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    fixes build with newer compilers like clang-9.0
</span><span style='display:block; white-space:pre;color:#404040;'>    that default to c++17
</span>---
 databases/mariadb-10.5/Portfile                      |  5 ++++-
 .../patch-cmake_mysql_columnstore_version.cmake.diff | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/Portfile b/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1134ba5c93c..0a516182393 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,7 +186,8 @@ if {$subport eq $name} {
</span>                    patch-libmariadb_libmariadb_CMakeLists.txt.diff \
                    patch-libmariadb_mariadb_config_CMakeLists.txt.diff \
                    patch-server_storage_perfschema_my_thread.h.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                   patch-cmake_mysql_version.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   patch-cmake_mysql_version.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   patch-cmake_mysql_columnstore_version.cmake.diff
</span> 
     post-patch {
         reinplace "s|@NAME@|${name_mysql}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -200,6 +201,8 @@ if {$subport eq $name} {
</span>             ${cmake.build_dir}/macports/macports-default.cnf \
             ${cmake.build_dir}/macports/my.cnf
         move ${worksrcpath}/VERSION ${worksrcpath}/VERSION.txt
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        move ${worksrcpath}/storage/columnstore/columnstore/VERSION ${worksrcpath}/storage/columnstore/columnstore/VERSION.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        move ${worksrcpath}/storage/maria/libmarias3/VERSION ${worksrcpath}/storage/maria/libmarias3/VERSION.txt
</span>     }
 
     configure.args-delete \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/patch-cmake_mysql_columnstore_version.cmake.diff b/databases/mariadb-10.5/files/patch-cmake_mysql_columnstore_version.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d9400406f17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.5/files/patch-cmake_mysql_columnstore_version.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/storage/columnstore/columnstore/cmake/columnstore_version.cmake.orig 2020-08-06 08:47:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/storage/columnstore/columnstore/cmake/columnstore_version.cmake      2020-08-24 22:19:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,7 +2,7 @@
</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;'>+-    ${ENGINE_SRC_DIR}/VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    ${ENGINE_SRC_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;'>+@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACRO(COLUMNSTORE_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 ${ENGINE_SRC_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++     FILE (STRINGS ${ENGINE_SRC_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>