[pkgsrc/trunk]: pkgsrc/graphics/opencv adam reports that OS X 10.6 patch is n...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6a0764e8d1b4
branches:  trunk
changeset: 604671:6a0764e8d1b4
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jun 02 11:56:35 2012 +0000

description:
adam reports that OS X 10.6 patch is not needed any longer, remove it.

diffstat:

 graphics/opencv/distinfo                                                 |   3 +-
 graphics/opencv/patches/patch-modules_core_include_opencv2_core_core.hpp |  20 ----------
 2 files changed, 1 insertions(+), 22 deletions(-)

diffs (36 lines):

diff -r 0f57831e6b26 -r 6a0764e8d1b4 graphics/opencv/distinfo
--- a/graphics/opencv/distinfo  Sat Jun 02 11:55:50 2012 +0000
+++ b/graphics/opencv/distinfo  Sat Jun 02 11:56:35 2012 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.12 2012/06/01 21:24:57 wiz Exp $
+$NetBSD: distinfo,v 1.13 2012/06/02 11:56:35 wiz Exp $
 
 SHA1 (OpenCV-2.4.1.tar.bz2) = bc6f23c62c8e3e0746f6f95067d54340d12aed56
 RMD160 (OpenCV-2.4.1.tar.bz2) = c28fec73cc9fcf2a7ca38990a315babc0310f501
 Size (OpenCV-2.4.1.tar.bz2) = 47211018 bytes
 SHA1 (patch-CMakeLists.txt) = 67660c0ed98db2c24b3348a47b5ea2d18903ed11
-SHA1 (patch-modules_core_include_opencv2_core_core.hpp) = ca4a861d0a1ac0c9416001ae9ed40cb0e924895a
diff -r 0f57831e6b26 -r 6a0764e8d1b4 graphics/opencv/patches/patch-modules_core_include_opencv2_core_core.hpp
--- a/graphics/opencv/patches/patch-modules_core_include_opencv2_core_core.hpp  Sat Jun 02 11:55:50 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-modules_core_include_opencv2_core_core.hpp,v 1.2 2012/06/01 21:24:57 wiz Exp $
-
-Fix building on Mac OS X, where MIN and MAX got redefined by Obj-C headers.
-http://code.opencv.org/issues/2011
-
---- modules/core/include/opencv2/core/core.hpp.orig    2012-04-03 17:44:46.000000000 +0000
-+++ modules/core/include/opencv2/core/core.hpp
-@@ -46,6 +46,12 @@
- #ifndef __OPENCV_CORE_HPP__
- #define __OPENCV_CORE_HPP__
- 
-+// make sure these are defined correctly
-+#undef MIN
-+#undef MAX
-+#define MIN(a,b) (((a)<(b))?(a):(b))
-+#define MAX(a,b) (((a)>(b))?(a):(b))
-+
- #include "opencv2/core/types_c.h"
- #include "opencv2/core/version.hpp"
-