UPDATE: graphics/opencv

Update opencv to the latest 3er branch.

- Update to 3.4.7
- Remove -docs to avoid java conflicts with JDK 8 and 11.
Pointed by kurt@. Secret hint to scrap the docs package completely by
sthen@ ;)
- Upstream switched completely to github
- Fix distfile
- Sort CONFIGURE_ARGS
- Add patch to install licenses files at the old location.

Quirks changes not included here.

All consumers build and run fine. OK?

RS

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.50
diff -u -p -u -p -r1.50 Makefile
--- Makefile 2 Jul 2019 10:13:03 -0000 1.50
+++ Makefile 22 Sep 2019 16:40:39 -0000
@@ -3,27 +3,29 @@
ONLY_FOR_ARCHS = ${GCC4_ARCHS} ${CLANG_ARCHS}

CATEGORIES = graphics devel
-COMMENT-docs = OpenCV documentation and examples
COMMENT-main = library for computer vision real-time processin
COMMENT-java = Java bindings for OpenCV

-V = 3.4.2
-REVISION = 1
-DISTNAME = opencv-${V}
+V = 3.4.7
+GH_ACCOUNT = opencv
+GH_PROJECT = opencv
+GH_TAGNAME = ${V}
+
PKGNAME-main = opencv-${V}
-PKGNAME-docs = opencv-docs-$V
PKGNAME-java = opencv-java-${V}

HOMEPAGE = https://www.opencv.org/

MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>

+DISTFILES = opencv-{opencv/archive/}${V}${EXTRACT_SUFX}
+
.for i in opencv_calib3d opencv_core opencv_features2d \
opencv_flann opencv_highgui opencv_imgproc \
opencv_ml opencv_objdetect opencv_photo opencv_stitching \
opencv_superres opencv_video opencv_videostab opencv_imgcodecs \
opencv_shape opencv_videoio opencv_dnn
-SHARED_LIBS += $i 4.0
+SHARED_LIBS += $i 5.0
.endfor

WANTLIB-main += ${COMPILER_LIBCXX} Half Iex IlmImf IlmThread Imath
@@ -39,15 +41,10 @@ WANTLIB-java += opencv_flann opencv_high
WANTLIB-java += opencv_ml opencv_objdetect opencv_photo opencv_video
WANTLIB-java += opencv_videoio

-WANTLIB-docs =
-
COMPILER = base-clang ports-gcc

-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
-EXTRACT_SUFX = .zip
-
-MULTI_PACKAGES = -main -docs -java
-PSEUDO_FLAVORS = no_docs no_java
+MULTI_PACKAGES = -main -java
+PSEUDO_FLAVORS = no_java
FLAVOR ?=

# BSDL
@@ -58,12 +55,10 @@ PERMIT_PACKAGE = Yes
MODULES = devel/cmake \
lang/python

-BUILD_DEPENDS = devel/doxygen \
- math/py-numpy \
+BUILD_DEPENDS = math/py-numpy \
math/eigen3

RUN_DEPENDS-main = math/py-numpy
-RUN_DEPENDS-docs = ${BUILD_PKGPATH},-main
RUN_DEPENDS-java = ${MODJAVA_RUN_DEPENDS}

LIB_DEPENDS-main = ${LIB_DEPENDS} \
@@ -89,34 +84,22 @@ CONFIGURE_ENV = CFLAGS="${CFLAGS} -fPIC

