Update to 1.0.0.

PR:		110057
Submitted by:	Tz-Huan Huang <tzhuan@csie.org>
Approved by:	maintainer timeout (4 weeks)

14 files changed, 343 insertions, 350 deletions

diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 3b99d2323719..a28e4c5d59ad 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -7,25 +7,119 @@
 #
 
 PORTNAME=	opencv
-PORTVERSION=	0.9.6
-PORTREVISION=	1
+PORTVERSION=	1.0.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	opencvlibrary
-DISTNAME=	opencv-${PORTVERSION}
 
 MAINTAINER=	msabramo@yahoo.com
 COMMENT=	Open Source Computer Vision Library from Intel
 
+CFLAGS+=	-I${LOCALBASE}/include/OpenEXR
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/OpenEXR
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_AUTOTOOLS=	libtool:15
-HAS_CONFIGURE=	yes
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--without-v4l --without-quicktime --without-carbon \
+				--without-1394libs \
+				--without-swig # I don't know anything about swig ...
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
+				png:${PORTSDIR}/graphics/png \
+				tiff:${PORTSDIR}/graphics/tiff \
+				jasper:${PORTSDIR}/graphics/jasper \
+				IlmImf:${PORTSDIR}/graphics/OpenEXR
+USE_GNOME=
+
+OPTIONS=	GTK "Enable GTK+-2.0 support" Off \
+			XINE "Enable XINE support" Off \
+			FFMPEG "Enable FFMPEG support" Off \
+			PYTHON "Enable PYTHON support" Off \
+			DEBUG "Build debugging symbols" Off \
+			DEMO "Build demo apps" Off
+# XXX:
+# I cannot disable the following features if they have been installed,
+# thus they should be enable now ...
+#
+#			JPEG "Enable JPEG support" On \
+#			PNG	"Enable PNG support" On \
+#			TIFF "Enable TIFF support" On \
+#			JASPER "Enable JASPER support" Off \
+#			OPENEXR "Enable OpenEXR support" Off \
 
