Update graphics/opencv-contrib-face to 3.1.0.

No opencv_face related changes mentioned in the changelog.
Lock this package to track graphics/oepncv version.

3 files changed, 27 insertions, 25 deletions

diff --git a/graphics/opencv-contrib-face/Makefile b/graphics/opencv-contrib-face/Makefile
index e56d704a08f..1d79a626d3c 100644
--- a/graphics/opencv-contrib-face/Makefile
+++ b/graphics/opencv-contrib-face/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2016/01/06 10:46:52 adam Exp $
+# $NetBSD: Makefile,v 1.4 2016/02/24 17:33:48 fhajny Exp $
 
-PKGNAME=	opencv-contrib-face-3.0.0
-PKGREVISION=	1
-DISTNAME=	opencv_contrib-3.0.0
+DISTNAME=	opencv_contrib-3.1.0
+PKGNAME=	${DISTNAME:S/_contrib/-contrib-face/}
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Itseez/}
 EXTRACT_SUFX=	.zip
@@ -13,7 +12,7 @@ HOMEPAGE=	http://code.opencv.org/projects/OpenCV/wiki/WikiStart
 COMMENT=	OpenCV face recognition contributed module
 LICENSE=	modified-bsd
 
-DISTFILES=      ${DEFAULT_DISTFILES} opencv-3.0.0.zip
+DISTFILES=	${DEFAULT_DISTFILES} opencv-${PKGVERSION_NOREV}.zip
 
 USE_CMAKE=		yes
 USE_LANGUAGES=		c c++
@@ -23,7 +22,7 @@ USE_TOOLS+=		gmake pkg-config
 
 INSTALL_DIRS=	modules/face
 
-WRKSRC=		${WRKDIR}/opencv-3.0.0/
+WRKSRC=		${WRKDIR}/opencv-${PKGVERSION_NOREV}/
 
 PATCHDIR=	${.CURDIR}/../../graphics/opencv/patches
 
@@ -39,7 +38,7 @@ OPSYSVARS+=		CMAKE_ARGS
 CMAKE_ARGS+=		-DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
 CMAKE_ARGS.SunOS+=	-DENABLE_PRECOMPILED_HEADERS=NO
 
-CMAKE_ARGS+=		-DOPENCV_EXTRA_MODULES_PATH=${WRKDIR}/opencv_contrib-3.0.0/modules
+CMAKE_ARGS+=		-DOPENCV_EXTRA_MODULES_PATH=${WRKDIR}/${DISTNAME}/modules
 CMAKE_ARGS+=		-DBUILD_opencv_adas=OFF
 CMAKE_ARGS+=		-DBUILD_opencv_bgsegm=OFF
 CMAKE_ARGS+=		-DBUILD_opencv_bioinspired=OFF
@@ -63,13 +62,10 @@ CMAKE_ARGS+=		-DBUILD_opencv_xobjdetect=OFF
 CMAKE_ARGS+=		-DBUILD_opencv_xphoto=OFF
 
 CMAKE_ARGS+=		-DBUILD_opencv_flann=OFF
-CMAKE_ARGS+=		-DBUILD_opencv_ml=OFF
 CMAKE_ARGS+=		-DBUILD_opencv_photo=OFF
 CMAKE_ARGS+=		-DBUILD_opencv_video=OFF
-CMAKE_ARGS+=		-DBUILD_opencv_imgcodecs=OFF
 CMAKE_ARGS+=		-DBUILD_opencv_videoio=OFF
 CMAKE_ARGS+=		-DBUILD_opencv_highgui=OFF
-CMAKE_ARGS+=		-DBUILD_opencv_objdetect=OFF
 CMAKE_ARGS+=		-DBUILD_opencv_superres=OFF
 CMAKE_ARGS+=		-DBUILD_opencv_ts=OFF
 CMAKE_ARGS+=		-DBUILD_opencv_features2d=OFF
@@ -83,6 +79,7 @@ CONFIGURE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
+BUILDLINK_API_DEPENDS.opencv+=	opencv>=${PKGVERSION_NOREV}
 .include "../../graphics/opencv/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/opencv-contrib-face/PLIST b/graphics/opencv-contrib-face/PLIST
index 4cef3867f12..603acc95f8c 100644
--- a/graphics/opencv-contrib-face/PLIST
+++ b/graphics/opencv-contrib-face/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2015/11/03 20:08:06 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/02/24 17:33:48 fhajny Exp $
 include/opencv2/face.hpp
 include/opencv2/face/facerec.hpp
+include/opencv2/face/predict_collector.hpp
 lib/libopencv_face.so
