5 files changed, 26 insertions, 14 deletions

diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index 7660f8e7e1fa..f502e4cf5089 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	cdo
-PORTVERSION=	1.8.2
-PORTREVISION=	1
+PORTVERSION=	1.9.0
 CATEGORIES=	science
-MASTER_SITES=	https://code.zmaw.de/attachments/download/14686/ \
+MASTER_SITES=	https://code.zmaw.de/attachments/download/15187/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -35,9 +34,11 @@ CONFIGURE_ARGS=	--disable-data \
 		--with-zlib=/usr
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
+MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	check
+USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
-USES=		execinfo gmake libtool localbase pathfix
+USES=		compiler:c++11-lib execinfo gmake libtool localbase pathfix
 
 CGRIBEX_CONFIGURE_WITH=	cgribex
 CGRIBEX_LIB_DEPENDS=	libcgribex.so:science/cgribex
diff --git a/science/cdo/distinfo b/science/cdo/distinfo
index d254f207a8d6..fa197c3f1c75 100644
--- a/science/cdo/distinfo
+++ b/science/cdo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495463430
-SHA256 (cdo-1.8.2.tar.gz) = 6ca6c1263af2237737728ac937a275f8aa27680507636a6b6320f347c69a369a
-SIZE (cdo-1.8.2.tar.gz) = 9373890
+TIMESTAMP = 1503779403
+SHA256 (cdo-1.9.0.tar.gz) = df367f8c3abf4ab085bcfc61e0205b28a5ecc69b7b83ba398b4d3c874dd69008
+SIZE (cdo-1.9.0.tar.gz) = 9447614
diff --git a/science/cdo/files/patch-src-cdo_pthread.c b/science/cdo/files/patch-src-cdo_pthread.cc
index 3db08949172d..930db89d9583 100644
--- a/science/cdo/files/patch-src-cdo_pthread.c
+++ b/science/cdo/files/patch-src-cdo_pthread.cc
@@ -1,5 +1,5 @@
---- src/cdo_pthread.c.orig	2017-01-19 08:25:24 UTC
-+++ src/cdo_pthread.c
+--- src/cdo_pthread.cc.orig	2017-07-03 08:59:29 UTC
++++ src/cdo_pthread.cc
 @@ -32,8 +32,10 @@ void print_pthread_info()
  {
  #if defined(HAVE_LIBPTHREAD)
diff --git a/science/cdo/files/patch-src-pthread_debug.c b/science/cdo/files/patch-src-pthread_debug.cc
index 9447b5aba3d2..87effb3d2694 100644
--- a/science/cdo/files/patch-src-pthread_debug.c
+++ b/science/cdo/files/patch-src-pthread_debug.cc
@@ -1,5 +1,5 @@
---- src/pthread_debug.c.orig	2016-06-10 08:14:45 UTC
-+++ src/pthread_debug.c
+--- src/pthread_debug.cc.orig	2017-07-03 08:59:29 UTC
++++ src/pthread_debug.cc
 @@ -76,6 +76,7 @@ void print_pthread_attr(const char *call
  }
  
diff --git a/science/cdo/files/patch-src-pthread_debug.h b/science/cdo/files/patch-src-pthread_debug.h
index 7c6565e31156..5875c1a3d8d3 100644
--- a/science/cdo/files/patch-src-pthread_debug.h
+++ b/science/cdo/files/patch-src-pthread_debug.h
@@ -1,7 +1,18 @@
---- src/pthread_debug.h.orig	2016-04-18 08:41:42 UTC
+--- src/pthread_debug.h.orig	2017-06-16 08:43:18 UTC
 +++ src/pthread_debug.h
-@@ -15,8 +15,10 @@ void Pthread_cond_signal(const char *cal
- void Pthread_cond_wait(const char *caller, pthread_cond_t *cond, pthread_mutex_t *mutex);
+@@ -8,15 +8,17 @@ int Pthread_create(const char *caller, p
+ 
+ int Pthread_join(const char *caller, pthread_t th, void **thread_return);
+ 
+-void Pthread_mutex_lock(const char *caller, pthread_mutex_t *mutex);
+-void Pthread_mutex_unlock(const char *caller, pthread_mutex_t *mutex);
++int Pthread_mutex_lock(const char *caller, pthread_mutex_t *mutex);
++int Pthread_mutex_unlock(const char *caller, pthread_mutex_t *mutex);
+ 
+-void Pthread_cond_signal(const char *caller, pthread_cond_t *cond);
+-void Pthread_cond_wait(const char *caller, pthread_cond_t *cond, pthread_mutex_t *mutex);
++int Pthread_cond_signal(const char *caller, pthread_cond_t *cond);
++int Pthread_cond_wait(const char *caller, pthread_cond_t *cond, pthread_mutex_t *mutex);
  
  void print_pthread_attr(const char *caller, pthread_attr_t *attr);
 +#if defined (PTHREAD_MUTEXATTR_CONDATTR)