<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/dcc48b8d45cb8bbf28cfc77c7e39d175b38ea6fd">https://github.com/macports/macports-ports/commit/dcc48b8d45cb8bbf28cfc77c7e39d175b38ea6fd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit dcc48b8d45cb8bbf28cfc77c7e39d175b38ea6fd
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue May 7 15:23:42 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> php*-mysql: 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>---
lang/php/Portfile | 42 +++++++++---------------------------------
1 file changed, 9 insertions(+), 33 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/Portfile b/lang/php/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b1dbed0276..feddf3cd153 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1501,7 +1501,7 @@ subport ${php}-mysql {
</span> configure.args-append --with-zlib-dir=${prefix}
if {[vercmp ${branch} >= 5.3]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysqlnd conflicts mysql5 mysql51 mysql55 mysql56 mariadb percona description {Use MySQL Native Driver} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysqlnd conflicts mysql51 mysql55 mysql56 mariadb percona description {Use MySQL Native Driver} {
</span> configure.args-append --with-pdo-mysql=mysqlnd
if {[vercmp ${branch} < 7.0]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1522,7 +1522,6 @@ To use mysqlnd with a local MySQL server, edit ${phpini} and set\
</span> mysql.default_socket, mysqli.default_socket and pdo_mysql.default_socket\
to the path to your MySQL server's socket file.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-For mysql5, use ${prefix}/var/run/mysql5/mysqld.sock
</span> For mysql51, use ${prefix}/var/run/mysql51/mysqld.sock
For mysql55, use ${prefix}/var/run/mysql55/mysqld.sock
For mysql56, use ${prefix}/var/run/mysql56/mysqld.sock
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1534,30 +1533,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql5 conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mysql8 mariadb percona description {Use MySQL 5 libraries} {
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysql-sock=${prefix}/var/run/mysql5/mysqld.sock \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pdo-mysql=${prefix}/bin/mysql_config5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${branch} < 7.0]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${workpath}/mysql5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file link -symbolic ${workpath}/mysql5/lib ${prefix}/lib/mysql5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file link -symbolic ${workpath}/mysql5/include ${prefix}/include/mysql5
</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;'>- configure.args-append --with-mysql=${workpath}/mysql5
</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;'>- if {[vercmp ${branch} < 8.2]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysqli=${prefix}/bin/mysql_config5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysqli
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql51 conflicts mysqlnd mysql5 mysql55 mysql56 mysql57 mysql8 mariadb percona description {Use MySQL 5.1 libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql51 conflicts mysqlnd mysql55 mysql56 mysql57 mysql8 mariadb percona description {Use MySQL 5.1 libraries} {
</span> depends_lib-append port:mysql51
configure.args-append --with-mysql-sock=${prefix}/var/run/mysql51/mysqld.sock \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1580,7 +1556,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql55 conflicts mysqlnd mysql5 mysql51 mysql56 mysql57 mysql8 mariadb percona description {Use MySQL 5.5 libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql55 conflicts mysqlnd mysql51 mysql56 mysql57 mysql8 mariadb percona description {Use MySQL 5.5 libraries} {
</span> depends_lib-append port:mysql55
configure.args-append --with-mysql-sock=${prefix}/var/run/mysql55/mysqld.sock \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1603,7 +1579,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql56 conflicts mysqlnd mysql5 mysql51 mysql55 mysql57 mysql8 mariadb percona description {Use MySQL 5.6 libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql56 conflicts mysqlnd mysql51 mysql55 mysql57 mysql8 mariadb percona description {Use MySQL 5.6 libraries} {
</span> depends_lib-append port:mysql56
configure.args-append --with-mysql-sock=${prefix}/var/run/mysql56/mysqld.sock \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1626,7 +1602,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql57 conflicts mysqlnd mysql5 mysql51 mysql55 mysql56 mysql8 mariadb percona description {Use MySQL 5.7 libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql57 conflicts mysqlnd mysql51 mysql55 mysql56 mysql8 mariadb percona description {Use MySQL 5.7 libraries} {
</span> depends_lib-append port:mysql57
configure.args-append --with-mysql-sock=${prefix}/var/run/mysql57/mysqld.sock \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1650,7 +1626,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock
</span> }
if {[vercmp ${branch} >= 7.3]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql8 conflicts mysqlnd mysql5 mysql51 mysql55 mysql56 mysql57 mariadb percona description {Use MySQL 8 libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql8 conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mariadb percona description {Use MySQL 8 libraries} {
</span> depends_lib-append port:mysql8
configure.args-append --with-mysql-sock=${prefix}/var/run/mysql8/mysqld.sock \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1664,7 +1640,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb conflicts mysqlnd mysql5 mysql51 mysql55 mysql56 mysql57 mysql8 percona description {Use MariaDB libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mysql8 percona description {Use MariaDB libraries} {
</span> depends_lib-append port:mariadb
configure.args-append --with-mysql-sock=${prefix}/var/run/mariadb/mysqld.sock \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1687,7 +1663,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant percona conflicts mysqlnd mysql5 mysql51 mysql55 mysql56 mysql57 mysql8 mariadb description {Use Percona libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant percona conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mysql8 mariadb description {Use Percona libraries} {
</span> depends_lib-append port:percona
configure.args-append --with-mysql-sock=${prefix}/var/run/percona/mysqld.sock \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1710,7 +1686,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset mysql5] && ![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mysql57] && ![variant_isset mysql8] && ![variant_isset mariadb] && ![variant_isset percona]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mysql57] && ![variant_isset mysql8] && ![variant_isset mariadb] && ![variant_isset percona]} {
</span> if {[vercmp ${branch} < 5.3]} {
default_variants +mariadb
} else {
</pre><pre style='margin:0'>
</pre>