<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c69c26cfc573075d1260e30ba2cd9c42033b8ab6">https://github.com/macports/macports-ports/commit/c69c26cfc573075d1260e30ba2cd9c42033b8ab6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new c69c26cfc57 notmuch: eliminate build conflict with previous version during upgrade Fixes: https://trac.macports.org/ticket/63274
</span>c69c26cfc57 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit c69c26cfc573075d1260e30ba2cd9c42033b8ab6
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Oct 23 16:13:04 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    notmuch: eliminate build conflict with previous version during upgrade
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/63274
</span>---
 mail/notmuch/Portfile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/notmuch/Portfile b/mail/notmuch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3caa3623e41..b60db975e76 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/notmuch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/notmuch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,13 +50,22 @@ depends_lib         port:gmime3 \
</span>                     port:xapian-core \
                     port:zlib
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts_build     ${name} xcbuild
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build     xcbuild
</span> 
 configure.args      --with-docs \
                     --without-desktop \
                     --without-emacs \
                     --without-ruby
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Ensure headers are searched against the work area first, before those in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ${prefix}/lib. Fixes build failures caused by referencing the previous
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# version's headers, during an update.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Trac Issue: https://trac.macports.org/ticket/63274
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -isystem${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.python    ${prefix}/bin/python${python_branch}
 
 if {[string match *clang* ${configure.cxx}]} {
</pre><pre style='margin:0'>

</pre>