Update to 2.3.1

Prepare moving of python module to own port

10 files changed, 173 insertions, 93 deletions

diff --git a/graphics/opencv-core/Makefile b/graphics/opencv-core/Makefile
index 4b80f54eac26..f5ba4cddad72 100644
--- a/graphics/opencv-core/Makefile
+++ b/graphics/opencv-core/Makefile
@@ -4,7 +4,7 @@
 #
 # $FreeBSD$
 #
-BUILDING_OPENCV_CORE=	yes
+_BUILDING_OPENCV_CORE=	yes
 MASTERDIR=	${.CURDIR}/../opencv
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 4e601ef37bdd..af237c004199 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME?=	opencv
-PORTVERSION=	2.3.0
+PORTVERSION=	2.3.1
 CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}library/${PORTNAME}-unix/${DISTVERSION:R}
+MASTER_SITES=	SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION}
 DISTNAME=	OpenCV-${DISTVERSION}
 
 MAINTAINER=	mm@FreeBSD.org
@@ -29,7 +29,10 @@ WRKSRC=		${WRKDIR}/OpenCV-${DISTVERSION:S/rc//}
 NOT_FOR_ARCHS=	sparc64
 NOT_FOR_ARCHS_REASON_sparc64=	does not compile on sparc64
 
-.if !defined(BUILDING_OPENCV_CORE)
+DATADIR=	${PREFIX}/share/OpenCV
+PLIST_SUB+=	VERSION=${PORTVERSION}
+
+.if !defined(_BUILDING_OPENCV_CORE) && !defined(_BUILDING_OPENCV_PYTHON)
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-opencv
 LIB_DEPENDS+=	opencv_core.2:${PORTSDIR}/graphics/opencv-core
 CMAKE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
@@ -44,7 +47,6 @@ OPTIONS=	EIGEN2	"Include Eigen 2 support" on \
 		JPEG	"Include JPEG support" on \
 		OPENEXR	"Include OpenEXR support" off \
 		PNG	"Include PNG support" on \
-		PYTHON	"Build with Python support" off \
 		QT4	"Build with Qt backend support" off \
 		TBB	"Include TBB support" off \
 		TIFF	"Include TIFF support" on \
@@ -53,83 +55,68 @@ OPTIONS=	EIGEN2	"Include Eigen 2 support" on \
 
 .include <bsd.port.options.mk>
 
-.ifndef(NOPORTEXAMPLES)
-CMAKE_ARGS+=	-DBUILD_EXAMPLES:lBOOL=On -DINSTALL_C_EXAMPLES:BOOL=On
-PORTEXAMPLES+=	c
+.if !defined(NOPORTEXAMPLES)
+CMAKE_ARGS+=	-DBUILD_EXAMPLES:BOOL=On -DINSTALL_C_EXAMPLES:BOOL=On
+PORTEXAMPLES+=	c cpp gpu
 .endif
 
-.ifndef(WITHOUT_EIGEN2)
+.if !defined(WITHOUT_EIGEN2)
 BUILD_DEPENDS+=	${LOCALBASE}/include/eigen2/Eigen/Eigen:${PORTSDIR}/math/eigen2
 CMAKE_ARGS+=	-DWITH_EIGEN2:BOOL=On
 .else
 CMAKE_ARGS+=	-DDWITH_EIGEN2:BOOL=Off
 .endif
 
-.ifdef(WITH_FFMPEG)
+.if defined(WITH_FFMPEG)
 LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 CMAKE_ARGS+=	-DWITH_FFMPEG:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_FFMPEG:BOOL=Off
 .endif
 
-.ifdef(WITH_GSTREAMER)
+.if defined(WITH_GSTREAMER)
 USE_GSTREAMER=	yes
 CMAKE_ARGS+=	-DWITH_GSTREAMER:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_GSTREAMER:BOOL=Off
 .endif
 
-.ifdef(WITH_GTK)
+.if defined(WITH_GTK)
 USE_GNOME=	gtk20
 CMAKE_ARGS+=	-DWITH_GTK:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_GTK:BOOL=Off
 .endif
 
-.ifndef(WITHOUT_JASPER)
+.if !defined(WITHOUT_JASPER)
 LIB_DEPENDS+=	jasper.4:${PORTSDIR}/graphics/jasper
 CMAKE_ARGS+=	-DWITH_JASPER:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_JASPER:BOOL=Off
 .endif
 
-.ifndef(WITHOUT_JPEG)
+.if !defined(WITHOUT_JPEG)
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 CMAKE_ARGS+=	-DWITH_JPEG:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_JPEG:BOOL=Off
 .endif
 
-.ifdef(WITH_OPENEXR)
+.if defined(WITH_OPENEXR)
 LIB_DEPENDS+=	IlmImf:${PORTSDIR}/graphics/OpenEXR
 CMAKE_ARGS+=	-DWITH_OPENEXR:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_OPENEXR:BOOL=Off
 .endif
 
-.ifndef(WITHOUT_PNG)
+.if !defined(WITHOUT_PNG)
 LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
 CMAKE_ARGS+=	-DWITH_PNG:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_PNG:BOOL=Off
 .endif
 
-.ifdef(WITH_PYTHON)
-USE_PYTHON=	yes
-BUILD_DEPENDS+=	${PYNUMPY}
-RUN_DEPENDS+=	${PYNUMPY}
-CMAKE_ARGS+=	-DBUILD_NEW_PYTHON_SUPPORT:BOOL=On
-.ifndef(NOPORTEXAMPLES)
-CMAKE_ARGS+=	-DINSTALL_PYTHON_EXAMPLES:BOOL=On
-PORTEXAMPLES+=	python
-.endif
-PLIST_SUB+=	PYTHON=""
-.else
-CMAKE_ARGS+=	-DBUILD_NEW_PYTHON_SUPPORT:BOOL=Off
-PLIST_SUB+=	PYTHON="@comment "
-.endif
-
-.ifdef(WITH_QT4)
+.if defined(WITH_QT4)
 USE_QT_VER= 	4
 QT_COMPONENTS+=	opengl moc_build qmake_build rcc_build uic_build
 CMAKE_ARGS+=	-DWITH_QT:BOOL=On -DWITH_QT_OPENGL:BOOL=On
@@ -137,7 +124,7 @@ CMAKE_ARGS+=	-DWITH_QT:BOOL=On -DWITH_QT_OPENGL:BOOL=On
 CMAKE_ARGS+=	-DWITH_QT:BOOL=Off
 .endif
 
-.ifdef(WITH_TBB)
+.if defined(WITH_TBB)
 LIB_DEPENDS+=	tbb.3:${PORTSDIR}/devel/tbb
 CMAKE_ARGS+=	-DWITH_TBB:BOOL=On \
 		-DTBBLIB_FOUND:BOOL=1 -DTBB_FOUND:BOOL=On \
@@ -148,14 +135,14 @@ CMAKE_ARGS+=	-DWITH_TBB:BOOL=On \
 CMAKE_ARGS+=	-DWITH_TBB:BOOL=Off
 .endif
 
-.ifndef(WITHOUT_TIFF)
+.if !defined(WITHOUT_TIFF)
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 CMAKE_ARGS+=	-DWITH_TIFF:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_TIFF:BOOL=Off
 .endif
 
-.ifndef(WITHOUT_V4L)
+.if !defined(WITHOUT_V4L)
 LIB_DEPENDS+=	v4l2.0:${PORTSDIR}/multimedia/libv4l
 BUILD_DEPENDS+=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
 CMAKE_ARGS+=	-DWITH_V4L:BOOL=On \
@@ -164,22 +151,41 @@ CMAKE_ARGS+=	-DWITH_V4L:BOOL=On \
 CMAKE_ARGS+=	-DWITH_V4L:BOOL=Off
 .endif
 
-.ifdef(WITH_XINE)
+.if defined(WITH_XINE)
 LIB_DEPENDS+=	xine.1:${PORTSDIR}/multimedia/libxine
 CMAKE_ARGS+=	-DWITH_XINE:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_XINE:BOOL=Off
 .endif
 
-.else # !defined(BUILDING_OPENCV_CORE)
+.else # defined(_BUILDING_OPENCV_CORE) || defined(_BUILDING_OPENCV_PYTHON)
+
+. if defined(_BUILDING_OPENCV_CORE)
 COMMENT=	OpenCV core libraries
 PLIST=		${PKGDIR}/pkg-plist.oc
 PKGNAMESUFFIX=	-core
 LATEST_LINK=	${PORTNAME}-core
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-opencv-core
-CMAKE_ARGS+=	-DBUILD_TESTS:BOOL=Off \
-		-DBUILD_EXAMPLES:lBOOL=Off \
-		-DBUILD_EXAMPLES:lBOOL=Off \
+
+. elif defined(_BUILDING_OPENCV_PYTHON)
+COMMENT=	OpenCV Python Library
+CATEGORIES=	graphics python
+PLIST=		${PKGDIR}/pkg-plist.python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	# no suffix
+
+LIB_DEPENDS+=	opencv_legacy.2:${PORTSDIR}/graphics/opencv
+CMAKE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+INSTALL_WRKSRC=	${WRKSRC}/modules/python
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-opencv-python
+
+USE_PYTHON=	yes
+BUILD_DEPENDS+=	${PYNUMPY}
+RUN_DEPENDS+=	${PYNUMPY}
+. endif	# defined(_BUILDING_OPENCV_PYTHON)
+CMAKE_ARGS+=	-DBUILD_EXAMPLES:BOOL=Off \
+		-DINSTALL_PYTHON_EXAMPLES:BOOL=Off \
+		-DBUILD_TESTS:BOOL=Off \
 		-DDWITH_EIGEN2:BOOL=Off \
 		-DWITH_FFMPEG:BOOL=Off \
 		-DWITH_GSTREAMER:BOOL=Off \
@@ -188,8 +194,6 @@ CMAKE_ARGS+=	-DBUILD_TESTS:BOOL=Off \
 		-DWITH_JPEG:BOOL=Off \
 		-DWITH_OPENEXR:BOOL=Off \
 		-DWITH_PNG:BOOL=Off \
-		-DBUILD_NEW_PYTHON_SUPPORT:BOOL=Off \
-		-DINSTALL_PYTHON_EXAMPLES:BOOL=Off \
 		-DWITH_QT:BOOL=Off \
 		-DWITH_TBB:BOOL=Off \
 		-DWITH_V4L:BOOL=Off \
@@ -198,7 +202,13 @@ CMAKE_ARGS+=	-DBUILD_TESTS:BOOL=Off \
 		-DWITH_PVAPI:BOOL=Off \
 		-DWITH_1394:BOOL=Off \
 		-DWITH_CUDA:BOOL=Off
-.endif # !defined(BUILDING_OPENCV_CORE)
+.endif # defined(_BUILDING_OPENCV_CORE) || defined(_BUILDING_OPENCV_PYTHON)
+
+.if defined(_BUILDING_OPENCV_PYTHON)
+CMAGE_ARGS+=	-DBUILD_NEW_PYTHON_SUPPORT:BOOL=On
+.else
+CMAGE_ARGS+=	-DBUILD_NEW_PYTHON_SUPPORT:BOOL=Off
+.endif
 
 .include <bsd.port.pre.mk>
 
@@ -206,16 +216,19 @@ post-patch:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 	@${REINPLACE_CMD} -e 's:set(OPENCV_SOVERSION.*:set(OPENCV_SOVERSION "$${OPENCV_VERSION_MAJOR}"):' \
 		-e 's:-pthread:${PTHREAD_LIBS}:g' \
-		-e 's:lib/pkgconfig:libdata/pkgconfig:g' \
-		-e 's:${PORTNAME}/doc:doc/${PORTNAME}:g' \
+		-e 's:$${OPENCV_LIB_INSTALL_PATH}/pkgconfig:$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig:g' \
+		-e 's:share/OpenCV/doc:share/doc/opencv:g' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|${PORTNAME}/samples|examples/${PORTNAME}|g' \
-		${WRKSRC}/samples/*/CMakeLists.txt
-.if defined(BUILDING_OPENCV_CORE)
+		${WRKSRC}/samples/*/CMakeLists.txt \
+		${WRKSRC}/samples/*/*/CMakeLists.txt
+
+.if defined(_BUILDING_OPENCV_CORE) && !defined(_BUILDING_OPENCV_PYTHON)
 	@${REINPLACE_CMD} -e '/add_subdirectory(data)/ d' \
 		-e '/add_subdirectory(include)/ d' \
 		-e 's|opencv.pc|opencv-core.pc|g' \
 		-e 's|OpenCVConfig.cmake|OpenCVConfig-core.cmake|g' \
+		-e 's|OpenCVConfig-version.cmake|OpenCVConfig-core-version.cmake|g' \
 		-e 's|    set(root_files README)||g' \
 		-e 's|    install(CODE "exec_program.*||g' \
 		${WRKSRC}/CMakeLists.txt
@@ -226,8 +239,9 @@ post-patch:
 	@${SED} -E -e \
 		's|    set\(OPENCV_LIB_COMPONENTS .*|    set\(OPENCV_LIB_COMPONENTS opencv_core opencv_imgproc opencv_video opencv_ml opencv_flann\)|g' \
 		${WRKSRC}/OpenCVConfig.cmake.in > ${WRKSRC}/OpenCVConfig-core.cmake.in
+	@${LN} -sf OpenCVConfig-version.cmake.in ${WRKSRC}/OpenCVConfig-core-version.cmake.in
 .endif
-.if defined(NOPORTDOCS) || defined(BUILDING_OPENCV_CORE)
+.if defined(NOPORTDOCS) || defined(_BUILDING_OPENCV_CORE) || defined(_BUILDING_OPENCV_PYTHON)
 	@${REINPLACE_CMD} -e '/add_subdirectory(doc)/ d' \
 		${WRKSRC}/CMakeLists.txt
 .endif
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index 76d75c225f07..28a46053ac69 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (OpenCV-2.3.0.tar.bz2) = bcbfff0ff767f0cf2523707a307a5fd0db4853c19c3498f322c8c5839429940b
-SIZE (OpenCV-2.3.0.tar.bz2) = 42849210
+SHA256 (OpenCV-2.3.1.tar.bz2) = 30e7f3e7b07fb5bd1605c934101e9f2487c3e2fcc97478e529756575024ee2b8
+SIZE (OpenCV-2.3.1.tar.bz2) = 32588659
diff --git a/graphics/opencv/files/extra-patch-opencv b/graphics/opencv/files/extra-patch-opencv
index 3d3fe1f8532e..17a8b438a1e2 100644
--- a/graphics/opencv/files/extra-patch-opencv
+++ b/graphics/opencv/files/extra-patch-opencv
@@ -1,6 +1,6 @@
---- modules/CMakeLists.txt.orig	2011-07-04 06:21:57.000000000 +0200
-+++ modules/CMakeLists.txt	2011-07-11 09:33:56.265459094 +0200
-@@ -8,25 +8,25 @@
+--- modules/CMakeLists.txt.orig	2011-08-02 14:48:41.000000000 +0200
++++ modules/CMakeLists.txt	2011-08-22 13:17:48.167347755 +0200
+@@ -10,18 +10,18 @@
  endif()
  
  add_subdirectory(calib3d)
@@ -10,10 +10,12 @@
 -add_subdirectory(flann)
 +#add_subdirectory(flann)
  
- if(BUILD_TESTS)
+-if(BUILD_TESTS)
 -  add_subdirectory(ts)
+-endif()
++#if(BUILD_TESTS)
 +#  add_subdirectory(ts)
- endif()
++#endif()
  add_subdirectory(highgui)
 -add_subdirectory(imgproc)
 +#add_subdirectory(imgproc)
@@ -23,8 +25,9 @@
 +#add_subdirectory(ml)
  add_subdirectory(objdetect)
  
- if(PYTHONLIBS_FOUND AND BUILD_NEW_PYTHON_SUPPORT)
-   add_subdirectory(python)
+ if(PYTHONLIBS_FOUND AND BUILD_NEW_PYTHON_SUPPORT AND PYTHON_USE_NUMPY)
+@@ -32,7 +32,7 @@
+   add_subdirectory(java)
  endif()
  
 -add_subdirectory(video)
diff --git a/graphics/opencv/files/extra-patch-opencv-core b/graphics/opencv/files/extra-patch-opencv-core
index 5c41cc1f7504..c91ba07eac3d 100644
--- a/graphics/opencv/files/extra-patch-opencv-core
+++ b/graphics/opencv/files/extra-patch-opencv-core
@@ -1,7 +1,7 @@
---- modules/CMakeLists.txt.orig	2011-07-04 06:21:57.000000000 +0200
-+++ modules/CMakeLists.txt	2011-07-11 09:35:33.207215658 +0200
-@@ -7,30 +7,30 @@
-   add_subdirectory(androidcamera)
+--- modules/CMakeLists.txt.orig	2011-08-02 14:48:41.000000000 +0200
++++ modules/CMakeLists.txt	2011-08-22 12:12:01.825347584 +0200
+@@ -9,34 +9,34 @@
+   endif()
  endif()
  
 -add_subdirectory(calib3d)
@@ -27,10 +27,20 @@
 -add_subdirectory(objdetect)
 +#add_subdirectory(objdetect)
  
- if(PYTHONLIBS_FOUND AND BUILD_NEW_PYTHON_SUPPORT)
+-if(PYTHONLIBS_FOUND AND BUILD_NEW_PYTHON_SUPPORT AND PYTHON_USE_NUMPY)
 -  add_subdirectory(python)
+-endif()
+-
+-if(BUILD_JAVA_SUPPORT)
+-  add_subdirectory(java)
+-endif()
++#if(PYTHONLIBS_FOUND AND BUILD_NEW_PYTHON_SUPPORT AND PYTHON_USE_NUMPY)
 +#  add_subdirectory(python)
- endif()
++#endif()
++
++#if(BUILD_JAVA_SUPPORT)
++#  add_subdirectory(java)
++#endif()
  
  add_subdirectory(video)
 -add_subdirectory(traincascade)
@@ -38,9 +48,11 @@
 +#add_subdirectory(traincascade)
 +#add_subdirectory(haartraining)
  
- if(NOT ANDROID)
+-if(NOT ANDROID)
 -  add_subdirectory(gpu)
 -  add_subdirectory(stitching)
+-endif()
++#if(NOT ANDROID)
 +#  add_subdirectory(gpu)
 +#  add_subdirectory(stitching)
- endif()
++#endif()
diff --git a/graphics/opencv/files/extra-patch-opencv-python b/graphics/opencv/files/extra-patch-opencv-python
new file mode 100644
index 000000000000..1e48c6406bf2
--- /dev/null
+++ b/graphics/opencv/files/extra-patch-opencv-python
@@ -0,0 +1,45 @@
+--- modules/CMakeLists.txt.orig	2011-08-22 18:34:10.458995645 +0200
++++ modules/CMakeLists.txt	2011-08-22 18:34:30.560542908 +0200
+@@ -1,42 +1,3 @@
+-if(ANDROID)
+-  ADD_DEFINITIONS(-DGTEST_HAS_STD_WSTRING=0)
+-  if(ANDROID_API_LEVEL LESS 8)
+-    ADD_DEFINITIONS(-DGTEST_HAS_CLONE=0)
+-  endif()
+-  
+-  IF(WITH_ANDROID_CAMERA)
+-      add_subdirectory(androidcamera)
+-  endif()
+-endif()
+-
+-add_subdirectory(calib3d)
+-add_subdirectory(core)
+-add_subdirectory(features2d)
+-add_subdirectory(flann)
+-
+-if(BUILD_TESTS)
+-  add_subdirectory(ts)
+-endif()
+-add_subdirectory(highgui)
+-add_subdirectory(imgproc)
+-add_subdirectory(legacy)
+-add_subdirectory(contrib)
+-add_subdirectory(ml)
+-add_subdirectory(objdetect)
+-
+ if(PYTHONLIBS_FOUND AND BUILD_NEW_PYTHON_SUPPORT AND PYTHON_USE_NUMPY)
+   add_subdirectory(python)
+ endif()
+-
+-if(BUILD_JAVA_SUPPORT)
+-  add_subdirectory(java)
+-endif()
+-
+-add_subdirectory(video)
+-add_subdirectory(traincascade)
+-add_subdirectory(haartraining)
+-
+-if(NOT ANDROID)
+-  add_subdirectory(gpu)
+-  add_subdirectory(stitching)
+-endif()
diff --git a/graphics/opencv/files/patch-samples-CMakeLists.txt b/graphics/opencv/files/patch-samples-CMakeLists.txt
deleted file mode 100644
index 537b7eeea4e0..000000000000
--- a/graphics/opencv/files/patch-samples-CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- samples/CMakeLists.txt.orig	2009-11-25 01:26:49.804760829 +0000
-+++ samples/CMakeLists.txt	2009-11-25 01:36:37.139328594 +0000
-@@ -4,5 +4,9 @@
- # ----------------------------------------------------------------------------
- 
- add_subdirectory(c)
-+if(INSTALL_PYTHON_EXAMPLES)
- add_subdirectory(swig_python)
-+endif()
-+if(INSTALL_OCTAVE_EXAMPLES)
- add_subdirectory(octave)
-+endif()
diff --git a/graphics/opencv/pkg-plist b/graphics/opencv/pkg-plist
index 309597071e1e..74ca77e3ad8e 100644
--- a/graphics/opencv/pkg-plist
+++ b/graphics/opencv/pkg-plist
@@ -16,11 +16,13 @@ include/opencv/highgui.h
 include/opencv/ml.h
 include/opencv2/calib3d/calib3d.hpp
 include/opencv2/contrib/contrib.hpp
+include/opencv2/contrib/retina.hpp
 include/opencv2/features2d/features2d.hpp
 include/opencv2/gpu/NCV.hpp
 include/opencv2/gpu/NPP_staging.hpp
 include/opencv2/gpu/devmem2d.hpp
 include/opencv2/gpu/gpu.hpp
+include/opencv2/gpu/gpumat.hpp
 include/opencv2/gpu/matrix_operations.hpp
 include/opencv2/gpu/stream_accessor.hpp
 include/opencv2/highgui/highgui.hpp
@@ -33,29 +35,28 @@ include/opencv2/objdetect/objdetect.hpp
 include/opencv2/opencv.hpp
 lib/libopencv_calib3d.so
 lib/libopencv_calib3d.so.2
-lib/libopencv_calib3d.so.2.3.0
+lib/libopencv_calib3d.so.%%VERSION%%
 lib/libopencv_contrib.so
 lib/libopencv_contrib.so.2
-lib/libopencv_contrib.so.2.3.0
+lib/libopencv_contrib.so.%%VERSION%%
 lib/libopencv_features2d.so
 lib/libopencv_features2d.so.2
-lib/libopencv_features2d.so.2.3.0
+lib/libopencv_features2d.so.%%VERSION%%
 lib/libopencv_gpu.so
 lib/libopencv_gpu.so.2
-lib/libopencv_gpu.so.2.3.0
+lib/libopencv_gpu.so.%%VERSION%%
 lib/libopencv_highgui.so
 lib/libopencv_highgui.so.2
-lib/libopencv_highgui.so.2.3.0
+lib/libopencv_highgui.so.%%VERSION%%
 lib/libopencv_legacy.so
 lib/libopencv_legacy.so.2
-lib/libopencv_legacy.so.2.3.0
+lib/libopencv_legacy.so.%%VERSION%%
 lib/libopencv_objdetect.so
 lib/libopencv_objdetect.so.2
-lib/libopencv_objdetect.so.2.3.0
+lib/libopencv_objdetect.so.%%VERSION%%
 libdata/pkgconfig/opencv.pc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv.so
-share/OpenCV
 %%DATADIR%%/OpenCVConfig.cmake
+%%DATADIR%%/OpenCVConfig-version.cmake
 %%DATADIR%%/haarcascades/haarcascade_eye.xml
 %%DATADIR%%/haarcascades/haarcascade_eye_tree_eyeglasses.xml
 %%DATADIR%%/haarcascades/haarcascade_frontalface_alt.xml
@@ -67,9 +68,11 @@ share/OpenCV
 %%DATADIR%%/haarcascades/haarcascade_lowerbody.xml
 %%DATADIR%%/haarcascades/haarcascade_mcs_eyepair_big.xml
 %%DATADIR%%/haarcascades/haarcascade_mcs_eyepair_small.xml
+%%DATADIR%%/haarcascades/haarcascade_mcs_leftear.xml
 %%DATADIR%%/haarcascades/haarcascade_mcs_lefteye.xml
 %%DATADIR%%/haarcascades/haarcascade_mcs_mouth.xml
 %%DATADIR%%/haarcascades/haarcascade_mcs_nose.xml
+%%DATADIR%%/haarcascades/haarcascade_mcs_rightear.xml
 %%DATADIR%%/haarcascades/haarcascade_mcs_righteye.xml
 %%DATADIR%%/haarcascades/haarcascade_mcs_upperbody.xml
 %%DATADIR%%/haarcascades/haarcascade_profileface.xml
@@ -78,7 +81,6 @@ share/OpenCV
 %%DATADIR%%/lbpcascades/lbpcascade_frontalface.xml
 @dirrm %%DATADIR%%/lbpcascades
 @dirrm %%DATADIR%%/haarcascades
-%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%
 @dirrm include/opencv2/objdetect
 @dirrm include/opencv2/legacy
 @dirrm include/opencv2/highgui
diff --git a/graphics/opencv/pkg-plist.oc b/graphics/opencv/pkg-plist.oc
index ce6f2830ddfc..c788596c66f0 100644
--- a/graphics/opencv/pkg-plist.oc
+++ b/graphics/opencv/pkg-plist.oc
@@ -9,23 +9,34 @@ include/opencv2/core/version.hpp
 include/opencv2/core/wimage.hpp
 include/opencv2/flann/all_indices.h
 include/opencv2/flann/allocator.h
+include/opencv2/flann/any.h
 include/opencv2/flann/autotuned_index.h
 include/opencv2/flann/composite_index.h
+include/opencv2/flann/config.h
+include/opencv2/flann/defines.h
 include/opencv2/flann/dist.h
+include/opencv2/flann/dummy.h
+include/opencv2/flann/dynamic_bitset.h
 include/opencv2/flann/flann.hpp
 include/opencv2/flann/flann_base.hpp
 include/opencv2/flann/general.h
 include/opencv2/flann/ground_truth.h
 include/opencv2/flann/hdf5.h
 include/opencv2/flann/heap.h
+include/opencv2/flann/hierarchical_clustering_index.h
 include/opencv2/flann/index_testing.h
 include/opencv2/flann/kdtree_index.h
+include/opencv2/flann/kdtree_single_index.h
 include/opencv2/flann/kmeans_index.h
 include/opencv2/flann/linear_index.h
 include/opencv2/flann/logger.h
+include/opencv2/flann/lsh_index.h
+include/opencv2/flann/lsh_table.h
 include/opencv2/flann/matrix.h
+include/opencv2/flann/miniflann.hpp
 include/opencv2/flann/nn_index.h
 include/opencv2/flann/object_factory.h
+include/opencv2/flann/params.h
 include/opencv2/flann/random.h
 include/opencv2/flann/result_set.h
 include/opencv2/flann/sampling.h
@@ -40,26 +51,28 @@ include/opencv2/ts/ts.hpp
 include/opencv2/ts/ts_gtest.h
 include/opencv2/video/background_segm.hpp
 include/opencv2/video/tracking.hpp
+include/opencv2/video/video.hpp
 lib/libopencv_core.so
 lib/libopencv_core.so.2
-lib/libopencv_core.so.2.3.0
+lib/libopencv_core.so.%%VERSION%%
 lib/libopencv_flann.so
 lib/libopencv_flann.so.2
-lib/libopencv_flann.so.2.3.0
+lib/libopencv_flann.so.%%VERSION%%
 lib/libopencv_imgproc.so
 lib/libopencv_imgproc.so.2
-lib/libopencv_imgproc.so.2.3.0
+lib/libopencv_imgproc.so.%%VERSION%%
 lib/libopencv_ml.so
 lib/libopencv_ml.so.2
-lib/libopencv_ml.so.2.3.0
+lib/libopencv_ml.so.%%VERSION%%
 lib/libopencv_ts.so
 lib/libopencv_ts.so.2
-lib/libopencv_ts.so.2.3.0
+lib/libopencv_ts.so.%%VERSION%%
 lib/libopencv_video.so
 lib/libopencv_video.so.2
-lib/libopencv_video.so.2.3.0
+lib/libopencv_video.so.%%VERSION%%
 libdata/pkgconfig/opencv-core.pc
 %%DATADIR%%/OpenCVConfig-core.cmake
+%%DATADIR%%/OpenCVConfig-core-version.cmake
 @dirrm %%DATADIR%%
 @dirrm include/opencv2/video
 @dirrm include/opencv2/ts
diff --git a/graphics/opencv/pkg-plist.python b/graphics/opencv/pkg-plist.python
new file mode 100644
index 000000000000..7d1e8570c345
--- /dev/null
+++ b/graphics/opencv/pkg-plist.python
@@ -0,0 +1,3 @@
+%%PYTHON_SITELIBDIR%%/cv2.so
+%%PYTHON_SITELIBDIR%%/cv.py
+@dirrmtry %%PYTHON_SITELIBDIR%%