<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/bfb57e44307a7b553fb82d572c2b222b2a889318">https://github.com/macports/macports-ports/commit/bfb57e44307a7b553fb82d572c2b222b2a889318</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 bfb57e44307 openexr3: conflict check: add date; cleanup
</span>bfb57e44307 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bfb57e44307a7b553fb82d572c2b222b2a889318
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri May 5 17:55:40 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> openexr3: conflict check: add date; cleanup
</span>---
graphics/openexr3/Portfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openexr3/Portfile b/graphics/openexr3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b21fcd4b697..1b6bcd7316a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openexr3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openexr3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,6 +96,7 @@ configure.ldflags-delete \
</span> -L${prefix}/lib
# openexr3 3.1.7_0 installs its own public copy of 'imath3' too, which causes a build conflict.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Logic added 2023-05-05; keep in place for at least 6 months.
</span> proc port_check_conflict {} {
global subport
set port_conflict_name ${subport}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,7 +111,7 @@ proc port_check_conflict {} {
</span> && [vercmp ${port_conflict_ver} ${port_conflict_ver_max}] <= 0 } {
ui_info "${port_conflict_name} conflicts; declare build conflict"
conflicts_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${port_conflict_name}
</span> }
}
}
</pre><pre style='margin:0'>
</pre>