<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0c8b49b012b7ca2f067d6fc4f2d5340c523a22ac">https://github.com/macports/macports-ports/commit/0c8b49b012b7ca2f067d6fc4f2d5340c523a22ac</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0c8b49b012b7ca2f067d6fc4f2d5340c523a22ac
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Thu Apr 8 15:34:51 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-tensorflow1: Add conflict with py38-tensorflow_macos
</span>---
 python/py-tensorflow1/Portfile | 5 +++++
 1 file changed, 5 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow1/Portfile b/python/py-tensorflow1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fdc9d72acc5..09a1e7a61e9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,6 +67,11 @@ if {${name} ne ${subport}} {
</span>     # TF versions 1 and 2 cannot be installed at once
     conflicts py${python.version}-tensorflow
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Conflicts with tensorflow_macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} eq 38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        conflicts-append py${python.version}-tensorflow_macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     depends_build-append \
         port:py${python.version}-future \
         port:py${python.version}-pip \
</pre><pre style='margin:0'>

</pre>