Update to 1.8.0

- Regenerate patch files with makepatch:

Changes:	https://code.zmaw.de/news/363

5 files changed, 21 insertions, 22 deletions

diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index c6f53d3089f8..f786a0634862 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	cdo
-PORTVERSION=	1.7.2
-PORTREVISION=	1
+PORTVERSION=	1.8.0
 CATEGORIES=	science
-MASTER_SITES=	https://code.zmaw.de/attachments/download/12760/ \
+MASTER_SITES=	https://code.zmaw.de/attachments/download/13772/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/science/cdo/distinfo b/science/cdo/distinfo
index 2d870b2288db..07a2dd4d63d8 100644
--- a/science/cdo/distinfo
+++ b/science/cdo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479408559
-SHA256 (cdo-1.7.2.tar.gz) = 4c43eba7a95f77457bfe0d30fb82382b3b5f2b0cf90aca6f0f0a008f6cc7e697
-SIZE (cdo-1.7.2.tar.gz) = 9041971
+TIMESTAMP = 1487174387
+SHA256 (cdo-1.8.0.tar.gz) = 2008c72740d9d485d2c857d99b8e26d801db5de3f5873fbec717d824441acf70
+SIZE (cdo-1.8.0.tar.gz) = 9275335
diff --git a/science/cdo/files/patch-src-cdo_pthread.c b/science/cdo/files/patch-src-cdo_pthread.c
index f2a66c09d771..3db08949172d 100644
--- a/science/cdo/files/patch-src-cdo_pthread.c
+++ b/science/cdo/files/patch-src-cdo_pthread.c
@@ -1,17 +1,17 @@
---- src/cdo_pthread.c.orig	2007-08-29 17:15:32.000000000 +0800
-+++ src/cdo_pthread.c	2011-02-26 03:30:00.000000000 +0800
-@@ -32,8 +32,10 @@
+--- src/cdo_pthread.c.orig	2017-01-19 08:25:24 UTC
++++ src/cdo_pthread.c
+@@ -32,8 +32,10 @@ void print_pthread_info()
  {
- #if  defined  (HAVE_LIBPTHREAD)
+ #if defined(HAVE_LIBPTHREAD)
    pthread_attr_t attr;
 +#if defined (PTHREAD_MUTEXATTR_CONDATTR)
    pthread_mutexattr_t m_attr;
    pthread_condattr_t c_attr;
 +#endif
  
- #if defined (PTHREAD_KEYS_MAX)
+ #if defined(PTHREAD_KEYS_MAX)
    fprintf(stderr, "PTHREAD_KEYS_MAX    = %d\n", PTHREAD_KEYS_MAX);
-@@ -54,6 +56,7 @@
+@@ -54,6 +56,7 @@ void print_pthread_info()
    print_pthread_attr("Default pthread attr", &attr);
    pthread_attr_destroy(&attr);
  
@@ -19,7 +19,7 @@
    pthread_mutexattr_init(&m_attr);
    print_pthread_mutexattr("Default pthread mutexattr", &m_attr);
    pthread_mutexattr_destroy(&m_attr);
-@@ -61,6 +64,7 @@
+@@ -61,6 +64,7 @@ void print_pthread_info()
    pthread_condattr_init(&c_attr);
    print_pthread_condattr("Default pthread condattr ", &c_attr);
    pthread_condattr_destroy(&c_attr);
diff --git a/science/cdo/files/patch-src-pthread_debug.c b/science/cdo/files/patch-src-pthread_debug.c
index 84ef54caf588..9447b5aba3d2 100644
--- a/science/cdo/files/patch-src-pthread_debug.c
+++ b/science/cdo/files/patch-src-pthread_debug.c
@@ -1,15 +1,15 @@
---- src/pthread_debug.c.orig	2010-11-12 20:22:44.000000000 +0800
-+++ src/pthread_debug.c	2011-02-26 03:30:00.000000000 +0800
-@@ -77,6 +77,7 @@
+--- src/pthread_debug.c.orig	2016-06-10 08:14:45 UTC
++++ src/pthread_debug.c
+@@ -76,6 +76,7 @@ void print_pthread_attr(const char *call
  }
  
  
 +#if defined (PTHREAD_MUTEXATTR_CONDATTR)
  void print_pthread_mutexattr(const char *caller,  pthread_mutexattr_t *m_attr)
  {
-   /*
-@@ -116,6 +117,7 @@
-   }
+   (void) caller;
+@@ -120,6 +121,7 @@ void print_pthread_condattr(const char *
+   (void) c_attr;
  #endif
  }
 +#endif
diff --git a/science/cdo/files/patch-src-pthread_debug.h b/science/cdo/files/patch-src-pthread_debug.h
index 98aa1b06a5fb..7c6565e31156 100644
--- a/science/cdo/files/patch-src-pthread_debug.h
+++ b/science/cdo/files/patch-src-pthread_debug.h
@@ -1,6 +1,6 @@
---- src/pthread_debug.h.orig	2010-11-12 20:19:20.000000000 +0800
-+++ src/pthread_debug.h	2011-02-26 03:30:00.000000000 +0800
-@@ -15,8 +15,10 @@
+--- src/pthread_debug.h.orig	2016-04-18 08:41:42 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);
  
  void print_pthread_attr(const char *caller, pthread_attr_t *attr);