<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5174b3d1a12dc6ed7a41113a05c75626d57f8893">https://github.com/macports/macports-ports/commit/5174b3d1a12dc6ed7a41113a05c75626d57f8893</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5174b3d1a12dc6ed7a41113a05c75626d57f8893
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Jan 14 14:18:52 2025 +1100
<span style='display:block; white-space:pre;color:#404040;'> dovecot: update database variants
</span>---
mail/dovecot/Portfile | 77 +++++++++++++++++++++++++++------------------------
1 file changed, 41 insertions(+), 36 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/dovecot/Portfile b/mail/dovecot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e5151bd4c7..0dce7343ff4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/dovecot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/dovecot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -286,16 +286,8 @@ if {${name} eq ${subport}} {
</span> "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql11 postgresql12 postgresql13 postgresql14 postgresql15 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable PostgreSQL 10 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PG_CONFIG=${prefix}/lib/postgresql10/bin/pg_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-pgsql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant postgresql11 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql10 postgresql12 postgresql13 postgresql14 postgresql15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql12 postgresql13 postgresql14 postgresql15 postgresql16 postgresql17 \
</span> description "Enable PostgreSQL 11 support" {
depends_lib-append port:postgresql11
configure.env-append PG_CONFIG=${prefix}/lib/postgresql11/bin/pg_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -303,7 +295,7 @@ if {${name} eq ${subport}} {
</span> }
variant postgresql12 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql10 postgresql11 postgresql13 postgresql14 postgresql15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql11 postgresql13 postgresql14 postgresql15 postgresql16 postgresql17 \
</span> description "Enable PostgreSQL 12 support" {
depends_lib-append port:postgresql12
configure.env-append PG_CONFIG=${prefix}/lib/postgresql12/bin/pg_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -311,7 +303,7 @@ if {${name} eq ${subport}} {
</span> }
variant postgresql13 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql10 postgresql11 postgresql12 postgresql14 postgresql15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql11 postgresql12 postgresql14 postgresql15 postgresql16 postgresql17 \
</span> description "Enable PostgreSQL 13 support" {
depends_lib-append port:postgresql13
configure.env-append PG_CONFIG=${prefix}/lib/postgresql13/bin/pg_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -319,7 +311,7 @@ if {${name} eq ${subport}} {
</span> }
variant postgresql14 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql10 postgresql11 postgresql12 postgresql13 postgresql15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql11 postgresql12 postgresql13 postgresql15 postgresql16 postgresql17 \
</span> description "Enable PostgreSQL 14 support" {
depends_lib-append port:postgresql14
configure.env-append PG_CONFIG=${prefix}/lib/postgresql14/bin/pg_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -327,31 +319,39 @@ if {${name} eq ${subport}} {
</span> }
variant postgresql15 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql10 postgresql11 postgresql12 postgresql13 postgresql14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql11 postgresql12 postgresql13 postgresql14 postgresql16 postgresql17 \
</span> description "Enable PostgreSQL 15 support" {
depends_lib-append port:postgresql15
configure.env-append PG_CONFIG=${prefix}/lib/postgresql15/bin/pg_config
configure.args-append --with-pgsql
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql16 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql11 postgresql12 postgresql13 postgresql14 postgresql15 postgresql17 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Enable PostgreSQL 16 support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PG_CONFIG=${prefix}/lib/postgresql16/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-pgsql
</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 postgresql17 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql11 postgresql12 postgresql13 postgresql14 postgresql15 postgresql16 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Enable PostgreSQL 16 support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PG_CONFIG=${prefix}/lib/postgresql16/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-pgsql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant percona \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mariadb10.2 mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.8 mysql57 mysql8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.8 mariadb10.11 mysql57 mysql8 \
</span> description "Enable Percona (MySQL) support" {
depends_lib-append port:percona
configure.env-append MYSQL_CONFIG=${prefix}/lib/percona/bin/mysql_config
configure.args-append --with-mysql
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb10.2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.8 mysql57 mysql8 percona \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable MariaDB 10.2 (MySQL) support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mariadb-10.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.2/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant mariadb10.3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mariadb10.2 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.8 mysql57 mysql8 percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.8 mariadb10.11 mysql57 mysql8 percona \
</span> description "Enable MariaDB 10.3 (MySQL) support" {
depends_lib-append port:mariadb-10.3
configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.3/bin/mysql_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -359,7 +359,7 @@ if {${name} eq ${subport}} {
</span> }
variant mariadb10.4 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mariadb10.2 mariadb10.3 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.8 mysql57 mysql8 percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mariadb10.3 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.8 mariadb10.11 mysql57 mysql8 percona \
</span> description "Enable MariaDB 10.4 (MySQL) support" {
depends_lib-append port:mariadb-10.4
configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.4/bin/mysql_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -367,7 +367,7 @@ if {${name} eq ${subport}} {
</span> }
variant mariadb10.5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mariadb10.2 mariadb10.3 mariadb10.4 mariadb10.6 mariadb10.7 mariadb10.8 mysql57 mysql8 percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mariadb10.3 mariadb10.4 mariadb10.6 mariadb10.7 mariadb10.8 mariadb10.11 mysql57 mysql8 percona \
</span> description "Enable MariaDB 10.5 (MySQL) support" {
depends_lib-append port:mariadb-10.5
configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.5/bin/mysql_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -375,7 +375,7 @@ if {${name} eq ${subport}} {
</span> }
variant mariadb10.6 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mariadb10.2 mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.7 mariadb10.8 mysql57 mysql8 percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.7 mariadb10.8 mariadb10.11 mysql57 mysql8 percona \
</span> description "Enable MariaDB 10.6 (MySQL) support" {
depends_lib-append port:mariadb-10.6
configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.6/bin/mysql_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -383,7 +383,7 @@ if {${name} eq ${subport}} {
</span> }
variant mariadb10.7 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mariadb10.2 mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.8 mysql57 mysql8 percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.8 mariadb10.11 mysql57 mysql8 percona \
</span> description "Enable MariaDB 10.7 (MySQL) support" {
depends_lib-append port:mariadb-10.7
configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.7/bin/mysql_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -391,15 +391,23 @@ if {${name} eq ${subport}} {
</span> }
variant mariadb10.8 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mariadb10.2 mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.7 mysql57 mysql8 percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.11 mysql57 mysql8 percona \
</span> description "Enable MariaDB 10.8 (MySQL) support" {
depends_lib-append port:mariadb-10.8
configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.8/bin/mysql_config
configure.args-append --with-mysql
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10.11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.8 mysql57 mysql8 percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Enable MariaDB 10.11 (MySQL) support" {
</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.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.11/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant mysql57 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mariadb10.2 mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.8 mysql8 percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.8 mariadb10.11 mysql8 percona \
</span> description "Enable MySQL 5.7 support" {
depends_lib-append port:mysql57
configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql57/bin/mysql_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -407,19 +415,16 @@ if {${name} eq ${subport}} {
</span> }
variant mysql8 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mariadb10.2 mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.8 mysql57 percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.8 mariadb10.11 mysql57 percona \
</span> description "Enable MySQL 8 support" {
depends_lib-append port:mysql8
configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql8/bin/mysql_config
configure.args-append --with-mysql
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove after 2023-08-20
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb10.1 requires mariadb10.7 description "Legacy compatibility variant" {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb requires mariadb10.7 description "Legacy compatibility variant" {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove after 2024-04-04
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql96 requires postgresql14 description "Legacy compatibility variant" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove after 2026-01-14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10.2 requires mariadb10.5 description "Legacy compatibility variant" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql10 requires postgresql13 description "Legacy compatibility variant" {}
</span>
if {[variant_isset "apns"]} {
set daemon_uniquename \
</pre><pre style='margin:0'>
</pre>