-LDFLAGS=	${PTHREAD_LIBS}
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
+.include <bsd.port.pre.mk>
 
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+.if defined(WITH_GTK)
+USE_XLIB=	yes
+USE_GNOME=	gtk20
+CONFIGURE_ARGS+=--with-gtk
+.else
+CONFIGURE_ARGS+=--without-gtk
+.endif
+
+#.if !defined(WITHOUT_JPEG)
+#LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
+#.endif
+#
+#.if !defined(WITHOUT_PNG)
+#LIB_DEPENDS+=	png:${PORTSDIR}/graphics/png
+#.endif
+#
+#.if !defined(WITHOUT_TIFF)
+#LIB_DEPENDS+=	tiff:${PORTSDIR}/graphics/tiff
+#.endif
+#
+#.if defined(WITH_JASPER)
+#LIB_DEPENDS+=	jasper:${PORTSDIR}/graphics/jasper
+#.endif
+#
+#.if defined(WITH_OPENEXR)
+#LIB_DEPENDS+=	libIlmImf:${PORTSDIR}/graphics/OpenEXR
+#CFLAGS+=	-I${LOCALBASE}/include/OpenEXR
+#CPPFLAGS+=	-I${LOCALBASE}/include/OpenEXR
+#.endif
+
+.if defined(WITH_XINE)
+CFLAGS+=	-I${X11BASE}/include
+CPPFLAGS+=	-I${X11BASE}/include
+LDFLAGS+=	-L${X11BASE}/lib
+LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
+CONFIGURE_ARGS+=--with-xine
+.else
+CONFIGURE_ARGS+=--without-xine
+.endif
+
+.if defined(WITH_FFMPEG)
+LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
+CONFIGURE_ARGS+=--with-ffmpeg
+.else
+CONFIGURE_ARGS+=--without-ffmpeg
+.endif
+
+.if defined(WITH_PYTHON)
+USE_PYTHON=	yes
+CONFIGURE_ARGS+=--with-python
+PLIST_SUB+=	PYTHON=""
+.else
+CONFIGURE_ARGS+=--without-python
+PLIST_SUB+=	PYTHON="@comment "
+.endif
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=--enable-debug
+.else
+CONFIGURE_ARGS+=--disable-debug
+.endif
+
+.if defined(WITH_DEMO)
+CONFIGURE_ARGS+=--enable-apps
+PLIST_SUB+=	DEMO=""
+.else
+CONFIGURE_ARGS+=--disable-apps
+PLIST_SUB+=	DEMO="@comment "
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index a5984b16c12b..723ade8eff95 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,3 +1,3 @@
-MD5 (opencv-0.9.6.tar.gz) = 00fe80e9b82bc29e9dd00934f7fd86db
-SHA256 (opencv-0.9.6.tar.gz) = fbf6482c5bd223d5037eba47a5302653f57127f055bfd116bff1feddcc093d6e
-SIZE (opencv-0.9.6.tar.gz) = 10017084
+MD5 (opencv-1.0.0.tar.gz) = 146a05005f2d2c16c4ee10ebd7f1dd58
+SHA256 (opencv-1.0.0.tar.gz) = 3a6ee888e4dd4ab7f2bc80d046688c099c6a95d1267af554b7c8f1543b66f21e
+SIZE (opencv-1.0.0.tar.gz) = 11146334
diff --git a/graphics/opencv/files/nopatch-aa b/graphics/opencv/files/nopatch-aa
deleted file mode 100644
index 99df5097af74..000000000000
--- a/graphics/opencv/files/nopatch-aa
+++ /dev/null
@@ -1,103 +0,0 @@
---- cxcore/src/cxswitcher.cpp   Mon Feb 28 16:34:30 2005
-+++ cxcore/src/cxswitcher.cpp.freebsd   Mon Feb 28 16:34:17 2005
-@@ -593,8 +593,8 @@
-         QueryPerformanceCounter( &counter );
-         return (int64)counter.QuadPart;
- #else
--        timeval tv;
--        timezone tz;
-+        struct timeval tv; // patch for FreeBSD: add "struct"
-+        struct timezone tz; // patch for FreeBSD: add "struct"
-         gettimeofday( &tv, &tz );
-         return (int64)tv.tv_sec*1000000 + tv.tv_usec;
- #endif
-
---- cxcore/src/Makefile.in.orig    Mon Feb 28 16:40:06 2005
-+++ cxcore/src/Makefile.in Mon Feb 28 16:40:18 2005
-@@ -137,7 +137,7 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = -ldl -lpthread -lm
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-
---- cv/src/Makefile.in.orig     Mon Feb 28 16:41:54 2005
-+++ cv/src/Makefile.in  Mon Feb 28 16:42:14 2005
-@@ -177,7 +177,7 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = -ldl -lpthread -lm
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-
---- otherlibs/highgui/Makefile.in.orig Mon Feb 28 18:02:19 2005
-+++ otherlibs/highgui/Makefile.in      Mon Feb 28 18:02:40 2005
-@@ -54,7 +54,7 @@
- libhighgui_la_DEPENDENCIES =
- am_libhighgui_la_OBJECTS = bitstrm.lo cvcap.lo cvcap_dc1394.lo \
-       cvcap_v4l.lo grfmt_base.lo grfmt_bmp.lo grfmt_jpeg.lo \
--      grfmt_png.lo grfmt_pxm.lo grfmt_sunras.lo grfmt_tiff.lo \
-+      grfmt_png.lo grfmt_pxm.lo grfmt_sunras.lo \
-       image.lo loadsave.lo precomp.lo utils.lo window_lnx.lo \
-       window_w32.lo
- libhighgui_la_OBJECTS = $(am_libhighgui_la_OBJECTS)
-@@ -201,7 +201,7 @@
- lib_LTLIBRARIES = libhighgui.la
- libhighgui_la_SOURCES = bitstrm.cpp cvcap.cpp cvcap_dc1394.cpp \
-     cvcap_v4l.cpp grfmt_base.cpp grfmt_bmp.cpp grfmt_jpeg.cpp \
--    grfmt_png.cpp grfmt_pxm.cpp grfmt_sunras.cpp grfmt_tiff.cpp \
-+    grfmt_png.cpp grfmt_pxm.cpp grfmt_sunras.cpp \
-     image.cpp loadsave.cpp precomp.cpp utils.cpp window_lnx.cpp \
-     window_w32.cpp
-
---- otherlibs/highgui/grfmts.h.orig     Mon Feb 28 17:10:41 2005
-+++ otherlibs/highgui/grfmts.h  Mon Feb 28 17:10:45 2005
-@@ -47,7 +47,6 @@
- #include "grfmt_sunras.h"
- #include "grfmt_jpeg.h"
- #include "grfmt_pxm.h"
--#include "grfmt_tiff.h"
- #include "grfmt_png.h"
-
- #endif/*_GRFMTS_H_*/
-
---- otherlibs/highgui/loadsave.cpp.orig Mon Feb 28 17:12:05 2005
-+++ otherlibs/highgui/loadsave.cpp      Mon Feb 28 17:12:09 2005
-@@ -299,7 +299,6 @@
-     m_factories->AddFactory( new GrFmtJpeg() );
-     m_factories->AddFactory( new GrFmtSunRaster() );
-     m_factories->AddFactory( new GrFmtPxM() );
--    m_factories->AddFactory( new GrFmtTiff() );
- #ifdef HAVE_PNG
-     m_factories->AddFactory( new GrFmtPng() );
- #endif
-
---- configure.orig      Thu Aug 19 03:46:49 2004
-+++ configure   Mon Feb 28 17:16:51 2005
-@@ -21218,7 +21218,7 @@
-
-
- have_v4l=no
--if test x$os_name=xLinux; then
-+if test x$os_name = xLinux; then
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_CAMV4L
-
---- tests/cxcore/src/Makefile.in.orig   Mon Feb 28 17:32:29 2005
-+++ tests/cxcore/src/Makefile.in        Mon Feb 28 17:32:57 2005
-@@ -189,6 +189,7 @@
- EXTRA_DIST = precomp.cpp cxcoretest.dsp cxcoretest.vcproj
- INCLUDES = -I. -I../../../cxcore/include -I../../cxts -I../../..
- cxcoretest_LDADD = -L../../../cxcore/src -lcxcore -L../../cxts -lcxts
-+cxcoretest_LDFLAGS = -pthread
- all: all-am
-
- .SUFFIXES:
-
diff --git a/graphics/opencv/files/patch-Makefile.in b/graphics/opencv/files/patch-Makefile.in
index 620e44755eb0..be06e908522c 100644
--- a/graphics/opencv/files/patch-Makefile.in
+++ b/graphics/opencv/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Thu Dec 29 14:20:44 2005
-+++ Makefile.in	Thu Dec 29 14:21:13 2005
-@@ -194,7 +194,7 @@
- 
- # All the rest of the distributed files
- EXTRA_DIST = THANKS COPYING INSTALL README NEWS ChangeLog opencv.spec opencv.spec.in opencv.pc.in opencv.pc autogen.sh _make utils
+--- Makefile.in.orig	Sun Mar  4 22:34:16 2007
++++ Makefile.in	Sun Mar  4 22:34:35 2007
+@@ -270,7 +270,7 @@
+ #EXTRA_DIST = THANKS TODO \
+ #             opencv.spec opencv.spec.in opencv.pc.in opencv.pc \
+ #             _make apps filters
 -pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(libdir)data/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = opencv.pc
