<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/433e788df6ef9d2c75c96e11b9293dcab304bb52">https://github.com/macports/macports-ports/commit/433e788df6ef9d2c75c96e11b9293dcab304bb52</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 433e788df6e mariadb-10.6: update to 10.6.2
</span>433e788df6e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 433e788df6ef9d2c75c96e11b9293dcab304bb52
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Jun 24 16:51:46 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> mariadb-10.6: update to 10.6.2
</span>---
databases/mariadb-10.6/Portfile | 35 +++++++++++-----------
.../mariadb-10.6/files/patch-CMakeLists.txt.diff | 4 +--
.../patch-libmariadb_cmake_install.cmake.diff | 3 +-
3 files changed, 21 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.6/Portfile b/databases/mariadb-10.6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ddc69740f6e..b53ea1a9364 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,12 +6,12 @@ legacysupport.newest_darwin_requires_legacy 10
</span>
name mariadb-10.6
set name_mysql ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 10.6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 10.6.2
</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
# 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 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 0
</span> set revision_server 0
categories databases
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,11 +53,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 01ada4b85f15c1c5841082f92180bf129d89debc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libmariadb_github_branch 74a405d9770720e000c391672fca9e67421fa4bf
</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 f271ad0c6e3c647df83c1d5ec9cd26d77cef2337
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wsrep_github_branch 85b815032145ef5c18b7a8931d84becf6df8cd18
</span>
set wsrep_api_github_author codership
set wsrep_api_github_project wsrep-API
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@ if {$subport eq $name} {
</span>
set libmarias3_github_author mariadb-corporation
set libmarias3_github_project libmarias3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libmarias3_github_branch 0d48bf334fde7d4e0dac22bda560e86037d35d77
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libmarias3_github_branch c71898f8259829bf4b2e01072000491281e5206d
</span>
set main_distname ${distname}
set main_distfile ${distfiles}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,17 +104,17 @@ if {$subport eq $name} {
</span> https://github.com/${libmarias3_github_author}/${libmarias3_github_project}/archive/${libmarias3_github_branch}:tagsix
checksums ${main_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f315f05339d8f946ddb2c737dd3a34635d3a17cb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 036cf53ea4079858919b66c4e60d9bfe4f907b0251a000ed56e75a33bb6509c8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 48597419 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 151e39ee1a997907c4f57c90a357042d0b7a6c53 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fde236d848f7ba2b9260662e5bb4704b7940d3ac675d0cd050c6c98780d9ba9a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 48637124 \
</span> ${libmariadb_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 19948e1f47bd69cbf34be421efd4aabbac94aa01 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c1cc8d03fd9ee5f4c18fd43f070b192ddf1a282f26e8f3fd01fa7e4c4e4de138 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 972684 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e052b60aa8bfa6acb30130e6d9fa3b702761d99b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 eaeff772575c29aef12c14f6054ade3453649c64c581fb59a9581e7913dddf69 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1010888 \
</span> ${wsrep_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 37c55c98f88647d6e638c4703e4f23f632a69ec6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5e552083e41607c79dec4ca07a53118f044109daa3cd76b051da327d3d1fa09a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 158850 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b51236bef0a9403200d43bee2399402f1106efb6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 03e1f2b81c654b79ee9c96a405b5197b11cc21a03836dc465ab7309f06af347a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 158961 \
</span> ${wsrep_api_distfile} \
rmd160 847e8d58c8806437088d77d444ecfe2dcd8a76d1 \
sha256 214fb8701ae51bcdf8171475a93f2c28ddd56e642feb172ec5148b4d3c73d4a6 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,9 +124,9 @@ if {$subport eq $name} {
</span> sha256 cd192678c2e82df79eb4b368bf6c836244802af3e30d41fd45074002a212288d \
size 14525542 \
${libmarias3_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 e613f2416a33d5760dd189513bbdca580367111c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3cf237b25d8dd32a9eec2f770313e5b1805dff4e0f4c0b5ea400abbf3be61279 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 364133
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3243c4b53814a7848614800f40de52cd18ee4b64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 364df3c93a7115ed00424e4a67c8d29129ed5733ef9214b95721bf0dd8a230ab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 364252
</span>
worksrcdir ${github.project}-${git.branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -210,7 +210,6 @@ if {$subport eq $name} {
</span> ${cmake.build_dir}/macports/my.cnf
move ${worksrcpath}/VERSION ${worksrcpath}/VERSION.txt
move ${worksrcpath}/storage/columnstore/columnstore/VERSION ${worksrcpath}/storage/columnstore/columnstore/VERSION.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/storage/maria/libmarias3/VERSION ${worksrcpath}/storage/maria/libmarias3/VERSION.txt
</span> }
configure.args-delete \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.6/files/patch-CMakeLists.txt.diff b/databases/mariadb-10.6/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d4466b6c3fe..1f1feae79db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.6/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.6/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- a/CMakeLists.txt
+++ b/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,6 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,6 +52,7 @@
</span>
MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@
</span> SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/Internal/CPack)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -287,6 +288,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -289,6 +290,9 @@
</span> ELSEIF (NOT ENABLED_LOCAL_INFILE MATCHES "^(ON|OFF|AUTO)$")
MESSAGE(FATAL_ERROR "ENABLED_LOCAL_INFILE must be one of OFF, ON, AUTO")
ENDIF()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.6/files/patch-libmariadb_cmake_install.cmake.diff b/databases/mariadb-10.6/files/patch-libmariadb_cmake_install.cmake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8fd9ef7377e..820a023cc5c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.6/files/patch-libmariadb_cmake_install.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.6/files/patch-libmariadb_cmake_install.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/libmariadb/cmake/install.cmake b/libmariadb/cmake/install.cmake
</span> index 4a82dd9..8120366 100644
--- a/libmariadb/cmake/install.cmake
+++ b/libmariadb/cmake/install.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,13 +60,13 @@ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,14 +61,14 @@
</span> # DEFAULT layout
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,6 +15,7 @@ index 4a82dd9..8120366 100644
</span> +SET(INSTALL_PCDIR_DEFAULT "lib/@NAME@/pkgconfig")
+SET(INSTALL_INCLUDEDIR_DEFAULT "include/@NAME@")
SET(INSTALL_DOCDIR_DEFAULT "docs")
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(INSTALL_MANDIR_DEFAULT "man")
</span> IF(NOT IS_SUBPROJECT)
- SET(INSTALL_PLUGINDIR_DEFAULT "lib/mariadb/plugin")
+ SET(INSTALL_PLUGINDIR_DEFAULT "lib/@NAME@/plugin")
</pre><pre style='margin:0'>
</pre>