<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/ff60bccc6e3fc27ce53383dd52287b3d5ef2df37">https://github.com/macports/macports-ports/commit/ff60bccc6e3fc27ce53383dd52287b3d5ef2df37</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ff60bccc6e3fc27ce53383dd52287b3d5ef2df37
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Oct 27 10:49:20 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    opencv4: reconcile with opencv4-devel
</span>---
 graphics/opencv4/Portfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv4/Portfile b/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e08f7ed9da..f9412f3151b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,6 +23,8 @@ PortGroup           github 1.0
</span> #==============================================================================
 
 name                opencv4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           opencv4-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_name         opencv4
</span> categories          graphics science
 platforms           darwin
 license             BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,8 +76,9 @@ if {${os.major} > 12} {
</span> }
 
 master_sites        ${github.master_sites}:${github.project}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> distfiles           [lindex ${distfiles} 0]:${github.project}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+distname            ${my_name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir         ${my_name}
</span> 
 #------------------------------------------------------------------------------
 # Subport name used for staging files, etc.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,7 +90,7 @@ distfiles           [lindex ${distfiles} 0]:${github.project}
</span> #   change once the various OpenCV-related ports are merged.
 #------------------------------------------------------------------------------
 set parent_subport_name \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${my_name}
</span> 
 # recognize dylib as a valid library suffix
 patchfiles-append   patch-dylib_suffix.diff
</pre><pre style='margin:0'>

</pre>