- all: cvconfig.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+ # The directory where the include files will be installed
diff --git a/graphics/opencv/files/patch-apps_haartraining_src_cvboost.cpp b/graphics/opencv/files/patch-apps_haartraining_src_cvboost.cpp
deleted file mode 100644
index e4cfdf54cb48..000000000000
--- a/graphics/opencv/files/patch-apps_haartraining_src_cvboost.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- apps/haartraining/src/cvboost.cpp.orig	Thu Dec 29 13:52:01 2005
-+++ apps/haartraining/src/cvboost.cpp	Thu Dec 29 13:52:08 2005
-@@ -40,7 +40,7 @@
- //M*/
- 
- #include <stdio.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <memory.h>
- #include <float.h>
- #include <math.h>
diff --git a/graphics/opencv/files/patch-configure b/graphics/opencv/files/patch-configure
index 19813ec7a53a..49488c739c7a 100644
--- a/graphics/opencv/files/patch-configure
+++ b/graphics/opencv/files/patch-configure
@@ -1,12 +1,30 @@
---- configure.orig      Thu Aug 19 03:46:49 2004
-+++ configure   Mon Feb 28 17:16:51 2005
-@@ -21218,7 +21218,7 @@
-
-
- have_v4l=no
--if test x$os_name=xLinux; then
-+if test x$os_name = xLinux; then
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_CAMV4L
-
+--- configure.orig	Wed Mar  7 19:49:27 2007
++++ configure	Wed Mar  7 19:49:52 2007
+@@ -22958,13 +22958,13 @@
+ 
+ 
+ if test x"$have_png" = "xyes"; then
+-    echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
+-echo $ECHO_N "checking for png_read_image in -lpng12... $ECHO_C" >&6
++    echo "$as_me:$LINENO: checking for png_read_image in -lpng" >&5
++echo $ECHO_N "checking for png_read_image in -lpng... $ECHO_C" >&6
+ if test "${ac_cv_lib_png12_png_read_image+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng12  $LIBS"
++LIBS="-lpng  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -23030,8 +23030,8 @@
+ #define HAVE_PNG
+ _ACEOF
+ 
+-                   IMAGELIBS="-lpng12 $IMAGELIBS"
+-                   LIBS="-lpng12 $LIBS"
++                   IMAGELIBS="-lpng $IMAGELIBS"
++                   LIBS="-lpng $LIBS"
+ 
+ 
+ for ac_func in png_get_valid png_set_tRNS_to_alpha
diff --git a/graphics/opencv/files/patch-cv_src_Makefile.in b/graphics/opencv/files/patch-cv_src_Makefile.in
deleted file mode 100644
index f68fc107dbad..000000000000
--- a/graphics/opencv/files/patch-cv_src_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- cv/src/Makefile.in.orig     Mon Feb 28 16:41:54 2005
-+++ cv/src/Makefile.in  Mon Feb 28 16:42:14 2005
-@@ -177,7 +177,7 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = -ldl -lpthread -lm
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-
diff --git a/graphics/opencv/files/patch-cxcore_src_Makefile.in b/graphics/opencv/files/patch-cxcore_src_Makefile.in
deleted file mode 100644
index cdc0918921ad..000000000000
--- a/graphics/opencv/files/patch-cxcore_src_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- cxcore/src/Makefile.in.orig    Mon Feb 28 16:40:06 2005
-+++ cxcore/src/Makefile.in Mon Feb 28 16:40:18 2005
-@@ -137,7 +137,7 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = -ldl -lpthread -lm
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-
diff --git a/graphics/opencv/files/patch-cxcore_src_cxswitcher.cpp b/graphics/opencv/files/patch-cxcore_src_cxswitcher.cpp
deleted file mode 100644
index 62e88d5e6963..000000000000
--- a/graphics/opencv/files/patch-cxcore_src_cxswitcher.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- cxcore/src/cxswitcher.cpp   Mon Feb 28 16:34:30 2005
-+++ cxcore/src/cxswitcher.cpp.freebsd   Mon Feb 28 16:34:17 2005
-@@ -593,8 +593,8 @@
-         QueryPerformanceCounter( &counter );
-         return (int64)counter.QuadPart;
- #else
--        timeval tv;
--        timezone tz;
-+        struct timeval tv; // patch for FreeBSD: add "struct"
-+        struct timezone tz; // patch for FreeBSD: add "struct"
-         gettimeofday( &tv, &tz );
-         return (int64)tv.tv_sec*1000000 + tv.tv_usec;
- #endif
-
diff --git a/graphics/opencv/files/patch-otherlibs_highgui_Makefile.in b/graphics/opencv/files/patch-otherlibs_highgui_Makefile.in
deleted file mode 100644
index bb7e6184e6a3..000000000000
--- a/graphics/opencv/files/patch-otherlibs_highgui_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- otherlibs/highgui/Makefile.in.orig	Thu Aug 19 20:46:43 2004
-+++ otherlibs/highgui/Makefile.in	Thu Dec 29 13:44:02 2005
-@@ -54,7 +54,7 @@
- libhighgui_la_DEPENDENCIES =
- am_libhighgui_la_OBJECTS = bitstrm.lo cvcap.lo cvcap_dc1394.lo \
- 	cvcap_v4l.lo grfmt_base.lo grfmt_bmp.lo grfmt_jpeg.lo \
--	grfmt_png.lo grfmt_pxm.lo grfmt_sunras.lo grfmt_tiff.lo \
-+	grfmt_png.lo grfmt_pxm.lo grfmt_sunras.lo \
- 	image.lo loadsave.lo precomp.lo utils.lo window_lnx.lo \
- 	window_w32.lo
- libhighgui_la_OBJECTS = $(am_libhighgui_la_OBJECTS)
-@@ -201,7 +201,7 @@
- lib_LTLIBRARIES = libhighgui.la
- libhighgui_la_SOURCES = bitstrm.cpp cvcap.cpp cvcap_dc1394.cpp \
-     cvcap_v4l.cpp grfmt_base.cpp grfmt_bmp.cpp grfmt_jpeg.cpp \
--    grfmt_png.cpp grfmt_pxm.cpp grfmt_sunras.cpp grfmt_tiff.cpp \
-+    grfmt_png.cpp grfmt_pxm.cpp grfmt_sunras.cpp \
-     image.cpp loadsave.cpp precomp.cpp utils.cpp window_lnx.cpp \
-     window_w32.cpp
- 
diff --git a/graphics/opencv/files/patch-otherlibs_highgui_grfmts.h b/graphics/opencv/files/patch-otherlibs_highgui_grfmts.h
deleted file mode 100644
index 1c92a4aa2774..000000000000
--- a/graphics/opencv/files/patch-otherlibs_highgui_grfmts.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- otherlibs/highgui/grfmts.h.orig     Mon Feb 28 17:10:41 2005
-+++ otherlibs/highgui/grfmts.h  Mon Feb 28 17:10:45 2005
-@@ -47,7 +47,6 @@
- #include "grfmt_sunras.h"
- #include "grfmt_jpeg.h"
- #include "grfmt_pxm.h"
--#include "grfmt_tiff.h"
- #include "grfmt_png.h"
-
- #endif/*_GRFMTS_H_*/
-
diff --git a/graphics/opencv/files/patch-otherlibs_highgui_loadsave.cpp b/graphics/opencv/files/patch-otherlibs_highgui_loadsave.cpp
deleted file mode 100644
index e3c26d2c95f0..000000000000
--- a/graphics/opencv/files/patch-otherlibs_highgui_loadsave.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- otherlibs/highgui/loadsave.cpp.orig Mon Feb 28 17:12:05 2005
-+++ otherlibs/highgui/loadsave.cpp      Mon Feb 28 17:12:09 2005
-@@ -299,7 +299,6 @@
-     m_factories->AddFactory( new GrFmtJpeg() );
-     m_factories->AddFactory( new GrFmtSunRaster() );
-     m_factories->AddFactory( new GrFmtPxM() );
--    m_factories->AddFactory( new GrFmtTiff() );
- #ifdef HAVE_PNG
-     m_factories->AddFactory( new GrFmtPng() );
- #endif
-
diff --git a/graphics/opencv/files/patch-tests_cxcore_src_Makefile.in b/graphics/opencv/files/patch-tests_cxcore_src_Makefile.in
deleted file mode 100644
index d3649b9a027d..000000000000
--- a/graphics/opencv/files/patch-tests_cxcore_src_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/cxcore/src/Makefile.in.orig   Mon Feb 28 17:32:29 2005
-+++ tests/cxcore/src/Makefile.in        Mon Feb 28 17:32:57 2005
-@@ -189,6 +189,7 @@
- EXTRA_DIST = precomp.cpp cxcoretest.dsp cxcoretest.vcproj
- INCLUDES = -I. -I../../../cxcore/include -I../../cxts -I../../..
- cxcoretest_LDADD = -L../../../cxcore/src -lcxcore -L../../cxts -lcxts
-+cxcoretest_LDFLAGS = -pthread
- all: all-am
-
- .SUFFIXES:
-
diff --git a/graphics/opencv/pkg-plist b/graphics/opencv/pkg-plist
index 58d08f6b396c..a4bda206542b 100644
--- a/graphics/opencv/pkg-plist
+++ b/graphics/opencv/pkg-plist
@@ -1,124 +1,210 @@
-bin/opencv-haartraining
-bin/opencv-createsamples
-bin/opencv-performance
-lib/libcv.a
-lib/libcv.la
-lib/libcv.so
-lib/libcv.so.9
-lib/libcvaux.a
-lib/libcvaux.la
-lib/libcvaux.so
-lib/libcvaux.so.9
-lib/libcvhaartraining.a
-lib/libhighgui.a
-lib/libhighgui.la
-lib/libhighgui.so
-lib/libhighgui.so.9
-lib/libcxts.a
-lib/libcxcore.a
-lib/libcxcore.la
-lib/libcxcore.so
-lib/libcxcore.so.9
-libdata/pkgconfig/opencv.pc
+%%DEMO%%bin/opencv-createsamples
+%%DEMO%%bin/opencv-haartraining
+%%DEMO%%bin/opencv-performance
 include/opencv/cv.h
 include/opencv/cv.hpp
 include/opencv/cvaux.h
 include/opencv/cvaux.hpp
 include/opencv/cvcompat.h
