diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2017-12-12 13:32:53 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2017-12-12 13:32:53 +0000 |
| commit | c9e9f17c7dee3d4497a9a9bfe1fcd47b64ca4192 (patch) | |
| tree | 3d1c6db7404287f1b453b09b4697a532f29f6a6d /science/cdo | |
| parent | 9927a9dcd10780227f2266a5d37561ee8b572965 (diff) | |
| download | ports-c9e9f17c7dee3d4497a9a9bfe1fcd47b64ca4192.tar.gz ports-c9e9f17c7dee3d4497a9a9bfe1fcd47b64ca4192.zip | |
Notes
Diffstat (limited to 'science/cdo')
| -rw-r--r-- | science/cdo/Makefile | 5 | ||||
| -rw-r--r-- | science/cdo/distinfo | 6 | ||||
| -rw-r--r-- | science/cdo/files/patch-src-pthread_debug.cc | 10 | ||||
| -rw-r--r-- | science/cdo/files/patch-src-pthread_debug.h | 15 | ||||
| -rw-r--r-- | science/cdo/pkg-descr | 2 |
5 files changed, 23 insertions, 15 deletions
diff --git a/science/cdo/Makefile b/science/cdo/Makefile index e5032544ef4c..df23e76a8c3a 100644 --- a/science/cdo/Makefile +++ b/science/cdo/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= cdo -PORTVERSION= 1.9.0 -PORTREVISION= 2 +PORTVERSION= 1.9.2 CATEGORIES= science -MASTER_SITES= https://code.zmaw.de/attachments/download/15187/ \ +MASTER_SITES= https://code.mpimet.mpg.de/attachments/download/16035/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org diff --git a/science/cdo/distinfo b/science/cdo/distinfo index fa197c3f1c75..4f6950f6b11c 100644 --- a/science/cdo/distinfo +++ b/science/cdo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1503779403 -SHA256 (cdo-1.9.0.tar.gz) = df367f8c3abf4ab085bcfc61e0205b28a5ecc69b7b83ba398b4d3c874dd69008 -SIZE (cdo-1.9.0.tar.gz) = 9447614 +TIMESTAMP = 1513017350 +SHA256 (cdo-1.9.2.tar.gz) = d1c5092167034a48e4b8ada24cf78a1d4b84e364ffbb08b9ca70d13f428f300c +SIZE (cdo-1.9.2.tar.gz) = 9997020 diff --git a/science/cdo/files/patch-src-pthread_debug.cc b/science/cdo/files/patch-src-pthread_debug.cc index 87effb3d2694..3cbe69e40ad7 100644 --- a/science/cdo/files/patch-src-pthread_debug.cc +++ b/science/cdo/files/patch-src-pthread_debug.cc @@ -1,6 +1,6 @@ ---- src/pthread_debug.cc.orig 2017-07-03 08:59:29 UTC +--- src/pthread_debug.cc.orig 2017-11-21 10:41:21 UTC +++ src/pthread_debug.cc -@@ -76,6 +76,7 @@ void print_pthread_attr(const char *call +@@ -80,6 +80,7 @@ void print_pthread_attr(const char *call } @@ -8,11 +8,11 @@ void print_pthread_mutexattr(const char *caller, pthread_mutexattr_t *m_attr) { (void) caller; -@@ -120,6 +121,7 @@ void print_pthread_condattr(const char * - (void) c_attr; +@@ -109,6 +110,7 @@ void print_pthread_mutexattr(const char + } #endif } +#endif - int PTHREAD_Debug = 0; + void print_pthread_condattr(const char *caller, pthread_condattr_t *c_attr) diff --git a/science/cdo/files/patch-src-pthread_debug.h b/science/cdo/files/patch-src-pthread_debug.h index 5875c1a3d8d3..d1f603481cb5 100644 --- a/science/cdo/files/patch-src-pthread_debug.h +++ b/science/cdo/files/patch-src-pthread_debug.h @@ -1,18 +1,27 @@ ---- src/pthread_debug.h.orig 2017-06-16 08:43:18 UTC +--- src/pthread_debug.h.orig 2017-11-21 10:40:41 UTC +++ src/pthread_debug.h -@@ -8,15 +8,17 @@ int Pthread_create(const char *caller, p +@@ -11,20 +11,22 @@ 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); +-void Pthread_mutex_lock(const char *caller, std::mutex &p_mutex); +int Pthread_mutex_lock(const char *caller, pthread_mutex_t *mutex); ++int Pthread_mutex_lock(const char *caller, std::mutex &p_mutex); + +-void Pthread_mutex_unlock(const char *caller, pthread_mutex_t *mutex); +-void Pthread_mutex_unlock(const char *caller, std::mutex& p_mutex); +int Pthread_mutex_unlock(const char *caller, pthread_mutex_t *mutex); ++int Pthread_mutex_unlock(const char *caller, std::mutex& p_mutex); -void Pthread_cond_signal(const char *caller, pthread_cond_t *cond); +-void Pthread_cond_signal(const char *caller,std::condition_variable &p_cond_var); -void Pthread_cond_wait(const char *caller, pthread_cond_t *cond, pthread_mutex_t *mutex); +-void Pthread_cond_wait(const char *caller, std::condition_variable &p_cond_var, std::unique_lock<std::mutex>& p_mutex); +int Pthread_cond_signal(const char *caller, pthread_cond_t *cond); ++int Pthread_cond_signal(const char *caller,std::condition_variable &p_cond_var); +int Pthread_cond_wait(const char *caller, pthread_cond_t *cond, pthread_mutex_t *mutex); ++int Pthread_cond_wait(const char *caller, std::condition_variable &p_cond_var, std::unique_lock<std::mutex>& p_mutex); void print_pthread_attr(const char *caller, pthread_attr_t *attr); +#if defined (PTHREAD_MUTEXATTR_CONDATTR) diff --git a/science/cdo/pkg-descr b/science/cdo/pkg-descr index 6f625db3500d..4352485b366a 100644 --- a/science/cdo/pkg-descr +++ b/science/cdo/pkg-descr @@ -20,4 +20,4 @@ overview about the main categories. * Vertical interpolation (ml2pl, ml2hl) * Time interpolation (inttime, intyear) -WWW: https://code.zmaw.de/projects/cdo +WWW: https://code.mpimet.mpg.de/projects/cdo |