<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ede9085c86f26e501c6fd41418f0e853277ad8a7">https://github.com/macports/macports-ports/commit/ede9085c86f26e501c6fd41418f0e853277ad8a7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ede9085c86f26e501c6fd41418f0e853277ad8a7
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Mon Mar 1 14:29:03 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> dovecot: Update to version 2.3.13 and bugfixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Update to version 2.3.13
</span><span style='display:block; white-space:pre;color:#404040;'> * Use MacPorts bison and flex (/usr/bin/bison doesn't work with this version)
</span><span style='display:block; white-space:pre;color:#404040;'> * Replace wget dependencies with port fetch downloads
</span><span style='display:block; white-space:pre;color:#404040;'> * Add post-activate check for dovecot-sieve version
</span>---
mail/dovecot/Portfile | 86 ++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 74 insertions(+), 12 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 c46d9f42b08..f754099b547 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,9 +3,9 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup dovecot core 2.3.11.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup dovecot core 2.3.13
</span> name dovecot
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> epoch 20060722
set core_version ${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,12 +23,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;'>-checksums rmd160 78920585b85a6ff582711f4d3b1ea9be9254197f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 242ecbf563b07ce9c5201464f1d0c42ec0df8511de0eda46129b6c42d5b97fe2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3815047
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> subport ${name}-sieve {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup dovecot pigeonhole 0.5.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup dovecot pigeonhole 0.5.[lindex [split ${core_version} .] end]
</span> revision 0
description Pigeonhole sieve and managesieve plugins for dovecot
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,9 +65,9 @@ subport ${name}-sieve {
</span>
distname dovecot-${core_version}-pigeonhole-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 410524bb4a11c592e1c641453d285804d1216b64 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b900eadbd53119032a86dc04284ee82e96a4bd8f5e57cf658451feda9808c5bf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1044337
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c79f957fd472d2185fee22b94bcc4563bc7da8ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a431654689e1cf88ee81fd17b050de24fc76d7cdf29b7301da91301e80fc932b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1048867
</span>
depends_lib-append \
port:${name} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,10 +92,55 @@ set perl5_major_version \
</span> 5.28
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d7efe49fb37000101af230f6202a3eabc1d375b2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 332ad02149a463283c15b0903e9dbc8db7d8ac69a9762cfa938c5228f2a4686c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3844219
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.only ${distfiles}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See wget command in ${worksrcpath}/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wiki_filename wiki2-export${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites-append https://dovecot.org/tmp/:dovecot_tmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append ${wiki_filename}:dovecot_tmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.only-append ${wiki_filename}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${wiki_filename} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ac21595985ab077820e21533266e23c2baaadf1d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9be2a458ad94b915dbb23afc943e8b90fce99d8158f1099144f701beadad9f5f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 446263
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See wget command in ${worksrcpath}/src/lib/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set unicode_filename UnicodeData.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites-append https://dovecot.org/res/:dovecot_res
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append ${unicode_filename}:dovecot_res
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${unicode_filename} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c9c12d76576decdf2588ce543b99b8ddbbcf523e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 68dfc414d28257b9b5d6ddbb8b466c768c00ebdf6cbf7784364a9b6cad55ee8f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1686443
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See wget command in ${worksrcpath}/src/lib-fts/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wordbreak_filename WordBreakProperty.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set proplist_filename PropList.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${wordbreak_filename}:dovecot_res \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${proplist_filename}:dovecot_res
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${wordbreak_filename} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a2bdcc9a6c068ca267d8f253fdf0f78873159e31 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cb2db065c77287e0f1d35b8c9b473d848b7566a1670439f67c357ca393084043 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 93799 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${proplist_filename} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2e9ba01e7374dafd81d8923ac4b33a13e5894173 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f413ea8dbd3858de72f3148b47dd0586019761357d1481e3b65f3a025bc27f82 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 116060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bison \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flex \
</span> port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:wget
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
depends_lib-append \
port:bzip2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,6 +160,15 @@ if {${name} eq ${subport}} {
</span> patch-src-lib-ioloop-notify-kqueue-c.diff \
patch-src-master-master-settings.c.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -nocomplain ${workpath}/wiki2-export/*.txt] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${f} ${worksrcpath}/doc/wiki
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${distpath}/${unicode_filename} ${worksrcpath}/src/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${distpath}/${wordbreak_filename} ${worksrcpath}/src/lib-fts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${distpath}/${proplist_filename} ${worksrcpath}/src/lib-fts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|@@default_internal_user@@|${default_internal_user}|g" \
${worksrcpath}/doc/example-config/conf.d/10-master.conf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,6 +204,18 @@ if {${name} eq ${subport}} {
</span> configure.env-append \
PANDOC=false
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # check if dovecot-sieve must be upgraded
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [catch {set result [registry_active dovecot-sieve]}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { [lindex [split [lindex [lindex ${result} 0] 1] .] end] ne
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [lindex [split ${core_version} .] end] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "dovecot-sieve @[lindex [lindex ${result} 0] 1] and dovecot @${core_version} versions are incompatible. Please run:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\tsudo port upgrade dovecot-sieve
</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;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant ldap description {Enable LDAP support} {
depends_lib-append port:openldap
configure.args-append --with-ldap=yes
</pre><pre style='margin:0'>
</pre>