<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4925e5bcf01f19c67cb27015829db9a2c8f6d488">https://github.com/macports/macports-ports/commit/4925e5bcf01f19c67cb27015829db9a2c8f6d488</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 4925e5bcf01 opencv3: update to 3.4.14; fix paths in pkgconfig Fixes: https://trac.macports.org/ticket/62462 Fixes: https://trac.macports.org/ticket/61908
</span>4925e5bcf01 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 4925e5bcf01f19c67cb27015829db9a2c8f6d488
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Apr 21 15:58:36 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    opencv3: update to 3.4.14; fix paths in pkgconfig
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/62462
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/61908
</span>---
 graphics/opencv3/Portfile | 127 ++++++++++++++++++++++++++++++----------------
 1 file changed, 84 insertions(+), 43 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 dfda62b82f4..e81a6b31e5d 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;'>@@ -6,8 +6,8 @@ PortGroup           compiler_blacklist_versions 1.0
</span> PortGroup           legacysupport 1.0
 
 name                opencv3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             3.4.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             3.4.14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> categories          graphics science
 platforms           darwin
 license             BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,10 +35,11 @@ distname            ${version}
</span> distfiles           ${distname}${extract.suffix}:opencv
 
 # don't forget to also update the checksums under the contrib variant.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  39f8733cb2f58d2a955e3c74e7a52f16b1b78d9c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  70230049194ae03ed8bfaab6cd1388569aa1b5c482d8b50d3af1cd2ae5a0b95d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    87573369
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  ba13d3a7b4d69228e8f9309b6f9f9daee73a69aa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  dfeb91c93d494be590afbe342ebb61742381f901fe2e0376987b1581f74948d1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    87648110
</span> 
 platform macosx {
     if {${os.major} <= 10} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -452,20 +453,24 @@ if {${name} eq ${subport}} {
</span> 
     variant dc1394 description {Use libdc1394 for FireWire camera; breaks compatibility with Apple iSight FireWire camera} {
         depends_lib-append  port:libdc1394
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-replace  -DWITH_1394=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DWITH_1394=OFF \
</span>                             -DWITH_1394=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-append   -DHAVE_DC1394_2=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DHAVE_DC1394_2=ON
</span>     }
 
     variant qt4 conflicts qt5 description {Build with Qt4 Backend support} {
         PortGroup           qt4 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-replace  -DWITH_QT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DWITH_QT=OFF \
</span>                             -DWITH_QT=4
     }
 
     variant qt5 conflicts qt4 description {Build with Qt5 Backend support} {
         PortGroup           qt5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-replace  -DWITH_QT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DWITH_QT=OFF \
</span>                             -DWITH_QT=5
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -477,34 +482,45 @@ if {${name} eq ${subport}} {
</span>         java.version        1.6+
         # Use latest LTS Java version as fallback
         java.fallback       openjdk11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_build-append    port:apache-ant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-replace  -DBUILD_opencv_java=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:apache-ant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DBUILD_opencv_java=OFF \
</span>                             -DBUILD_opencv_java=ON
     }
 
     if {[variant_isset java] && ![variant_isset python27]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-replace  -DPYTHON_EXECUTABLE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON_EXECUTABLE=OFF \
</span>                             -DPYTHON_EXECUTABLE=/usr/bin/python
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-delete   -DBUILD_opencv_python2=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DBUILD_opencv_python2=OFF
</span>     }
 
     variant tbb description {Use Intel TBB} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append      port:tbb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-replace  -DWITH_TBB=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:tbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DWITH_TBB=OFF \
</span>                             -DWITH_TBB=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-append   -DHAVE_TBB=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DHAVE_TBB=ON \
</span>                             -DTBB_INCLUDE_DIRS=${prefix}/include
     }
 
     variant vtk description {Include VTK support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append      port:vtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-replace  -DWITH_VTK=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:vtk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DWITH_VTK=OFF \
</span>                             -DWITH_VTK=ON
     }
 
     variant gdal description {Include GDAL support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append      port:gdal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-replace  -DWITH_GDAL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:gdal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DWITH_GDAL=OFF \
</span>                             -DWITH_GDAL=ON
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -512,10 +528,11 @@ if {${name} eq ${subport}} {
</span>         master_sites-append     https://github.com/opencv/opencv_contrib/archive:opencv_contrib
         distfiles-append        ${version}.zip:opencv_contrib
         checksums-append        ${version}.zip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            rmd160  e3fe150fa131a4cf7cd9e0bf9f6a597df6e8f3f3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            sha256  4412a8b1a9d55b4bac489d79c21c567e0bf69272e6fbc7f45a68a7b72fb59066 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            size    56393041
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-append   -DOPENCV_EXTRA_MODULES_PATH=${workpath}/opencv_contrib-${version}/modules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                rmd160  13c4602866dd64d96f7666c9910e6befe7cbdb60 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                sha256  e43874c9d1922c5c1a5826855730327c793bfb8f6e4074cd2f30983d4a220a14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                size    56393741
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DOPENCV_EXTRA_MODULES_PATH=${workpath}/opencv_contrib-${version}/modules \
</span>                             -DBUILD_PROTOBUF=YES
         depends_lib-append      \
                             port:gflags \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -530,7 +547,7 @@ if {${name} eq ${subport}} {
</span>             ln -s ${workpath}/opencv_contrib-${version} ${worksrcpath}/opencv_contrib
         }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        extract.only            ${distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        extract.only        ${distname}${extract.suffix}
</span> #                            ${version}.zip
 
         # dnn_modern:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -539,16 +556,16 @@ if {${name} eq ${subport}} {
</span>         distfiles-append        v1.0.0a3.tar.gz:tiny-dnn
 
         checksums-append        v1.0.0a3.tar.gz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            rmd160 1d44a0f0c3b0a6f31a333afdfb246526c42336ad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            sha256 e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5175846505aa18b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            size 12885646
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                rmd160  1d44a0f0c3b0a6f31a333afdfb246526c42336ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                sha256  e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5175846505aa18b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                size    12885646
</span> 
         configure.args-append  -DOPENCV_TINY_DNN_URL=file://${distpath}/
 
         # xfeatures2d/boostdesc:
         master_sites-append    https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26:boostdesc
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        distfiles-append       boostdesc_bgm.i:boostdesc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        distfiles-append   boostdesc_bgm.i:boostdesc \
</span>                            boostdesc_bgm_bi.i:boostdesc \
                            boostdesc_bgm_hd.i:boostdesc \
                            boostdesc_binboost_064.i:boostdesc \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -556,7 +573,7 @@ if {${name} eq ${subport}} {
</span>                            boostdesc_binboost_256.i:boostdesc \
                            boostdesc_lbgm.i:boostdesc
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        checksums-append       boostdesc_bgm.i \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        checksums-append   boostdesc_bgm.i \
</span>                                rmd160 a090147b1ff8cdb23cbb3898cb5cd9cdb181f000 \
                                sha256 c441a027f15b9b8ff6c006b0775cd86781169ebd5b6257a94bdce668010d5df5 \
                                size 14852 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -590,12 +607,12 @@ if {${name} eq ${subport}} {
</span>         #xfeatures2d/vggdesc:
         master_sites-append    https://raw.githubusercontent.com/opencv/opencv_3rdparty/fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:vggdesc
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        distfiles-append       vgg_generated_48.i:vggdesc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        distfiles-append   vgg_generated_48.i:vggdesc \
</span>                            vgg_generated_64.i:vggdesc \
                            vgg_generated_80.i:vggdesc \
                            vgg_generated_120.i:vggdesc
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        checksums-append       vgg_generated_48.i \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        checksums-append   vgg_generated_48.i \
</span>                                rmd160 fdb2d976ec287c4989e9d3b6f95104a0bef9c9a4 \
                                sha256 71274a67ab0896865e27de830eda0065e387d75fe071dab4a887e2430ccb8a35 \
                                size 773330 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -617,9 +634,9 @@ if {${name} eq ${subport}} {
</span>         #face:
         master_sites-append    https://raw.githubusercontent.com/opencv/opencv_3rdparty/8afa57abc8229d611c4937165d20e2a2d9fc5a12:face
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        distfiles-append       face_landmark_model.dat:face
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        distfiles-append   face_landmark_model.dat:face
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        checksums-append       face_landmark_model.dat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        checksums-append   face_landmark_model.dat \
</span>                            rmd160 3a4e4a80f2c74a6af2b36b4d74e3c6d59c347ce0 \
                            sha256 eeab592db2861a6c94d592a48456cf59945d31483ce94a6bc4d3a4e318049ba3 \
                            size 72368157
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -710,18 +727,42 @@ 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:#e0ffe0;'>+proc opencv_fix_pkgconfig {p_destroot p_prefix p_subport p_parent_subport_name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${p_subport} eq ${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/opencv.pc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ui_debug "opencv_fix_pkgconfig: fixing pkgconfig file ${pkgconfig_file}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Fix paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|\$\{exec_prefix\}\/||g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${pkgconfig_file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|\$\{prefix\}\/||g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${pkgconfig_file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # http://trac.macports.org/ticket/42702
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[variant_isset qt4] || [variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|-L//System/Library/Frameworks ||g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${pkgconfig_file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|-lOpenGL.framework|-framework OpenGL|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${pkgconfig_file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    return 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> proc opencv_post_destroot {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    global prefix
</span>     global destroot
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    global prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    global subport
</span>     global parent_subport_name
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # http://trac.macports.org/ticket/42702
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[variant_isset qt4] || [variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|-L//System/Library/Frameworks ||g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${destroot}${prefix}/lib/${parent_subport_name}/pkgconfig/opencv.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|-lOpenGL.framework|-framework OpenGL|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${destroot}${prefix}/lib/${parent_subport_name}/pkgconfig/opencv.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    opencv_fix_pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${destroot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${subport} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${parent_subport_name}
</span> 
     set bin_main_dir \
         "${destroot}${prefix}/bin"
</pre><pre style='margin:0'>

</pre>