graphics/opencv: add suffix to make room for 3.x series

To avoid confusion, the main port is to track the latest release.
Whether to rename includes/libraries as well making it possible to
install 2.x and 3.x side-by-side remains to be investigated.

PR:		210505 (for tracking)
Inspired by:	PkgSrc

50 files changed, 77 insertions, 59 deletions

diff --git a/MOVED b/MOVED
index dad8aaa5a1d2..40f9365135e1 100644
--- a/MOVED
+++ b/MOVED
@@ -8662,3 +8662,7 @@ databases/postgresql91-plperl||2016-10-01|Has expired: End-of-life is near
 databases/postgresql91-pltcl||2016-10-02|Has expired: End-of-life is near
 databases/postgresql91-docs||2016-10-02|Has expired: End-of-life is near
 www/mediawiki125||2016-10-02|Has expired: EOL upstream
+graphics/opencv|graphics/opencv2|2016-10-03|Renamed
+graphics/opencv-core|graphics/opencv2-core|2016-10-03|Renamed
+graphics/opencv-java|graphics/opencv2-java|2016-10-03|Renamed
+graphics/py-opencv|graphics/py-opencv2|2016-10-03|Renamed
diff --git a/graphics/Makefile b/graphics/Makefile
index ce9493ef4404..358bdc217d5e 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -611,9 +611,9 @@
     SUBDIR += opencolorio
     SUBDIR += opencolorio-tools
     SUBDIR += opencsg
-    SUBDIR += opencv
-    SUBDIR += opencv-core
-    SUBDIR += opencv-java
+    SUBDIR += opencv2
+    SUBDIR += opencv2-core
+    SUBDIR += opencv2-java
     SUBDIR += opendx
     SUBDIR += opengl-man
     SUBDIR += opengtl
@@ -849,7 +849,7 @@
     SUBDIR += py-ming
     SUBDIR += py-nwdiag
     SUBDIR += py-opencolorio
-    SUBDIR += py-opencv
+    SUBDIR += py-opencv2
     SUBDIR += py-openexr
     SUBDIR += py-openimageio
     SUBDIR += py-paint
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 9f9b9a1a1476..fe7a053323d4 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	cimg
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.7
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	graphics devel
 
@@ -57,8 +58,8 @@ LIB_DEPENDS+=	libcurl.so:ftp/curl			\
 		libIlmImf.so:graphics/OpenEXR		\
 		libgimp-2.0.so:graphics/gimp-app	\
 		libfftw3.so:math/fftw3			\
-		libopencv_legacy.so:graphics/opencv	\
-		libopencv_core.so:graphics/opencv-core	\
+		libopencv_legacy.so:graphics/opencv2	\
+		libopencv_core.so:graphics/opencv2-core	\
 		libGraphicsMagick.so:graphics/GraphicsMagick
 USES+=		jpeg
 ALL_TARGET=	Mlinux
diff --git a/graphics/frei0r/Makefile b/graphics/frei0r/Makefile
index 6474d7452196..0eda7903edae 100644
--- a/graphics/frei0r/Makefile
+++ b/graphics/frei0r/Makefile
@@ -28,10 +28,10 @@ USES+=	localbase
 .endif
 
 .if defined(BUILDING_FREI0R_OPENCV)
-PORTREVISION=	0
+PORTREVISION=	1
 COMMENT=	Frei0r OpenCV plugins
 PKGNAMESUFFIX=	-plugins-opencv
-LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv
+LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv2
 FREI0R_PLUGINS=	facebl0r facedetect
 
 CMAKE_ARGS+=	-DWITHOUT_OPENCV:BOOL=OFF \
diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile
index 736927d985a5..c678a2cc8a45 100644
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gmic
 PORTVERSION=	1.6.9
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://gmic.eu/files/source/
 PKGNAMEPREFIX=	gimp-
@@ -13,7 +14,7 @@ COMMENT=	GREYC's Magic Image Converter
 
 LIB_DEPENDS=	libGraphicsMagick++.so:graphics/GraphicsMagick \
 		libIlmImf.so:graphics/OpenEXR \
