<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/73d5a1003d3be2bc6a8aa364669a56a1a5511bc0">https://github.com/macports/macports-ports/commit/73d5a1003d3be2bc6a8aa364669a56a1a5511bc0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 73d5a1003d3be2bc6a8aa364669a56a1a5511bc0
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Dec 16 19:38:30 2021 -0600

<span style='display:block; white-space:pre;color:#404040;'>    notmuch: Fix self build conflict
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/63274
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/63665
</span>---
 mail/notmuch/Portfile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 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 6bb2c9c35d7..3648b8dc04c 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     ${name} xcbuild
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build     xcbuild
</span> 
 configure.args      --with-docs \
                     --without-desktop \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,11 +60,17 @@ configure.args      --with-docs \
</span> # Ensure headers are searched against the work area first, before those in
 # ${prefix}/include. Fixes build failures caused by referencing the previous
 # version's headers, during an update.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Trac Issue: https://trac.macports.org/ticket/63274
</span><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;'>+# https://nmbug.notmuchmail.org/nmweb/show/7851CAB5-4556-4931-A0A2-37003E56C927%40ryandesign.com
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Ensure libraries built in the work area are found first, before those in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ${prefix}/lib. -L${prefix}/lib still gets added later in the build command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# by the build system to find MacPorts libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://nmbug.notmuchmail.org/nmweb/show/7851CAB5-4556-4931-A0A2-37003E56C927%40ryandesign.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -L${prefix}/lib
</span> 
 configure.python    ${prefix}/bin/python${python_branch}
 
</pre><pre style='margin:0'>

</pre>