<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/493ac072a0f87a11ed60ef4ca9abad5feae707d8">https://github.com/macports/macports-ports/commit/493ac072a0f87a11ed60ef4ca9abad5feae707d8</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 493ac072a0f usd: mark port as conflicting with spidermonkey
</span>493ac072a0f is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 493ac072a0f87a11ed60ef4ca9abad5feae707d8
</span>Author: Jason Liu <jasonliu--@users.noreply.github.com>
AuthorDate: Wed Sep 22 14:09:43 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    usd: mark port as conflicting with spidermonkey
</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/63258
</span>---
 graphics/usd/Portfile      | 8 ++++++++
 lang/spidermonkey/Portfile | 8 ++++++++
 2 files changed, 16 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/usd/Portfile b/graphics/usd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 59ccc43f639..cf1d05eb8d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/usd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/usd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +39,14 @@ set py_ver_nodot    [string map {. {}} ${py_ver}]
</span> set py_ver_major    [lindex [split $py_ver .] 0]
 set py_ver_minor    [lindex [split $py_ver .] 1]
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Both usd and spidermonkey attempt to create a library file called
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ${prefix}/lib/libjs.dylib. Unfortunately, these are not the same
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# library, they just happen to be named the same.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (See: https://trac.macports.org/ticket/63258)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This issue has been reported upstream:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/PixarAnimationStudios/USD/issues/1615
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           spidermonkey
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append  port:tbb
 
 compiler.cxx_standard 2014
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/spidermonkey/Portfile b/lang/spidermonkey/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 97effa3e541..072cda3aa17 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/spidermonkey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/spidermonkey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,6 +21,14 @@ checksums           md5 5571134c3863686b623ebe4e6b1f6fe6 \
</span>                     sha1 1a99e8e10cb6600a03ea98895583a8ed42136d1f \
                     rmd160 6eadf1ac7c10a13b3db3d499856c9e18ddbcdfdb
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Both usd and spidermonkey attempt to create a library file called
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ${prefix}/lib/libjs.dylib. Unfortunately, these are not the same
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# library, they just happen to be named the same.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (https://trac.macports.org/ticket/63258)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This issue has been reported upstream:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/PixarAnimationStudios/USD/issues/1615
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           usd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib         port:nspr \
                     port:readline
 
</pre><pre style='margin:0'>

</pre>