<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8cf4c3a4f2084e8dca588e2aed91ed186e8a20d0">https://github.com/macports/macports-ports/commit/8cf4c3a4f2084e8dca588e2aed91ed186e8a20d0</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 8cf4c3a4f20 p5-dbd-mysql, qt5-mysql-plugin, qt6-mysql-plugin update variants p5-dbd-mysql: Add additional mysql and mariadb variants qt5-mysql-plugin: add MYSQL81 and MariaDB 10.11 variants qt6-mysql-plugin: add MYSQL81 variant
</span>8cf4c3a4f20 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8cf4c3a4f2084e8dca588e2aed91ed186e8a20d0
</span>Author: jhoyt4 <john.hoyt@gmail.com>
AuthorDate: Sun Aug 27 16:33:24 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> p5-dbd-mysql, qt5-mysql-plugin, qt6-mysql-plugin update variants
</span><span style='display:block; white-space:pre;color:#404040;'> p5-dbd-mysql: Add additional mysql and mariadb variants
</span><span style='display:block; white-space:pre;color:#404040;'> qt5-mysql-plugin: add MYSQL81 and MariaDB 10.11 variants
</span><span style='display:block; white-space:pre;color:#404040;'> qt6-mysql-plugin: add MYSQL81 variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
aqua/qt5/Portfile | 16 +++++++++
aqua/qt6/Portfile | 7 ++++
perl/p5-dbd-mysql/Portfile | 90 ++++++++++++++++++++++++++++++++++++----------
3 files changed, 95 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dd5a72aae0f..d8c007f736b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -868,6 +868,14 @@ array set sql_plugins {
</span> "-lmysqlclient_r"
""
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "mariadb10_11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:mariadb-10.11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/include/mariadb-10.11/mysql"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/lib/mariadb-10.11/mysql"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-lmysqlclient_r"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> {
"mariadb10_10"
"port:mariadb-10.10"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -948,6 +956,14 @@ array set sql_plugins {
</span> "-lmysqlclient_r"
""
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "mysql81"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:mysql81"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/include/mysql81/mysql"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/lib/mysql81/mysql"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-lmysqlclient"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> {
"mysql8"
"port:mysql8"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/Portfile b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b0af370e510..6a8b52dbaf7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -745,6 +745,13 @@ array set sql_plugins {
</span> -DMySQL_LIBRARY=${prefix}/lib/mysql8/mysql/libmysqlclient.dylib
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ mysql81 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:mysql81"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMySQL_INCLUDE_DIR=${prefix}/include/mysql81/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMySQL_LIBRARY=${prefix}/lib/mysql81/mysql/libmysqlclient.dylib
</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/perl/p5-dbd-mysql/Portfile b/perl/p5-dbd-mysql/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c0914593e4e..ce285d06356 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-dbd-mysql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-dbd-mysql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,56 +26,106 @@ if {${perl5.major} != ""} {
</span> depends_lib-append \
port:p${perl5.major}-dbi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql56 conflicts mysql57 mysql8 mariadb10_1 mariadb10_2 mariadb10_3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_4 mariadb10_5 percona description {build with mysql56 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql56 conflicts mysql57 mysql8 mysql81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_1 mariadb10_2 mariadb10_3 mariadb10_4 mariadb10_5 mariadb10_6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ percona description {build with mysql56 port} {
</span> depends_lib-append port:mysql56
configure.args-append --mysql_config=${prefix}/lib/mysql56/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql57 conflicts mysql56 mysql8 mariadb10_1 mariadb10_2 mariadb10_3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_4 mariadb10_5 percona description {build with mysql57 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql57 conflicts mysql56 mysql8 mysql81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_1 mariadb10_2 mariadb10_3 mariadb10_4 mariadb10_5 mariadb10_6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_11 percona description {build with mysql57 port} {
</span> depends_lib-append port:mysql57
configure.args-append --mysql_config=${prefix}/lib/mysql57/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql8 conflicts mysql56 mysql57 mariadb10_1 mariadb10_2 mariadb10_3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_4 mariadb10_5 percona description {build with mysql8 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql8 conflicts mysql56 mysql57 mysql81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_1 mariadb10_2 mariadb10_3 mariadb10_4 mariadb10_5 mariadb10_6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_11 percona description {build with mysql8 port} {
</span> depends_lib-append port:mysql8
configure.args-append --mysql_config=${prefix}/lib/mysql8/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb10_1 conflicts mysql56 mysql57 mysql8 mariadb10_2 mariadb10_3 mariadb10_4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_5 percona description {build with mariadb-10.1 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql81 conflicts mysql56 mysql57 mysql8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_1 mariadb10_2 mariadb10_3 mariadb10_4 mariadb10_5 mariadb10_6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_11 percona description {build with mysql8 1port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mysql81
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --mysql_config=${prefix}/lib/mysql81/bin/mysql_config
</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 mariadb10_1 conflicts mysql56 mysql57 mysql8 mysql81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_2 mariadb10_3 mariadb10_4 mariadb10_5 mariadb10_6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ percona description {build with mariadb-10.1 port} {
</span> depends_lib-append port:mariadb-10.1
configure.args-append --mysql_config=${prefix}/lib/mariadb-10.1/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb10_2 conflicts mysql56 mysql57 mysql8 mariadb10_1 mariadb10_3 mariadb10_4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_5 percona description {build with mariadb-10.2 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10_2 conflicts mysql56 mysql57 mysql8 mysql81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_1 mariadb10_3 mariadb10_4 mariadb10_5 mariadb10_6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ percona description {build with mariadb-10.2 port} {
</span> depends_lib-append port:mariadb-10.2
configure.args-append --mysql_config=${prefix}/lib/mariadb-10.2/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb10_3 conflicts mysql56 mysql57 mysql8 mariadb10_1 mariadb10_2 mariadb10_4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_5 percona description {build with mariadb-10.3 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10_3 conflicts mysql56 mysql57 mysql8 mysql81\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_1 mariadb10_2 mariadb10_4 mariadb10_5 mariadb10_6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ percona description {build with mariadb-10.3 port} {
</span> depends_lib-append port:mariadb-10.3
configure.args-append --mysql_config=${prefix}/lib/mariadb-10.3/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb10_4 conflicts mysql56 mysql57 mysql8 mariadb10_1 mariadb10_2 mariadb10_3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_5 percona description {build with mariadb-10.4 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10_4 conflicts mysql56 mysql57 mysql8 mysql81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_1 mariadb10_2 mariadb10_3 mariadb10_5 mariadb10_6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mmariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ percona description {build with mariadb-10.4 port} {
</span> depends_lib-append port:mariadb-10.4
configure.args-append --mysql_config=${prefix}/lib/mariadb-10.4/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb10_5 conflicts mysql56 mysql57 mysql8 mariadb10_1 mariadb10_2 mariadb10_3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_4 percona description {build with mariadb-10.5 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10_5 conflicts mysql56 mysql57 mysql8 mysql81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_1 mariadb10_2 mariadb10_3 mariadb10_4 mariadb10_6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ percona description {build with mariadb-10.5 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mariadb-10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --mysql_config=${prefix}/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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10_6 conflicts mysql56 mysql57 mysql8 mysql81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_1 mariadb10_2 mariadb10_3 mariadb10_4 mariadb10_5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ percona description {build with mariadb-10.5 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mariadb-10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --mysql_config=${prefix}/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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10_10 conflicts mysql56 mysql57 mysql8 mysql81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_1 mariadb10_2 mariadb10_3 mariadb10_4 mariadb10_5 mariadb10_6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ percona description {build with mariadb-10.5 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mariadb-10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --mysql_config=${prefix}/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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10_11 conflicts mysql56 mysql57 mysql8 mysql81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_1 mariadb10_2 mariadb10_3 mariadb10_4 mariadb10_5 mariadb10_6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ percona description {build with mariadb-10.5 port} {
</span> depends_lib-append port:mariadb-10.5
configure.args-append --mysql_config=${prefix}/lib/mariadb-10.5/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant percona conflicts mysql56 mysql57 mysql8 mariadb10_1 mariadb10_2 mariadb10_3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_4 mariadb10_5 description {build with percona port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant percona conflicts mysql56 mysql57 mysql8 mysql81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_1 mariadb10_2 mariadb10_3 mariadb10_4 mariadb10_5 mariadb10_6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {build with percona port} {
</span> depends_lib-append port:percona
configure.args-append --mysql_config=${prefix}/lib/percona/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,11 +133,15 @@ if {${perl5.major} != ""} {
</span> if { ![variant_isset mysql56]
&& ![variant_isset mysql57]
&& ![variant_isset mysql8]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![variant_isset mysql81]
</span> && ![variant_isset mariadb10_1]
&& ![variant_isset mariadb10_2]
&& ![variant_isset mariadb10_3]
&& ![variant_isset mariadb10_4]
&& ![variant_isset mariadb10_5]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![variant_isset mariadb10_6]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![variant_isset mariadb10_10]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![variant_isset mariadb10_11]
</span> && ![variant_isset percona]
} {
if {${os.major} > 12} {
</pre><pre style='margin:0'>
</pre>