fix broken dynamic library handling on Darwin

8 files changed, 95 insertions, 8 deletions

diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index f269e194a2c..ed2c8a4e03b 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2016/01/06 10:46:52 adam Exp $
+# $NetBSD: Makefile,v 1.59 2016/02/08 02:04:18 dbj Exp $
 
 DISTNAME=	opencv-3.0.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Itseez/}
 EXTRACT_SUFX=	.zip
@@ -13,7 +13,6 @@ LICENSE=	modified-bsd
 
 USE_CMAKE=		yes
 USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config
 
@@ -26,8 +25,6 @@ PKGCONFIG_OVERRIDE+=	opencv.pc.cmake.in
 PY_PATCHPLIST=		yes
 REPLACE_PYTHON+=	samples/python/*.py
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/a$//}
-
 # includes configure output and paths to gmake etc.
 CHECK_WRKREF_SKIP=	${PREFIX}/lib/libopencv_core.*
 
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index e006fcff552..e2c13c80584 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,16 +1,21 @@
-$NetBSD: distinfo,v 1.32 2015/11/03 21:34:11 agc Exp $
+$NetBSD: distinfo,v 1.33 2016/02/08 02:04:18 dbj Exp $
 
 SHA1 (opencv-3.0.0.zip) = 7b7cd6cb3b7bad537cacad04bb7aa264a897d545
 RMD160 (opencv-3.0.0.zip) = 7b4dff26502e71e6570c2452c35fd03a1982bc7e
 SHA512 (opencv-3.0.0.zip) = 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375
 Size (opencv-3.0.0.zip) = 100980799 bytes
 SHA1 (patch-3rdparty_ippicv_downloader.cmake) = 8d99b26a39aa184a4dfc03e4928ea7b7b62e71d9
+SHA1 (patch-apps_annotation_CMakeLists.txt) = 4c3a00b0dfef5e978b10ba966f68d050a06208fe
+SHA1 (patch-apps_createsamples_CMakeLists.txt) = 2d60ecc0e1674cde4414e91e837c24fa464d42aa
+SHA1 (patch-apps_traincascade_CMakeLists.txt) = 7114cc4c2057e12dc8e47bc61334cb8e175987eb
 SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20
+SHA1 (patch-cmake_OpenCVModule.cmake) = 440788935a55ae1056407243b730fc13328e12f5
 SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
 SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
 SHA1 (patch-modules_core_src_parallel__pthreads.cpp) = dba43f8252eda7807379469cf9359581bf4d41ad
 SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
 SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
+SHA1 (patch-modules_java_CMakeLists.txt) = 020a8d2048d927e5d3819867df0d889bb516d8b4
 SHA1 (patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp) = 2f4d2f43afe370eef748e05bec199bc963e1ecab
-SHA1 (patch-modules_python_common.cmake) = d6289a316712bb8be4d590965c87f6bb3525a938
+SHA1 (patch-modules_python_common.cmake) = 23d5c21ad4b2e09f1223f02c45bd51e373d1b520
 SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
diff --git a/graphics/opencv/patches/patch-apps_annotation_CMakeLists.txt b/graphics/opencv/patches/patch-apps_annotation_CMakeLists.txt
new file mode 100644
index 00000000000..31e3b1a6a2b
--- /dev/null
+++ b/graphics/opencv/patches/patch-apps_annotation_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-apps_annotation_CMakeLists.txt,v 1.1 2016/02/08 02:04:18 dbj Exp $
+
+Fix library id handling on Darwin
+
+--- apps/annotation/CMakeLists.txt.orig	2015-06-03 17:21:34.000000000 +0000
++++ apps/annotation/CMakeLists.txt
+@@ -21,7 +21,7 @@ set_target_properties(${the_target} PROP
+                       DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+                       ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+                       RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
+-                      INSTALL_NAME_DIR lib
++                      INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}
+                       OUTPUT_NAME "opencv_annotation")
+ 
+ if(ENABLE_SOLUTION_FOLDERS)
diff --git a/graphics/opencv/patches/patch-apps_createsamples_CMakeLists.txt b/graphics/opencv/patches/patch-apps_createsamples_CMakeLists.txt
new file mode 100644
index 00000000000..3851d263a18
--- /dev/null
+++ b/graphics/opencv/patches/patch-apps_createsamples_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-apps_createsamples_CMakeLists.txt,v 1.1 2016/02/08 02:04:18 dbj Exp $
+
+Fix library id handling on Darwin
+
+--- apps/createsamples/CMakeLists.txt.orig	2015-06-03 17:21:34.000000000 +0000
++++ apps/createsamples/CMakeLists.txt
+@@ -23,7 +23,7 @@ set_target_properties(${the_target} PROP
+                       DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+                       ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+                       RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
+-                      INSTALL_NAME_DIR lib
++                      INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}
+                       OUTPUT_NAME "opencv_createsamples")
+ 
+ if(ENABLE_SOLUTION_FOLDERS)
diff --git a/graphics/opencv/patches/patch-apps_traincascade_CMakeLists.txt b/graphics/opencv/patches/patch-apps_traincascade_CMakeLists.txt
new file mode 100644
index 00000000000..fb23b3a081d
--- /dev/null
+++ b/graphics/opencv/patches/patch-apps_traincascade_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-apps_traincascade_CMakeLists.txt,v 1.1 2016/02/08 02:04:18 dbj Exp $
+
+Fix library id handling on Darwin
+
+--- apps/traincascade/CMakeLists.txt.orig	2015-06-03 17:21:34.000000000 +0000
++++ apps/traincascade/CMakeLists.txt
+@@ -23,7 +23,7 @@ set_target_properties(${the_target} PROP
+                       DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+                       ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+                       RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
+-                      INSTALL_NAME_DIR lib
++                      INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}
+                       OUTPUT_NAME "opencv_traincascade")
+ 
+ if(ENABLE_SOLUTION_FOLDERS)
diff --git a/graphics/opencv/patches/patch-cmake_OpenCVModule.cmake b/graphics/opencv/patches/patch-cmake_OpenCVModule.cmake
new file mode 100644
index 00000000000..e3234a449fe
--- /dev/null
+++ b/graphics/opencv/patches/patch-cmake_OpenCVModule.cmake
@@ -0,0 +1,15 @@
+$NetBSD: patch-cmake_OpenCVModule.cmake,v 1.1 2016/02/08 02:04:18 dbj Exp $
+
+Fix library id handling on Darwin
+
+--- cmake/OpenCVModule.cmake.orig	2015-06-03 17:21:34.000000000 +0000
++++ cmake/OpenCVModule.cmake
+@@ -754,7 +754,7 @@ macro(_ocv_create_module)
+     ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+     LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+     RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
+-    INSTALL_NAME_DIR lib
++    INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}
+   )
+ 
+   # For dynamic link numbering convenions
diff --git a/graphics/opencv/patches/patch-modules_java_CMakeLists.txt b/graphics/opencv/patches/patch-modules_java_CMakeLists.txt
new file mode 100644
index 00000000000..3ed5bbb3089
--- /dev/null
+++ b/graphics/opencv/patches/patch-modules_java_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-modules_java_CMakeLists.txt,v 1.1 2016/02/08 02:04:18 dbj Exp $
+
+Fix library id handling on Darwin
+
+--- modules/java/CMakeLists.txt.orig	2015-06-03 17:21:34.000000000 +0000
++++ modules/java/CMakeLists.txt
+@@ -363,7 +363,7 @@ set_target_properties(${the_module} PROP
+     ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+     LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+     RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
+-    INSTALL_NAME_DIR ${OPENCV_LIB_INSTALL_PATH}
++    INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}
+     LINK_INTERFACE_LIBRARIES ""
+     )
+ 
diff --git a/graphics/opencv/patches/patch-modules_python_common.cmake b/graphics/opencv/patches/patch-modules_python_common.cmake
index dde4584dd33..64fd2eadfdb 100644
--- a/graphics/opencv/patches/patch-modules_python_common.cmake
+++ b/graphics/opencv/patches/patch-modules_python_common.cmake
@@ -1,6 +1,7 @@
-$NetBSD: patch-modules_python_common.cmake,v 1.1 2015/10/08 17:45:59 fhajny Exp $
+$NetBSD: patch-modules_python_common.cmake,v 1.2 2016/02/08 02:04:18 dbj Exp $
 
 Backport fix from https://github.com/Itseez/opencv/pull/4109
+Also, fix library id handling on Darwin
 
 --- modules/python/common.cmake.orig	2015-06-03 17:21:34.000000000 +0000
 +++ modules/python/common.cmake
@@ -12,3 +13,12 @@ Backport fix from https://github.com/Itseez/opencv/pull/4109
  
  set(cv2_generated_hdrs
      "${CMAKE_CURRENT_BINARY_DIR}/pyopencv_generated_include.h"
+@@ -45,7 +46,7 @@ add_custom_command(
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/headers.txt
+    DEPENDS ${opencv_hdrs})
+ 
+-ocv_add_library(${the_module} SHARED ${PYTHON_SOURCE_DIR}/src2/cv2.cpp ${cv2_generated_hdrs})
++ocv_add_library(${the_module} MODULE ${PYTHON_SOURCE_DIR}/src2/cv2.cpp ${cv2_generated_hdrs})
+ 
+ if(PYTHON_DEBUG_LIBRARIES AND NOT PYTHON_LIBRARIES MATCHES "optimized.*debug")
+   ocv_target_link_libraries(${the_module} debug ${PYTHON_DEBUG_LIBRARIES} optimized ${PYTHON_LIBRARIES})