Update OpenCV to 2.3.0-rc

24 files changed, 400 insertions, 164 deletions

diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 2c84c50d87a3..c83c3d9313dc 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cimg
 PORTVERSION=	1.4.8
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	graphics devel
 MASTER_SITES=	SF/${PORTNAME}		\
@@ -48,7 +49,7 @@ USE_FORTRAN=	yes
 LIB_DEPENDS+=	png:${PORTSDIR}/graphics/png		\
 		jpeg:${PORTSDIR}/graphics/jpeg		\
 		tiff:${PORTSDIR}/graphics/tiff		\
-		cv:${PORTSDIR}/graphics/opencv		\
+		opencv_legacy.2:${PORTSDIR}/graphics/opencv		\
 		IlmImf:${PORTSDIR}/graphics/OpenEXR	\
 		gimp-2.0:${PORTSDIR}/graphics/gimp-app	\
 		fftw3:${PORTSDIR}/math/fftw3		\
diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile
index 9137bf95ae5d..102688bbe0c2 100644
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmic
 PORTVERSION=	1.4.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/${PORTNAME}/old
@@ -22,7 +22,7 @@ LIB_DEPENDS=	GraphicsMagick++.6:${PORTSDIR}/graphics/GraphicsMagick13 \
 		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
 		Magick++.4:${PORTSDIR}/graphics/ImageMagick \
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
-		cv.2:${PORTSDIR}/graphics/opencv \
+		opencv_legacy.2:${PORTSDIR}/graphics/opencv \
 		fftw3.5:${PORTSDIR}/math/fftw3 \
 		gimp-2.0:${PORTSDIR}/graphics/gimp-app
 
@@ -56,7 +56,11 @@ PLIST_SUB+=	BASH="@comment "
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's/-lcv/-lopencv_legacy/g' \
+		-e 's/-lhighgui/-lopencv_legacy/g' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's#/usr/X11R6#${PREFIX}#g' \
+		-e 's/-lcv -lhighgui/-lopencv_legacy/g' \
 		${WRKSRC}/src/Makefile
 
 do-install:
diff --git a/graphics/gstreamer-plugins-opencv/Makefile b/graphics/gstreamer-plugins-opencv/Makefile
index 89d31d466806..0b3319b9f217 100644
--- a/graphics/gstreamer-plugins-opencv/Makefile
+++ b/graphics/gstreamer-plugins-opencv/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer opencv real time computer vision plugin
diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile
index 514bfb076f50..f4745871ec82 100644
--- a/graphics/kipi-plugins-kde4/Makefile
+++ b/graphics/kipi-plugins-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kipi-plugins
 PORTVERSION=	1.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	SF/kipi/${PORTNAME}/${PORTVERSION}
@@ -50,7 +50,7 @@ PLIST_SUB+=	GPOD="@comment "
 .endif
 
 .if defined(WITH_OPENCV)
-LIB_DEPENDS+=	cv.2:${PORTSDIR}/graphics/opencv
+LIB_DEPENDS+=	opencv_legacy.2:${PORTSDIR}/graphics/opencv
 PLIST_SUB+=	OPENCV=""
 .else
 CMAKE_ARGS+=	-DWITH_OpenCV:BOOL=OFF
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index c5c0d05efcaa..979098916b98 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -5,14 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	opencv
-PORTVERSION=	2.1.0
-PORTREVISION=	2
+PORTNAME?=	opencv
+DISTVERSION=	2.3.0rc
 CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION:R}
-DISTNAME=	OpenCV-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}library/${PORTNAME}-unix/${DISTVERSION:R}
+DISTNAME=	OpenCV-${DISTVERSION}
 
-MAINTAINER=	avilla@FreeBSD.org
+MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Open Source Computer Vision library from Intel
 
 LICENSE=	BSD
@@ -25,35 +24,45 @@ USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_LDCONFIG=	yes
 