-include/opencv/cvhaartraining.h
+%%DEMO%%include/opencv/cvhaartraining.h
 include/opencv/cvmat.hpp
 include/opencv/cvtypes.h
+include/opencv/cvver.h
+include/opencv/cvvidsurv.hpp
 include/opencv/cxcore.h
+include/opencv/cxcore.hpp
 include/opencv/cxerror.h
 include/opencv/cxmisc.h
 include/opencv/cxtypes.h
 include/opencv/highgui.h
+include/opencv/ml.h
+lib/libcv.a
+lib/libcv.la
+lib/libcv.so
+lib/libcv.so.1
+lib/libcvaux.a
+lib/libcvaux.la
+lib/libcvaux.so
+lib/libcvaux.so.1
+%%DEMO%%lib/libcvhaartraining.a
+lib/libcxcore.a
+lib/libcxcore.la
+lib/libcxcore.so
+lib/libcxcore.so.1
+lib/libhighgui.a
+lib/libhighgui.la
+lib/libhighgui.so
+lib/libhighgui.so.1
+lib/libml.a
+lib/libml.la
+lib/libml.so
+lib/libml.so.1
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/__init__.py
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/__init__.pyc
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/__init__.pyo
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_cv.a
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_cv.la
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_cv.so
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_highgui.a
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_highgui.la
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_highgui.so
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/adaptors.py
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/adaptors.pyc
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/adaptors.pyo
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/cv.py
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/cv.pyc
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/cv.pyo
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/highgui.py
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/highgui.pyc
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/highgui.pyo
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/matlab_syntax.py
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/matlab_syntax.pyc
+%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/matlab_syntax.pyo
+libdata/pkgconfig/opencv.pc
+%%DATADIR%%/doc/cvcam.rtf
+%%DATADIR%%/doc/faq.htm
+%%DATADIR%%/doc/index.htm
+%%DATADIR%%/doc/license.txt
+%%DATADIR%%/doc/opencv.jpg
+%%DATADIR%%/doc/opencvman_old.pdf
+%%DATADIR%%/doc/papers/algo_tracking.pdf
+%%DATADIR%%/doc/papers/avbpa99.ps
+%%DATADIR%%/doc/papers/camshift.pdf
+%%DATADIR%%/doc/python-wrappers-on-windows.txt
+%%DATADIR%%/doc/python.txt
+%%DATADIR%%/doc/ref/opencvref.css
+%%DATADIR%%/doc/ref/opencvref_cv.htm
+%%DATADIR%%/doc/ref/opencvref_cvaux.htm
+%%DATADIR%%/doc/ref/opencvref_cxcore.htm
+%%DATADIR%%/doc/ref/opencvref_highgui.htm
+%%DATADIR%%/doc/ref/opencvref_ml.htm
+%%DATADIR%%/doc/ref/pics/backprojectpatch.png
+%%DATADIR%%/doc/ref/pics/boundingrect.png
+%%DATADIR%%/doc/ref/pics/building.jpg
+%%DATADIR%%/doc/ref/pics/contoursecarea.png
+%%DATADIR%%/doc/ref/pics/cornersubpix.png
+%%DATADIR%%/doc/ref/pics/defects.png
+%%DATADIR%%/doc/ref/pics/ellipse.png
+%%DATADIR%%/doc/ref/pics/em1.png
+%%DATADIR%%/doc/ref/pics/em3.png
+%%DATADIR%%/doc/ref/pics/em4.png
+%%DATADIR%%/doc/ref/pics/em5.png
+%%DATADIR%%/doc/ref/pics/em6.png
+%%DATADIR%%/doc/ref/pics/em7.png
+%%DATADIR%%/doc/ref/pics/em8.png
+%%DATADIR%%/doc/ref/pics/em9.png
+%%DATADIR%%/doc/ref/pics/errmsg.png
+%%DATADIR%%/doc/ref/pics/face.png
+%%DATADIR%%/doc/ref/pics/haarfeatures.png
+%%DATADIR%%/doc/ref/pics/houghp.png
+%%DATADIR%%/doc/ref/pics/inv_logpolar.jpg
+%%DATADIR%%/doc/ref/pics/left.jpg
+%%DATADIR%%/doc/ref/pics/logpolar.jpg
+%%DATADIR%%/doc/ref/pics/maxrect.png
+%%DATADIR%%/doc/ref/pics/memstorage1.png
+%%DATADIR%%/doc/ref/pics/memstorage2.png
+%%DATADIR%%/doc/ref/pics/minareabox.png
+%%DATADIR%%/doc/ref/pics/mlp_.png
+%%DATADIR%%/doc/ref/pics/neuron_model.png
+%%DATADIR%%/doc/ref/pics/pointpolygon.png
+%%DATADIR%%/doc/ref/pics/quadedge.png
+%%DATADIR%%/doc/ref/pics/right.jpg
+%%DATADIR%%/doc/ref/pics/sigmoid_bipolar.png
+%%DATADIR%%/doc/ref/pics/subdiv.png
+%%DATADIR%%/doc/ref/pics/threshold.png
+%%DATADIR%%/haarcascades/haarcascade_frontalface_alt.xml
+%%DATADIR%%/haarcascades/haarcascade_frontalface_alt2.xml
+%%DATADIR%%/haarcascades/haarcascade_frontalface_alt_tree.xml
+%%DATADIR%%/haarcascades/haarcascade_frontalface_default.xml
+%%DATADIR%%/haarcascades/haarcascade_fullbody.xml
+%%DATADIR%%/haarcascades/haarcascade_lowerbody.xml
+%%DATADIR%%/haarcascades/haarcascade_profileface.xml
+%%DATADIR%%/haarcascades/haarcascade_upperbody.xml
+%%DATADIR%%/readme.txt
+%%DATADIR%%/samples/c/agaricus-lepiota.data
+%%DATADIR%%/samples/c/airplane.jpg
+%%DATADIR%%/samples/c/baboon.jpg
+%%DATADIR%%/samples/c/blobtrack.cpp
+%%DATADIR%%/samples/c/build_all.sh
+%%DATADIR%%/samples/c/camshiftdemo.c
+%%DATADIR%%/samples/c/contours.c
+%%DATADIR%%/samples/c/convert_cascade.c
+%%DATADIR%%/samples/c/convexhull.c
+%%DATADIR%%/samples/c/cvsample.dsp
+%%DATADIR%%/samples/c/cvsample.vcproj
+%%DATADIR%%/samples/c/delaunay.c
+%%DATADIR%%/samples/c/demhist.c
+%%DATADIR%%/samples/c/dft.c
+%%DATADIR%%/samples/c/distrans.c
+%%DATADIR%%/samples/c/drawing.c
+%%DATADIR%%/samples/c/edge.c
+%%DATADIR%%/samples/c/facedetect.c
+%%DATADIR%%/samples/c/facedetect.cmd
+%%DATADIR%%/samples/c/ffilldemo.c
+%%DATADIR%%/samples/c/fitellipse.c
+%%DATADIR%%/samples/c/fruits.jpg
+%%DATADIR%%/samples/c/houghlines.c
+%%DATADIR%%/samples/c/image.cpp
+%%DATADIR%%/samples/c/inpaint.cpp
+%%DATADIR%%/samples/c/kalman.c
+%%DATADIR%%/samples/c/kmeans.c
+%%DATADIR%%/samples/c/laplace.c
+%%DATADIR%%/samples/c/lena.jpg
+%%DATADIR%%/samples/c/letter-recognition.data
+%%DATADIR%%/samples/c/letter_recog.cpp
+%%DATADIR%%/samples/c/lkdemo.c
+%%DATADIR%%/samples/c/makefile.gnu
+%%DATADIR%%/samples/c/makefile.ms
+%%DATADIR%%/samples/c/minarea.c
+%%DATADIR%%/samples/c/morphology.c
+%%DATADIR%%/samples/c/motempl.c
+%%DATADIR%%/samples/c/mushroom.cpp
+%%DATADIR%%/samples/c/pic1.png
+%%DATADIR%%/samples/c/pic2.png
+%%DATADIR%%/samples/c/pic3.png
+%%DATADIR%%/samples/c/pic4.png
+%%DATADIR%%/samples/c/pic5.png
+%%DATADIR%%/samples/c/pic6.png
+%%DATADIR%%/samples/c/pyramid_segmentation.c
+%%DATADIR%%/samples/c/squares.c
+%%DATADIR%%/samples/c/stuff.jpg
+%%DATADIR%%/samples/c/watershed.cpp
+%%DATADIR%%/samples/python/cam-histo.py
+%%DATADIR%%/samples/python/capture-cam.py
+%%DATADIR%%/samples/python/chessboard.py
+%%DATADIR%%/samples/python/contours.py
+%%DATADIR%%/samples/python/convexhull.py
+%%DATADIR%%/samples/python/delaunay.py
+%%DATADIR%%/samples/python/demhist.py
+%%DATADIR%%/samples/python/dft.py
+%%DATADIR%%/samples/python/distrans.py
+%%DATADIR%%/samples/python/drawing.py
+%%DATADIR%%/samples/python/edge.py
+%%DATADIR%%/samples/python/facedetect.py
+%%DATADIR%%/samples/python/ffilldemo.py
+%%DATADIR%%/samples/python/fitellipse.py
+%%DATADIR%%/samples/python/houghlines.py
+%%DATADIR%%/samples/python/inpaint.py
+%%DATADIR%%/samples/python/kalman.py
+%%DATADIR%%/samples/python/kmeans.py
+%%DATADIR%%/samples/python/laplace.py
+%%DATADIR%%/samples/python/lkdemo.py
+%%DATADIR%%/samples/python/logpolar.py
+%%DATADIR%%/samples/python/minarea.py
+%%DATADIR%%/samples/python/minidemo.py
+%%DATADIR%%/samples/python/morphology.py
+%%DATADIR%%/samples/python/motempl.py
+%%DATADIR%%/samples/python/pyramid_segmentation.py
+%%DATADIR%%/samples/python/squares.py
+%%DATADIR%%/samples/python/watershed.py
+@dirrm %%DATADIR%%/samples/python
+@dirrm %%DATADIR%%/samples/c
+@dirrm %%DATADIR%%/samples
+@dirrm %%DATADIR%%/haarcascades
+@dirrm %%DATADIR%%/doc/ref/pics
+@dirrm %%DATADIR%%/doc/ref
+@dirrm %%DATADIR%%/doc/papers
+@dirrm %%DATADIR%%/doc
+@dirrm %%DATADIR%%
+%%PYTHON%%@dirrm %%PYTHONPREFIX_SITELIBDIR%%/opencv
 @dirrm include/opencv
