<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/19b17dcf3aadcad9c6f9f5ef31fd333ec5726c2a">https://github.com/macports/macports-ports/commit/19b17dcf3aadcad9c6f9f5ef31fd333ec5726c2a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 19b17dcf3aadcad9c6f9f5ef31fd333ec5726c2a
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue May 7 14:38:04 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-oursql: Remove mysql5 variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/43431
</span>---
python/py-oursql/Portfile | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-oursql/Portfile b/python/py-oursql/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 84c9ac93d1d..7a0029356f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-oursql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-oursql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,6 @@ version [expr {${name} eq ${subport} || ${python.version} < 30
</span> : {0.9.3}}]
categories-append devel databases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,38 +49,34 @@ if {${name} ne ${subport}} {
</span> sha256 58c12b577804b1d0174536ed075d31d27346aa9efc686482f99b265e5a1fa984
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql5 conflicts mysql51 mysql55 mysql56 mariadb percona description {Build with MySQL 5} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append MYSQL_CONFIG=${prefix}/lib/mysql5/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql51 conflicts mysql5 mysql55 mysql56 mariadb percona description {Build with MySQL 5.1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql51 conflicts mysql55 mysql56 mariadb percona description {Build with MySQL 5.1} {
</span> depends_lib-append port:mysql51
build.env-append MYSQL_CONFIG=${prefix}/lib/mysql51/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql55 conflicts mysql5 mysql51 mysql56 mariadb percona description {Build with MySQL 5.5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql55 conflicts mysql51 mysql56 mariadb percona description {Build with MySQL 5.5} {
</span> depends_lib-append port:mysql55
build.env-append MYSQL_CONFIG=${prefix}/lib/mysql55/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql56 conflicts mysql5 mysql51 mysql55 mariadb percona description {Build with MySQL 5.6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql56 conflicts mysql51 mysql55 mariadb percona description {Build with MySQL 5.6} {
</span> depends_lib-append port:mysql56
build.env-append MYSQL_CONFIG=${prefix}/lib/mysql56/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb conflicts mysql5 mysql51 mysql55 mysql56 percona description {Build with MariaDB} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb conflicts mysql51 mysql55 mysql56 percona description {Build with MariaDB} {
</span> depends_lib-append port:mariadb
build.env-append MYSQL_CONFIG=${prefix}/lib/mariadb/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant percona conflicts mysql5 mysql51 mysql55 mysql56 mariadb description {Build with Percona} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant percona conflicts mysql51 mysql55 mysql56 mariadb description {Build with Percona} {
</span> depends_lib-append port:percona
build.env-append MYSQL_CONFIG=${prefix}/lib/percona/bin/mysql_config
}
proc no_variant_set {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return [expr {!([variant_isset mysql5] || [variant_isset mysql51] ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [expr {!([variant_isset mysql51] ||
</span> [variant_isset mysql55] || [variant_isset mysql56] ||
[variant_isset mariadb] || [variant_isset percona])}]
}
if {[no_variant_set]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +mysql5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +mysql56
</span> }
pre-fetch {
if {[no_variant_set]} {
</pre><pre style='margin:0'>
</pre>