Ticket #58845: opencv4-py2-enable.patch

(a) Portfile vs. (b) Portfile-pyenabled

@@ -129 +129 @@
                     \
                     -DHAVE_COCOA:BOOL=ON \
                     \
-                    -DBUILD_opencv_python2:BOOL=OFF \
+                    -DBUILD_opencv_python2:BOOL=ON \
                     -DBUILD_opencv_python3:BOOL=OFF \
                     -DOPENCV_PYTHON_SKIP_DETECTION:BOOL=OFF \
-                    -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python \
-                    -DPYTHON_DEFAULT_EXECUTABLE:FILEPATH=/usr/bin/python
+                    -DPYTHON_EXECUTABLE:FILEPATH=/opt/local/bin/python \
+                    -DPYTHON_DEFAULT_EXECUTABLE:FILEPATH=/opt/local/bin/python \
+                    -DPYTHON_INCLUDE_DIR:FILEPATH=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7 \
+                    -DPYTHON_LIBRARY:FILEPATH=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib \
+                    -DPYTHON2_NUMPY_INCLUDE_DIRS:FILEPATH=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/core/include
 
 universal_variant   no
 
@@ -190 +193 @@
                         -DOPENCV_ENABLE_NONFREE:BOOL=ON
 }
 
-#variant contrib description {Build OpenCV with extra modules (untested)} {
-#    master_sites-append https://github.com/opencv/opencv_contrib/archive/:opencv_contrib
-#
-#    distfiles-append    ${distname}.zip:opencv_contrib
-#
-#    checksums-append    ${distname}.zip \
-#                        rmd160  a0dac9a5fc1c95d056a7523a6f37b8d1f600dd2b \
-#                        sha256  b4013495ac6c4dd05dcad1c90b6c731b488a1d775835175327f3c20884269715 \
-#                        size    61741612
-#
-#    depends_extract-append \
-#                        port:unzip
-#
-#    post-extract {
-#        system "${prefix}/bin/unzip -o '${distpath}/${distname}.zip' -d '${worksrcpath}'"
-#
-#        # less than ideal way for patchfiles to be applied to contrib directory
-#        ln -s ${workpath}/opencv_contrib-${version} ${worksrcpath}/opencv_contrib
-#    }
-#}
+variant contrib description {Build OpenCV with extra modules (untested)} {
+    master_sites-append https://github.com/opencv/opencv_contrib/archive/:opencv_contrib
+
+    distfiles-append    ${distname}.zip:opencv_contrib
+
+    checksums-append    ${distname}.zip \
+                        rmd160  d16fa70629f6d72c62ffd5857973f3bcba92da64 \
+                        sha256  72adb3862d6a0a25e2830eb656da46ad3fddbc5f234b3411771f000fb25caaa6 \
+                        size    61818192
+
+    depends_extract-append \
+                        port:unzip
+
+    post-extract {
+        system "${prefix}/bin/unzip -o '${distpath}/${distname}.zip' -d '${workpath}'"
+
+        # less than ideal way for patchfiles to be applied to contrib directory
+        #ln -s ${workpath}/opencv_contrib-${version} ${worksrcpath}/opencv_contrib
+
+        configure.args-append -DOPENCV_EXTRA_MODULES_PATH:FILEPATH=${workpath}/opencv_contrib-${version}/modules
+    }
+}
 
 livecheck.type      regex
 livecheck.url       https://opencv.org/releases.html