<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4450ea70f94ac45794a69671e610a338afc840e7">https://github.com/macports/macports-ports/commit/4450ea70f94ac45794a69671e610a338afc840e7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4450ea70f94ac45794a69671e610a338afc840e7
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Sun Feb 16 06:52:24 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> dovecot: Remove obsolete variants
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Completes steps in stalled PR https://github.com/macports/macports-ports/pull/5236/
</span>---
mail/dovecot/Portfile | 153 ++++++++++++++++++--------------------------------
1 file changed, 54 insertions(+), 99 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 3be845d..c569a22 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;'>@@ -254,103 +254,66 @@ if {${name} eq ${subport}} {
</span> }
variant postgresql96 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql82 postgresql83 postgresql84 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql90 postgresql91 postgresql92 postgresql93 postgresql94 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql10 postgresql11 postgresql12 \
</span> description "Enable PostgreSQL 9.6 support" {
depends_lib-append port:postgresql96
configure.env-append PG_CONFIG=${prefix}/lib/postgresql96/bin/pg_config
configure.args-append --with-pgsql
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql95 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql82 postgresql83 postgresql84 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql90 postgresql91 postgresql92 postgresql93 postgresql94 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable PostgreSQL 9.5 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql95
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PG_CONFIG=${prefix}/lib/postgresql95/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql96 postgresql11 postgresql12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Enable PostgreSQL 10 support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PG_CONFIG=${prefix}/lib/postgresql10/bin/pg_config
</span> configure.args-append --with-pgsql
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql94 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql82 postgresql83 postgresql84 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql90 postgresql91 postgresql92 postgresql93 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql95 postgresql96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable PostgreSQL 9.4 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql94
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PG_CONFIG=${prefix}/lib/postgresql94/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql96 postgresql10 postgresql12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Enable PostgreSQL 11 support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PG_CONFIG=${prefix}/lib/postgresql11/bin/pg_config
</span> configure.args-append --with-pgsql
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql93 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql82 postgresql83 postgresql84 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql90 postgresql91 postgresql92 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql94 postgresql95 postgresql96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable PostgreSQL 9.3 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql93
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PG_CONFIG=${prefix}/lib/postgresql93/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql96 postgresql10 postgresql11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Enable PostgreSQL 12 support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PG_CONFIG=${prefix}/lib/postgresql12/bin/pg_config
</span> configure.args-append --with-pgsql
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql92 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql82 postgresql83 postgresql84 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql90 postgresql91 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql93 postgresql94 postgresql95 postgresql96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable PostgreSQL 9.2 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql92
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PG_CONFIG=${prefix}/lib/postgresql92/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:#e0ffe0;'>+ # remove 2021-03-02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql95 requires postgresql11 description "Legacy compatibility variant" {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql91 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql82 postgresql83 postgresql84 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql90 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql92 postgresql93 postgresql94 postgresql95 postgresql96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable PostgreSQL 9.1 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql91
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PG_CONFIG=${prefix}/lib/postgresql91/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:#e0ffe0;'>+ # remove 2021-03-02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql94 requires postgresql11 description "Legacy compatibility variant" {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql90 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql82 postgresql83 postgresql84 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql91 postgresql92 postgresql93 postgresql94 postgresql95 postgresql96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable PostgreSQL 9.0 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PG_CONFIG=${prefix}/lib/postgresql90/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:#e0ffe0;'>+ # remove 2021-03-02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql93 requires postgresql11 description "Legacy compatibility variant" {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql84 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql82 postgresql83 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql91 postgresql92 postgresql93 postgresql94 postgresql95 postgresql96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable PostgreSQL 8.4 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql84
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PG_CONFIG=${prefix}/lib/postgresql84/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:#e0ffe0;'>+ # remove 2021-03-02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql92 requires postgresql11 description "Legacy compatibility variant" {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql83 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql82 postgresql84 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql91 postgresql92 postgresql93 postgresql94 postgresql95 postgresql96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable PostgreSQL 8.3 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql83
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PG_CONFIG=${prefix}/lib/postgresql83/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:#e0ffe0;'>+ # remove 2021-03-02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql91 requires postgresql11 description "Legacy compatibility variant" {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql83 postgresql84 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql91 postgresql92 postgresql93 postgresql94 postgresql95 postgresql96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable PostgreSQL 8.2 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql82
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PG_CONFIG=${prefix}/lib/postgresql82/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:#e0ffe0;'>+ # remove 2021-03-02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql90 requires postgresql11 description "Legacy compatibility variant" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove 2021-03-02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql84 requires postgresql11 description "Legacy compatibility variant" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove 2021-03-02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql83 requires postgresql11 description "Legacy compatibility variant" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove 2021-03-02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql82 requires postgresql11 description "Legacy compatibility variant" {}
</span>
variant percona \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql5 mysql51 mysql55 mysql56 mariadb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mysql57 mysql8 mariadb mariadb10.1 \
</span> description "Enable Percona (MySQL) support" {
depends_lib-append port:percona
configure.env-append MYSQL_CONFIG=${prefix}/lib/percona/bin/mysql_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -358,42 +321,34 @@ if {${name} eq ${subport}} {
</span> }
variant mariadb \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql5 mysql51 mysql55 mysql56 percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mysql57 mysql8 mariadb10.1 percona \
</span> description "Enable MariaDB (MySQL) support" {
depends_lib-append port:mariadb
configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb/bin/mysql_config
configure.args-append --with-mysql
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql56 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql5 mysql51 mysql55 mariadb percona \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable MySQL 5.6 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql56/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><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql55 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql5 mysql51 mysql56 mariadb percona \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable MySQL 5.5 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql55/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mysql57 mysql8 mariadb percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Enable MariaDB 10.1 (MySQL) support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mariadb-10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.1/bin/mysql_config
</span> configure.args-append --with-mysql
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql51 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql5 mysql55 mysql56 mariadb percona \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable MySQL 5.1 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql51
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql51/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql57 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mysql8 mariadb mariadb10.1 percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Enable MySQL 5.7 support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mysql57
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql57/bin/mysql_config
</span> configure.args-append --with-mysql
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql51 mysql55 mysql56 mariadb percona \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable MySQL 5.1 support" {
</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;'>- configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql5/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mysql57 mariadb mariadb10.1 percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Enable MySQL 8 support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mysql8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql8/bin/mysql_config
</span> configure.args-append --with-mysql
}
</pre><pre style='margin:0'>
</pre>