-lib/libopencv_face.so.3.0
+lib/libopencv_face.so.3.1
 lib/libopencv_face.so.${PKGVERSION}
diff --git a/graphics/opencv-contrib-face/distinfo b/graphics/opencv-contrib-face/distinfo
index e7e74a72d57..32648f40fca 100644
--- a/graphics/opencv-contrib-face/distinfo
+++ b/graphics/opencv-contrib-face/distinfo
@@ -1,20 +1,24 @@
-$NetBSD: distinfo,v 1.1 2015/11/03 20:08:06 markd Exp $
+$NetBSD: distinfo,v 1.2 2016/02/24 17:33:48 fhajny Exp $
 
-SHA1 (opencv-3.0.0.zip) = 7b7cd6cb3b7bad537cacad04bb7aa264a897d545
-RMD160 (opencv-3.0.0.zip) = 7b4dff26502e71e6570c2452c35fd03a1982bc7e
-SHA512 (opencv-3.0.0.zip) = 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375
-Size (opencv-3.0.0.zip) = 100980799 bytes
-SHA1 (opencv_contrib-3.0.0.zip) = f4b78128dfded4ea58cedc3cfb09b3dbc3b1c798
-RMD160 (opencv_contrib-3.0.0.zip) = b257895ab529db2354f17c87b9f02d53625bb5e2
-SHA512 (opencv_contrib-3.0.0.zip) = ab2e8162382068013e7f56b8c34d5376fe6492f4a6967e577d0211444b5dceee38a7523ff2370d4271d4e1c9f9722ce8d2fe901a8ee5616d08e7c507fa65d882
-Size (opencv_contrib-3.0.0.zip) = 72797628 bytes
-SHA1 (patch-3rdparty_ippicv_downloader.cmake) = 8d99b26a39aa184a4dfc03e4928ea7b7b62e71d9
+SHA1 (opencv-3.1.0.zip) = 8c932b68fe2e1575e88dde759ab1ed1d53d6f41b
+RMD160 (opencv-3.1.0.zip) = d7a811c67cfb16243470822150760252d5770165
+SHA512 (opencv-3.1.0.zip) = b4915e8838fce8ba9e1af8b11e46678624435e9a41592e645413dfdc830993eaa017d337fe4c212a49f096421a6317a1892546087fbc3cfdab554522336c0f1a
+Size (opencv-3.1.0.zip) = 79186131 bytes
+SHA1 (opencv_contrib-3.1.0.zip) = 4c64e698fcf9c1a2e3720446bab4d7fc5f487064
+RMD160 (opencv_contrib-3.1.0.zip) = 91266cae464ab0f9c00f0f764ba9025a6765d83a
+SHA512 (opencv_contrib-3.1.0.zip) = f0ceb8d9ed85efe948a40071793d164a82391a462c52ca71a6029e8b119afdab8b1453baaed2cd7d540001559849a62ec4b745d41345db225acff0531c76e762
+Size (opencv_contrib-3.1.0.zip) = 55182211 bytes
+SHA1 (patch-3rdparty_ippicv_downloader.cmake) = a0b7c1b52f9ec4f35ff3f846785fbbfec1eeac51
+SHA1 (patch-apps_annotation_CMakeLists.txt) = 4c3a00b0dfef5e978b10ba966f68d050a06208fe
+SHA1 (patch-apps_createsamples_CMakeLists.txt) = 2d60ecc0e1674cde4414e91e837c24fa464d42aa
+SHA1 (patch-apps_traincascade_CMakeLists.txt) = 7114cc4c2057e12dc8e47bc61334cb8e175987eb
 SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20
+SHA1 (patch-cmake_OpenCVModule.cmake) = 7667f19f3e9c6ff757d92a6a49e7c3430c6c080d
 SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
 SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
-SHA1 (patch-modules_core_src_parallel__pthreads.cpp) = dba43f8252eda7807379469cf9359581bf4d41ad
+SHA1 (patch-modules_core_src_parallel__pthreads.cpp) = c64ef8872c120db0ab92582496235858eec9bf92
 SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
 SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
-SHA1 (patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp) = 2f4d2f43afe370eef748e05bec199bc963e1ecab
-SHA1 (patch-modules_python_common.cmake) = d6289a316712bb8be4d590965c87f6bb3525a938
+SHA1 (patch-modules_java_CMakeLists.txt) = 020a8d2048d927e5d3819867df0d889bb516d8b4
+SHA1 (patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp) = 83575857156321ae07f3fb03d1b3c61b804b3832
 SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c