Update cad/oce to 0.18.1.

- Added missing ErrorStatus function in BRepLib_CheckCurveOnSurface
- Install Shaders directory to resource folder
- Fix normals of generated VTK polydata
- prevent DRAWEXE from being added to OCE_LIBRARIES (issue #660)
- Fix warnings with VTK 7.1
- Fix missing include and other minor header issues
- Fix clockget_time detection on osx

4 files changed, 15 insertions, 14 deletions

diff --git a/cad/oce/Makefile b/cad/oce/Makefile
index d4aaad0bea4..f34118e960e 100644
--- a/cad/oce/Makefile
+++ b/cad/oce/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2017/01/20 11:00:50 fhajny Exp $
+# $NetBSD: Makefile,v 1.2 2017/05/15 12:31:38 fhajny Exp $
 
-DISTNAME=	OCE-0.18
+DISTNAME=	OCE-0.18.1
 PKGNAME=	${DISTNAME:tl}
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GITHUB:=tpaviot/}
diff --git a/cad/oce/PLIST.x11 b/cad/oce/PLIST.x11
index 7e367c401a1..06e7ef2b8a8 100644
--- a/cad/oce/PLIST.x11
+++ b/cad/oce/PLIST.x11
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.x11,v 1.1 2017/01/20 11:00:50 fhajny Exp $
+@comment $NetBSD: PLIST.x11,v 1.2 2017/05/15 12:31:38 fhajny Exp $
 include/oce/AIS_AngleDimension.hxx
 include/oce/AIS_AttributeFilter.lxx
 include/oce/AIS_Axis.lxx
@@ -469,6 +469,7 @@ lib/libTKXmlXCAF.so.11
 lib/libTKXmlXCAF.so.11.0.0
 share/oce/src/Shaders/Declarations.glsl
 share/oce/src/Shaders/DeclarationsImpl.glsl
+share/oce/src/Shaders/FILES
 share/oce/src/Shaders/PhongShading.fs
 share/oce/src/Shaders/PhongShading.vs
 share/oce/src/Shaders/RaytraceBase.fs
diff --git a/cad/oce/distinfo b/cad/oce/distinfo
index 221ea86475c..06ce9778d93 100644
--- a/cad/oce/distinfo
+++ b/cad/oce/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.1 2017/01/20 11:00:50 fhajny Exp $
+$NetBSD: distinfo,v 1.2 2017/05/15 12:31:38 fhajny Exp $
 
-SHA1 (OCE-0.18.tar.gz) = a3ca95d347b34b5a011a0ac86758f5c3494aa58e
-RMD160 (OCE-0.18.tar.gz) = c116477c7c6099868aeed9b415223e041a65ae67
-SHA512 (OCE-0.18.tar.gz) = c38f852aad0a5c08448750ca0572d8c21a7056b11a9f6e9472af817745bb8162f8b21ca62a00da6c15e167e1f658cfe0ead12b93207b6d52d08a77bcc7807423
-Size (OCE-0.18.tar.gz) = 24632429 bytes
+SHA1 (OCE-0.18.1.tar.gz) = 0740c8e3d6751050ac87610fed5b5dd994155020
+RMD160 (OCE-0.18.1.tar.gz) = 0952a711a1050405571422b18e84c47ab1a5e95b
+SHA512 (OCE-0.18.1.tar.gz) = f5de2ded128d452a032083dd923a0b80b3909e7f26823e5d36018d0714be354aaf4b9bf07327251206cba0b3b7aabf5fd9e03cd5887a2dd2a2554f9df3740730
+Size (OCE-0.18.1.tar.gz) = 24634500 bytes
 SHA1 (patch-CMakeLists.txt) = 572853b493ce8551f1d910c897271827943b595a
-SHA1 (patch-adm_cmake_TKernel_CMakeLists.txt) = f6158d5fc2ad9417ce1ce02b2f6a9ee79e6dc10e
+SHA1 (patch-adm_cmake_TKernel_CMakeLists.txt) = acb153e88ce92c7f651a2762de5a60a51d1af5dd
 SHA1 (patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx) = f4778ecd72e5f984f316e85e535a7418ca7ae806
 SHA1 (patch-src_OSD_OSD__MemInfo.cxx) = e1328a861393d458bc110c930c5ecf5343e2a304
 SHA1 (patch-src_OSD_OSD__signal.cxx) = dbbca884a075fd3b5d92cf1c2c8abf7ebd120485
diff --git a/cad/oce/patches/patch-adm_cmake_TKernel_CMakeLists.txt b/cad/oce/patches/patch-adm_cmake_TKernel_CMakeLists.txt
index 57610aec200..3d338b43ce3 100644
--- a/cad/oce/patches/patch-adm_cmake_TKernel_CMakeLists.txt
+++ b/cad/oce/patches/patch-adm_cmake_TKernel_CMakeLists.txt
@@ -1,13 +1,13 @@
-$NetBSD: patch-adm_cmake_TKernel_CMakeLists.txt,v 1.1 2017/01/20 11:00:50 fhajny Exp $
+$NetBSD: patch-adm_cmake_TKernel_CMakeLists.txt,v 1.2 2017/05/15 12:31:38 fhajny Exp $
 
 SunOS needs libresolv here.
 
---- adm/cmake/TKernel/CMakeLists.txt.orig	2014-11-30 05:46:16.000000000 +0000
+--- adm/cmake/TKernel/CMakeLists.txt.orig	2017-05-10 04:51:14.000000000 +0000
 +++ adm/cmake/TKernel/CMakeLists.txt
-@@ -41,6 +41,9 @@ else(WIN32)
+@@ -39,6 +39,9 @@ else(WIN32)
  			set(TOOLKIT_LIBS ${TOOLKIT_LIBS} rt)
- 		endif(NOT CLOCK_GETTIME_IN_LIBC)
- 	endif(NOT APPLE)
+ 		endif(NOT APPLE)
+ 	endif(NOT HAVE_CLOCK_GETTIME)
 +	if(CMAKE_SYSTEM_NAME STREQUAL SunOS)
 +		set(TOOLKIT_LIBS ${TOOLKIT_LIBS} resolv)
 +	endif(CMAKE_SYSTEM_NAME)