<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/f65e212809604fe13adf5045602956820b8f1660">https://github.com/macports/macports-ports/commit/f65e212809604fe13adf5045602956820b8f1660</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 f65e2128096 mariadb-10.4: update to 10.4.16
</span>f65e2128096 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit f65e212809604fe13adf5045602956820b8f1660
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Nov 5 20:00:11 2020 -0500

<span style='display:block; white-space:pre;color:#404040;'>    mariadb-10.4: update to 10.4.16
</span>---
 databases/mariadb-10.4/Portfile                    | 24 +++++++++++-----------
 ...patch-libmariadb_libmariadb_CMakeLists.txt.diff |  7 ++++---
 ...h-libmariadb_mariadb_config_CMakeLists.txt.diff |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.4/Portfile b/databases/mariadb-10.4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 47f98140ddb..3933a3b7441 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ legacysupport.newest_darwin_requires_legacy 10
</span> 
 name                mariadb-10.4
 set name_mysql      ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             10.4.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             10.4.16
</span> set version_branch  [join [lrange [split ${version} .] 0 1] .]
 # Please set revision_client and revision_server to 0 if you bump
 # version; these can be changed independently for the 2 subports, but
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,11 +51,11 @@ if {$subport eq $name} {
</span> 
     set libmariadb_github_author  MariaDB
     set libmariadb_github_project mariadb-connector-c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set libmariadb_github_branch  a746c3af449a8754e78ad7971e59e79af7957cdb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set libmariadb_github_branch  e38244220646a7e95c9be22576460aa7a4eb715f
</span> 
     set wsrep_github_author  codership
     set wsrep_github_project wsrep-lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set wsrep_github_branch  ae4e58ba031587039c8830f2f8ca51fa9fb7d6eb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set wsrep_github_branch  2da6e4894e1df5d1db51db2bbc49255e02251b9d
</span> 
     set wsrep_api_github_author   codership
     set wsrep_api_github_project  wsrep-API
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,17 +84,17 @@ if {$subport eq $name} {
</span>                  https://github.com/${wsrep_api_github_author}/${wsrep_api_github_project}/archive/${wsrep_api_github_branch}:tagfour
 
     checksums       ${main_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  c881e0d8b64ba6273c310c1d1dc85d9e6b376e77 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  f0f025cb9837acadacc8bf0d1fdf0147300ec3a3f23627680cce8a178246c425 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    63577332 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  5efb9dc945631e0cddb91055d9a2f8b4f4abf649 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  276dcd99ef664a4a00b15b28a54374786cca4340a30d7a6a11a5d85a3c44b13f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    63741128 \
</span>                     ${libmariadb_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  9ee86632bb8b43aee53c8930a2058db871934195 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  c673e270324a4fd15a2948648e401b9a48bbbc6ce0a94ddac312bd5028f4c43f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    753351 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  d27a09440473220f4e617e9d21cfd81560f79bfb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  7a05709f25a528fe8fac5f4eea49c8a4ca24d3850824644b22f17b9e111e16d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    760350 \
</span>                     ${wsrep_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  e02776333003dc31f2eee9bd6e079696d42b1255 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  63a53f885e0985b377e0f2a5ed7ec3c8ad46667246323d5c2d505a1b805cc7dd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    144954 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  a229d2b6a24d49a146c6750bedc4f93db85fe311 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  4990b30e01d2e7071c74018d765e5e30c2191a8b479623a6745b43329c932ef3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    145209 \
</span>                     ${wsrep_api_distfile} \
                     rmd160  9de88c7e2154eb3ff1b5fc92e42cca2f487580df \
                     sha256  2675869edc98e631337a6a235bc6494209be06826d4d4b7d610aa10eb5f81d88 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.4/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff b/databases/mariadb-10.4/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fc11fb28b92..ea11a5ed6ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.4/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.4/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,13 @@ diff --git a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeL
</span> index e4217439..6fa6b468 100644
 --- a/libmariadb/libmariadb/CMakeLists.txt
 +++ b/libmariadb/libmariadb/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -311,7 +311,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,9 +311,6 @@
</span>    IF(ICONV_INCLUDE_DIR)
       INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR}) 
    ENDIF()
<span style='display:block; white-space:pre;background:#ffe0e0;'>--  ADD_DEFINITIONS(-DLIBICONV_PLUG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  # ADD_DEFINITIONS(-DLIBICONV_PLUG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  IF(NOT CMAKE_SYSTEM_NAME MATCHES AIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    ADD_DEFINITIONS(-DLIBICONV_PLUG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  ENDIF()
</span>  ENDIF()
  
  IF(ZLIB_FOUND AND WITH_EXTERNAL_ZLIB)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.4/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff b/databases/mariadb-10.4/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fc5e2620dcc..db53342a996 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.4/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.4/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/libmariadb/mariadb_config/CMakeLists.txt b/libmariadb/mariadb_confi
</span> index 60d8c58..7a66cf3 100644
 --- a/libmariadb/mariadb_config/CMakeLists.txt
 +++ b/libmariadb/mariadb_config/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -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;'>+@@ -59,7 +59,7 @@
</span>  # Installation
  #
  INSTALL(TARGETS mariadb_config
</pre><pre style='margin:0'>

</pre>