<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/4c1e11cc877eaa5a18448b82fc1708b9a0094cde">https://github.com/macports/macports-ports/commit/4c1e11cc877eaa5a18448b82fc1708b9a0094cde</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 4c1e11c  mariadb-10.2: move VERSION -> VERSION.txt and use the new file correctly
</span>4c1e11c is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 4c1e11cc877eaa5a18448b82fc1708b9a0094cde
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Dec 24 20:35:01 2019 -0500

<span style='display:block; white-space:pre;color:#404040;'>    mariadb-10.2: move VERSION -> VERSION.txt and use the new file correctly
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/59575
</span>---
 databases/mariadb-10.2/Portfile                      |  4 +++-
 .../files/patch-cmake_mysql_version.cmake.diff       | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.2/Portfile b/databases/mariadb-10.2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 21ff362..cce5794 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,7 +98,8 @@ if {$subport eq $name} {
</span>     patchfiles     patch-cmake-install_layout.cmake.diff \
                    patch-CMakeLists.txt.diff \
                    patch-libmariadb_plugins_auth_CMakeLists.txt.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                   patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   patch-libmariadb_libmariadb_CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   patch-cmake_mysql_version.cmake.diff
</span> 
     post-patch {
         reinplace "s|@NAME@|${name_mysql}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,6 +110,7 @@ if {$subport eq $name} {
</span>         reinplace "s|@PREFIX@|${prefix}|g" \
             ${cmake.build_dir}/macports/macports-default.cnf \
             ${cmake.build_dir}/macports/my.cnf
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        move ${worksrcpath}/VERSION ${worksrcpath}/VERSION.txt
</span>     }
 
     configure.args-delete \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.2/files/patch-cmake_mysql_version.cmake.diff b/databases/mariadb-10.2/files/patch-cmake_mysql_version.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1bc1260
</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.2/files/patch-cmake_mysql_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/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;'>+@@ -23,7 +23,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;'>+-  ${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;'>+@@ -31,7 +31,7 @@
</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>