<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7aa619147e087b71b2da4a2f916adeb96cbb5859">https://github.com/macports/macports-ports/commit/7aa619147e087b71b2da4a2f916adeb96cbb5859</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 7aa619147e0 p5-dbd-mysql: Fix error where wrong database was installed
</span>7aa619147e0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7aa619147e087b71b2da4a2f916adeb96cbb5859
</span>Author: jhoyt4 <john.hoyt@gmail.com>
AuthorDate: Sat Feb 17 14:02:31 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> p5-dbd-mysql: Fix error where wrong database was installed
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix all variants to properly parse dependencies. The main culprit
</span><span style='display:block; white-space:pre;color:#404040;'> was missing start brackes after the description field
</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/69359
</span>---
perl/p5-dbd-mysql/Portfile | 59 ++++++++++++++++++++--------------------------
1 file changed, 25 insertions(+), 34 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 0c82ee84a1e..2518b601397 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;'>@@ -5,7 +5,7 @@ PortGroup perl5 1.0
</span>
perl5.branches 5.28 5.30 5.32 5.34
perl5.setup DBD-mysql 5.003 ../../authors/id/D/DV/DVEEDEN
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license {Artistic-1 GPL}
maintainers nomaintainer
description Perl5 Database Interface to the MySQL database
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,65 +26,56 @@ if {${perl5.major} != ""} {
</span> depends_lib-append \
port:p${perl5.major}-dbi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql8 conflicts mysql81 mysql82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_4 mariadb10_5 mariadb10_6 mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- percona description {build with mysql8 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql8 conflicts mysql81 mysql82 mariadb10_4 mariadb10_5 mariadb10_6 mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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 mysql81 conflicts mysql8 mysql82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_4 mariadb10_5 mariadb10_6 mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- percona description {build with mysql81 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql81 conflicts mysql8 mysql82 mariadb10_4 mariadb10_5 mariadb10_6 mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {build with mysql81 port} {
</span> depends_lib-append port:mysql81
configure.args-append --mysql_config=${prefix}/lib/mysql81/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql82 conflicts mysql8 mysql81 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_4 mariadb10_5 mariadb10_6 mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- percona description {build with mysql82 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql82 conflicts mysql8 mysql81 mariadb10_4 mariadb10_5 mariadb10_6 mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {build with mysql82 port} {
</span> depends_lib-append port:mysql82
configure.args-append --mysql_config=${prefix}/lib/mysql82/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb10_4 conflicts mysql8 mysql81 mysql82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_5 mariadb10_6 mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- percona description {build with mariadb-10.4 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10_4 conflicts mysql8 mysql81 mysql82 mariadb10_5 mariadb10_6 mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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 mysql8 mysql81 mysql82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_4 mariadb10_6 mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- percona description {build with mariadb-10.5 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10_5 conflicts mysql8 mysql81 mysql82 mariadb10_4 mariadb10_6 mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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 mariadb10_6 conflicts mysql8 mysql81 mysql82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_4 mariadb10_5 mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- percona description {build with mariadb-10.5 port} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mariadb-10.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --mysql_config=${prefix}/lib/mariadb-10.5/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10_6 conflicts mysql8 mysql81 mysql82 mariadb10_4 mariadb10_5 mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {build with mariadb-10.6 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mariadb-10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --mysql_config=${prefix}/lib/mariadb-10.6/bin/mysql_config
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb10_10 conflicts mysql8 mysql81 mysql82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_4 mariadb10_5 mariadb10_6 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- percona description {build with mariadb-10.5 port} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mariadb-10.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --mysql_config=${prefix}/lib/mariadb-10.5/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10_10 conflicts mysql8 mysql81 mysql82 mariadb10_4 mariadb10_5 mariadb10_6 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {build with mariadb-10.10 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mariadb-10.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --mysql_config=${prefix}/lib/mariadb-10.10/bin/mysql_config
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb10_11 conflicts mysql8 mysql81 mysql82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_4 mariadb10_5 mariadb10_6 mariadb10_10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- percona description {build with mariadb-10.5 port} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mariadb-10.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --mysql_config=${prefix}/lib/mariadb-10.5/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10_11 conflicts mysql8 mysql81 mysql82 mariadb10_4 mariadb10_5 mariadb10_6 mariadb10_10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {build with mariadb-10.11 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mariadb-10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --mysql_config=${prefix}/lib/mariadb-10.11/bin/mysql_config
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant percona conflicts mysql8 mysql81 mysql82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mariadb10_4 mariadb10_5 mariadb10_6 mariadb10_10 mariadb10_11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {build with percona port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant percona conflicts mysql8 mysql81 mysql82 mariadb10_4 mariadb10_5 mariadb10_6 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
}
</pre><pre style='margin:0'>
</pre>