@@ -1572,7 +1572,7 @@ subport ${php}-mysql {
15721572 configure.args-append --with-zlib-dir=${prefix}
15731573
15741574 if {[vercmp ${branch} >= 5.3]} {
1575- variant mysqlnd conflicts mysql51 mysql55 mysql56 mariadb description {Use MySQL Native Driver} {
1575+ variant mysqlnd conflicts mysql51 mysql55 mysql56 mysql57 mysql8 mariadb10 mariadb11 percona description {Use MySQL Native Driver} {
15761576 configure.args-append --with-pdo-mysql=mysqlnd
15771577
15781578 if {[vercmp ${branch} < 7.0]} {
@@ -1598,12 +1598,14 @@ For mysql55, use ${prefix}/var/run/mysql55/mysqld.sock
15981598For mysql56, use ${prefix} /var/run/mysql56/mysqld.sock
15991599For mysql57, use ${prefix} /var/run/mysql57/mysqld.sock
16001600For mysql8, use ${prefix} /var/run/mysql8/mysqld.sock
1601- For mariadb, use ${prefix} /var/run/mariadb/mysqld.sock
1601+ For mariadb10, use ${prefix} /var/run/mariadb-10.11/mysqld.sock
1602+ For mariadb11, use ${prefix} /var/run/mariadb-11.4/mysqld.sock
1603+ For percona, use ${prefix} /var/run/percona/mysqld.sock
16021604"
16031605 }
16041606 }
16051607
1606- variant mysql51 conflicts mysqlnd mysql55 mysql56 mysql57 mysql8 mariadb description {Use MySQL 5.1 libraries} {
1608+ variant mysql51 conflicts mysqlnd mysql55 mysql56 mysql57 mysql8 mariadb10 mariadb11 percona description {Use MySQL 5.1 libraries} {
16071609 depends_lib-append port:mysql51
16081610
16091611 configure.args-append --with-mysql-sock=${prefix} /var/run/mysql51/mysqld.sock \
@@ -1626,7 +1628,7 @@ For mariadb, use ${prefix}/var/run/mariadb/mysqld.sock
16261628 }
16271629 }
16281630
1629- variant mysql55 conflicts mysqlnd mysql51 mysql56 mysql57 mysql8 mariadb description {Use MySQL 5.5 libraries} {
1631+ variant mysql55 conflicts mysqlnd mysql51 mysql56 mysql57 mysql8 mariadb10 mariadb11 percona description {Use MySQL 5.5 libraries} {
16301632 depends_lib-append port:mysql55
16311633
16321634 configure.args-append --with-mysql-sock=${prefix} /var/run/mysql55/mysqld.sock \
@@ -1649,7 +1651,7 @@ For mariadb, use ${prefix}/var/run/mariadb/mysqld.sock
16491651 }
16501652 }
16511653
1652- variant mysql56 conflicts mysqlnd mysql51 mysql55 mysql57 mysql8 mariadb description {Use MySQL 5.6 libraries} {
1654+ variant mysql56 conflicts mysqlnd mysql51 mysql55 mysql57 mysql8 mariadb10 mariadb11 percona description {Use MySQL 5.6 libraries} {
16531655 depends_lib-append port:mysql56
16541656
16551657 configure.args-append --with-mysql-sock=${prefix} /var/run/mysql56/mysqld.sock \
@@ -1672,7 +1674,7 @@ For mariadb, use ${prefix}/var/run/mariadb/mysqld.sock
16721674 }
16731675 }
16741676
1675- variant mysql57 conflicts mysqlnd mysql51 mysql55 mysql56 mysql8 mariadb description {Use MySQL 5.7 libraries} {
1677+ variant mysql57 conflicts mysqlnd mysql51 mysql55 mysql56 mysql8 mariadb10 mariadb11 percona description {Use MySQL 5.7 libraries} {
16761678 depends_lib-append port:mysql57
16771679
16781680 configure.args-append --with-mysql-sock=${prefix} /var/run/mysql57/mysqld.sock \
@@ -1696,7 +1698,7 @@ For mariadb, use ${prefix}/var/run/mariadb/mysqld.sock
16961698 }
16971699
16981700 if {[vercmp ${branch} >= 7.3]} {
1699- variant mysql8 conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mariadb description {Use MySQL 8 libraries} {
1701+ variant mysql8 conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mariadb10 mariadb11 percona description {Use MySQL 8 libraries} {
17001702 depends_lib-append port:mysql8
17011703
17021704 configure.args-append --with-mysql-sock=${prefix} /var/run/mysql8/mysqld.sock \
@@ -1710,32 +1712,83 @@ For mariadb, use ${prefix}/var/run/mariadb/mysqld.sock
17101712 }
17111713 }
17121714
1713- variant mariadb conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mysql8 description {Use MariaDB libraries} {
1714- depends_lib-append port:mariadb
1715+ # remove after 2026-04-02
1716+ variant mariadb requires mariadb10 description " Legacy compatibility variant " {}
17151717
1716- configure.args-append --with-mysql-sock=${prefix} /var/run/mariadb/mysqld.sock \
1717- --with-pdo-mysql=${prefix} /lib/mariadb/bin/mysql_config
1718+ variant mariadb10 conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mysql8 mariadb11 percona description {Use MariaDB 10 libraries} {
1719+ set my_db 10.11
1720+ depends_lib-append port:mariadb-${my_db}
1721+
1722+ configure.args-append --with-mysql-sock=${prefix} /var/run/mariadb-${my_db} /mysqld.sock \
1723+ --with-pdo-mysql=${prefix} /lib/mariadb-${my_db} /bin/mysql_config
17181724
17191725 if {[vercmp ${branch} < 7.0]} {
17201726 post-extract {
17211727 file mkdir ${workpath} /mariadb
1722- file link -symbolic ${workpath} /mariadb/lib ${prefix} /lib/mariadb
1723- file link -symbolic ${workpath} /mariadb/include ${prefix} /include/mariadb
1728+ file link -symbolic ${workpath} /mariadb/lib ${prefix} /lib/mariadb- ${my_db}
1729+ file link -symbolic ${workpath} /mariadb/include ${prefix} /include/mariadb- ${my_db}
17241730 }
17251731
17261732 configure.args-append --with-mysql=${workpath} /mariadb
17271733 }
17281734
17291735 if {[vercmp ${branch} < 8.2]} {
1730- configure.args-append --with-mysqli=${prefix} /lib/mariadb/bin/mysql_config
1736+ configure.args-append --with-mysqli=${prefix} /lib/mariadb/bin-${my_db} /mysql_config
1737+ } else {
1738+ configure.args-append --with-mysqli
1739+ }
1740+ }
1741+
1742+ variant mariadb11 conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mysql8 mariadb10 percona description {Use MariaDB 11 libraries} {
1743+ set my_db 11.8
1744+ depends_lib-append port:mariadb-${my_db}
1745+
1746+ configure.args-append --with-mysql-sock=${prefix} /var/run/mariadb-${my_db} /mysqld.sock \
1747+ --with-pdo-mysql=${prefix} /lib/mariadb-${my_db} /bin/mysql_config
1748+
1749+ if {[vercmp ${branch} < 7.0]} {
1750+ post-extract {
1751+ file mkdir ${workpath} /mariadb
1752+ file link -symbolic ${workpath} /mariadb/lib ${prefix} /lib/mariadb-${my_db}
1753+ file link -symbolic ${workpath} /mariadb/include ${prefix} /include/mariadb-${my_db}
1754+ }
1755+
1756+ configure.args-append --with-mysql=${workpath} /mariadb
1757+ }
1758+
1759+ if {[vercmp ${branch} < 8.2]} {
1760+ configure.args-append --with-mysqli=${prefix} /lib/mariadb/bin-${my_db} /mysql_config
1761+ } else {
1762+ configure.args-append --with-mysqli
1763+ }
1764+ }
1765+
1766+ variant percona conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mysql8 mariadb10 mariadb11 description {Use Percona libraries} {
1767+ depends_lib-append port:percona
1768+
1769+ configure.args-append --with-mysql-sock=${prefix} /var/run/percona/mysqld.sock \
1770+ --with-pdo-mysql=${prefix} /lib/percona/bin/mysql_config
1771+
1772+ if {[vercmp ${branch} < 7.0]} {
1773+ post-extract {
1774+ file mkdir ${workpath} /percona
1775+ file link -symbolic ${workpath} /percona/lib ${prefix} /lib/percona
1776+ file link -symbolic ${workpath} /percona/include ${prefix} /include/percona
1777+ }
1778+
1779+ configure.args-append --with-mysql=${workpath} /percona
1780+ }
1781+
1782+ if {[vercmp ${branch} < 8.2]} {
1783+ configure.args-append --with-mysqli=${prefix} /lib/percona/bin/mysql_config
17311784 } else {
17321785 configure.args-append --with-mysqli
17331786 }
17341787 }
17351788
1736- if {![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mysql57] && ![variant_isset mysql8] && ![variant_isset mariadb ]} {
1789+ if {![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mysql57] && ![variant_isset mysql8] && ![variant_isset mariadb10] && ![variant_isset mariadb11] && ![variant_isset percona ]} {
17371790 if {[vercmp ${branch} < 5.3]} {
1738- default_variants +mariadb
1791+ default_variants +mariadb10
17391792 } else {
17401793 default_variants +mysqlnd
17411794 }
0 commit comments