<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/3dc1da300b10f785071132b1aff48a28e01b7638">https://github.com/macports/macports-ports/commit/3dc1da300b10f785071132b1aff48a28e01b7638</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 3dc1da300b1 notmuch: revert previous fix for build conflict Fixes: https://trac.macports.org/ticket/63665 See: https://trac.macports.org/ticket/63274
</span>3dc1da300b1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3dc1da300b10f785071132b1aff48a28e01b7638
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Oct 25 14:48:50 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> notmuch: revert previous fix for build conflict
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/63665
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/63274
</span>---
mail/notmuch/Portfile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
<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 a70dfe5a2c4..9414d0354f5 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,7 +50,7 @@ depends_lib port:gmime3 \
</span> port:xapian-core \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts_build xcbuild
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build ${name} xcbuild
</span>
configure.args --with-docs \
--without-desktop \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,9 +62,9 @@ configure.args --with-docs \
</span> # version's headers, during an update.
#
# Trac Issue: https://trac.macports.org/ticket/63274
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -isystem${prefix}/include
</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>
configure.python ${prefix}/bin/python${python_branch}
</pre><pre style='margin:0'>
</pre>