<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/301eda8b32a1dc39639a82b71ff0537850462435">https://github.com/macports/macports-ports/commit/301eda8b32a1dc39639a82b71ff0537850462435</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 301eda8b32a1dc39639a82b71ff0537850462435
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Aug 20 18:32:13 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> dovecot: update to 2.3.19.1, sieve to 0.5.19
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also switch to release tarballs, use perl 5.34, and update database
</span><span style='display:block; white-space:pre;color:#404040;'> variants.
</span>---
mail/dovecot/Portfile | 224 +++++++++++------------
mail/dovecot/files/dynamic_lookup-11-sieve.patch | 23 +++
mail/dovecot/files/dynamic_lookup-11.patch | 25 +++
3 files changed, 155 insertions(+), 117 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 9934898758c..5e575bc76a7 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;'>@@ -3,15 +3,14 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup dovecot core 2.3.17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set core_branch 2.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set core_version ${core_branch}.19.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup dovecot core ${core_version}
</span> name dovecot
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span> epoch 20060722
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set core_version ${version}
</span>
categories mail
maintainers {jberry @jdberry} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license LGPL-2.1
homepage https://www.dovecot.org
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,8 +22,8 @@ long_description Dovecot is an IMAP and POP3 server for \
</span> uses several coding techniques to avoid most of \
the common pitfalls.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name}-sieve {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup dovecot pigeonhole 0.5.[lindex [split ${core_version} .] end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport dovecot-sieve {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup dovecot pigeonhole 0.5.[lindex [split ${core_version} .] 2]
</span> revision 0
description Pigeonhole sieve and managesieve plugins for dovecot
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,24 +62,17 @@ subport ${name}-sieve {
</span>
homepage https://pigeonhole.dovecot.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distname dovecot-${core_version}-pigeonhole-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname dovecot-${core_branch}-pigeonhole-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites ${homepage}releases/${core_branch}/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8144f3b69723ac9bffc87173defbcdf789182283 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3b8201b878f3966a33a4061a38f11e38fc7133de6c5ce7e03280dd3d3e944a8e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1063351
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 d453de41682ce7c809cabb3c5ebddbe5e31eb804 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 637709a83fb1338c918e5398049f96b7aeb5ae00696794ed1e5a4d4c0ca3f688 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1954347
</span>
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${name} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mercurial
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:dovecot
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note: https://trac.macports.org/ticket/58544#comment:11 for this build logic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoreconf.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles dynamic_lookup-11-sieve.patch
</span>
configure.ldflags-append \
-L${prefix}/lib/dovecot
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,62 +80,23 @@ subport ${name}-sieve {
</span> --disable-dependency-tracking
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set perl5_major_version \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set perl5.major 5.34
</span>
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d8e048d879279943c61f49816e8fed511cfc3a6e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8cab77f36130bd370908f7b446680d099f864022fb873c109535e69f5e92d87e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3959234
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.only ${distfiles}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See wget command in ${worksrcpath}/autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wiki_filename wiki2-export${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites-append https://dovecot.org/tmp/:dovecot_tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append ${wiki_filename}:dovecot_tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.only-append ${wiki_filename}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${wiki_filename} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ac21595985ab077820e21533266e23c2baaadf1d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9be2a458ad94b915dbb23afc943e8b90fce99d8158f1099144f701beadad9f5f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 446263
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See wget command in ${worksrcpath}/src/lib/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set unicode_filename UnicodeData.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites-append https://dovecot.org/res/:dovecot_res
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append ${unicode_filename}:dovecot_res
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${unicode_filename} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c9c12d76576decdf2588ce543b99b8ddbbcf523e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 68dfc414d28257b9b5d6ddbb8b466c768c00ebdf6cbf7784364a9b6cad55ee8f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1686443
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See wget command in ${worksrcpath}/src/lib-fts/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wordbreak_filename WordBreakProperty.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set proplist_filename PropList.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${wordbreak_filename}:dovecot_res \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${proplist_filename}:dovecot_res
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${wordbreak_filename} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a2bdcc9a6c068ca267d8f253fdf0f78873159e31 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cb2db065c77287e0f1d35b8c9b473d848b7566a1670439f67c357ca393084043 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 93799 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${proplist_filename} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2e9ba01e7374dafd81d8923ac4b33a13e5894173 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f413ea8dbd3858de72f3148b47dd0586019761357d1481e3b65f3a025bc27f82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 116060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://dovecot.org/releases/${core_branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 1332df6aaa11d9625f8ed29a9eeda09c083db7a0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 db5abcd87d7309659ea6b45b2cb6ee9c5f97486b2b719a5dd05a759e1f6a5c51 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7790851
</span>
depends_build-append \
port:bison \
port:flex \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext \
</span> port:pkgconfig
depends_lib-append \
port:bzip2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:icu \
</span> port:libiconv \
path:lib/libssl.dylib:openssl \
port:lz4 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,16 +111,8 @@ if {${name} eq ${subport}} {
</span> patch.pre_args -p1
patchfiles patch-doc-example-config-conf.d-10-master.conf.diff \
patch-src-lib-ioloop-notify-kqueue-c.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-master-master-settings.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob -nocomplain ${workpath}/wiki2-export/*.txt] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${f} ${worksrcpath}/doc/wiki
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${distpath}/${unicode_filename} ${worksrcpath}/src/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${distpath}/${wordbreak_filename} ${worksrcpath}/src/lib-fts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${distpath}/${proplist_filename} ${worksrcpath}/src/lib-fts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-master-master-settings.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dynamic_lookup-11.patch
</span>
post-patch {
reinplace "s|@@default_internal_user@@|${default_internal_user}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,20 +121,6 @@ if {${name} eq ${subport}} {
</span> ${worksrcpath}/doc/example-config/conf.d/10-master.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note: https://trac.macports.org/ticket/58544#comment:11 for this build logic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoreconf.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the line `dummy < /dev/tty` breaks this; just copy the necessary file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # system -W ${worksrcpath} "gettextize -f"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -W ${worksrcpath} ${prefix}/share/gettext/config.rpath .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args --sysconfdir=${prefix}/etc \
--localstatedir=${prefix}/var \
--with-ssl=openssl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,7 +139,7 @@ if {${name} eq ${subport}} {
</span> post-activate {
if { [catch {set result [registry_active dovecot-sieve]}] } {
} elseif { [lindex [split [lindex [lindex ${result} 0] 1] .] end] ne
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [lindex [split ${core_version} .] end] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [lindex [split ${core_version} .] 2] } {
</span> ui_msg "dovecot-sieve @[lindex [lindex ${result} 0] 1] and dovecot @${core_version} versions are incompatible. Please run:
\tsudo port upgrade dovecot-sieve
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,10 +152,10 @@ if {${name} eq ${subport}} {
</span> configure.args-append --with-ldap=yes
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant solr description {Enable apache-solr support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:clucene port:curl port:expat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant solr requires lucene description {Enable apache-solr support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:curl port:expat
</span> depends_run-append port:apache-solr8
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-solr --with-lucene
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-solr
</span> }
variant lucene description {Enable lucene support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -248,11 +179,11 @@ if {${name} eq ${subport}} {
</span> ${worksrcpath}/src/plugins/push-notify/push-notify-plugin.c
}
depends_run-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:perl${perl5_major_version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5_major_version}-json \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5_major_version}-moo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5_major_version}-privileges-drop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5_major_version}-protocol-http2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:perl${perl5.major} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-json \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-moo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-privileges-drop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-protocol-http2
</span> pre-destroot {
xinstall -m 0750 -d \
-o ${default_internal_user} -g ${default_login_user} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -274,7 +205,7 @@ if {${name} eq ${subport}} {
</span> ${destroot}${prefix}/lib/pushnotify/Net/APNS
foreach cmd [list \
"s|@PREFIX@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|@PERL5_MAJOR_VERSION@|${perl5_major_version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@PERL5_MAJOR_VERSION@|${perl5.major}|g" \
</span> "s|@DEFAULT_INTERNAL_USER@|${default_internal_user}|g" \
] {
reinplace ${cmd} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,7 +270,7 @@ if {${name} eq ${subport}} {
</span> }
variant postgresql96 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql10 postgresql11 postgresql12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql10 postgresql11 postgresql12 postgresql13 postgresql14 \
</span> description "Enable PostgreSQL 9.6 support" {
depends_lib-append port:postgresql96
configure.env-append PG_CONFIG=${prefix}/lib/postgresql96/bin/pg_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -347,7 +278,7 @@ if {${name} eq ${subport}} {
</span> }
variant postgresql10 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql96 postgresql11 postgresql12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql96 postgresql11 postgresql12 postgresql13 postgresql14 \
</span> description "Enable PostgreSQL 10 support" {
depends_lib-append port:postgresql10
configure.env-append PG_CONFIG=${prefix}/lib/postgresql10/bin/pg_config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -355,7 +286,7 @@ if {${name} eq ${subport}} {
</span> }
variant postgresql11 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql96 postgresql10 postgresql12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql96 postgresql10 postgresql12 postgresql13 postgresql14 \
</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;'>@@ -363,39 +294,95 @@ if {${name} eq ${subport}} {
</span> }
variant postgresql12 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql96 postgresql10 postgresql11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql96 postgresql10 postgresql11 postgresql13 postgresql14 \
</span> description "Enable PostgreSQL 12 support" {
depends_lib-append port:postgresql12
configure.env-append PG_CONFIG=${prefix}/lib/postgresql12/bin/pg_config
configure.args-append --with-pgsql
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql13 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql96 postgresql10 postgresql11 postgresql12 postgresql14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Enable PostgreSQL 13 support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PG_CONFIG=${prefix}/lib/postgresql13/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 postgresql14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql96 postgresql10 postgresql11 postgresql12 postgresql13 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Enable PostgreSQL 14 support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PG_CONFIG=${prefix}/lib/postgresql14/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 mysql57 mysql8 mariadb mariadb10.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mariadb10.2 mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.8 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 mariadb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql57 mysql8 mariadb10.1 percona \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable MariaDB (MySQL) support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mariadb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10.2 \
</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.2 (MySQL) support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mariadb-10.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.2/bin/mysql_config
</span> configure.args-append --with-mysql
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb10.1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql57 mysql8 mariadb percona \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable MariaDB 10.1 (MySQL) support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mariadb-10.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.1/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10.3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>+ description "Enable MariaDB 10.3 (MySQL) support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mariadb-10.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.3/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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>+ description "Enable MariaDB 10.4 (MySQL) support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mariadb-10.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.4/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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10.5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>+ description "Enable MariaDB 10.5 (MySQL) support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mariadb-10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.5/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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10.6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>+ description "Enable MariaDB 10.6 (MySQL) support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mariadb-10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.6/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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>+ description "Enable MariaDB 10.7 (MySQL) support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mariadb-10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.7/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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb10.8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>+ description "Enable MariaDB 10.8 (MySQL) support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mariadb-10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb-10.8/bin/mysql_config
</span> configure.args-append --with-mysql
}
variant mysql57 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql8 mariadb mariadb10.1 percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mariadb10.2 mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.8 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;'>@@ -403,13 +390,16 @@ if {${name} eq ${subport}} {
</span> }
variant mysql8 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql57 mariadb mariadb10.1 percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts mariadb10.2 mariadb10.3 mariadb10.4 mariadb10.5 mariadb10.6 mariadb10.7 mariadb10.8 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:#e0ffe0;'>+ variant mariadb10.1 requires mariadb10.7 description "Legacy compatibility variant" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb requires mariadb10.7 description "Legacy compatibility variant" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[variant_isset "apns"]} {
set daemon_uniquename \
org.macports.${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/dovecot/files/dynamic_lookup-11-sieve.patch b/mail/dovecot/files/dynamic_lookup-11-sieve.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d0d29c4ca4e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/dovecot/files/dynamic_lookup-11-sieve.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2022-06-14 16:56:03.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-08-20 18:28:39.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7704,16 +7704,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darwin1.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- darwin*) # darwin 5.x on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # if running on 10.5 or later, the deployment target defaults
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # to the OS version, if on x86, and 10.4, the deployment
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # target defaults to 10.4. Don't you love it?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.[012][,.]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case $MACOSX_DEPLOYMENT_TARGET,$host in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 10.[012],*|,*powerpc*-darwin[5-8]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/dovecot/files/dynamic_lookup-11.patch b/mail/dovecot/files/dynamic_lookup-11.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..edd5af0d2af
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/dovecot/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Recognize macOS 11 and later, remove inaccurate comment, and simplify.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44605
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.orig 2022-06-14 16:55:14.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure 2022-08-20 18:19:08.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10857,16 +10857,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darwin1.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- darwin*) # darwin 5.x on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # if running on 10.5 or later, the deployment target defaults
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # to the OS version, if on x86, and 10.4, the deployment
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # target defaults to 10.4. Don't you love it?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.[012][,.]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case $MACOSX_DEPLOYMENT_TARGET,$host in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 10.[012],*|,*powerpc*-darwin[5-8]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span></pre><pre style='margin:0'>
</pre>