<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/ff718cfa2dcd107c3499fe4ce55951936bdbcc66">https://github.com/macports/macports-ports/commit/ff718cfa2dcd107c3499fe4ce55951936bdbcc66</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 ff718cfa2dc mariadb-10.2: update to 10.2.35
</span>ff718cfa2dc is described below

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

<span style='display:block; white-space:pre;color:#404040;'>    mariadb-10.2: update to 10.2.35
</span>---
 databases/mariadb-10.2/Portfile                          | 16 ++++++++--------
 .../mariadb-10.2/files/patch-include_my_global.h.diff    |  2 +-
 .../patch-libmariadb_libmariadb_CMakeLists.txt.diff      |  7 ++++---
 .../patch-libmariadb_mariadb_config_CMakeLists.txt.diff  |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

<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 a165a06fa07..e098f3452e4 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;'>@@ -6,7 +6,7 @@ legacysupport.newest_darwin_requires_legacy 10
</span> 
 name                mariadb-10.2
 set name_mysql      ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             10.2.34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             10.2.35
</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;'>@@ -50,7 +50,7 @@ if {$subport eq $name} {
</span> 
     set submodule_github_author  MariaDB
     set submodule_github_project mariadb-connector-c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set submodule_github_branch  a746c3af449a8754e78ad7971e59e79af7957cdb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set submodule_github_branch  e38244220646a7e95c9be22576460aa7a4eb715f
</span> 
     set main_distname ${distname}
     set main_distfile ${distfiles}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,13 +64,13 @@ if {$subport eq $name} {
</span>                  https://github.com/${submodule_github_author}/${submodule_github_project}/archive/${submodule_github_branch}:tagtwo
 
     checksums    ${main_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                 rmd160 26f8b30289ae3e6058f71a8a39938ca39cdfbe89 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 sha256  cfebd08c52e3461879b56efe65913101e6bd516b1b0dbe00086fc1a835dc55fa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 size    64712987 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 rmd160 c207cca865087bfa0006aa01b59beb3de2bbc57c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 sha256 562323fa3ad7ce4b4f0a6dc1967689b1f465055aa5ecf1d2ff9eb5630c0603d2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 size   64848792 \
</span>                  ${submodule_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> 
     worksrcdir   ${github.project}-${git.branch}
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.2/files/patch-include_my_global.h.diff b/databases/mariadb-10.2/files/patch-include_my_global.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8ab96ca0d4d..e312a6058e8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.2/files/patch-include_my_global.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.2/files/patch-include_my_global.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/include/my_global.h b/include/my_global.h
</span> index ae8835a2..25296c01 100644
 --- a/include/my_global.h
 +++ b/include/my_global.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -159,7 +159,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -164,7 +164,7 @@
</span>  #  if defined(__i386__) || defined(__ppc__)
  #    define SIZEOF_CHARP 4
  #    define SIZEOF_LONG 4
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.2/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff b/databases/mariadb-10.2/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.2/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.2/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.2/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff b/databases/mariadb-10.2/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.2/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff
</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;'>@@ -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>