<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2b5435d5c56867aa9d95e1427556995056252302">https://github.com/macports/macports-ports/commit/2b5435d5c56867aa9d95e1427556995056252302</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2b5435d5c56867aa9d95e1427556995056252302
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Aug 22 01:10:45 2024 +1000
<span style='display:block; white-space:pre;color:#404040;'> mariadb-10.5: update to 10.5.26
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes compatibility with latest libxml2. Also switch to building from
</span><span style='display:block; white-space:pre;color:#404040;'> the official release tarball.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/69428
</span>---
databases/mariadb-10.5/Portfile | 145 +++-------------------------------------
1 file changed, 10 insertions(+), 135 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/Portfile b/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1219f73b705..81346044b37 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ legacysupport.newest_darwin_requires_legacy 15
</span>
name mariadb-10.5
set name_mysql ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 10.5.18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 10.5.26
</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;'>@@ -15,15 +15,13 @@ set version_branch [join [lrange [split ${version} .] 0 1] .]
</span> set revision_client 0
set revision_server 0
categories databases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://mariadb.org/
</span> maintainers {michaelld @michaelld} openmaintainer
if {$subport eq $name} {
PortGroup cmake 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup github 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup boost 1.0
PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +45,6 @@ if {$subport eq $name} {
</span> # https://trac.macports.org/ticket/60805
compiler.blacklist-append {clang < 900}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup MariaDB server ${version} mariadb-
</span> revision ${revision_client}
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,132 +52,12 @@ if {$subport eq $name} {
</span> long_description Mariadb is a fork of the MySQL server, a multi-threaded SQL database.
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # mariadb-connector-c, wsrep-lib and wsrep-API are submodules,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # but because we're not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # cloning into a GIT module in the first place, we can't use the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # git submodule feature. Have to download separately and install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # into the correct location to get this port to work! Which means
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we need a mariadb-connector-c branch and so forth ... basically
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # replicate what the github PG does but without using it since it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # is not designed to be used for multiple downloads.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set libmariadb_github_author MariaDB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set libmariadb_github_project mariadb-connector-c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set libmariadb_github_branch 7fdb3eab66384a355475704332d11cc1ab82499a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wsrep_github_author codership
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wsrep_github_project wsrep-lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wsrep_github_branch 8bfce04189671eb1f06e0fa83dff8c880f31088f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wsrep_api_github_author codership
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wsrep_api_github_project wsrep-API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wsrep_api_github_branch 02ed17238cee97b5a3ea2495ca87b63570403f01
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set columnstore_github_author mariadb-corporation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set columnstore_github_project mariadb-columnstore-engine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set columnstore_github_branch f91c12c9df0597561b0d7f5cc6876e246d24763b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set libmarias3_github_author mariadb-corporation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set libmarias3_github_project libmarias3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set libmarias3_github_branch 3846890513df0653b8919bc45a7600f9b55cab31
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set main_distname ${distname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set main_distfile ${distfiles}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set libmariadb_distname ${libmariadb_github_project}-${libmariadb_github_branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set libmariadb_distfile ${libmariadb_distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wsrep_distname ${wsrep_github_project}-${wsrep_github_branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wsrep_distfile ${wsrep_distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wsrep_api_distname ${wsrep_api_github_project}-${wsrep_api_github_branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wsrep_api_distfile ${wsrep_api_distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set columnstore_distname ${columnstore_github_project}-${columnstore_github_branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set columnstore_distfile ${columnstore_distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set libmarias3_distname ${libmarias3_github_project}-${libmarias3_github_branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set libmarias3_distfile ${libmarias3_distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles ${main_distfile}:tagone \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${libmariadb_distfile}:tagtwo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${wsrep_distfile}:tagthree \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${wsrep_api_distfile}:tagfour \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${columnstore_distfile}:tagfive \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${libmarias3_distfile}:tagsix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites ${github.homepage}/archive/${git.branch}:tagone \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://github.com/${libmariadb_github_author}/${libmariadb_github_project}/archive/${libmariadb_github_branch}:tagtwo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://github.com/${wsrep_github_author}/${wsrep_github_project}/archive/${wsrep_github_branch}:tagthree \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://github.com/${wsrep_api_github_author}/${wsrep_api_github_project}/archive/${wsrep_api_github_branch}:tagfour \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://github.com/${columnstore_github_author}/${columnstore_github_project}/archive/${columnstore_github_branch}:tagfive \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://github.com/${libmarias3_github_author}/${libmarias3_github_project}/archive/${libmarias3_github_branch}:tagsix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums ${main_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 283b2ac6078e769084a91551b7b8dc568693039f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dae639e5757c00b7f5e2aa3a291965eda75f632afcb72b35b7d96827e8d1e06b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 66101190 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${libmariadb_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c63e8387fa7bf3f2d6d4d7db87835f01875fcccf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 37902fbad5b55968e297b071819228a0b58f253d82d2813f249a7ba230d71019 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1191573 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${wsrep_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f5c1f52a07dcccd4babb0e4da5ddca52cd78c8e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8a64fbb42a76c9839e2aaf43ebeb143f39c2842874084b7f1f7ba1f842b7d052 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 176413 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${wsrep_api_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 996ddebec67793a0b15d9e2cff9aa70e7760550e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 99960eb0ccb4dff5eb354289b0a8ec2ecb0dcc246f54edf292f69f340a916ee4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 91283 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${columnstore_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9bb6e42de4cc47b0e14cef409820a1e527e3b2b6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6b29244c6485f4ee4a700894f8cb7b983b7665e89668b8e8e09bc79e61c58f23 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14612522 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${libmarias3_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 bf90ab4856c1fec9272309134837f1f50fdb8de8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0c9ce4cc300bfefcb9dd188a46d736c0e119210c01cbfb04725b07f5330be679 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 364270
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir ${github.project}-${git.branch}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # put the libmariadb_github_project directory into position
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove the original directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "delete ${worksrcpath}/libmariadb"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${worksrcpath}/libmariadb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "move ${workpath}/${libmariadb_distname} ${worksrcpath}/libmariadb"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${workpath}/${libmariadb_distname} ${worksrcpath}/libmariadb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # put the wsrep_github_project directory into position
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove the original directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "delete ${worksrcpath}/wsrep-lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${worksrcpath}/wsrep-lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "move ${workpath}/${wsrep_distname} ${worksrcpath}/wsrep-lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${workpath}/${wsrep_distname} ${worksrcpath}/wsrep-lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # put the wsrep_api_github_project directory into position
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove the original directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "delete ${worksrcpath}/wsrep-lib/wsrep-API/v26"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${worksrcpath}/wsrep-lib/wsrep-API/v26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "move ${workpath}/${wsrep_api_distname} ${worksrcpath}/wsrep-lib/wsrep-API/v26"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${workpath}/${wsrep_api_distname} ${worksrcpath}/wsrep-lib/wsrep-API/v26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # put the columnstore_github_project directory into position
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove the original directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "delete ${worksrcpath}/storage/columnstore/columnstore"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${worksrcpath}/storage/columnstore/columnstore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "move ${workpath}/${columnstore_distname} ${worksrcpath}/storage/columnstore/columnstore"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${workpath}/${columnstore_distname} ${worksrcpath}/storage/columnstore/columnstore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # put the libmarias3_github_project directory into position
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove the original directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "delete ${worksrcpath}/storage/maria/libmarias3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${worksrcpath}/storage/maria/libmarias3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "move ${workpath}/${libmarias3_distname} ${worksrcpath}/storage/maria/libmarias3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${workpath}/${libmarias3_distname} ${worksrcpath}/storage/maria/libmarias3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://downloads.mariadb.org/rest-api/mariadb/${version}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname mariadb-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 d708746c77ea40a4db66534f52ac47f22af7ca39 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dd5f99a1d30ae47365fc18b1deeff6dc0ab38ac84e7d9fd9c8c04ff6b01961f1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 116566259
</span>
depends_build-append port:bison
depends_lib-append port:curl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -330,15 +207,15 @@ possible to install and have running all the MacPorts mysql ports
</span> simultaneously.
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.livecheck.regex (${version_branch}\\.\[0-9\]+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url https://downloads.mariadb.org/rest-api/mariadb/${version_branch}/latest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex {"release_id": *"([0-9.]+)"}
</span> }
subport ${name_mysql}-server {
revision ${revision_server}
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description (Beta version) Run ${name_mysql} as server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Run ${name_mysql} as server
</span> long_description {*}${description}
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -403,5 +280,3 @@ If this is a new install you might want to run:
</span>
livecheck.type none
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://mariadb.org/
</span></pre><pre style='margin:0'>
</pre>