graphics/opencv: back out r423216 and r423063 (replaying r423316)

Renaming didn't help to unblock 3.x progress as co-existence with 2.x
was no less complex than simply fixing consumers. This commit also
restores directory-level history accidentally lost via git-svn.

PR:		210505
Pointy hat to:	jbeich (should've discussed first)

36 files changed, 41 insertions, 45 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index bd116399d574..99d634d7e0b9 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -620,9 +620,9 @@
     SUBDIR += opencolorio
     SUBDIR += opencolorio-tools
     SUBDIR += opencsg
-    SUBDIR += opencv2
-    SUBDIR += opencv2-core
-    SUBDIR += opencv2-java
+    SUBDIR += opencv
+    SUBDIR += opencv-core
+    SUBDIR += opencv-java
     SUBDIR += opendx
     SUBDIR += opengl-man
     SUBDIR += opengtl
@@ -862,7 +862,7 @@
     SUBDIR += py-ming
     SUBDIR += py-nwdiag
     SUBDIR += py-opencolorio
-    SUBDIR += py-opencv2
+    SUBDIR += py-opencv
     SUBDIR += py-openexr
     SUBDIR += py-openimageio
     SUBDIR += py-paint
diff --git a/graphics/caffe/Makefile b/graphics/caffe/Makefile
index 035138792aa3..f01b0d781889 100644
--- a/graphics/caffe/Makefile
+++ b/graphics/caffe/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	caffe
 PORTVERSION=	1.0.0.r5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 MAINTAINER=	eric@camachat.org
@@ -23,8 +23,8 @@ LIB_DEPENDS=	libsnappy.so:archivers/snappy \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libprotobuf.so:devel/protobuf \
-		libopencv_highgui.so:graphics/opencv2 \
-		libopencv_core.so:graphics/opencv2-core \
+		libopencv_highgui.so:graphics/opencv \
+		libopencv_core.so:graphics/opencv-core \
 		libopenblas.so:math/openblas \
 		libhdf5.so:science/hdf5
 RUN_DEPENDS=	${PYNUMPY} \
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index eec83885be3b..a846239df17b 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cimg
 DISTVERSION=	1.7.9
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	3
 CATEGORIES=	graphics devel
 
@@ -57,8 +57,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/opencv2	\
-		libopencv_core.so:graphics/opencv2-core	\
+		libopencv_legacy.so:graphics/opencv	\
+		libopencv_core.so:graphics/opencv-core	\
 		libGraphicsMagick.so:graphics/GraphicsMagick
 USES+=		jpeg
 ALL_TARGET=	Mlinux
diff --git a/graphics/frei0r/Makefile b/graphics/frei0r/Makefile
index 0eda7903edae..57a6575c4817 100644
--- a/graphics/frei0r/Makefile
+++ b/graphics/frei0r/Makefile
@@ -28,10 +28,10 @@ USES+=	localbase
 .endif
 
 .if defined(BUILDING_FREI0R_OPENCV)
-PORTREVISION=	1
+PORTREVISION=	2
 COMMENT=	Frei0r OpenCV plugins
 PKGNAMESUFFIX=	-plugins-opencv
-LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv2
+LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv
 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 c45f5b14a84b..e70c76e3bed8 100644
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gmic
 PORTVERSION=	1.6.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://gmic.eu/files/source/
 PKGNAMEPREFIX=	gimp-
@@ -14,7 +14,7 @@ COMMENT=	GREYC's Magic Image Converter
 
 LIB_DEPENDS=	libGraphicsMagick++.so:graphics/GraphicsMagick \
 		libIlmImf.so:graphics/OpenEXR \
-		libopencv_legacy.so:graphics/opencv2 \
+		libopencv_legacy.so:graphics/opencv \
 		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 387a6008adee..9b6621584e40 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=	4
+PORTREVISION=	5
 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 5e999140200f..9fe2b6b045fc 100644
--- a/graphics/gstreamer1-plugins-opencv/Makefile
+++ b/graphics/gstreamer1-plugins-opencv/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	2
 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 a496e504b07a..2e92314ea905 100644
--- a/graphics/kipi-plugin-removeredeyes/Makefile
+++ b/graphics/kipi-plugin-removeredeyes/Makefile
@@ -2,13 +2,13 @@
 
 PORTNAME=	kipi-plugin-${KIPI_PLUGIN}
 PORTVERSION=	${DIGIKAM_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv2
+LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv
 
 KIPI_PLUGIN=	removeredeyes
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/libkface/Makefile b/graphics/libkface/Makefile
index f6cb59b7260f..fb011e420b65 100644
--- a/graphics/libkface/Makefile
+++ b/graphics/libkface/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libkface
 PORTVERSION=	${KDE4_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
@@ -13,7 +13,7 @@ COMMENT=	KDE4 library for face recognition
 LICENSE=	GPLv2+ LGPL20+
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv2
+LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv
 
 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 e51d552da55e..fea42002e970 100644
--- a/graphics/nomacs/Makefile
+++ b/graphics/nomacs/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	nomacs
 PORTVERSION=	2.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 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/opencv2-core
+		libopencv_core.so:graphics/opencv-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/opencv2-core/Makefile b/graphics/opencv-core/Makefile
index 035cd9aaa5df..7ec85eab4d25 100644
--- a/graphics/opencv2-core/Makefile
+++ b/graphics/opencv-core/Makefile
@@ -2,13 +2,13 @@
 # $FreeBSD$
 
 PORTREVISION=	1
-PKGNAMESUFFIX=	2-${OCV_SLAVE}
+PKGNAMESUFFIX=	-${OCV_SLAVE}
 
 COMMENT=	OpenCV core libraries
 
 OCV_SLAVE=	core
 OCV_CORE=	yes
-MASTERDIR=	${.CURDIR:H}/opencv2
+MASTERDIR=	${.CURDIR:H}/opencv
 PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/opencv2-core/pkg-plist b/graphics/opencv-core/pkg-plist
index 71ea81e139b3..71ea81e139b3 100644
--- a/graphics/opencv2-core/pkg-plist
+++ b/graphics/opencv-core/pkg-plist
diff --git a/graphics/opencv2-java/Makefile b/graphics/opencv-java/Makefile
index 09bf862c5f1b..a9f6a19e756a 100644
--- a/graphics/opencv2-java/Makefile
+++ b/graphics/opencv-java/Makefile
@@ -2,13 +2,13 @@
 
 PORTREVISION=	1
 CATEGORIES=	graphics java
-PKGNAMESUFFIX=	2-${OCV_SLAVE}
+PKGNAMESUFFIX=	-${OCV_SLAVE}
 
 COMMENT=	OpenCV Java library
 
 OCV_SLAVE=	java
 OCV_JAVA=	yes
-MASTERDIR=	${.CURDIR:H}/opencv2
+MASTERDIR=	${.CURDIR:H}/opencv
 PLIST=		${.CURDIR}/pkg-plist
 
 PLIST_SUB+=	OCV_VER=${DISTVERSION:R:S|.||g}
diff --git a/graphics/opencv2-java/pkg-plist b/graphics/opencv-java/pkg-plist
index 107f21febc9e..107f21febc9e 100644
--- a/graphics/opencv2-java/pkg-plist
+++ b/graphics/opencv-java/pkg-plist
diff --git a/graphics/opencv2/Makefile b/graphics/opencv/Makefile
index 10d6bf1ca0ef..36541eb3a122 100644
--- a/graphics/opencv2/Makefile
+++ b/graphics/opencv/Makefile
@@ -5,7 +5,6 @@ PORTNAME?=	opencv
 PORTVERSION=	2.4.13.1
 PORTREVISION?=	6
 CATEGORIES=	graphics
-PKGNAMESUFFIX?=	2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Source Computer Vision library
@@ -14,9 +13,6 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
-PORTSCOUT=	limit:^2\.
-
-CONFLICTS_INSTALL=	${PKGBASE:S/${PORTNAME}2/${PORTNAME}/}
 
 USES=		cmake pkgconfig
 USE_LDCONFIG=	yes
@@ -141,7 +137,7 @@ TBB_DESC=		TBB support
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
 . endfor
 .elif defined(OCV_PYTHON)
-LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv2
+LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv
 BUILD_DEPENDS+=	${PYNUMPY}
 RUN_DEPENDS+=	${PYNUMPY}
 USES+=		python:2.7
@@ -152,7 +148,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/opencv2
+LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv
 USES+=		python:build
 USE_JAVA=	yes
 CMAKE_ARGS+=	-DBUILD_opencv_java:BOOL=On
@@ -162,7 +158,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/opencv2-core
+LIB_DEPENDS+=	libopencv_core.so:graphics/opencv-core
 . for module in ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS}
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
 . endfor
diff --git a/graphics/opencv2/distinfo b/graphics/opencv/distinfo
index bdc98110c8db..bdc98110c8db 100644
--- a/graphics/opencv2/distinfo
+++ b/graphics/opencv/distinfo
diff --git a/graphics/opencv2/files/FindOpenCVCore.cmake.in b/graphics/opencv/files/FindOpenCVCore.cmake.in
index ee278d78fcd6..ee278d78fcd6 100644
--- a/graphics/opencv2/files/FindOpenCVCore.cmake.in
+++ b/graphics/opencv/files/FindOpenCVCore.cmake.in
diff --git a/graphics/opencv2/files/patch-cmake__OpenCVCompilerOptions.cmake b/graphics/opencv/files/patch-cmake__OpenCVCompilerOptions.cmake
index b6c66a3ae2ec..b6c66a3ae2ec 100644
--- a/graphics/opencv2/files/patch-cmake__OpenCVCompilerOptions.cmake
+++ b/graphics/opencv/files/patch-cmake__OpenCVCompilerOptions.cmake
diff --git a/graphics/opencv2/files/patch-cmake__OpenCVFindLibsGUI.cmake b/graphics/opencv/files/patch-cmake__OpenCVFindLibsGUI.cmake
index cfe9392d3e21..cfe9392d3e21 100644
--- a/graphics/opencv2/files/patch-cmake__OpenCVFindLibsGUI.cmake
+++ b/graphics/opencv/files/patch-cmake__OpenCVFindLibsGUI.cmake
diff --git a/graphics/opencv2/files/patch-cmake__OpenCVVersion.cmake b/graphics/opencv/files/patch-cmake__OpenCVVersion.cmake
index d77f4b0b5511..d77f4b0b5511 100644
--- a/graphics/opencv2/files/patch-cmake__OpenCVVersion.cmake
+++ b/graphics/opencv/files/patch-cmake__OpenCVVersion.cmake
diff --git a/graphics/opencv2/files/patch-modules__contrib__src__spinimages.cpp b/graphics/opencv/files/patch-modules__contrib__src__spinimages.cpp
index d44b043812a7..d44b043812a7 100644
--- a/graphics/opencv2/files/patch-modules__contrib__src__spinimages.cpp
+++ b/graphics/opencv/files/patch-modules__contrib__src__spinimages.cpp
diff --git a/graphics/opencv2/files/patch-modules__core__src__system.cpp b/graphics/opencv/files/patch-modules__core__src__system.cpp
index 81eff621346d..81eff621346d 100644
--- a/graphics/opencv2/files/patch-modules__core__src__system.cpp
+++ b/graphics/opencv/files/patch-modules__core__src__system.cpp
diff --git a/graphics/opencv2/files/patch-modules__highgui__src__cap_libv4l.cpp b/graphics/opencv/files/patch-modules__highgui__src__cap_libv4l.cpp
index 33a6ec871e13..33a6ec871e13 100644
--- a/graphics/opencv2/files/patch-modules__highgui__src__cap_libv4l.cpp
+++ b/graphics/opencv/files/patch-modules__highgui__src__cap_libv4l.cpp
diff --git a/graphics/opencv2/files/patch-modules__highgui__src__cap_v4l.cpp b/graphics/opencv/files/patch-modules__highgui__src__cap_v4l.cpp
index b8ad1a3fdfa3..b8ad1a3fdfa3 100644
--- a/graphics/opencv2/files/patch-modules__highgui__src__cap_v4l.cpp
+++ b/graphics/opencv/files/patch-modules__highgui__src__cap_v4l.cpp
diff --git a/graphics/opencv2/files/patch-modules__python__src2__cv2.cv.hpp b/graphics/opencv/files/patch-modules__python__src2__cv2.cv.hpp
index 94780cc36351..94780cc36351 100644
--- a/graphics/opencv2/files/patch-modules__python__src2__cv2.cv.hpp
+++ b/graphics/opencv/files/patch-modules__python__src2__cv2.cv.hpp
diff --git a/graphics/opencv2/files/patch-modules__ts__src__ts.cpp b/graphics/opencv/files/patch-modules__ts__src__ts.cpp
index 44151a8a0e3d..44151a8a0e3d 100644
--- a/graphics/opencv2/files/patch-modules__ts__src__ts.cpp
+++ b/graphics/opencv/files/patch-modules__ts__src__ts.cpp
diff --git a/graphics/opencv2/files/patch-samples__cpp__tutorial_code__core__how_to_scan_images__how_to_scan_images.cpp b/graphics/opencv/files/patch-samples__cpp__tutorial_code__core__how_to_scan_images__how_to_scan_images.cpp
index 8c0e72703f52..8c0e72703f52 100644
--- a/graphics/opencv2/files/patch-samples__cpp__tutorial_code__core__how_to_scan_images__how_to_scan_images.cpp
+++ b/graphics/opencv/files/patch-samples__cpp__tutorial_code__core__how_to_scan_images__how_to_scan_images.cpp
diff --git a/graphics/opencv2/pkg-descr b/graphics/opencv/pkg-descr
index 688822e99384..688822e99384 100644
--- a/graphics/opencv2/pkg-descr
+++ b/graphics/opencv/pkg-descr
diff --git a/graphics/opencv2/pkg-plist b/graphics/opencv/pkg-plist
index 2a7e0841340d..2a7e0841340d 100644
--- a/graphics/opencv2/pkg-plist
+++ b/graphics/opencv/pkg-plist
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 2bbd93b35f30..2fea68c6b4c7 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	openimageio
 PORTVERSION=	1.6.12
 DISTVERSIONPREFIX=	Release-
-PORTREVISION=	8
+PORTREVISION=	9
 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/opencv2
+OPENCV_LIB_DEPENDS=	libopencv_highgui.so:graphics/opencv
 
 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 184eab039df3..9f6326c40239 100644
--- a/graphics/p5-Image-ObjectDetect/Makefile
+++ b/graphics/p5-Image-ObjectDetect/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Image-ObjectDetect
 PORTVERSION=	0.12
-PORTREVISION=	3
+PORTREVISION=	4
 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/opencv2
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/opencv.pc:graphics/opencv
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/graphics/php-facedetect/Makefile b/graphics/php-facedetect/Makefile
index 2d038d9e3da4..650bc3428149 100644
--- a/graphics/php-facedetect/Makefile
+++ b/graphics/php-facedetect/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	facedetect
 PORTVERSION=	1.1
-PORTREVISION=	5
+PORTREVISION=	6
 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/opencv2
+LIB_DEPENDS=	libopencv_objdetect.so:graphics/opencv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	infusion
diff --git a/graphics/py-opencv2/Makefile b/graphics/py-opencv/Makefile
index bb59d2478705..a8b1562a09b5 100644
--- a/graphics/py-opencv2/Makefile
+++ b/graphics/py-opencv/Makefile
@@ -9,7 +9,7 @@ COMMENT=	OpenCV Python library
 
 OCV_SLAVE=	python
 OCV_PYTHON=	yes
-MASTERDIR=	${.CURDIR:H}/opencv2
+MASTERDIR=	${.CURDIR:H}/opencv
 PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/py-opencv2/pkg-plist b/graphics/py-opencv/pkg-plist
index cc41f22ca9c3..cc41f22ca9c3 100644
--- a/graphics/py-opencv2/pkg-plist
+++ b/graphics/py-opencv/pkg-plist
diff --git a/graphics/rubygem-objectdetect/Makefile b/graphics/rubygem-objectdetect/Makefile
index 3ccae76ea8c7..4fe2d3038aff 100644
--- a/graphics/rubygem-objectdetect/Makefile
+++ b/graphics/rubygem-objectdetect/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	objectdetect
 PORTVERSION=	0.0.3
-PORTREVISION=	8
+PORTREVISION=	9
 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/opencv2
+LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv
 
 USE_RUBY=	yes
 USES=		gem pkgconfig
diff --git a/graphics/waifu2x-converter-cpp/Makefile b/graphics/waifu2x-converter-cpp/Makefile
index c7b30a8b0310..28d598159c1f 100644
--- a/graphics/waifu2x-converter-cpp/Makefile
+++ b/graphics/waifu2x-converter-cpp/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	waifu2x-converter-cpp
 DISTVERSION=	1.0.0-410
 DISTVERSIONSUFFIX=	-g5e5ac35
-PORTREVISION=	2
+PORTREVISION=	3
 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
@@ -18,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/opencv2 \
-		libopencv_imgproc.so:graphics/opencv2-core
+LIB_DEPENDS=	libopencv_highgui.so:graphics/opencv \
+		libopencv_imgproc.so:graphics/opencv-core
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tanakamura