<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/77637c0a4ccb8b719a1d05cba2c9dbaab43a65ec">https://github.com/macports/macports-ports/commit/77637c0a4ccb8b719a1d05cba2c9dbaab43a65ec</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 77637c0a4cc mariadb-10.2: add patches from https://trac.macports.org/ticket/55916
</span>77637c0a4cc is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 77637c0a4ccb8b719a1d05cba2c9dbaab43a65ec
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Jun 26 15:29:30 2020 -0400

<span style='display:block; white-space:pre;color:#404040;'>    mariadb-10.2: add patches from https://trac.macports.org/ticket/55916
</span>---
 databases/mariadb-10.2/Portfile                    |  6 +++++-
 .../patch-libmariadb_cmake_install.cmake.diff      | 23 ++++++++++++++++++++++
 ...h-libmariadb_mariadb_config_CMakeLists.txt.diff | 13 ++++++++++++
 3 files changed, 41 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 5e7890ced50..5dceac65f2f 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;'>@@ -11,7 +11,7 @@ set version_branch  [join [lrange [split ${version} .] 0 1] .]
</span> # Please set revision_client and revision_server to 0 if you bump
 # version; these can be changed independently for the 2 subports, but
 # can be changed at the same time if that's what's required.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_client 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 2
</span> set revision_server 0
 categories          databases
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,12 +98,16 @@ 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:#e0ffe0;'>+                   patch-libmariadb_cmake_install.cmake.diff \
</span>                    patch-libmariadb_libmariadb_CMakeLists.txt.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                   patch-libmariadb_mariadb_config_CMakeLists.txt.diff \
</span>                    patch-cmake_mysql_version.cmake.diff
 
     post-patch {
         reinplace "s|@NAME@|${name_mysql}|g" \
             ${worksrcpath}/cmake/install_layout.cmake
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@NAME@|${name_mysql}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/libmariadb/cmake/install.cmake
</span>         reinplace "s|@NAME@|${name_mysql}|g" \
             ${cmake.build_dir}/macports/macports-default.cnf \
             ${cmake.build_dir}/macports/my.cnf
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.2/files/patch-libmariadb_cmake_install.cmake.diff b/databases/mariadb-10.2/files/patch-libmariadb_cmake_install.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8fd9ef7377e
</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-libmariadb_cmake_install.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libmariadb/cmake/install.cmake b/libmariadb/cmake/install.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4a82dd9..8120366 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libmariadb/cmake/install.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libmariadb/cmake/install.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,13 +60,13 @@ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # DEFAULT layout
</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;'>+-SET(INSTALL_BINDIR_DEFAULT "bin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(INSTALL_LIBDIR_DEFAULT "lib/mariadb")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(INSTALL_PCDIR_DEFAULT "lib/pkgconfig")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(INSTALL_INCLUDEDIR_DEFAULT "include/mariadb")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_BINDIR_DEFAULT "lib/@NAME@/bin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_LIBDIR_DEFAULT "lib/@NAME@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_PCDIR_DEFAULT "lib/@NAME@/pkgconfig")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_INCLUDEDIR_DEFAULT "include/@NAME@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(INSTALL_DOCDIR_DEFAULT "docs")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(NOT IS_SUBPROJECT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  SET(INSTALL_PLUGINDIR_DEFAULT "lib/mariadb/plugin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  SET(INSTALL_PLUGINDIR_DEFAULT "lib/@NAME@/plugin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(LIBMARIADB_STATIC_DEFAULT "mariadbclient")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.2/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff b/databases/mariadb-10.2/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fc5e2620dcc
</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-libmariadb_mariadb_config_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libmariadb/mariadb_config/CMakeLists.txt b/libmariadb/mariadb_config/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 60d8c58..7a66cf3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libmariadb/mariadb_config/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libmariadb/mariadb_config/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,7 +55,7 @@ ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Installation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL(TARGETS mariadb_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        DESTINATION "bin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        DESTINATION "${INSTALL_BINDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         COMPONENT Development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc
</span></pre><pre style='margin:0'>

</pre>