svn commit: r470161 - in head/science/cdo: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Wed May 16 23:54:24 UTC 2018
Author: sunpoet
Date: Wed May 16 23:54:22 2018
New Revision: 470161
URL: https://svnweb.freebsd.org/changeset/ports/470161
Log:
Update to 1.9.4
Changes: https://code.mpimet.mpg.de/projects/cdo/news
Modified:
head/science/cdo/Makefile
head/science/cdo/distinfo
head/science/cdo/files/patch-src-cdo_pthread.cc
head/science/cdo/files/patch-src-pthread_debug.cc
head/science/cdo/files/patch-src-pthread_debug.h
Modified: head/science/cdo/Makefile
==============================================================================
--- head/science/cdo/Makefile Wed May 16 23:54:16 2018 (r470160)
+++ head/science/cdo/Makefile Wed May 16 23:54:22 2018 (r470161)
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= cdo
-PORTVERSION= 1.9.3
+PORTVERSION= 1.9.4
CATEGORIES= science
-MASTER_SITES= https://code.mpimet.mpg.de/attachments/download/16435/ \
+MASTER_SITES= https://code.mpimet.mpg.de/attachments/download/17374/ \
LOCAL/sunpoet
MAINTAINER= sunpoet at FreeBSD.org
Modified: head/science/cdo/distinfo
==============================================================================
--- head/science/cdo/distinfo Wed May 16 23:54:16 2018 (r470160)
+++ head/science/cdo/distinfo Wed May 16 23:54:22 2018 (r470161)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517730075
-SHA256 (cdo-1.9.3.tar.gz) = e83a3de7b402600c0d9a5df18073d36d133ff9719d3c561a0efa90f9c1599f3f
-SIZE (cdo-1.9.3.tar.gz) = 9950612
+TIMESTAMP = 1526403275
+SHA256 (cdo-1.9.4.tar.gz) = 3d1c0fd3f7d38c5d3d88139ca1546c9d24e1b1ff752a794a4194dfe624695def
+SIZE (cdo-1.9.4.tar.gz) = 10052888
Modified: head/science/cdo/files/patch-src-cdo_pthread.cc
==============================================================================
--- head/science/cdo/files/patch-src-cdo_pthread.cc Wed May 16 23:54:16 2018 (r470160)
+++ head/science/cdo/files/patch-src-cdo_pthread.cc Wed May 16 23:54:22 2018 (r470161)
@@ -1,8 +1,8 @@
---- src/cdo_pthread.cc.orig 2017-07-03 08:59:29 UTC
+--- src/cdo_pthread.cc.orig 2018-05-09 08:49:58 UTC
+++ src/cdo_pthread.cc
-@@ -32,8 +32,10 @@ void print_pthread_info()
+@@ -32,8 +32,10 @@ print_pthread_info()
{
- #if defined(HAVE_LIBPTHREAD)
+ #ifdef HAVE_LIBPTHREAD
pthread_attr_t attr;
+#if defined (PTHREAD_MUTEXATTR_CONDATTR)
pthread_mutexattr_t m_attr;
@@ -11,7 +11,7 @@
#if defined(PTHREAD_KEYS_MAX)
fprintf(stderr, "PTHREAD_KEYS_MAX = %d\n", PTHREAD_KEYS_MAX);
-@@ -54,6 +56,7 @@ void print_pthread_info()
+@@ -54,6 +56,7 @@ 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 @@ void print_pthread_info()
+@@ -61,6 +64,7 @@ print_pthread_info()
pthread_condattr_init(&c_attr);
print_pthread_condattr("Default pthread condattr ", &c_attr);
pthread_condattr_destroy(&c_attr);
Modified: head/science/cdo/files/patch-src-pthread_debug.cc
==============================================================================
--- head/science/cdo/files/patch-src-pthread_debug.cc Wed May 16 23:54:16 2018 (r470160)
+++ head/science/cdo/files/patch-src-pthread_debug.cc Wed May 16 23:54:22 2018 (r470161)
@@ -1,18 +1,18 @@
---- src/pthread_debug.cc.orig 2017-11-21 10:41:21 UTC
+--- src/pthread_debug.cc.orig 2018-05-09 08:49:58 UTC
+++ src/pthread_debug.cc
-@@ -80,6 +80,7 @@ void print_pthread_attr(const char *call
+@@ -87,6 +87,7 @@ print_pthread_attr(const char *caller, p
+ fprintf(stderr, "%-18s : %-14s = %ld\n", caller, "stacksize", (long) stacksize);
}
-
+#if defined (PTHREAD_MUTEXATTR_CONDATTR)
- void print_pthread_mutexattr(const char *caller, pthread_mutexattr_t *m_attr)
+ void
+ print_pthread_mutexattr(const char *caller, pthread_mutexattr_t *m_attr)
{
- (void) caller;
-@@ -109,6 +110,7 @@ void print_pthread_mutexattr(const char
+@@ -118,6 +119,7 @@ PTHREAD_PRIO_NONE);
}
#endif
}
+#endif
-
- void print_pthread_condattr(const char *caller, pthread_condattr_t *c_attr)
+ void
+ print_pthread_condattr(const char *caller, pthread_condattr_t *c_attr)
Modified: head/science/cdo/files/patch-src-pthread_debug.h
==============================================================================
--- head/science/cdo/files/patch-src-pthread_debug.h Wed May 16 23:54:16 2018 (r470160)
+++ head/science/cdo/files/patch-src-pthread_debug.h Wed May 16 23:54:22 2018 (r470161)
@@ -1,6 +1,6 @@
---- src/pthread_debug.h.orig 2017-11-21 10:40:41 UTC
+--- src/pthread_debug.h.orig 2018-05-09 08:49:58 UTC
+++ src/pthread_debug.h
-@@ -11,20 +11,22 @@ int Pthread_create(const char *caller, p
+@@ -26,20 +26,22 @@ int Pthread_create(const char *caller, p
int Pthread_join(const char *caller, pthread_t th, void **thread_return);
@@ -10,24 +10,24 @@
+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);
+-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);
++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_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);
+-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_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);
++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)
- void print_pthread_mutexattr(const char *caller, pthread_mutexattr_t *m_attr);
+ void print_pthread_mutexattr(const char *caller, pthread_mutexattr_t *m_attr);
void print_pthread_condattr(const char *caller, pthread_condattr_t *c_attr);
+#endif
-
- #define pthread_create(a, b, c, d) Pthread_create(__func__, a, b, c, d)
+ #define pthread_create(a, b, c, d) Pthread_create(__func__, a, b, c, d)
+ #define pthread_join(a, b) Pthread_join(__func__, a, b)
More information about the svn-ports-head
mailing list