+WRKSRC=		${WRKDIR}/OpenCV-${DISTVERSION:S/rc//}
+
 NOT_FOR_ARCHS=	sparc64
 NOT_FOR_ARCHS_REASON_sparc64=	does not compile on sparc64
 
-PORTDOCS=	CMakeLists.txt ChangeLog.htm README.txt \
-		haartraining.htm index.htm license.txt \
-		opencv-logo.png opencv-logo2.png opencv.jpg \
-		opencv.pdf packaging.txt papers pattern.pdf vidsurv
+.if !defined(BUILDING_OPENCV_CORE)
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-opencv
+LIB_DEPENDS+=	opencv_core.2:${PORTSDIR}/graphics/opencv-core
+CMAKE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
-PORTEXAMPLES=	c
+PORTDOCS=	*
 
-OPTIONS=	FFMPEG	"Include FFmpeg support" off \
+OPTIONS=	EIGEN2	"Include Eigen 2 support" on \
+		FFMPEG	"Include FFmpeg support" off \
 		GSTREAMER	"Include Gstreamer support" off \
 		GTK	"Include GTK+ support" off \
 		JASPER	"Include JPEG 2000 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 \
 		V4L	"Include Video4Linux support" on \
 		XINE	"Include XINE support" off
 
-# Cannot be built with CMake yet.
-#OCTAVE	"Build with Octave support" off \
-
 .include <bsd.port.options.mk>
 
 .ifndef(NOPORTEXAMPLES)
-CMAKE_ARGS+=	-DBUILD_EXAMPLES:BOOL=On -DINSTALL_C_EXAMPLES:BOOL=On
+CMAKE_ARGS+=	-DBUILD_EXAMPLES:lBOOL=On -DINSTALL_C_EXAMPLES:BOOL=On
+PORTEXAMPLES+=	c
+.endif
+
+.ifndef(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)
@@ -91,18 +100,12 @@ CMAKE_ARGS+=	-DWITH_JPEG:BOOL=On
 CMAKE_ARGS+=	-DWITH_JPEG:BOOL=Off
 .endif
 
-#.ifdef(WITH_OCTAVE)
-#.include "${PORTSDIR}/Mk/bsd.octave.mk"
-#CMAKE_ARGS+=	-DBUILD_OCTAVE_SUPPORT:BOOL=On
-#.ifndef(NOPORTEXAMPLES)
-#CMAKE_ARGS+=	-DINSTALL_OCTAVE_EXAMPLES:BOOL=On
-#PORTEXAMPLES+=	octave
-#.endif
-#PLIST_SUB+=	OCTAVE=""
-#.else
-#CMAKE_ARGS+=	-DBUILD_OCTAVE_SUPPORT:BOOL=Off
-#PLIST_SUB+=	OCTAVE="@comment "
-#.endif
+.ifdef(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)
 LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
@@ -126,6 +129,14 @@ CMAKE_ARGS+=	-DBUILD_NEW_PYTHON_SUPPORT:BOOL=Off
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
+.ifdef(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
+.else
+CMAKE_ARGS+=	-DWITH_QT:BOOL=Off
+.endif
+
 .ifdef(WITH_TBB)
 LIB_DEPENDS+=	tbb.3:${PORTSDIR}/devel/tbb
 CMAKE_ARGS+=	-DWITH_TBB:BOOL=On \
@@ -160,6 +171,35 @@ CMAKE_ARGS+=	-DWITH_XINE:BOOL=On
 CMAKE_ARGS+=	-DWITH_XINE:BOOL=Off
 .endif
 
+.else # !defined(BUILDING_OPENCV_CORE)
+COMMENT=	OpenCV core libraries
+PLIST=		${PKGDIR}/pkg-plist.core
+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 \
+		-DDWITH_EIGEN2:BOOL=Off \
+		-DWITH_FFMPEG:BOOL=Off \
+		-DWITH_GSTREAMER:BOOL=Off \
+		-DWITH_GTK:BOOL=Off \
+		-DWITH_JASPER: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 \
+		-DWITH_TIFF:BOOL=Off \
+		-DWITH_XINE:BOOL=Off \
+		-DWITH_PVAPI:BOOL=Off \
+		-DWITH_1394:BOOL=Off \
+		-DWITH_CUDA:BOOL=Off
+.endif # !defined(BUILDING_OPENCV_CORE)
+
 .include <bsd.port.pre.mk>
 
 # This whole block looks a bit hackish, but it works...
@@ -179,16 +219,30 @@ CMAKE_SOURCE_PATH=	-DCMAKE_C_FLAGS:STRING="${CFLAGS:C/-Wl[^ ]*//g}" \
 			${WRKSRC}
 .endif
 
-pre-configure:
+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' \
 		${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e 's:${PORTNAME}/samples:examples/${PORTNAME}:g' \
+	@${REINPLACE_CMD} -e 's|${PORTNAME}/samples|examples/${PORTNAME}|g' \
 		${WRKSRC}/samples/*/CMakeLists.txt
-.ifdef(NOPORTDOCS)
+.if defined(BUILDING_OPENCV_CORE)
+	@${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' \
+		${WRKSRC}/CMakeLists.txt
+	@${SED} -E -e \
+		's|Name:.*|Name: OpenCV-core|' -e \
+		's|Libs:.*|Libs: -L$${libdir} -lopencv_core@OPENCV_DLLVERSION@ -lopencv_imgproc@OPENCV_DLLVERSION@ -lopencv_video@OPENCV_DLLVERSION@ -lopencv_flann@OPENCV_DLLVERSION@|' \
+		${WRKSRC}/opencv.pc.cmake.in > ${WRKSRC}/opencv-core.pc.cmake.in
+	@${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
+.endif
+.if defined(NOPORTDOCS) || defined(BUILDING_OPENCV_CORE)
 	@${REINPLACE_CMD} -e '/add_subdirectory(doc)/ d' \
 		${WRKSRC}/CMakeLists.txt
 .endif
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index 4f4e66efb5f2..54069954e9d8 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,3 +1,2 @@
-MD5 (OpenCV-2.1.0.tar.bz2) = 1d71584fb4e04214c0085108f95e24c8
-SHA256 (OpenCV-2.1.0.tar.bz2) = 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
-SIZE (OpenCV-2.1.0.tar.bz2) = 14459566
+SHA256 (OpenCV-2.3.0rc.tar.bz2) = 2911e48379e073f95f6716c34692d2017b3a8e17e773100d626905056cb7c5b5
+SIZE (OpenCV-2.3.0rc.tar.bz2) = 40489828
diff --git a/graphics/opencv/files/extra-patch-opencv b/graphics/opencv/files/extra-patch-opencv
new file mode 100644
index 000000000000..714e3f1bc2db
--- /dev/null
+++ b/graphics/opencv/files/extra-patch-opencv
@@ -0,0 +1,38 @@
+--- modules/CMakeLists.txt.orig	2011-06-27 13:43:54.557252854 +0200
++++ modules/CMakeLists.txt	2011-06-27 13:44:14.656997882 +0200
+@@ -8,29 +8,29 @@
+ endif()
+ 
+ add_subdirectory(calib3d)
+-add_subdirectory(core)
++#add_subdirectory(core)
+ add_subdirectory(features2d)
+-add_subdirectory(flann)
++#add_subdirectory(flann)
+ 
+ if(MSVC OR MINGW)
+   add_subdirectory(ffmpeg)
+ endif()
+ 
+ if(BUILD_TESTS)
+-  add_subdirectory(ts)
++#  add_subdirectory(ts)
+ endif()
+ add_subdirectory(highgui)
+-add_subdirectory(imgproc)
++#add_subdirectory(imgproc)
+ add_subdirectory(legacy)
+ add_subdirectory(contrib)
+-add_subdirectory(ml)
++#add_subdirectory(ml)
+ add_subdirectory(objdetect)
+ 
+ if(PYTHONLIBS_FOUND AND BUILD_NEW_PYTHON_SUPPORT)
+   add_subdirectory(python)
+ endif()
+ 
+-add_subdirectory(video)
++#add_subdirectory(video)
+ add_subdirectory(traincascade)
+ add_subdirectory(haartraining)
+ 
diff --git a/graphics/opencv/files/extra-patch-opencv-core b/graphics/opencv/files/extra-patch-opencv-core
new file mode 100644
index 000000000000..639e1c4949b6
--- /dev/null
+++ b/graphics/opencv/files/extra-patch-opencv-core
@@ -0,0 +1,50 @@
+--- modules/CMakeLists.txt.orig	2011-06-21 15:24:05.000000000 +0200
++++ modules/CMakeLists.txt	2011-06-27 13:29:25.803871762 +0200
+@@ -7,34 +7,34 @@
+   add_subdirectory(androidcamera)
+ endif()
+ 
+-add_subdirectory(calib3d)
++#add_subdirectory(calib3d)
+ add_subdirectory(core)
+-add_subdirectory(features2d)
++#add_subdirectory(features2d)
+ add_subdirectory(flann)
+ 
+ if(MSVC OR MINGW)
+   add_subdirectory(ffmpeg)
+ endif()
+ 
+-if(BUILD_TESTS)
++#if(BUILD_TESTS)
+   add_subdirectory(ts)
+-endif()
+-add_subdirectory(highgui)
++#endif()
++#add_subdirectory(highgui)
+ add_subdirectory(imgproc)
+-add_subdirectory(legacy)
+-add_subdirectory(contrib)
++#add_subdirectory(legacy)
++#add_subdirectory(contrib)
+ add_subdirectory(ml)
+-add_subdirectory(objdetect)
++#add_subdirectory(objdetect)
+ 
+ if(PYTHONLIBS_FOUND AND BUILD_NEW_PYTHON_SUPPORT)
+-  add_subdirectory(python)
++#  add_subdirectory(python)
+ endif()
+ 
+ add_subdirectory(video)
+-add_subdirectory(traincascade)
+-add_subdirectory(haartraining)
++#add_subdirectory(traincascade)
++#add_subdirectory(haartraining)
+ 
+ if(NOT ANDROID)
+-  add_subdirectory(gpu)
+-  add_subdirectory(stitching)
++#  add_subdirectory(gpu)
++#  add_subdirectory(stitching)
+ endif()
diff --git a/graphics/opencv/files/patch-apps-traincascade-imagestorage.h b/graphics/opencv/files/patch-apps-traincascade-imagestorage.h
deleted file mode 100644
index c4c90572949d..000000000000
--- a/graphics/opencv/files/patch-apps-traincascade-imagestorage.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- apps/traincascade/imagestorage.h~
-+++ apps/traincascade/imagestorage.h
-@@ -1,6 +1,7 @@
- #ifndef _OPENCV_IMAGESTORAGE_H_
- #define _OPENCV_IMAGESTORAGE_H_
- 
-+#include <cstdio>
- #include <highgui.h>
- 
- using namespace cv;
diff --git a/graphics/opencv/files/patch-src-highgui-cvcap_ffmpeg.cpp b/graphics/opencv/files/patch-modules-highgui-src-cap_ffmpeg.c
index e2634aa7d441..98f15cd2998c 100644
--- a/graphics/opencv/files/patch-src-highgui-cvcap_ffmpeg.cpp
+++ b/graphics/opencv/files/patch-modules-highgui-src-cap_ffmpeg.c
@@ -1,7 +1,7 @@
---- src/highgui/cvcap_ffmpeg.cpp.orig	2009-11-25 03:11:36.744288703 +0000
-+++ src/highgui/cvcap_ffmpeg.cpp	2009-11-25 03:13:37.172158178 +0000
-@@ -52,7 +52,8 @@
- #define INT64_C
+--- modules/highgui/src/cap_ffmpeg.cpp.orig	2011-06-21 15:24:06.000000000 +0200
++++ modules/highgui/src/cap_ffmpeg.cpp	2011-06-27 08:36:37.096041264 +0200
+@@ -53,7 +53,8 @@
+ #define UINT64_C
  #define __STDC_CONSTANT_MACROS
  // force re-inclusion of stdint.h to get INT64_C macro
 -#undef _STDINT_H
diff --git a/graphics/opencv/files/patch-modules-highgui-src-cap_libv4l.cpp b/graphics/opencv/files/patch-modules-highgui-src-cap_libv4l.cpp
new file mode 100644
index 000000000000..95ebcaa7deaf
--- /dev/null
+++ b/graphics/opencv/files/patch-modules-highgui-src-cap_libv4l.cpp
@@ -0,0 +1,19 @@
+--- modules/highgui/src/cap_libv4l.cpp.orig	2011-06-21 15:24:06.000000000 +0200
++++ modules/highgui/src/cap_libv4l.cpp	2011-06-27 08:39:17.750223439 +0200
+@@ -236,7 +236,6 @@
+ #include <sys/mman.h>
+ #include <string.h>
+ #include <stdlib.h>
+-#include <asm/types.h>          /* for videodev2.h */
+ #include <assert.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+@@ -568,7 +567,7 @@
+ 
+ static void v4l2_scan_controls(CvCaptureCAM_V4L* capture) {
+ 
+-  __u32 ctrl_id;
++  uint32_t ctrl_id;
+   struct v4l2_control c;
+   if (capture->v4l2_ctrl_ranges != NULL) {
+     v4l2_free_ranges(capture);
diff --git a/graphics/opencv/files/patch-src-highgui-cvcap_v4l.cpp b/graphics/opencv/files/patch-modules-highgui-src-cap_v4l.cpp
index f2ba12401e74..b70a409b23b0 100644
--- a/graphics/opencv/files/patch-src-highgui-cvcap_v4l.cpp
+++ b/graphics/opencv/files/patch-modules-highgui-src-cap_v4l.cpp
@@ -1,5 +1,5 @@
---- src/highgui/cvcap_v4l.cpp.orig	2009-11-25 03:13:51.305028046 +0000
-+++ src/highgui/cvcap_v4l.cpp	2009-11-25 03:15:01.637453337 +0000
+--- modules/highgui/src/cap_v4l.cpp.orig	2011-06-21 15:24:06.000000000 +0200
++++ modules/highgui/src/cap_v4l.cpp	2011-06-27 08:38:16.221682985 +0200
 @@ -218,7 +218,6 @@
  
  #include <string.h>
@@ -8,13 +8,13 @@
  #include <assert.h>
  #include <sys/stat.h>
  #include <sys/ioctl.h>
-@@ -646,8 +646,7 @@
-
+@@ -649,8 +648,7 @@
+ 
  static void v4l2_scan_controls(CvCaptureCAM_V4L* capture)
  {
 -
 -  __u32 ctrl_id;
 +   uint32_t ctrl_id;
-
+ 
    for (ctrl_id = V4L2_CID_BASE;
         ctrl_id < V4L2_CID_LASTP1;
diff --git a/graphics/opencv/files/patch-modules-traincascade-imagestorage.h b/graphics/opencv/files/patch-modules-traincascade-imagestorage.h
new file mode 100644
index 000000000000..405e3dc3c6ca
--- /dev/null
+++ b/graphics/opencv/files/patch-modules-traincascade-imagestorage.h
@@ -0,0 +1,10 @@
+--- modules/traincascade/imagestorage.h.orig	2011-06-27 08:30:19.212006174 +0200
++++ modules/traincascade/imagestorage.h	2011-06-27 08:30:50.325671316 +0200
+@@ -1,6 +1,7 @@
+ #ifndef _OPENCV_IMAGESTORAGE_H_
+ #define _OPENCV_IMAGESTORAGE_H_
+ 
++#include <cstdio>
+ #include "highgui.h"
+ 
+ using namespace cv;
diff --git a/graphics/opencv/files/patch-samples-c-image.cpp b/graphics/opencv/files/patch-samples-c-image.cpp
deleted file mode 100644
index c6d8d4642e37..000000000000
--- a/graphics/opencv/files/patch-samples-c-image.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
---- samples/c/image.cpp~
-+++ samples/c/image.cpp
-@@ -1,3 +1,4 @@
-+#include <cstdio>
- #include "cv.h" // include standard OpenCV headers, same as before
- #include "highgui.h"
- 
diff --git a/graphics/opencv/files/patch-samples-cpp-image.cpp b/graphics/opencv/files/patch-samples-cpp-image.cpp
new file mode 100644
index 000000000000..bb12d1310d30
--- /dev/null
+++ b/graphics/opencv/files/patch-samples-cpp-image.cpp
@@ -0,0 +1,7 @@
+--- samples/cpp/image.cpp.orig	2011-06-21 15:24:12.000000000 +0200
++++ samples/cpp/image.cpp	2011-06-27 08:32:11.174032625 +0200
+@@ -1,3 +1,4 @@
++#include <cstdio>
+ #include "cv.h" // include standard OpenCV headers, same as before
+ #include "highgui.h"
+ #include "ml.h"
diff --git a/graphics/opencv/files/patch-src-highgui-cvcap_libv4l.cpp b/graphics/opencv/files/patch-src-highgui-cvcap_libv4l.cpp
deleted file mode 100644
index 7f55f7a1eeeb..000000000000
--- a/graphics/opencv/files/patch-src-highgui-cvcap_libv4l.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/highgui/cvcap_libv4l.cpp.orig	2009-10-01 11:20:58.000000000 +1100
-+++ src/highgui/cvcap_libv4l.cpp	2010-04-15 22:27:16.647412519 +1100
-@@ -214,7 +214,6 @@
- #include <sys/mman.h>
- #include <string.h>
- #include <stdlib.h>
--#include <asm/types.h>          /* for videodev2.h */
- #include <assert.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-@@ -466,8 +465,7 @@
- 
- static void v4l2_scan_controls(CvCaptureCAM_V4L* capture)
- {
--
--  __u32 ctrl_id;
-+  uint32_t ctrl_id;
- 
-   for (ctrl_id = V4L2_CID_BASE;
-        ctrl_id < V4L2_CID_LASTP1;
diff --git a/graphics/opencv/files/patch-src-highgui-grfmt_png.cpp b/graphics/opencv/files/patch-src-highgui-grfmt_png.cpp
deleted file mode 100644
index c0d79d218fbc..000000000000
--- a/graphics/opencv/files/patch-src-highgui-grfmt_png.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/highgui/grfmt_png.cpp.orig     2009-10-01 03:20:58.000000000 +0300
-+++ src/highgui/grfmt_png.cpp  2010-03-29 19:24:40.000000000 +0300
-@@ -138,7 +138,8 @@
-
-         if( info_ptr && end_info )
-         {
--            if( setjmp( png_ptr->jmpbuf ) == 0 )
-+
-+  if ( (setjmp(png_jmpbuf(png_ptr))) == 0 )
-             {
-                 if( !m_buf.empty() )
-                     png_set_read_fn(png_ptr, this, (png_rw_ptr)readDataFromBuf );
-@@ -200,7 +201,7 @@
-         png_infop info_ptr = (png_infop)m_info_ptr;
-         png_infop end_info = (png_infop)m_end_info;
-
--        if( setjmp(png_ptr->jmpbuf) == 0 )
-+if ( (setjmp(png_jmpbuf(png_ptr))) == 0 )
-         {
-             int y;
-
-@@ -223,7 +224,7 @@
-                 png_set_palette_to_rgb( png_ptr );
-
-             if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 )
--                png_set_gray_1_2_4_to_8( png_ptr );
-+                 png_set_expand_gray_1_2_4_to_8( png_ptr );
-
-             if( CV_MAT_CN(m_type) > 1 && color )
-                 png_set_bgr( png_ptr ); // convert RGB to BGR
-@@ -322,7 +323,8 @@
-
-         if( info_ptr )
-         {
--            if( setjmp( png_ptr->jmpbuf ) == 0 )
-+
-+if ( (setjmp(png_jmpbuf(png_ptr))) == 0 )
-             {
-                 if( m_buf )
-                 {
diff --git a/graphics/opencv/pkg-plist b/graphics/opencv/pkg-plist
index ad1751da68ca..b1c7343a82b1 100644
--- a/graphics/opencv/pkg-plist
+++ b/graphics/opencv/pkg-plist
@@ -1,45 +1,59 @@
 bin/opencv_createsamples
 bin/opencv_haartraining
 bin/opencv_performance
+bin/opencv_stitching
 bin/opencv_traincascade
 include/opencv/cv.h
 include/opencv/cv.hpp
 include/opencv/cvaux.h
 include/opencv/cvaux.hpp
-include/opencv/cvcompat.h
-include/opencv/cvinternal.h
-include/opencv/cvtypes.h
-include/opencv/cvver.h
-include/opencv/cvvidsurv.hpp
 include/opencv/cvwimage.h
 include/opencv/cxcore.h
 include/opencv/cxcore.hpp
-include/opencv/cxerror.h
-include/opencv/cxflann.h
-include/opencv/cxmat.hpp
+include/opencv/cxeigen.hpp
 include/opencv/cxmisc.h
-include/opencv/cxoperations.hpp
-include/opencv/cxtypes.h
 include/opencv/highgui.h
-include/opencv/highgui.hpp
 include/opencv/ml.h
-lib/libcv.so
-lib/libcv.so.2
-lib/libcv.so.2.1.0
-lib/libcvaux.so
-lib/libcvaux.so.2
-lib/libcvaux.so.2.1.0
-lib/libcxcore.so
-lib/libcxcore.so.2
-lib/libcxcore.so.2.1.0
-lib/libhighgui.so
-lib/libhighgui.so.2
-lib/libhighgui.so.2.1.0
-lib/libml.so
-lib/libml.so.2
-lib/libml.so.2.1.0
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv.so
+include/opencv2/calib3d/calib3d.hpp
+include/opencv2/contrib/contrib.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/matrix_operations.hpp
+include/opencv2/gpu/stream_accessor.hpp
+include/opencv2/highgui/highgui.hpp
+include/opencv2/highgui/highgui_c.h
+include/opencv2/legacy/blobtrack.hpp
+include/opencv2/legacy/compat.hpp
+include/opencv2/legacy/legacy.hpp
+include/opencv2/legacy/streams.hpp
+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_contrib.so
+lib/libopencv_contrib.so.2
+lib/libopencv_contrib.so.2.3.0
+lib/libopencv_features2d.so
+lib/libopencv_features2d.so.2
+lib/libopencv_features2d.so.2.3.0
+lib/libopencv_gpu.so
+lib/libopencv_gpu.so.2
+lib/libopencv_gpu.so.2.3.0
+lib/libopencv_highgui.so
+lib/libopencv_highgui.so.2
+lib/libopencv_highgui.so.2.3.0
+lib/libopencv_legacy.so
+lib/libopencv_legacy.so.2
+lib/libopencv_legacy.so.2.3.0
+lib/libopencv_objdetect.so
+lib/libopencv_objdetect.so.2
+lib/libopencv_objdetect.so.2.3.0
 libdata/pkgconfig/opencv.pc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv.so
 %%DATADIR%%/OpenCVConfig.cmake
 %%DATADIR%%/haarcascades/haarcascade_eye.xml
 %%DATADIR%%/haarcascades/haarcascade_eye_tree_eyeglasses.xml
@@ -63,6 +77,13 @@ libdata/pkgconfig/opencv.pc
 %%DATADIR%%/lbpcascades/lbpcascade_frontalface.xml
 @dirrm %%DATADIR%%/lbpcascades
 @dirrm %%DATADIR%%/haarcascades
-@dirrm %%DATADIR%%
 %%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrm include/opencv2/video
+@dirrm include/opencv2/objdetect
+@dirrm include/opencv2/legacy
+@dirrm include/opencv2/highgui
+@dirrm include/opencv2/gpu
+@dirrm include/opencv2/features2d
+@dirrm include/opencv2/contrib
+@dirrm include/opencv2/calib3d
 @dirrm include/opencv
diff --git a/graphics/opencv/pkg-plist.core b/graphics/opencv/pkg-plist.core
new file mode 100644
index 000000000000..ce6f2830ddfc
--- /dev/null
+++ b/graphics/opencv/pkg-plist.core
@@ -0,0 +1,70 @@
+include/opencv2/core/core.hpp
+include/opencv2/core/core_c.h
+include/opencv2/core/eigen.hpp
+include/opencv2/core/internal.hpp
+include/opencv2/core/mat.hpp
+include/opencv2/core/operations.hpp
+include/opencv2/core/types_c.h
+include/opencv2/core/version.hpp
+include/opencv2/core/wimage.hpp
+include/opencv2/flann/all_indices.h
+include/opencv2/flann/allocator.h
+include/opencv2/flann/autotuned_index.h
+include/opencv2/flann/composite_index.h
+include/opencv2/flann/dist.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/index_testing.h
+include/opencv2/flann/kdtree_index.h
+include/opencv2/flann/kmeans_index.h
+include/opencv2/flann/linear_index.h
+include/opencv2/flann/logger.h
+include/opencv2/flann/matrix.h
+include/opencv2/flann/nn_index.h
+include/opencv2/flann/object_factory.h
+include/opencv2/flann/random.h
+include/opencv2/flann/result_set.h
+include/opencv2/flann/sampling.h
+include/opencv2/flann/saving.h
+include/opencv2/flann/simplex_downhill.h
+include/opencv2/flann/timer.h
+include/opencv2/imgproc/imgproc.hpp
+include/opencv2/imgproc/imgproc_c.h
+include/opencv2/imgproc/types_c.h
+include/opencv2/ml/ml.hpp
+include/opencv2/ts/ts.hpp
+include/opencv2/ts/ts_gtest.h
+include/opencv2/video/background_segm.hpp
+include/opencv2/video/tracking.hpp
+lib/libopencv_core.so
+lib/libopencv_core.so.2
+lib/libopencv_core.so.2.3.0
+lib/libopencv_flann.so
+lib/libopencv_flann.so.2
+lib/libopencv_flann.so.2.3.0
+lib/libopencv_imgproc.so
+lib/libopencv_imgproc.so.2
+lib/libopencv_imgproc.so.2.3.0
+lib/libopencv_ml.so
+lib/libopencv_ml.so.2
+lib/libopencv_ml.so.2.3.0
+lib/libopencv_ts.so
+lib/libopencv_ts.so.2
+lib/libopencv_ts.so.2.3.0
+lib/libopencv_video.so
+lib/libopencv_video.so.2
+lib/libopencv_video.so.2.3.0
+libdata/pkgconfig/opencv-core.pc
+%%DATADIR%%/OpenCVConfig-core.cmake
+@dirrm %%DATADIR%%
+@dirrm include/opencv2/video
+@dirrm include/opencv2/ts
+@dirrm include/opencv2/ml
+@dirrm include/opencv2/imgproc
+@dirrm include/opencv2/flann
+@dirrm include/opencv2/core
+@dirrm include/opencv2
diff --git a/graphics/php-facedetect/Makefile b/graphics/php-facedetect/Makefile
index cbd78d3ecc6a..ffd8ee396467 100644
--- a/graphics/php-facedetect/Makefile
+++ b/graphics/php-facedetect/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	facedetect
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.xarg.org/download/
 PKGNAMEPREFIX=	php-
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	php-
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Face detection extension for PHP using OpenCV library
 
-LIB_DEPENDS=	cv.2:${PORTSDIR}/graphics/opencv
+LIB_DEPENDS=	opencv_legacy.2:${PORTSDIR}/graphics/opencv
 
 LICENSE=	PHP30
 
@@ -37,7 +37,4 @@ CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
 USE_GCC=	4.2+
 .endif
 
-post-patch:
-	@${TOUCH} ${WRKSRC}/cvconfig.h
-
 .include <bsd.port.post.mk>
diff --git a/graphics/php-facedetect/files/patch-config.m4 b/graphics/php-facedetect/files/patch-config.m4
new file mode 100644
index 000000000000..9ef19afebcc5
--- /dev/null
+++ b/graphics/php-facedetect/files/patch-config.m4
@@ -0,0 +1,21 @@
+--- config.m4.orig	2011-06-28 15:05:08.566341757 +0200
++++ config.m4	2011-06-28 15:06:08.526112463 +0200
+@@ -25,15 +25,12 @@
+   PHP_ADD_INCLUDE($FACEDETECT_DIR/include)
+ 
+   AC_CHECK_HEADER([$FACEDETECT_DIR/include/opencv/cv.h], [], AC_MSG_ERROR('opencv/cv.h' header not found))
+-  AC_CHECK_HEADER([$FACEDETECT_DIR/include/opencv/cvver.h], [], AC_MSG_ERROR('opencv/cvver.h' header not found))
++  AC_CHECK_HEADER([$FACEDETECT_DIR/include/opencv2/core/version.hpp], [], AC_MSG_ERROR('opencv2/core/version.hpp' header not found))
+   AC_CHECK_HEADER([$FACEDETECT_DIR/include/opencv/highgui.h], [], AC_MSG_ERROR('opencv/highgui.h' header not found))
+ 
+-  PHP_CHECK_LIBRARY(cv, cvLoad,
++  PHP_CHECK_LIBRARY(opencv_legacy, cvLoad,
+   [
+-    PHP_ADD_LIBRARY_WITH_PATH(cv, $FACEDETECT_DIR/lib, FACEDETECT_SHARED_LIBADD)
+-    PHP_ADD_LIBRARY_WITH_PATH(cvaux, $FACEDETECT_DIR/lib, FACEDETECT_SHARED_LIBADD)
+-    PHP_ADD_LIBRARY_WITH_PATH(highgui, $FACEDETECT_DIR/lib, FACEDETECT_SHARED_LIBADD)
+-    PHP_ADD_LIBRARY_WITH_PATH(cxcore, $FACEDETECT_DIR/lib, FACEDETECT_SHARED_LIBADD)
++    PHP_ADD_LIBRARY_WITH_PATH(opencv_legacy, $FACEDETECT_DIR/lib, FACEDETECT_SHARED_LIBADD)
+     AC_DEFINE(HAVE_FACEDETECT, 1, [ ])
+   ],[
+     AC_MSG_ERROR([wrong OpenCV version or OpenCV not found])
diff --git a/graphics/php-facedetect/files/patch-facedetect.c b/graphics/php-facedetect/files/patch-facedetect.c
new file mode 100644
index 000000000000..fc83012c89db
--- /dev/null
+++ b/graphics/php-facedetect/files/patch-facedetect.c
@@ -0,0 +1,20 @@
+--- facedetect.c.orig	2010-03-15 01:07:12.000000000 +0100
++++ facedetect.c	2011-06-28 15:08:27.134914621 +0200
+@@ -21,7 +21,7 @@
+ #include "php_facedetect.h"
+ 
+ #include <opencv/cv.h>
+-#include <opencv/cvver.h>
++#include <opencv2/core/version.hpp>
+ #include <opencv/highgui.h>
+ 
+ /* {{{ facedetect_functions[]
+@@ -104,7 +104,7 @@
+ 
+ 	storage = cvCreateMemStorage(0);
+ 
+-	faces = cvHaarDetectObjects(gray, cascade, storage, 1.1, 2, CV_HAAR_DO_CANNY_PRUNING, cvSize(0, 0));
++	faces = cvHaarDetectObjects(gray, cascade, storage, 1.1, 2, CV_HAAR_DO_CANNY_PRUNING, cvSize(0, 0), cvSize(0, 0));
+ 
+ 	if(return_type) {
+ 
diff --git a/graphics/rubygem-objectdetect/Makefile b/graphics/rubygem-objectdetect/Makefile
index 011dea3ddc6a..09da39529e8e 100644
--- a/graphics/rubygem-objectdetect/Makefile
+++ b/graphics/rubygem-objectdetect/Makefile
@@ -7,14 +7,16 @@
 
 PORTNAME=	objectdetect
 PORTVERSION=	0.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics rubygems
-MASTER_SITES=	RG
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	mm
+DISTFILES=	${PORTNAME}-${PORTVERSION}-opencv23.gem
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	A simple library for detecting objects in pictures
 
-LIB_DEPENDS=	cv.2:${PORTSDIR}/graphics/opencv
+LIB_DEPENDS=	opencv_legacy.2:${PORTSDIR}/graphics/opencv
 
 LICENSE=	MIT
 
diff --git a/graphics/rubygem-objectdetect/distinfo b/graphics/rubygem-objectdetect/distinfo
index c94c8a7a068c..1b6a01b1b590 100644
--- a/graphics/rubygem-objectdetect/distinfo
+++ b/graphics/rubygem-objectdetect/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/objectdetect-0.0.3.gem) = f3ad7dc88e7b7c57c1d2686f197e9615d8d495e32ff12fbd2f44e4d348b19e36
-SIZE (rubygem/objectdetect-0.0.3.gem) = 16896
+SHA256 (rubygem/objectdetect-0.0.3-opencv23.gem) = c48b7540be661c2ef0f6483576f393c7c9ab14ae8de9f1c4e7ffea85dd895e64
+SIZE (rubygem/objectdetect-0.0.3-opencv23.gem) = 16896