-		libopencv_legacy.so:graphics/opencv \
+		libopencv_legacy.so:graphics/opencv2 \
 		libMagick++-6.so:graphics/ImageMagick \
 		libavcodec.so:multimedia/ffmpeg \
 		libfftw3.so:math/fftw3 \
diff --git a/graphics/gstreamer-plugins-opencv/Makefile b/graphics/gstreamer-plugins-opencv/Makefile
index 1eb2f2f20df4..387a6008adee 100644
--- a/graphics/gstreamer-plugins-opencv/Makefile
+++ b/graphics/gstreamer-plugins-opencv/Makefile
@@ -1,7 +1,7 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer opencv real time computer vision plugin
diff --git a/graphics/gstreamer1-plugins-opencv/Makefile b/graphics/gstreamer1-plugins-opencv/Makefile
index 47d960fb4e06..5e999140200f 100644
--- a/graphics/gstreamer1-plugins-opencv/Makefile
+++ b/graphics/gstreamer1-plugins-opencv/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	GStreamer opencv real time computer vision plugin
diff --git a/graphics/kipi-plugin-removeredeyes/Makefile b/graphics/kipi-plugin-removeredeyes/Makefile
index 31e92847587f..a496e504b07a 100644
--- a/graphics/kipi-plugin-removeredeyes/Makefile
+++ b/graphics/kipi-plugin-removeredeyes/Makefile
@@ -2,12 +2,13 @@
 
 PORTNAME=	kipi-plugin-${KIPI_PLUGIN}
 PORTVERSION=	${DIGIKAM_VER}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv
+LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv2
 
 KIPI_PLUGIN=	removeredeyes
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/libkface/Makefile b/graphics/libkface/Makefile
index 3d7633da7841..f6cb59b7260f 100644
--- a/graphics/libkface/Makefile
+++ b/graphics/libkface/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libkface
 PORTVERSION=	${KDE4_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
@@ -12,7 +13,7 @@ COMMENT=	KDE4 library for face recognition
 LICENSE=	GPLv2+ LGPL20+
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv
+LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv2
 
 USES=		cmake:outsource kde:4 pathfix pkgconfig tar:xz
 USE_KDE=	kdelibs automoc4 marble
diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile
index dcce12f53e47..bbed72b960d1 100644
--- a/graphics/nomacs/Makefile
+++ b/graphics/nomacs/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	nomacs
 PORTVERSION=	2.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	SF/nomacs/nomacs-${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -14,7 +14,7 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libsysinfo.so:devel/libsysinfo \
-		libopencv_core.so:graphics/opencv-core
+		libopencv_core.so:graphics/opencv2-core
 USES=		cmake desktop-file-utils dos2unix pkgconfig tar:bzip2
 USE_QT4=	gui network linguist_build moc_build \
 		qmake_build rcc_build uic_build
diff --git a/graphics/opencv-core/Makefile b/graphics/opencv2-core/Makefile
index f3931332ccb6..ce50a4782f82 100644
--- a/graphics/opencv-core/Makefile
+++ b/graphics/opencv2-core/Makefile
@@ -2,13 +2,13 @@
 # $FreeBSD$
 
 PORTREVISION=	0
-PKGNAMESUFFIX=	-${OCV_SLAVE}
+PKGNAMESUFFIX=	2-${OCV_SLAVE}
 
 COMMENT=	OpenCV core libraries
 
 OCV_SLAVE=	core
 OCV_CORE=	yes
-MASTERDIR=	${.CURDIR:H}/opencv
+MASTERDIR=	${.CURDIR:H}/opencv2
 PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/opencv-core/pkg-plist b/graphics/opencv2-core/pkg-plist
index 71ea81e139b3..71ea81e139b3 100644
--- a/graphics/opencv-core/pkg-plist
+++ b/graphics/opencv2-core/pkg-plist
diff --git a/graphics/opencv-java/Makefile b/graphics/opencv2-java/Makefile
index 452492510c7a..a95757c1a102 100644
--- a/graphics/opencv-java/Makefile
+++ b/graphics/opencv2-java/Makefile
@@ -2,13 +2,13 @@
 
 PORTREVISION=	0
 CATEGORIES=	graphics java
-PKGNAMESUFFIX=	-${OCV_SLAVE}
+PKGNAMESUFFIX=	2-${OCV_SLAVE}
 
 COMMENT=	OpenCV Java library
 
 OCV_SLAVE=	java
 OCV_JAVA=	yes
-MASTERDIR=	${.CURDIR:H}/opencv
+MASTERDIR=	${.CURDIR:H}/opencv2
 PLIST=		${.CURDIR}/pkg-plist
 
 PLIST_SUB+=	OCV_VER=${DISTVERSION:R:S|.||g}
diff --git a/graphics/opencv-java/pkg-plist b/graphics/opencv2-java/pkg-plist
index 107f21febc9e..107f21febc9e 100644
--- a/graphics/opencv-java/pkg-plist
+++ b/graphics/opencv2-java/pkg-plist
diff --git a/graphics/opencv/Makefile b/graphics/opencv2/Makefile
index 0955be8f7ab1..6b3853801736 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv2/Makefile
@@ -5,6 +5,7 @@ PORTNAME?=	opencv
 PORTVERSION=	2.4.13.1
 PORTREVISION?=	0
 CATEGORIES=	graphics
+PKGNAMESUFFIX?=	2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Source Computer Vision library
@@ -13,6 +14,9 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
+PORTSCOUT=	limit:^2\.
+
+CONFLICTS_INSTALL=	${PKGBASE:S/${PORTNAME}2/${PORTNAME}/}
 
 USES=		cmake compiler:c++11-lib pkgconfig
 USE_LDCONFIG=	yes
@@ -138,7 +142,7 @@ TBB_DESC=		TBB support
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
 . endfor
 .elif defined(OCV_PYTHON)
-LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv
+LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv2
 BUILD_DEPENDS+=	${PYNUMPY}
 RUN_DEPENDS+=	${PYNUMPY}
 USES+=		python:2.7
@@ -149,7 +153,7 @@ CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
 INSTALL_WRKSRC=	${WRKSRC}/modules/python
 .elif defined(OCV_JAVA)
 BUILD_DEPENDS+=	ant:devel/apache-ant
-LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv
+LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv2
 USES+=		python:build
 USE_JAVA=	yes
 CMAKE_ARGS+=	-DBUILD_opencv_java:BOOL=On
@@ -159,7 +163,7 @@ CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
 CONFIGURE_ENV+=	JAVA_HOME="${JAVA_HOME}"
 INSTALL_WRKSRC=	${WRKSRC}/modules/java
 .else
-LIB_DEPENDS+=	libopencv_core.so:graphics/opencv-core
+LIB_DEPENDS+=	libopencv_core.so:graphics/opencv2-core
 . for module in ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS}
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
 . endfor
diff --git a/graphics/opencv/distinfo b/graphics/opencv2/distinfo
index bdc98110c8db..bdc98110c8db 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv2/distinfo
diff --git a/graphics/opencv/files/FindOpenCVCore.cmake.in b/graphics/opencv2/files/FindOpenCVCore.cmake.in
index ee278d78fcd6..ee278d78fcd6 100644
--- a/graphics/opencv/files/FindOpenCVCore.cmake.in
+++ b/graphics/opencv2/files/FindOpenCVCore.cmake.in
diff --git a/graphics/opencv/files/patch-cmake__OpenCVCompilerOptions.cmake b/graphics/opencv2/files/patch-cmake__OpenCVCompilerOptions.cmake
index b6c66a3ae2ec..b6c66a3ae2ec 100644
--- a/graphics/opencv/files/patch-cmake__OpenCVCompilerOptions.cmake
+++ b/graphics/opencv2/files/patch-cmake__OpenCVCompilerOptions.cmake
diff --git a/graphics/opencv/files/patch-cmake__OpenCVFindLibsGUI.cmake b/graphics/opencv2/files/patch-cmake__OpenCVFindLibsGUI.cmake
index cfe9392d3e21..cfe9392d3e21 100644
--- a/graphics/opencv/files/patch-cmake__OpenCVFindLibsGUI.cmake
+++ b/graphics/opencv2/files/patch-cmake__OpenCVFindLibsGUI.cmake
diff --git a/graphics/opencv/files/patch-cmake__OpenCVVersion.cmake b/graphics/opencv2/files/patch-cmake__OpenCVVersion.cmake
index d77f4b0b5511..d77f4b0b5511 100644
--- a/graphics/opencv/files/patch-cmake__OpenCVVersion.cmake
+++ b/graphics/opencv2/files/patch-cmake__OpenCVVersion.cmake
diff --git a/graphics/opencv/files/patch-modules__contrib__src__spinimages.cpp b/graphics/opencv2/files/patch-modules__contrib__src__spinimages.cpp
index d44b043812a7..d44b043812a7 100644
--- a/graphics/opencv/files/patch-modules__contrib__src__spinimages.cpp
+++ b/graphics/opencv2/files/patch-modules__contrib__src__spinimages.cpp
diff --git a/graphics/opencv/files/patch-modules__core__src__system.cpp b/graphics/opencv2/files/patch-modules__core__src__system.cpp
index 81eff621346d..81eff621346d 100644
--- a/graphics/opencv/files/patch-modules__core__src__system.cpp
+++ b/graphics/opencv2/files/patch-modules__core__src__system.cpp
diff --git a/graphics/opencv/files/patch-modules__highgui__src__cap_libv4l.cpp b/graphics/opencv2/files/patch-modules__highgui__src__cap_libv4l.cpp
index 33a6ec871e13..33a6ec871e13 100644
--- a/graphics/opencv/files/patch-modules__highgui__src__cap_libv4l.cpp
+++ b/graphics/opencv2/files/patch-modules__highgui__src__cap_libv4l.cpp
diff --git a/graphics/opencv/files/patch-modules__highgui__src__cap_v4l.cpp b/graphics/opencv2/files/patch-modules__highgui__src__cap_v4l.cpp
index b8ad1a3fdfa3..b8ad1a3fdfa3 100644
--- a/graphics/opencv/files/patch-modules__highgui__src__cap_v4l.cpp
+++ b/graphics/opencv2/files/patch-modules__highgui__src__cap_v4l.cpp
diff --git a/graphics/opencv/files/patch-modules__python__src2__cv2.cv.hpp b/graphics/opencv2/files/patch-modules__python__src2__cv2.cv.hpp
index 94780cc36351..94780cc36351 100644
--- a/graphics/opencv/files/patch-modules__python__src2__cv2.cv.hpp
+++ b/graphics/opencv2/files/patch-modules__python__src2__cv2.cv.hpp
diff --git a/graphics/opencv/files/patch-modules__ts__src__ts.cpp b/graphics/opencv2/files/patch-modules__ts__src__ts.cpp
index 44151a8a0e3d..44151a8a0e3d 100644
--- a/graphics/opencv/files/patch-modules__ts__src__ts.cpp
+++ b/graphics/opencv2/files/patch-modules__ts__src__ts.cpp
diff --git a/graphics/opencv/files/patch-samples__cpp__tutorial_code__core__how_to_scan_images__how_to_scan_images.cpp b/graphics/opencv2/files/patch-samples__cpp__tutorial_code__core__how_to_scan_images__how_to_scan_images.cpp
index 8c0e72703f52..8c0e72703f52 100644
--- a/graphics/opencv/files/patch-samples__cpp__tutorial_code__core__how_to_scan_images__how_to_scan_images.cpp
+++ b/graphics/opencv2/files/patch-samples__cpp__tutorial_code__core__how_to_scan_images__how_to_scan_images.cpp
diff --git a/graphics/opencv/pkg-descr b/graphics/opencv2/pkg-descr
index 688822e99384..688822e99384 100644
--- a/graphics/opencv/pkg-descr
+++ b/graphics/opencv2/pkg-descr
diff --git a/graphics/opencv/pkg-plist b/graphics/opencv2/pkg-plist
index 2a7e0841340d..2a7e0841340d 100644
--- a/graphics/opencv/pkg-plist
+++ b/graphics/opencv2/pkg-plist
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 6dd7e8428f46..612bc909781e 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	openimageio
 PORTVERSION=	1.6.12
 DISTVERSIONPREFIX=	Release-
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
@@ -62,7 +62,7 @@ OCIO_LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio
 
 OPENCV_CMAKE_ON=	-DUSE_OPENCV:BOOL=ON
 OPENCV_CMAKE_OFF=	-DUSE_OPENCV:BOOL=OFF
-OPENCV_LIB_DEPENDS=	libopencv_highgui.so:graphics/opencv
+OPENCV_LIB_DEPENDS=	libopencv_highgui.so:graphics/opencv2
 
 OPENJPEG_CMAKE_ON=	-DUSE_OPENJPEG:BOOL=ON
 OPENJPEG_CMAKE_OFF=	-DUSE_OPENJPEG:BOOL=OFF
diff --git a/graphics/p5-Image-ObjectDetect/Makefile b/graphics/p5-Image-ObjectDetect/Makefile
index 13c777640c13..184eab039df3 100644
--- a/graphics/p5-Image-ObjectDetect/Makefile
+++ b/graphics/p5-Image-ObjectDetect/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Image-ObjectDetect
 PORTVERSION=	0.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,7 +14,7 @@ COMMENT=	Detects objects from picture using opencv
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/opencv.pc:graphics/opencv
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/opencv.pc:graphics/opencv2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/graphics/php-facedetect/Makefile b/graphics/php-facedetect/Makefile
index 9555fb4371c0..f6600ef027c5 100644
--- a/graphics/php-facedetect/Makefile
+++ b/graphics/php-facedetect/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	facedetect
 PORTVERSION=	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	php-
 
@@ -12,7 +12,7 @@ COMMENT=	Face detection extension for PHP using OpenCV library
 
 LICENSE=	PHP30
 
-LIB_DEPENDS=	libopencv_objdetect.so:graphics/opencv
+LIB_DEPENDS=	libopencv_objdetect.so:graphics/opencv2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	infusion
diff --git a/graphics/py-opencv/Makefile b/graphics/py-opencv2/Makefile
index e7bdf3c8ecaf..ed3c3947d564 100644
--- a/graphics/py-opencv/Makefile
+++ b/graphics/py-opencv2/Makefile
@@ -9,7 +9,7 @@ COMMENT=	OpenCV Python library
 
 OCV_SLAVE=	python
 OCV_PYTHON=	yes
-MASTERDIR=	${.CURDIR:H}/opencv
+MASTERDIR=	${.CURDIR:H}/opencv2
 PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/py-opencv/pkg-plist b/graphics/py-opencv2/pkg-plist
index cc41f22ca9c3..cc41f22ca9c3 100644
--- a/graphics/py-opencv/pkg-plist
+++ b/graphics/py-opencv2/pkg-plist
diff --git a/graphics/rubygem-objectdetect/Makefile b/graphics/rubygem-objectdetect/Makefile
index 704ea253a788..3ccae76ea8c7 100644
--- a/graphics/rubygem-objectdetect/Makefile
+++ b/graphics/rubygem-objectdetect/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	objectdetect
 PORTVERSION=	0.0.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics rubygems
 MASTER_SITES=	RG
 
@@ -12,7 +12,7 @@ COMMENT=	Simple library for detecting objects in pictures
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv
+LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv2
 
 USE_RUBY=	yes
 USES=		gem pkgconfig
diff --git a/graphics/waifu2x-converter-cpp/Makefile b/graphics/waifu2x-converter-cpp/Makefile
index db38dccdfb63..cb76307e8d13 100644
--- a/graphics/waifu2x-converter-cpp/Makefile
+++ b/graphics/waifu2x-converter-cpp/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	waifu2x-converter-cpp
 DISTVERSION=	1.0.0-410
 DISTVERSIONSUFFIX=	-g5e5ac35
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://aur.archlinux.org/cgit/aur.git/plain/${PORTNAME:C/-.*//}.1.gz?h=${PORTNAME:C/-.*//}-git&id=5c150a5&/:manpage
 DISTFILES=	${PORTNAME:C/-.*//}.1.gz:manpage
@@ -17,8 +18,8 @@ LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/LICENSE
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:devel/opencl
-LIB_DEPENDS=	libopencv_highgui.so:graphics/opencv \
-		libopencv_imgproc.so:graphics/opencv-core
+LIB_DEPENDS=	libopencv_highgui.so:graphics/opencv2 \
+		libopencv_imgproc.so:graphics/opencv2-core
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tanakamura
diff --git a/math/saga/Makefile b/math/saga/Makefile
index e14aa4b471c4..23ab7e856d6c 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	saga
 PORTVERSION=	2.3.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -20,8 +21,8 @@ LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libjasper.so:graphics/jasper \
 		liblas.so:devel/liblas12 \
 		libodbc.so:databases/unixODBC \
-		libopencv_ml.so:graphics/opencv \
-		libopencv_core.so:graphics/opencv-core \
+		libopencv_ml.so:graphics/opencv2 \
+		libopencv_core.so:graphics/opencv2-core \
 		libproj.so:graphics/proj \
 		libtbb.so:devel/tbb \
 		libtiff.so:graphics/tiff
diff --git a/math/scilab-toolbox-sivp/Makefile b/math/scilab-toolbox-sivp/Makefile
index ccf9d65ab19e..6aedb9b29c89 100644
--- a/math/scilab-toolbox-sivp/Makefile
+++ b/math/scilab-toolbox-sivp/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	sivp
 DISTVERSION=	1.0.0.r286
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math graphics multimedia
 MASTER_SITES=	LOCAL/makc
 PKGNAMEPREFIX=	scilab-toolbox-
@@ -11,7 +11,7 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Scilab Image and Video Processing Toolbox
 
 BUILD_DEPENDS=	${SCILAB_CMD}:math/scilab
-LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv
+LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv2
 RUN_DEPENDS=	${SCILAB_CMD}:math/scilab
 
 USES=		dos2unix pkgconfig tar:xz
diff --git a/misc/auto-multiple-choice/Makefile b/misc/auto-multiple-choice/Makefile
index e717ab366cc6..f349953b2acc 100644
--- a/misc/auto-multiple-choice/Makefile
+++ b/misc/auto-multiple-choice/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	auto-multiple-choice
 PORTVERSION=	1.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://download.gna.org/auto-qcm/
 DISTNAME=	auto-multiple-choice_${PORTVERSION}_precomp
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libcairo.so:graphics/cairo \
 		libnetpbm.so:graphics/netpbm \
-		libopencv_highgui.so:graphics/opencv \
+		libopencv_highgui.so:graphics/opencv2 \
 		libpangocairo-1.0.so:x11-toolkits/pango \
 		libpoppler-glib.so:graphics/poppler-glib
 RUN_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 3f34e1732c5f..c17b8cf1d0a7 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	2.8.8
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -229,7 +229,7 @@ OPENCL_LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 OPENCL_CONFIGURE_ENABLE=	opencl
 
 # opencv
-OPENCV_LIB_DEPENDS=	libopencv_imgproc.so:graphics/opencv-core
+OPENCV_LIB_DEPENDS=	libopencv_imgproc.so:graphics/opencv2-core
 OPENCV_CONFIGURE_ENABLE=	libopencv
 
 # opengl
diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile
index ba350ce78a56..01d519c9406c 100644
--- a/multimedia/ffmpeg0/Makefile
+++ b/multimedia/ffmpeg0/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.7.17
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -101,7 +101,7 @@ GSM_CONFIGURE_ENABLE=		libgsm
 LAME_LIB_DEPENDS=		libmp3lame.so:audio/lame
 LAME_CONFIGURE_ENABLE=		libmp3lame
 
-OPENCV_LIB_DEPENDS=		libopencv_imgproc.so:graphics/opencv-core
+OPENCV_LIB_DEPENDS=		libopencv_imgproc.so:graphics/opencv2-core
 OPENCV_CONFIGURE_ENABLE=	libopencv
 
 OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:graphics/openjpeg15
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index feb739df1efe..3767093361c6 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -427,7 +427,7 @@ gst_ogg_PLIST_FILES=	${GST_LIB_DIR}/libgstogg.la \
 gst_ogg_DIST=	base
 
 # opencv
-gst_opencv_LIB_DEPENDS+=libopencv_highgui.so:graphics/opencv
+gst_opencv_LIB_DEPENDS+=libopencv_highgui.so:graphics/opencv2
 gst_opencv_CONFIGURE_ENV+=	OPENCV_CFLAGS="-I${LOCALBASE}/include/opencv"
 gst_opencv_PLIST_FILES= ${GST_LIB_DIR}/libgstopencv.la \
 			${GST_LIB_DIR}/libgstopencv.so
diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common
index 95a40c3520ae..365f222de06f 100644
--- a/multimedia/gstreamer1-plugins/Makefile.common
+++ b/multimedia/gstreamer1-plugins/Makefile.common
@@ -341,7 +341,7 @@ gst_neon_PLIST_FILES=	${GST_LIB_DIR}/libgstneonhttpsrc.so
 gst_ogg_LIB_DEPENDS=	libogg.so:audio/libogg
 
 # opencv
-gst_opencv_LIB_DEPENDS=	libopencv_highgui.so:graphics/opencv
+gst_opencv_LIB_DEPENDS=	libopencv_highgui.so:graphics/opencv2
 gst_opencv_PLIST_FILES=	${GST_LIB_DIR}/libgstopencv.so \
 			share/gst-plugins-bad/${VERSION}/opencv_haarcascades/fist.xml \
 			share/gst-plugins-bad/${VERSION}/opencv_haarcascades/palm.xml
diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index e41d8515235d..70f3b837b94b 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libav
 PORTVERSION=	11.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 
@@ -10,7 +10,7 @@ MAINTAINER=	dem.procopiou@gmail.com
 COMMENT=	Realtime audio/video conversion library
 
 BUILD_DEPENDS=	yasm:devel/yasm
-LIB_DEPENDS=	libopencv_core.so:graphics/opencv-core \
+LIB_DEPENDS=	libopencv_core.so:graphics/opencv2-core \
 		libgmp.so:math/gmp \
 		libvdpau.so:multimedia/libvdpau \
 		libhogweed.so:security/nettle
@@ -99,7 +99,7 @@ JACK_CONFIGURE_OFF=		--disable-indev=jack
 LAME_LIB_DEPENDS=		libmp3lame.so:audio/lame
 LAME_CONFIGURE_ENABLE=		libmp3lame
 
-OPENCV_LIB_DEPENDS=		libopencv_gpu.so:graphics/opencv
+OPENCV_LIB_DEPENDS=		libopencv_gpu.so:graphics/opencv2
 OPENCV_CONFIGURE_ENABLE=	libopencv
 
 OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:graphics/openjpeg15
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 3f02fe5e640c..97e01574771d 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	lives
 PORTVERSION=	2.8.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
@@ -20,8 +21,8 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		liboil-0.3.so:devel/liboil \
 		libprojectM.so:graphics/libprojectm \
 		libvisual-0.4.so:graphics/libvisual04 \
-		libopencv_calib3d.so:graphics/opencv \
-		libopencv_core.so:graphics/opencv-core \
+		libopencv_calib3d.so:graphics/opencv2 \
+		libopencv_core.so:graphics/opencv2-core \
 		libpng16.so:graphics/png \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
diff --git a/multimedia/py-moviepy/Makefile b/multimedia/py-moviepy/Makefile
index f5902b5ab10c..0798dd030ccf 100644
--- a/multimedia/py-moviepy/Makefile
+++ b/multimedia/py-moviepy/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	moviepy
 PORTVERSION=	0.2.2.11
+PORTREVISION=	1
 CATEGORIES=	multimedia python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ RUN_DEPENDS=	convert:graphics/ImageMagick \
 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm \
 		${PYTHON_PKGNAMEPREFIX}imageio>0:graphics/py-imageio \
-		${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv \
+		${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv2 \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy
 
diff --git a/net-im/qTox/Makefile b/net-im/qTox/Makefile
index 077c0b3d1f5b..050c44e37ccb 100644
--- a/net-im/qTox/Makefile
+++ b/net-im/qTox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qTox
 PORTVERSION=	1.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-im net-p2p
 
@@ -14,8 +14,8 @@ LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 LIB_DEPENDS=	libtoxcore.so:net-im/tox \
-		libopencv_highgui.so:graphics/opencv \
-		libopencv_core.so:graphics/opencv-core \
+		libopencv_highgui.so:graphics/opencv2 \
+		libopencv_core.so:graphics/opencv2-core \
 		libavcodec.so:multimedia/ffmpeg \
 		libvpx.so:multimedia/libvpx \
 		libfilteraudio.so:audio/libfilteraudio \
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index 9923d2d0114b..c82776631c1f 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	retroshare
 PORTVERSION=	0.6.0e
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 
 MAINTAINER=	peter@netkey.at
@@ -18,8 +18,8 @@ LIB_DEPENDS=	libsqlcipher.so:databases/sqlcipher \
 		libupnp.so:devel/upnp \
 		libgnome-keyring.so:security/libgnome-keyring \
 		libgpgme.so:security/gpgme \
-		libopencv_highgui.so:graphics/opencv \
-		libopencv_imgproc.so:graphics/opencv-core \
+		libopencv_highgui.so:graphics/opencv2 \
+		libopencv_imgproc.so:graphics/opencv2-core \
 		libavcodec.so:multimedia/ffmpeg \
 		libcurl.so:ftp/curl \
 		libmicrohttpd.so:www/libmicrohttpd
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index b4b7aa04c7e6..bdf5d49ce205 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	freeswitch
 PORTVERSION=	1.6.8
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://files.freeswitch.org/releases/freeswitch/ \
 		http://files.freeswitch.org/releases/sounds/:sounds
@@ -70,7 +71,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:audio/ladspa \
 		${LOCALBASE}/bin/aclocal:devel/automake
 RUN_DEPENDS+=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 LIB_DEPENDS+=	libavformat.so:multimedia/ffmpeg \
-		libopencv_legacy.so:graphics/opencv \
+		libopencv_legacy.so:graphics/opencv2 \
 		libhiredis.so:databases/hiredis \
 		libmemcached.so:databases/libmemcached \
 		libSoundTouch.so:audio/soundtouch \
diff --git a/x11-toolkits/py-kivy/Makefile b/x11-toolkits/py-kivy/Makefile
index c126dc7c7395..ed16e7eb38a9 100644
--- a/x11-toolkits/py-kivy/Makefile
+++ b/x11-toolkits/py-kivy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kivy
 PORTVERSION=	1.9.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	GH LOCAL/dbn/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -59,7 +60,7 @@ GSTREAMER_MAKE_ENV_OFF=	USE_GSTREAMER=0
 GSTREAMER_LIB_DEPENDS=	libgstreamer-1.0.so:multimedia/gstreamer1
 GSTREAMER_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygst.py:multimedia/py-gstreamer
 GSTREAMER_USES=		pkgconfig
-OPENCV_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv
+OPENCV_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv2
 PIL_DESC=		Text and window rendering support via Pillow
 PIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 PYGAME_DESC=		Window, text and image rendering support via PyGame