# ATM opencv requires V4L1 compat, ask them to change it,
# then see WITH_V4L below.
-CONFIGURE_ARGS = -DWITH_1394=Off \
- -DWITH_VTK=Off \
+CONFIGURE_ARGS = -DBUILD_DOCS=Off \
+ -DBUILD_EXAMPLES=Off \
+ -DBUILD_IPP_IW=Off \
+ -DBUILD_ITT=Off \
+ -DBUILD_PERF_TESTS=Off \
+ -DBUILD_TESTS=Off \
+ -DENABLE_SSE3=Off \
+ -DINSTALL_PYTHON_EXAMPLES=Off \
+ -DINSTALL_TESTS=Off \
+ -DWITH_1394=Off \
-DWITH_CUDA=Off \
-DWITH_EIGEN=Off \
- -DWITH_V4L=Off \
-DWITH_IPP=Off \
-DWITH_OPENCL=Off \
- -DBUILD_ITT=Off \
- -DBUILD_IPP_IW=Off \
- -DENABLE_SSE3=Off \
- -DBUILD_TESTS=Off \
- -DBUILD_PERF_TESTS=Off \
- -DINSTALL_TESTS=Off \
-
-CONFIGURE_ARGS += -DCMAKE_POLICY_DEFAULT_CMP0058=NEW
-
-.if ${BUILD_PACKAGES:M-docs}
-BUILD_DEPENDS += textproc/py-sphinx
-ALL_TARGET = all doxygen
-CONFIGURE_ARGS += -DBUILD_DOCS=On \
- -DBUILD_EXAMPLES=On \
- -DINSTALL_C_EXAMPLES=On \
- -DINSTALL_PYTHON_EXAMPLES=On
-.else
-CONFIGURE_ARGS += -DBUILD_DOCS=Off \
- -DBUILD_EXAMPLES=Off \
- -DINSTALL_PYTHON_EXAMPLES=Off
-.endif
+ -DWITH_V4L=Off \
+ -DWITH_VTK=Off

.if ${BUILD_PACKAGES:M-java}
MODULES += java
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/opencv/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo 23 Mar 2019 07:26:56 -0000 1.8
+++ distinfo 22 Sep 2019 16:40:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (opencv-3.4.2.zip) = lAXF19irFpbphjHQySElgWNW7DZqc8QXvcxNdHg7Qqo=
-SIZE (opencv-3.4.2.zip) = 91570120
+SHA256 (opencv-3.4.7.tar.gz) = 6nQ4lqYEproeHBZRrULJfQ+QFl3r6ZQIEcfgvaowdSY=
+SIZE (opencv-3.4.7.tar.gz) = 88350165
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 22 Sep 2019 16:40:39 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -616,7 +616,7 @@ else()
+ ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples)
+ ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
+ ocv_update(OPENCV_OTHER_INSTALL_PATH share/OpenCV)
+- ocv_update(OPENCV_LICENSES_INSTALL_PATH "${CMAKE_INSTALL_DATAROOTDIR}/licenses/opencv3")
++ ocv_update(OPENCV_LICENSES_INSTALL_PATH "${CMAKE_INSTALL_DATAROOTDIR}/OpenCV/licenses/")
+
+ if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
+ math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
Index: patches/patch-cmake_OpenCVFindLibsVideo_cmake
===================================================================
RCS file: /cvs/ports/graphics/opencv/patches/patch-cmake_OpenCVFindLibsVideo_cmake,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-cmake_OpenCVFindLibsVideo_cmake
--- patches/patch-cmake_OpenCVFindLibsVideo_cmake 23 Mar 2019 07:26:56 -0000 1.6
+++ patches/patch-cmake_OpenCVFindLibsVideo_cmake 22 Sep 2019 16:40:39 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-cmake_OpenCVFindLibsVide
Index: cmake/OpenCVFindLibsVideo.cmake
--- cmake/OpenCVFindLibsVideo.cmake.orig
+++ cmake/OpenCVFindLibsVideo.cmake
-@@ -186,7 +186,6 @@ if(WITH_V4L)
+@@ -185,7 +185,6 @@ if(WITH_V4L)
endif()
endif()
CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
Index: patches/patch-modules_core_src_system_cpp
===================================================================
RCS file: /cvs/ports/graphics/opencv/patches/patch-modules_core_src_system_cpp,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-modules_core_src_system_cpp
--- patches/patch-modules_core_src_system_cpp 23 Mar 2019 07:26:56 -0000 1.5
+++ patches/patch-modules_core_src_system_cpp 22 Sep 2019 16:40:39 -0000
@@ -3,7 +3,7 @@ Fix build on i386.
Index: modules/core/src/system.cpp
--- modules/core/src/system.cpp.orig
+++ modules/core/src/system.cpp
-@@ -185,9 +185,12 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
+@@ -189,9 +189,12 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)