<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/a97812abf4618bde172fb8cf6c4046abc251293c">https://github.com/macports/macports-ports/commit/a97812abf4618bde172fb8cf6c4046abc251293c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a97812abf4618bde172fb8cf6c4046abc251293c
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Oct 27 11:17:53 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> opencv3: reconcile with opencv3-devel
</span>---
graphics/opencv3/Portfile | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv3/Portfile b/graphics/opencv3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 127a7cd8c0c..69601724a13 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,6 +23,8 @@ PortGroup legacysupport 1.0
</span> #==============================================================================
name opencv3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts opencv3-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_name opencv3
</span> version 3.4.16
revision 0
categories graphics science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +50,7 @@ homepage https://opencv.org
</span> master_sites https://github.com/opencv/opencv/archive/:opencv
distname ${version}
distfiles ${distname}${extract.suffix}:opencv
<span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir ${my_name}
</span>
# don't forget to also update the checksums under the contrib variant.
checksums-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +83,7 @@ platform macosx {
</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>
worksrcdir ${parent_subport_name}-${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -345,9 +348,9 @@ if {${universal_possible} && [variant_isset universal]} {
</span>
foreach python_branch {2.7} {
set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- subport py${python_version}-${parent_subport_name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport py${python_version}-${name} {
</span> depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${parent_subport_name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${name} \
</span> port:python${python_version} \
port:py${python_version}-numpy
configure.args-replace \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -369,7 +372,7 @@ foreach python_branch {2.7} {
</span> # Deconflict with parent port contents
post-destroot {
ui_debug "${subport}: python subport: removing files unrelated to Python bindings"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [exec port contents ${parent_subport_name}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [exec port contents ${name}] {
</span> delete ${destroot}${f}
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -379,9 +382,9 @@ foreach python_branch {2.7} {
</span> set python_branches {3.5 3.6 3.7 3.8 3.9}
foreach python_branch ${python_branches} {
set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- subport py${python_version}-${parent_subport_name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport py${python_version}-${name} {
</span> depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${parent_subport_name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${name} \
</span> port:python${python_version} \
port:py${python_version}-numpy
configure.args-replace \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -399,7 +402,7 @@ foreach python_branch ${python_branches} {
</span> # Deconflict with parent port contents
post-destroot {
ui_debug "${subport}: python subport: removing files unrelated to Python bindings"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [exec port contents ${parent_subport_name}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [exec port contents ${name}] {
</span> delete ${destroot}${f}
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -408,7 +411,7 @@ foreach python_branch ${python_branches} {
</span>
if {${name} eq ${subport}} {
notes \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "* ${subport} binaries are now prefixed with '${subport}_', to prevent conflicts\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "* ${subport} binaries are now prefixed with '${my_name}_', to prevent conflicts\
</span> with other OpenCV-related ports." \
"* Python bindings are now implemented via subports 'pyXX-${subport}',\
to support multiple Python versions side-by-side."
</pre><pre style='margin:0'>
</pre>