-share/opencv/readme.txt
-share/opencv/doc/cvcam.rtf
-share/opencv/doc/faq.htm
-share/opencv/doc/index.htm
-share/opencv/doc/license.txt
-share/opencv/doc/opencv.jpg
-share/opencv/doc/opencvman_old.pdf
-share/opencv/haarcascades/haarcascade_frontalface_alt.xml
-share/opencv/haarcascades/haarcascade_frontalface_alt2.xml
-share/opencv/haarcascades/haarcascade_frontalface_alt_tree.xml
-share/opencv/haarcascades/haarcascade_frontalface_default.xml
-share/opencv/haarcascades/haarcascade_fullbody.xml
-share/opencv/haarcascades/haarcascade_lowerbody.xml
-share/opencv/haarcascades/haarcascade_profileface.xml
-share/opencv/haarcascades/haarcascade_upperbody.xml
-@dirrm share/opencv/haarcascades
-share/opencv/doc/papers/algo_tracking.pdf
-share/opencv/doc/papers/avbpa99.ps
-share/opencv/doc/papers/camshift.pdf
-@dirrm share/opencv/doc/papers
-share/opencv/doc/ref/opencvref.css
-share/opencv/doc/ref/opencvref_cv.htm
-share/opencv/doc/ref/opencvref_cvaux.htm
-share/opencv/doc/ref/opencvref_cxcore.htm
-share/opencv/doc/ref/opencvref_highgui.htm
-share/opencv/samples/c/airplane.jpg
-share/opencv/samples/c/baboon.jpg
-share/opencv/samples/c/build_all.sh
-share/opencv/samples/c/camshiftdemo.c
-share/opencv/samples/c/contours.c
-share/opencv/samples/c/convexhull.c
-share/opencv/samples/c/cvsample.dsp
-share/opencv/samples/c/cvsample.vcproj
-share/opencv/samples/c/delaunay.c
-share/opencv/samples/c/demhist.c
-share/opencv/samples/c/distrans.c
-share/opencv/samples/c/drawing.c
-share/opencv/samples/c/edge.c
-share/opencv/samples/c/facedetect.c
-share/opencv/samples/c/facedetect.cmd
-share/opencv/samples/c/ffilldemo.c
-share/opencv/samples/c/fitellipse.c
-share/opencv/samples/c/fruits.jpg
-share/opencv/samples/c/kalman.c
-share/opencv/samples/c/kmeans.c
-share/opencv/samples/c/laplace.c
-share/opencv/samples/c/lena.jpg
-share/opencv/samples/c/lkdemo.c
-share/opencv/samples/c/makefile.gcc
-share/opencv/samples/c/makefile.gen
-share/opencv/samples/c/minarea.c
-share/opencv/samples/c/morphology.c
-share/opencv/samples/c/motempl.c
-share/opencv/samples/c/pic1.png
-share/opencv/samples/c/pic2.png
-share/opencv/samples/c/pic3.png
-share/opencv/samples/c/pic4.png
-share/opencv/samples/c/pic5.png
-share/opencv/samples/c/pic6.png
-share/opencv/samples/c/pyramid_segmentation.c
-share/opencv/samples/c/squares.c
-share/opencv/samples/c/stuff.jpg
-@dirrm share/opencv/samples/c
-@dirrm share/opencv/samples
-share/opencv/doc/ref/pics/backprojectpatch.png
-share/opencv/doc/ref/pics/boundingrect.png
-share/opencv/doc/ref/pics/building.jpg
-share/opencv/doc/ref/pics/contoursecarea.png
-share/opencv/doc/ref/pics/cornersubpix.png
-share/opencv/doc/ref/pics/defects.png
-share/opencv/doc/ref/pics/ellipse.png
-share/opencv/doc/ref/pics/errmsg.png
-share/opencv/doc/ref/pics/face.png
-share/opencv/doc/ref/pics/haarfeatures.png
-share/opencv/doc/ref/pics/houghp.png
-share/opencv/doc/ref/pics/left.jpg
-share/opencv/doc/ref/pics/maxrect.png
-share/opencv/doc/ref/pics/memstorage1.png
-share/opencv/doc/ref/pics/memstorage2.png
-share/opencv/doc/ref/pics/minareabox.png
-share/opencv/doc/ref/pics/quadedge.png
-share/opencv/doc/ref/pics/right.jpg
-share/opencv/doc/ref/pics/subdiv.png
-share/opencv/doc/ref/pics/threshold.png
-@dirrm share/opencv/doc/ref/pics
-@dirrm share/opencv/doc/ref
-@dirrm share/opencv/doc
-@dirrm share/opencv