<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/052adf1916f5e69cf19c9f31d90f42dda3d2a6de">https://github.com/macports/macports-ports/commit/052adf1916f5e69cf19c9f31d90f42dda3d2a6de</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 052adf1916f mariadb-10.5: new port
</span>052adf1916f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 052adf1916f5e69cf19c9f31d90f42dda3d2a6de
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Aug 14 14:39:04 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> mariadb-10.5: new port
</span>---
databases/mariadb-10.5/Portfile | 382 +++++++++++++++++++++
databases/mariadb-10.5/files/macports-default.cnf | 9 +
databases/mariadb-10.5/files/mariadb-10.5 | 169 +++++++++
databases/mariadb-10.5/files/my.cnf | 2 +
.../files/org.macports.mysql-server.plist | 30 ++
.../mariadb-10.5/files/patch-CMakeLists.txt.diff | 20 ++
.../files/patch-cmake-install_layout.cmake.diff | 56 +++
.../files/patch-cmake_mysql_version.cmake.diff | 20 ++
.../patch-libmariadb_cmake_install.cmake.diff | 23 ++
...patch-libmariadb_libmariadb_CMakeLists.txt.diff | 13 +
...h-libmariadb_mariadb_config_CMakeLists.txt.diff | 13 +
11 files changed, 737 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/Portfile b/databases/mariadb-10.5/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f2c6bafce30
</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.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,382 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name mariadb-10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set name_mysql ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 10.5.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set version_branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Please set revision_client and revision_server to 0 if you bump
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# version; these can be changed independently for the 2 subports, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# can be changed at the same time if that's what's required.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_server 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories databases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {michaelld @michaelld} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup select 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup MariaDB server ${version} mariadb-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision ${revision_client}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license GPL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Multithreaded SQL database server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description Mariadb is a fork of the MySQL server, a multi-threaded SQL database.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # mariadb-connector-c, wsrep-lib and wsrep-API are submodules,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # but because we're not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # cloning into a GIT module in the first place, we can't use the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # git submodule feature. Have to download separately and install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # into the correct location to get this port to work! Which means
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we need a mariadb-connector-c branch and so forth ... basically
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # replicate what the github PG does but without using it since it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # is not designed to be used for multiple downloads.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libmariadb_github_author MariaDB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libmariadb_github_project mariadb-connector-c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libmariadb_github_branch a746c3af449a8754e78ad7971e59e79af7957cdb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wsrep_github_author codership
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wsrep_github_project wsrep-lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wsrep_github_branch ae4e58ba031587039c8830f2f8ca51fa9fb7d6eb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wsrep_api_github_author codership
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wsrep_api_github_project wsrep-API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wsrep_api_github_branch 12a50c43b112648fec3b1213a1470a85aca55f2c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set columnstore_github_author mariadb-corporation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set columnstore_github_project mariadb-columnstore-engine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set columnstore_github_branch b6b02ed516f92055127d416370799d91a82754ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libmarias3_github_author mariadb-corporation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libmarias3_github_project libmarias3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libmarias3_github_branch d172e86c16224b4e0229ca6f102e662a2315aeff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set main_distname ${distname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set main_distfile ${distfiles}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libmariadb_distname ${libmariadb_github_project}-${libmariadb_github_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libmariadb_distfile ${libmariadb_distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wsrep_distname ${wsrep_github_project}-${wsrep_github_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wsrep_distfile ${wsrep_distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wsrep_api_distname ${wsrep_api_github_project}-${wsrep_api_github_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wsrep_api_distfile ${wsrep_api_distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set columnstore_distname ${columnstore_github_project}-${columnstore_github_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set columnstore_distfile ${columnstore_distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libmarias3_distname ${libmarias3_github_project}-${libmarias3_github_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libmarias3_distfile ${libmarias3_distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles ${main_distfile}:tagone \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libmariadb_distfile}:tagtwo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${wsrep_distfile}:tagthree \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${wsrep_api_distfile}:tagfour \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${columnstore_distfile}:tagfive \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libmarias3_distfile}:tagsix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites ${github.homepage}/archive/${git.branch}:tagone \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/${libmariadb_github_author}/${libmariadb_github_project}/archive/${libmariadb_github_branch}:tagtwo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/${wsrep_github_author}/${wsrep_github_project}/archive/${wsrep_github_branch}:tagthree \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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:#e0ffe0;'>+ https://github.com/${columnstore_github_author}/${columnstore_github_project}/archive/${columnstore_github_branch}:tagfive \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/${libmarias3_github_author}/${libmarias3_github_project}/archive/${libmarias3_github_branch}:tagsix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums ${main_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 179fe9d686595a90f8dec65c617ef0d736ae63f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f96fd70c244c13ab72de9982b8f35480eef7c9b8c1ee15ef7b88a418ce9a88d2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 63958773 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libmariadb_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 9ee86632bb8b43aee53c8930a2058db871934195 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c673e270324a4fd15a2948648e401b9a48bbbc6ce0a94ddac312bd5028f4c43f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 753351 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${wsrep_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e02776333003dc31f2eee9bd6e079696d42b1255 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 63a53f885e0985b377e0f2a5ed7ec3c8ad46667246323d5c2d505a1b805cc7dd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 144954 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${wsrep_api_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 9de88c7e2154eb3ff1b5fc92e42cca2f487580df \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2675869edc98e631337a6a235bc6494209be06826d4d4b7d610aa10eb5f81d88 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 52889 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${columnstore_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 35c19ef1d685ae080987864de708d8603f1b378a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7eaf37e80d0a3a7280a5f4adb2d7aa8148c88910fc874f6a24437cbaac6cffab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4746345 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libmarias3_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ae1b5dade05705f6d73213f9d15613afa0df3ddb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e3ae43b86975b582a787de62e9ff9972c7771c41365c2715f64a8dc91948475c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 357838
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${github.project}-${git.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # put the libmariadb_github_project directory into position
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove the original directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "delete ${worksrcpath}/libmariadb"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/libmariadb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "move ${workpath}/${libmariadb_distname} ${worksrcpath}/libmariadb"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${workpath}/${libmariadb_distname} ${worksrcpath}/libmariadb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # put the wsrep_github_project directory into position
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove the original directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "delete ${worksrcpath}/wsrep-lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/wsrep-lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "move ${workpath}/${wsrep_distname} ${worksrcpath}/wsrep-lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${workpath}/${wsrep_distname} ${worksrcpath}/wsrep-lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # put the wsrep_api_github_project directory into position
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove the original directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "delete ${worksrcpath}/wsrep-lib/wsrep-API/v26"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/wsrep-lib/wsrep-API/v26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "move ${workpath}/${wsrep_api_distname} ${worksrcpath}/wsrep-lib/wsrep-API/v26"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${workpath}/${wsrep_api_distname} ${worksrcpath}/wsrep-lib/wsrep-API/v26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # put the columnstore_github_project directory into position
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove the original directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "delete ${worksrcpath}/storage/columnstore/columnstore"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/storage/columnstore/columnstore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "move ${workpath}/${columnstore_distname} ${worksrcpath}/storage/columnstore/columnstore"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${workpath}/${columnstore_distname} ${worksrcpath}/storage/columnstore/columnstore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # put the libmarias3_github_project directory into position
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove the original directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "delete ${worksrcpath}/storage/maria/libmarias3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/storage/maria/libmarias3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "move ${workpath}/${libmarias3_distname} ${worksrcpath}/storage/maria/libmarias3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${workpath}/${libmarias3_distname} ${worksrcpath}/storage/maria/libmarias3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:zlib port:tcp_wrappers port:ncurses port:judy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libssl.dylib:openssl port:libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:mysql_select
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ select.group mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ select.file ${filespath}/${name_mysql}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${cmake.build_dir}/macports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/macports-default.cnf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${filespath}/my.cnf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${cmake.build_dir}/macports/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-cmake-install_layout.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libmariadb_cmake_install.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libmariadb_libmariadb_CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libmariadb_mariadb_config_CMakeLists.txt.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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@NAME@|${name_mysql}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/cmake/install_layout.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@NAME@|${name_mysql}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/libmariadb/cmake/install.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@NAME@|${name_mysql}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${cmake.build_dir}/macports/macports-default.cnf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${cmake.build_dir}/macports/my.cnf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${cmake.build_dir}/macports/macports-default.cnf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${cmake.build_dir}/macports/my.cnf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/VERSION ${worksrcpath}/VERSION.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_NAME_DIR:STRING=${prefix}/lib/${name_mysql}/mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DINSTALL_LAYOUT:STRING=MACPORTS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSYSCONFDIR:PATH=${prefix}/etc/${name_mysql} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMYSQL_UNIX_ADDR:PATH=${prefix}/var/run/${name_mysql}/mysqld.sock \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMYSQL_DATADIR:PATH=${prefix}/var/db/${name_mysql} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDEFAULT_CHARSET:STRING=utf8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDEFAULT_COLLATION:STRING=utf8_general_ci \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_EMBEDDED_SERVER:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_ZLIB:STRING=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_UNIT_TESTS:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITHOUT_CASSANDRA_STORAGE_ENGINE:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITHOUT_MROONGA_STORAGE_ENGINE:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITHOUT_ROCKSDB_STORAGE_ENGINE:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITHOUT_TOKUDB_STORAGE_ENGINE:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_GCOV:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_DTRACE:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_READLINE:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_LIBWRAP:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_SSL:STRING=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_SSL_PATH=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMYSQL_MAINTAINER_MODE:STRING=AUTO \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DICONV_LIBRARIES=${prefix}/lib/libiconv.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DICONV_INCLUDE_DIR:PATH=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCONNECT_WITH_LIBXML2=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # proc portdestroot::destroot_finish fails to find and compress our man pages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so borrow the compress command and run on our files now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set manpath "${destroot}${prefix}/share/man"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gzip [findBinary gzip ${portutil::autoconf::gzip_path}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach manpage [glob -type f ${destroot}${prefix}/share/man/${name_mysql}/man\[1-9\]/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix paths in manpages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|/etc/|${prefix}/etc/${name_mysql}/|g" ${manpage}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Compress all manpages with gzip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "$gzip -9vf ${manpage}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #foreach samp_conffile [glob -type f ${destroot}${prefix}/share/${name_mysql}/support-files/my-*.cnf] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # # Fix paths in sample configuration files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # reinplace -q "s|/etc/my.cnf|${prefix}/etc/${name_mysql}/my.cnf|g" ${samp_conffile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -o root -d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/${name_mysql}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${cmake.build_dir}/macports/macports-default.cnf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/${name_mysql}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -o root -d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/${name_mysql}/support-files/macports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${cmake.build_dir}/macports/my.cnf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/${name_mysql}/support-files/macports/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-install {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${prefix}/etc/LaunchDaemons/org.macports.${name_mysql}/org.macports.${name_mysql}-server.plist]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "The ${name_mysql} client has been installed."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "To install the ${name_mysql} server, install the ${name_mysql}-server port."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The macports-default.cnf is installed by ${name_mysql}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Early versions of ${name_mysql}-server installed macports-default.cnf so for a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # reasonable period we need to deactivate older versions of the ${name_mysql}-server.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [file exists ${prefix}/etc/${name_mysql}/macports-default.cnf]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![catch {set vers [lindex [registry_active ${name_mysql}-server] 0]}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && [vercmp [lindex $vers 1] 5.5.24] < 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_deactivate_composite ${name_mysql}-server "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${prefix}/etc/${name_mysql}/my.cnf]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${prefix}/share/${name_mysql}/support-files/macports/my.cnf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/etc/${name_mysql}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant system_readline description {Use system readline instead of bundled readline} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add readline support.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "-DWITH_READLINE:BOOL=OFF" has the peculiar meaning "do not use the bundled copy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # of readline but use the system's (i.e. MacPorts') copy of readline"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:readline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -DWITH_READLINE:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DWITH_READLINE:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+On activation if no ${prefix}/etc/${name_mysql}/my.cnf file exists one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+will be created which loads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+${prefix}/etc/${name_mysql}/macports-default.cnf.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+If a ${prefix}/etc/${name_mysql}/my.cnf file exists MacPorts does not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+touch it and any changes you make to ${prefix}/etc/${name_mysql}/my.cnf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+will be preserved (e.g., during port upgrades, deactivations or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+activations). ${prefix}/etc/${name_mysql}/my.cnf is a good place to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+customize your ${name_mysql} installation.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Any changes made to ${prefix}/etc/${name_mysql}/macports-default.cnf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+will be lost during port upgrades, deactivations or activations so you
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+are advised to not make changes here. Currently
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+${prefix}/etc/${name_mysql}/macports-default.cnf contains only one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+directive; to disable networking. With disabled networking it is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+possible to install and have running all the MacPorts mysql ports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+simultaneously.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.livecheck.regex (${version_branch}.\[0-9\]+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name_mysql}-server {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision ${revision_server}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description (Beta version) Run ${name_mysql} as server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:${name_mysql}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {"darwin" eq ${os.platform} && ${os.major} > 8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mysqluser _mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mysqluser mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_users ${mysqluser} group=${mysqluser} realname=MySQL\ Server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/org.macports.mysql-server.plist ${workpath}/org.macports.${subport}.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@NAMEMYSQL@|${name_mysql}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/org.macports.${subport}.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/org.macports.${subport}.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@SUBPORT@|${subport}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/org.macports.${subport}.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@USER@|${mysqluser}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/org.macports.${subport}.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@GROUP@|${mysqluser}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/org.macports.${subport}.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 755 ${destroot}${prefix}/etc/LaunchDaemons/org.macports.${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -o root -W ${workpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ org.macports.${subport}.plist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/LaunchDaemons/org.macports.${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 755 ${destroot}/Library/LaunchDaemons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/etc/LaunchDaemons/org.macports.${subport}/org.macports.${subport}.plist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}/Library/LaunchDaemons/org.macports.${subport}.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -o root -d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -o ${mysqluser} -g ${mysqluser} -d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/${name_mysql} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/db/${name_mysql} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/log/${name_mysql} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/run/${name_mysql}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.keepdirs-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/db/${name_mysql} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/log/${name_mysql} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/run/${name_mysql}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+If this is a new install you might want to run:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\$ sudo -u ${mysqluser} ${prefix}/lib/${name_mysql}/bin/mysql_install_db
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://mariadb.org/
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/macports-default.cnf b/databases/mariadb-10.5/files/macports-default.cnf
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3e4106fc499
</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.5/files/macports-default.cnf
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# WARNING! ANY CHANGES TO THIS FILE WILL BE LOST ON UNINSTALL/UPGRADES!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Make your changes to @PREFIX@/etc/@NAME@/my.cnf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# YOU HAVE BEEN WARNED!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# MacPorts default options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[mysqld]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# skip-networking so multiple mysql server ports can be loaded
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# without each competing for port 3306.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+skip-networking
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/mariadb-10.5 b/databases/mariadb-10.5/files/mariadb-10.5
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6b4e0ec0581
</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.5/files/mariadb-10.5
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,169 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/aria_chk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/aria_dump_log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/aria_ftdump
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/aria_pack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/aria_read_log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/innochecksum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/msql2mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/my_print_defaults
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/myisam_ftdump
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/myisamchk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/myisamlog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/myisampack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysql_client_test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysql_client_test_embedded
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysql_convert_table_format
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysql_embedded
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysql_find_rows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysql_fix_extensions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysql_install_db
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysql_plugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysql_secure_installation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysql_setpermission
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysql_tzinfo_to_sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysql_upgrade
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysql_waitpid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysqlaccess
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysqladmin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysqlbinlog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysqlcheck
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysqld
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysqld_multi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysqld_safe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysqldump
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysqldumpslow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysqlhotcopy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysqlimport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysqlshow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysqlslap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysqltest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mysqltest_embedded
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/mytop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/perror
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/replace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/resolve_stack_dump
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/resolveip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/wsrep_sst_common
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/wsrep_sst_mysqldump
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/mariadb-10.5/bin/wsrep_sst_rsync
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/aria_chk.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/aria_dump_log.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/aria_ftdump.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/aria_pack.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/aria_read_log.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/innochecksum.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/msql2mysql.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/my_print_defaults.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/myisam_ftdump.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/myisamchk.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/myisamlog.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/myisampack.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql-stress-test.pl.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql-test-run.pl.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql.server.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql_client_test.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql_client_test_embedded.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql_config.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql_convert_table_format.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql_find_rows.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql_fix_extensions.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql_install_db.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql_plugin.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql_secure_installation.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql_setpermission.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql_tzinfo_to_sql.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql_upgrade.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysql_waitpid.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysqlaccess.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysqladmin.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysqlbinlog.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysqlcheck.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysqld_multi.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysqld_safe.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysqldump.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysqldumpslow.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysqlhotcopy.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysqlimport.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysqlshow.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysqlslap.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysqltest.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/mysqltest_embedded.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/perror.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/replace.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/resolve_stack_dump.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man1/resolveip.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/mariadb-10.5/man8/mysqld.8.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/my.cnf b/databases/mariadb-10.5/files/my.cnf
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1d00ab6d441
</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.5/files/my.cnf
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,2 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Use default MacPorts settings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+!include @PREFIX@/etc/@NAME@/macports-default.cnf
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/org.macports.mysql-server.plist b/databases/mariadb-10.5/files/org.macports.mysql-server.plist
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a308af5272c
</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.5/files/org.macports.mysql-server.plist
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<plist version="1.0">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>Label</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>org.macports.@SUBPORT@</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>ProcessType</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>Interactive</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>Disabled</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <false/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>RunAtLoad</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <true/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>KeepAlive</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <true/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>SessionCreate</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <true/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>LaunchOnlyOnce</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <false/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>UserName</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>@USER@</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>GroupName</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>@GROUP@</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>ExitTimeOut</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <integer>600</integer>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>ProgramArguments</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <array>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>@PREFIX@/lib/@NAMEMYSQL@/bin/mysqld</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </array>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+</dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+</plist>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/patch-CMakeLists.txt.diff b/databases/mariadb-10.5/files/patch-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d4466b6c3fe
</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.5/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,6 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/Internal/CPack)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -287,6 +288,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSEIF (NOT ENABLED_LOCAL_INFILE MATCHES "^(ON|OFF|AUTO)$")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(FATAL_ERROR "ENABLED_LOCAL_INFILE must be one of OFF, ON, AUTO")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IF(SYSCONFDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set DBUG_OFF and other optional release-only flags for non-debug project types
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOREACH(BUILD_TYPE RELEASE RELWITHDEBINFO MINSIZEREL)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/patch-cmake-install_layout.cmake.diff b/databases/mariadb-10.5/files/patch-cmake-install_layout.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..361c81b16ec
</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.5/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/install_layout.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/install_layout.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(INSTALL_LAYOUT "${INSTALL_LAYOUT}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer) RPM DEB SVR4")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer) RPM DEB SVR4 MACPORTS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(INSTALL_LAYOUT MATCHES "RPM")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,7 +94,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CMAKE_INSTALL_PREFIX ${default_prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CACHE PATH "install prefix" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(VALID_INSTALL_LAYOUTS "RPM" "STANDALONE" "DEB" "SVR4")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(VALID_INSTALL_LAYOUTS "RPM" "STANDALONE" "DEB" "SVR4" "MACPORTS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(ind EQUAL -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -228,6 +228,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(INSTALL_MYSQLDATADIR_SVR4 "/var/lib/mysql")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(INSTALL_UNIX_ADDRDIR_SVR "/tmp/mysql.sock")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# MACPORTS layout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_BINDIR_MACPORTS "lib/@NAME@/bin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_SBINDIR_MACPORTS "lib/@NAME@/bin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_SCRIPTDIR_MACPORTS "lib/@NAME@/bin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_LIBDIR_MACPORTS "lib/@NAME@/mysql")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_PLUGINDIR_MACPORTS "lib/@NAME@/plugin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_INCLUDEDIR_MACPORTS "include/@NAME@/mysql")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_DOCDIR_MACPORTS "share/doc/@NAME@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_DOCREADMEDIR_MACPORTS "share/doc/@NAME@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_MANDIR_MACPORTS "share/man/@NAME@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_INFODIR_MACPORTS "share/doc/@NAME@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_SHAREDIR_MACPORTS "share/@NAME@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_MYSQLSHAREDIR_MACPORTS "share/@NAME@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_MYSQLTESTDIR_MACPORTS "share/@NAME@/mysql-test")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_SQLBENCHDIR_MACPORTS "share/@NAME@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_SUPPORTFILESDIR_MACPORTS "share/@NAME@/support-files")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_MYSQLDATADIR_MACPORTS "var/db/@NAME@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_PLUGINTESTDIR_MACPORTS ${plugin_tests})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# SUID /bin/ps is not in MacPorts sandbox causing scripts/CMakeLists.txt tests to fail so we set FIND_PROC here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(FIND_PROC "ps -ef | grep -v mysqld_safe | grep -- $MYSQLD | grep $PID > /dev/null")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Clear cached variables if install layout was changed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(OLD_INSTALL_LAYOUT)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/patch-cmake_mysql_version.cmake.diff b/databases/mariadb-10.5/files/patch-cmake_mysql_version.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1bc12605073
</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.5/files/patch-cmake_mysql_version.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/mysql_version.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/mysql_version.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Generate "something" to trigger cmake rerun when VERSION changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIGURE_FILE(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${CMAKE_SOURCE_DIR}/VERSION.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_BINARY_DIR}/VERSION.dep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACRO(MYSQL_GET_CONFIG_VALUE keyword var)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(NOT ${var})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION.txt str REGEX "^[ ]*${keyword}=")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(str)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRING(REPLACE "${keyword}=" "" str ${str})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRING(REGEX REPLACE "[ ].*" "" str "${str}")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/patch-libmariadb_cmake_install.cmake.diff b/databases/mariadb-10.5/files/patch-libmariadb_cmake_install.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8fd9ef7377e
</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.5/files/patch-libmariadb_cmake_install.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libmariadb/cmake/install.cmake b/libmariadb/cmake/install.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4a82dd9..8120366 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libmariadb/cmake/install.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libmariadb/cmake/install.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,13 +60,13 @@ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # DEFAULT layout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(INSTALL_BINDIR_DEFAULT "bin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(INSTALL_LIBDIR_DEFAULT "lib/mariadb")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(INSTALL_PCDIR_DEFAULT "lib/pkgconfig")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(INSTALL_INCLUDEDIR_DEFAULT "include/mariadb")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_BINDIR_DEFAULT "lib/@NAME@/bin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_LIBDIR_DEFAULT "lib/@NAME@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_PCDIR_DEFAULT "lib/@NAME@/pkgconfig")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_INCLUDEDIR_DEFAULT "include/@NAME@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(INSTALL_DOCDIR_DEFAULT "docs")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(NOT IS_SUBPROJECT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(INSTALL_PLUGINDIR_DEFAULT "lib/mariadb/plugin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(INSTALL_PLUGINDIR_DEFAULT "lib/@NAME@/plugin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(LIBMARIADB_STATIC_DEFAULT "mariadbclient")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff b/databases/mariadb-10.5/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fc11fb28b92
</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.5/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e4217439..6fa6b468 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libmariadb/libmariadb/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libmariadb/libmariadb/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,7 +311,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(ICONV_INCLUDE_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ADD_DEFINITIONS(-DLIBICONV_PLUG)
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(ZLIB_FOUND AND WITH_EXTERNAL_ZLIB)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff b/databases/mariadb-10.5/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fc5e2620dcc
</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.5/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libmariadb/mariadb_config/CMakeLists.txt b/libmariadb/mariadb_config/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 60d8c58..7a66cf3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libmariadb/mariadb_config/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libmariadb/mariadb_config/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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;'>+ # Installation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL(TARGETS mariadb_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION "bin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION "${INSTALL_BINDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPONENT Development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc
</span></pre><pre style='margin:0'>
</pre>