<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/36da528b65b0ad985a666de929fe14ecca12395d">https://github.com/macports/macports-ports/commit/36da528b65b0ad985a666de929fe14ecca12395d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 36da528b65b0ad985a666de929fe14ecca12395d
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Oct 1 17:54:23 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> opencv4-devel: fix pkgconfig
</span>---
graphics/opencv4-devel/Portfile | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv4-devel/Portfile b/graphics/opencv4-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d9f2e16a493..aa6c283e770 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv4-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv4-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@ if {${os.major} > 12} {
</span> # NOTE: Separate revisions maintained for Python subports, later in portfile
if {${opencv_latest}} {
github.setup opencv opencv 4.6.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 5
</span> epoch 1
checksums-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +72,7 @@ if {${opencv_latest}} {
</span> livecheck.regex {/archive/([0-9.]+)[a-z]?\.[tz]}
} else {
github.setup opencv opencv 4.5.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 11
</span>
checksums-append \
${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -752,11 +752,11 @@ proc opencv_soft_link_binaries {p_bin_main_dir p_bin_port_dir p_destroot p_prefi
</span> return 0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc opencv_fix_pkgconfig {p_destroot p_prefix p_subport p_parent_subport_name} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${p_subport} eq ${p_parent_subport_name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set pkgconfig_file \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${p_destroot}${p_prefix}/lib/${p_parent_subport_name}/pkgconfig/opencv4.pc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc opencv_fix_pkgconfig {p_destroot p_prefix p_parent_subport_name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pkgconfig_file \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${p_destroot}${p_prefix}/lib/${p_parent_subport_name}/pkgconfig/opencv4.pc"
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${pkgconfig_file}]} {
</span> ui_debug "opencv_fix_pkgconfig: fixing pkgconfig file ${pkgconfig_file}"
# Fix paths
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -778,7 +778,6 @@ proc opencv_post_destroot {} {
</span> opencv_fix_pkgconfig \
${destroot} \
${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${subport} \
</span> ${parent_subport_name}
set bin_main_dir \
</pre><pre style='margin:0'>
</pre>