- Update graphics/*opencv* to 2.4.7

- Revert options helpers to if statements since the OFF condition is not
  applied when OPTIONS_EXCLUDE is used
- Move most of the OpenCV modules from the graphics/opencv-core port to
  graphics/opencv, leaving opencv-core as just the bare minimum required
  for building ffmpeg with OpenCV support
- Install examples for python and java bindings
- Add new slave port graphics/opencv-java: Java bindings for OpenCV
- Bump PORTREVISION and make dependency adjustments and fixes for
  dependent ports
- Add UPDATING entry

3 files changed, 23 insertions, 11 deletions

diff --git a/math/saga/Makefile b/math/saga/Makefile
index f9b848c330d5..368cc889c3f2 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	saga
 PORTVERSION=	2.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src
@@ -13,13 +13,13 @@ COMMENT=	System for Automated Geoscientific Analyses
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	proj:${PORTSDIR}/graphics/proj \
-		gdal:${PORTSDIR}/graphics/gdal \
-		jasper:${PORTSDIR}/graphics/jasper \
-		tiff:${PORTSDIR}/graphics/tiff \
-		iodbc:${PORTSDIR}/databases/libiodbc \
-		las:${PORTSDIR}/devel/liblas \
-		opencv_legacy:${PORTSDIR}/graphics/opencv
+LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj \
+		libgdal.so:${PORTSDIR}/graphics/gdal \
+		libjasper.so:${PORTSDIR}/graphics/jasper \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		libiodbc.so:${PORTSDIR}/databases/libiodbc \
+		liblas.so:${PORTSDIR}/devel/liblas \
+		libopencv_core.so:${PORTSDIR}/graphics/opencv-core
 
 USE_ZIP=	yes
 USE_WX=		2.9
@@ -107,9 +107,9 @@ post-extract:
 		${WRKSRC}/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.am
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lcv|-lopencv_legacy|g' \
+	@${REINPLACE_CMD} -e 's|-lcv|-lopencv_core -lopencv_imgproc|g' \
 		${WRKSRC}/src/modules_images/modules_opencv/opencv/Makefile.am
-	@${REINPLACE_CMD} -e 's|\[cv\]|\[opencv_legacy\]|' \
+	@${REINPLACE_CMD} -e 's|\[cv\]|\[opencv_core\]|' \
 		${WRKSRC}/configure.in
 	@${REINPLACE_CMD} -e 's|\\n"), SAGA_VERSION)| (rev. 1760)\\n"), SAGA_VERSION)|' \
 		${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp
diff --git a/math/saga/files/patch-src__modules_images__modules_opencv__opencv__opencv.h b/math/saga/files/patch-src__modules_images__modules_opencv__opencv__opencv.h
new file mode 100644
index 000000000000..8f7882f1f548
--- /dev/null
+++ b/math/saga/files/patch-src__modules_images__modules_opencv__opencv__opencv.h
@@ -0,0 +1,12 @@
+--- ./src/modules_images/modules_opencv/opencv/opencv.h.orig	2013-12-03 19:17:30.000000000 -0500
++++ ./src/modules_images/modules_opencv/opencv/opencv.h	2013-12-03 19:19:37.000000000 -0500
+@@ -73,7 +73,8 @@
+ #include "MLB_Interface.h"
+ 
+ //---------------------------------------------------------
+-#include <opencv/cv.h>
++#include <opencv2/core/core_c.h>
++#include <opencv2/imgproc/imgproc_c.h>
+ 
+ 
+ ///////////////////////////////////////////////////////////
diff --git a/math/scilab-toolbox-sivp/Makefile b/math/scilab-toolbox-sivp/Makefile
index cd89f372d218..1393d6de899b 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=	2
+PORTREVISION=	3
 CATEGORIES=	math graphics multimedia
 MASTER_SITES=	LOCAL/makc
 PKGNAMEPREFIX=	scilab-toolbox-