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

<span style='display:block; white-space:pre;color:#808000;'>commit aa3f8dc16fdd86ebb901525b5f8118e04beeccc2
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Jun 8 22:47:51 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    mariadb-10.2: update to 10.2.44
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Remove integrated patch.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Remove +readline variant since it won't work, and patch build to work with internally-provided readline.
</span>---
 databases/mariadb-10.2/Portfile                    | 29 ++++++++--------------
 ...h-libmariadb_mariadb_config_CMakeLists.txt.diff | 13 ----------
 .../files/patch-use-correct-readline.diff          | 15 +++++++++++
 3 files changed, 25 insertions(+), 32 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 dc5bdbc8df7..caa190c8fbf 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.41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             10.2.44
</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  735a7299dbae19cc2b82b9697becaf90e9b43047
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set submodule_github_branch  ab7a81e79e4be4324a2d09d19d4f5249801ef665
</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  e35df07c2461f243d3ce42eb1e4ee0c340d5b108 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  3faa55d30a6d8a75b47342eaae6ec59f1f13b308e0f5e3211c1fab33667152a1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    65087230 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  1427ffa0e9ee9fad8cab8146eaf5a8059957f3fc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  b0ef15fdb31436c92b2a543a21ecdc92456e9a1f87bc3ce2118227bb83a111aa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    65164233 \
</span>                     ${submodule_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  c2b5c79914342ab2d546e05d6a3af51bfd540847 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  9df8813ccc64f8f206d924a2210a7d74bf3801b6a4c7ed376ffb3cd7a8420921 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    967825
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  c78575cf544d96cfba6cc9dcd5c86a43f6c26e52 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  98db207c6ae8b9553947d05891571b211ab7aab461cd8f071c4730a1302e9a48 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    967973
</span> 
     worksrcdir   ${github.project}-${git.branch}
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,8 +103,8 @@ if {$subport eq $name} {
</span>                    patch-CMakeLists.txt.diff \
                    patch-libmariadb_cmake_install.cmake.diff \
                    patch-libmariadb_libmariadb_CMakeLists.txt.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                   patch-libmariadb_mariadb_config_CMakeLists.txt.diff \
</span><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-use-correct-readline.diff
</span> 
     # patch to provide minimum changes required for ARM64 support;
     # guessing this will be fixed in the next release.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -196,15 +196,6 @@ if {$subport eq $name} {
</span>         }
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant system_readline description {Use system readline instead of bundled readline} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # Add readline support.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # "-DWITH_READLINE:BOOL=OFF" has the peculiar meaning "do not use the bundled copy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # of readline but use the system's (i.e. MacPorts') copy of readline"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append      port:readline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-delete   -DWITH_READLINE:BOOL=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-append   -DWITH_READLINE:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     notes "
 On activation if no ${prefix}/etc/${name_mysql}/my.cnf file exists one
 will be created which loads
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index db53342a996..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/libmariadb/mariadb_config/CMakeLists.txt b/libmariadb/mariadb_config/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 60d8c58..7a66cf3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/libmariadb/mariadb_config/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/libmariadb/mariadb_config/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +59,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Installation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL(TARGETS mariadb_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        DESTINATION "bin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        DESTINATION "${INSTALL_BINDIR}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         COMPONENT Development)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.2/files/patch-use-correct-readline.diff b/databases/mariadb-10.2/files/patch-use-correct-readline.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b9f542db9af
</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-use-correct-readline.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/client/mysql.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/client/mysql.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,11 +90,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__WIN__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <conio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#  include <editline/readline.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#  include <readline.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <readline.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HAVE_READLINE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define USE_POPEN
</span></pre><pre style='margin:0'>

</pre>