<pre style='margin:0'>
Leonardo Brondani Schenkel (lbschenkel) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6dc783a9b44bb086026c036cc64b1c4db16fedff">https://github.com/macports/macports-ports/commit/6dc783a9b44bb086026c036cc64b1c4db16fedff</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6dc783a9b44bb086026c036cc64b1c4db16fedff
</span>Author: Leonardo Brondani Schenkel <lbschenkel@macports.org>
AuthorDate: Wed Apr 1 09:36:23 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> neomutt: update to 20200320
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - drop patch (fixed upstream)
</span><span style='display:block; white-space:pre;color:#404040;'> - enable gpgme variant by default (recommended by upstream)
</span>---
mail/neomutt/Portfile | 12 ++++-----
...patch-Fix-old-append-trick-in-trash_append.diff | 31 ----------------------
2 files changed, 5 insertions(+), 38 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/neomutt/Portfile b/mail/neomutt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d3fc02..3278ab5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/neomutt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/neomutt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup neomutt neomutt 20191207
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup neomutt neomutt 20200320
</span> revision 1
categories mail
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,9 @@ long_description Mutt is a small but very powerful text-based MIME \
</span> groups of messages.
homepage https://neomutt.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b9b9711aa897e498ee9e22a05d876e9da3c232c1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1cbfba0e1d897d2be3624345a8bf0c7f35211cd278398a5a924f319f1bfe8117 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3229315
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ea03b935d7537bc6559c7335b9b70c37d6264d06 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3784b2ab301764fc3ce8cb36643a00327f09bc913c97ee23963c76f5e4e8c79f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3305028
</span>
depends_build port:docbook-xml-4.2 port:docbook-xsl-nons port:libxslt port:w3m
depends_lib path:bin/perl:perl5 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,8 +33,6 @@ depends_lib path:bin/perl:perl5 \
</span> port:zlib
depends_run path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Fix-old-append-trick-in-trash_append.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
# Use MacPorts Perl
reinplace -W ${worksrcpath} "s|/usr/bin/perl|${prefix}/bin/perl|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +66,7 @@ configure.args --disable-idn \
</span> configure.ccache no
configure.env-append CCACHE=none
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +idn +mutt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +gpgme +idn +mutt
</span> if {${install.user} ne "root"} {
default_variants-append +homespool
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/neomutt/files/patch-Fix-old-append-trick-in-trash_append.diff b/mail/neomutt/files/patch-Fix-old-append-trick-in-trash_append.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 76ce718..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/neomutt/files/patch-Fix-old-append-trick-in-trash_append.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 815627e19ee760d71a0eb02dd404219ac3a70626 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Pietro Cerutti <gahr@gahr.ch>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 30 Dec 2019 10:27:21 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix 'old append' trick in trash_append
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes #2048
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mx.c | 4 +---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git mx.c mx.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 709f1e9cb..4ea46a2dc 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mx.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mx.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -537,12 +537,10 @@ static int trash_append(struct Mailbox *m)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct Mailbox *m_trash = mx_path_resolve(C_Trash);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const bool old_append = m_trash->append;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct Context *ctx_trash = mx_mbox_open(m_trash, MUTT_APPEND);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ctx_trash)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bool old_append = m_trash->append;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_trash->append = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* continue from initial scan above */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = first_del; i < m->msg_count; i++)
</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;'>-2.25.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>