<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d4f31d5a1c60a08990702bad2a8e2695371057ca">https://github.com/macports/macports-ports/commit/d4f31d5a1c60a08990702bad2a8e2695371057ca</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 d4f31d5a1c6 p5-dbd-mysql: update variants
</span>d4f31d5a1c6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d4f31d5a1c60a08990702bad2a8e2695371057ca
</span>Author: iEFdev <eric@iefdev.se>
AuthorDate: Sun Aug 2 15:25:19 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> p5-dbd-mysql: update variants
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Add variants: 'maria10_{3,4}'
</span><span style='display:block; white-space:pre;color:#404040;'> - Remove older legacy variant (< mysql57)
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/43431
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> —
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This one also closes an old ticket – which looks fixed, but forgotten
</span><span style='display:block; white-space:pre;color:#404040;'> about?
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Closes: https://trac.macports.org/ticket/44484
</span>---
perl/p5-dbd-mysql/Portfile | 67 ++++++++++++++++++++++++++--------------------
1 file changed, 38 insertions(+), 29 deletions(-)
<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 66aab02952a..f731605dae4 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,70 +26,79 @@ if {${perl5.major} != ""} {
</span> depends_lib-append \
port:p${perl5.major}-dbi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql4 conflicts mysql5 mysql51 mysql55 mysql56 mysql57 mariadb mariadb10_0 mariadb10_1 mariadb10_2 percona description {build with mysql4 port} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach version {4 5 51 55} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql${version} requires mysql57 description {Legacy compatibility variant} {}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql5 conflicts mysql4 mysql51 mysql55 mysql56 mysql57 mariadb mariadb10_0 mariadb10_1 mariadb10_2 percona description {build with mysql5 port} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:bin/mysql_config5:mysql5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --mysql_config=${prefix}/bin/mysql_config5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql51 conflicts mysql4 mysql5 mysql55 mysql56 mysql57 mariadb mariadb10_0 mariadb10_1 mariadb10_2 percona description {build with mysql51 port} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql51
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --mysql_config=${prefix}/lib/mysql51/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql55 conflicts mysql4 mysql5 mysql51 mysql56 mysql57 mariadb mariadb10_0 mariadb10_1 mariadb10_2 percona description {build with mysql55 port} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --mysql_config=${prefix}/lib/mysql55/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql56 conflicts mysql4 mysql5 mysql51 mysql55 mysql57 mariadb mariadb10_0 mariadb10_1 mariadb10_2 percona description {build with mysql56 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql56 conflicts mysql57 mysql8 mariadb mariadb10_0 mariadb10_1 mariadb10_2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_2 mariadb10_3 mariadb10_4 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 mysql4 mysql5 mysql51 mysql55 mysql56 mariadb mariadb10_0 mariadb10_1 mariadb10_2 percona description {build with mysql57 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql57 conflicts mysql56 mysql8 mariadb mariadb10_0 mariadb10_1 mariadb10_2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_3 mariadb10_4 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 mariadb conflicts mysql4 mysql5 mysql51 mysql55 mysql56 mysql57 mariadb10_0 mariadb10_1 mariadb10_2 percona description {build with mariadb port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql8 conflicts mysql56 mysql57 mariadb mariadb10_0 mariadb10_1 mariadb10_2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_3 mariadb10_4 percona description {build with mysql8 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mysql8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --mysql_config=${prefix}/lib/mysql8/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 mariadb conflicts mysql56 mysql57 mysql8 mariadb10_0 mariadb10_1 mariadb10_2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_3 mariadb10_4 percona description {build with mariadb port} {
</span> depends_lib-append port:mariadb
configure.args-append --mysql_config=${prefix}/lib/mariadb/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb10_0 conflicts mysql4 mysql5 mysql51 mysql55 mysql56 mysql57 mariadb mariadb10_1 mariadb10_2 percona description {build with mariadb-10.0 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10_0 conflicts mysql56 mysql57 mysql8 mariadb mariadb10_1 mariadb10_2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_3 mariadb10_4 percona description {build with mariadb-10.0 port} {
</span> depends_lib-append port:mariadb-10.0
configure.args-append --mysql_config=${prefix}/lib/mariadb-10.0/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb10_1 conflicts mysql4 mysql5 mysql51 mysql55 mysql56 mysql57 mariadb mariadb10_0 mariadb10_2 percona description {build with mariadb-10.1 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10_1 conflicts mysql56 mysql57 mysql8 mariadb mariadb10_0 mariadb10_2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_3 mariadb10_4 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 mysql4 mysql5 mysql51 mysql55 mysql56 mysql57 mariadb mariadb10_0 mariadb10_1 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 mariadb mariadb10_0 mariadb10_1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_3 mariadb10_4 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 percona conflicts mysql4 mysql5 mysql51 mysql55 mysql56 mariadb description {build with percona port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10_3 conflicts mysql56 mysql57 mysql8 mariadb mariadb10_0 mariadb10_1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_2 mariadb10_4 percona description {build with mariadb-10.3 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mariadb-10.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --mysql_config=${prefix}/lib/mariadb-10.3/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_4 conflicts mysql56 mysql57 mysql8 mariadb mariadb10_0 mariadb10_1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_2 mariadb10_3 percona description {build with mariadb-10.4 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mariadb-10.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --mysql_config=${prefix}/lib/mariadb-10.4/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 percona conflicts mysql56 mysql57 mysql8 mariadb mariadb10_0 mariadb10_1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mariadb10_2 mariadb10_3 mariadb10_4 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:#ffe0e0;'>- if { ![variant_isset mysql4]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![variant_isset mysql5]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![variant_isset mysql51]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![variant_isset mysql55]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![variant_isset mysql56]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![variant_isset mysql56]
</span> && ![variant_isset mysql57]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![variant_isset mysql8]
</span> && ![variant_isset mariadb]
&& ![variant_isset mariadb10_0]
&& ![variant_isset mariadb10_1]
&& ![variant_isset mariadb10_2]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![variant_isset mariadb10_3]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![variant_isset mariadb10_4]
</span> && ![variant_isset percona]
} {
if {${os.major} > 12} {
</pre><pre style='margin:0'>
</pre>