Date: Sun, 8 Nov 2020 17:11:32 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554488 - in head/science/cdo: . files Message-ID: <202011081711.0A8HBWRY090922@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sun Nov 8 17:11:31 2020 New Revision: 554488 URL: https://svnweb.freebsd.org/changeset/ports/554488 Log: Update to 1.9.9 Changes: https://code.mpimet.mpg.de/projects/cdo/news Added: head/science/cdo/files/patch-libcdi-src-cdilib.c (contents, props changed) head/science/cdo/files/patch-libcdi-src-namespace.c (contents, props changed) head/science/cdo/files/patch-libcdi-src-resource_handle.c (contents, props changed) Deleted: 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/distinfo Modified: head/science/cdo/Makefile ============================================================================== --- head/science/cdo/Makefile Sun Nov 8 17:11:27 2020 (r554487) +++ head/science/cdo/Makefile Sun Nov 8 17:11:31 2020 (r554488) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= cdo -PORTVERSION= 1.9.8 -PORTREVISION= 1 +PORTVERSION= 1.9.9 CATEGORIES= science -MASTER_SITES= https://code.mpimet.mpg.de/attachments/download/20826/ \ +MASTER_SITES= https://code.mpimet.mpg.de/attachments/download/23323/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org @@ -65,7 +64,7 @@ UUID_LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid .include <bsd.port.pre.mk> .if ${ARCH} != "sparc64" -CFLAGS+= -DPTHREAD_MUTEXATTR_CONDATTR +CFLAGS+= -DPTHREAD_MUTEXATTR .endif post-patch: Modified: head/science/cdo/distinfo ============================================================================== --- head/science/cdo/distinfo Sun Nov 8 17:11:27 2020 (r554487) +++ head/science/cdo/distinfo Sun Nov 8 17:11:31 2020 (r554488) @@ -1,3 +1,3 @@ -TIMESTAMP = 1573550115 -SHA256 (cdo-1.9.8.tar.gz) = f2660ac6f8bf3fa071cf2a3a196b3ec75ad007deb3a782455e80f28680c5252a -SIZE (cdo-1.9.8.tar.gz) = 10793380 +TIMESTAMP = 1604680076 +SHA256 (cdo-1.9.9.tar.gz) = 959b5b58f495d521a7fd1daa84644888ec87d6a0df43f22ad950d17aee5ba98d +SIZE (cdo-1.9.9.tar.gz) = 11511630 Added: head/science/cdo/files/patch-libcdi-src-cdilib.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/cdo/files/patch-libcdi-src-cdilib.c Sun Nov 8 17:11:31 2020 (r554488) @@ -0,0 +1,31 @@ +--- libcdi/src/cdilib.c.orig 2020-02-22 18:32:17 UTC ++++ libcdi/src/cdilib.c +@@ -34056,11 +34056,13 @@ static pthread_mutex_t namespaceMutex; + static void + namespaceInitialize(void) + { ++#if defined(PTHREAD_MUTEXATTR) + pthread_mutexattr_t ma; + pthread_mutexattr_init(&ma); + pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_RECURSIVE); + pthread_mutex_init(&namespaceMutex, &ma); + pthread_mutexattr_destroy(&ma); ++#endif + } + + # define NAMESPACE_LOCK() pthread_mutex_lock(&namespaceMutex) +@@ -34516,12 +34518,14 @@ static + void listInitialize ( void ) + { + #if defined (HAVE_LIBPTHREAD) ++#if defined(PTHREAD_MUTEXATTR) + pthread_mutexattr_t ma; + pthread_mutexattr_init(&ma); + pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_RECURSIVE); + /* initialize global API mutex lock */ + pthread_mutex_init ( &listMutex, &ma); + pthread_mutexattr_destroy(&ma); ++#endif + #endif + /* file is special and has its own table, which needs to be + * created, before we register the listDestroy exit handler */ Added: head/science/cdo/files/patch-libcdi-src-namespace.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/cdo/files/patch-libcdi-src-namespace.c Sun Nov 8 17:11:31 2020 (r554488) @@ -0,0 +1,16 @@ +--- libcdi/src/namespace.c.orig 2020-01-21 20:19:01 UTC ++++ libcdi/src/namespace.c +@@ -88,11 +88,13 @@ static pthread_mutex_t namespaceMutex; + static void + namespaceInitialize(void) + { ++#if defined(PTHREAD_MUTEXATTR) + pthread_mutexattr_t ma; + pthread_mutexattr_init(&ma); + pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_RECURSIVE); + pthread_mutex_init(&namespaceMutex, &ma); + pthread_mutexattr_destroy(&ma); ++#endif + } + + # define NAMESPACE_LOCK() pthread_mutex_lock(&namespaceMutex) Added: head/science/cdo/files/patch-libcdi-src-resource_handle.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/cdo/files/patch-libcdi-src-resource_handle.c Sun Nov 8 17:11:31 2020 (r554488) @@ -0,0 +1,17 @@ +--- libcdi/src/resource_handle.c.orig 2020-04-22 13:06:24 UTC ++++ libcdi/src/resource_handle.c +@@ -208,12 +208,14 @@ static + void listInitialize ( void ) + { + #if defined (HAVE_LIBPTHREAD) ++#if defined(PTHREAD_MUTEXATTR) + pthread_mutexattr_t ma; + pthread_mutexattr_init(&ma); + pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_RECURSIVE); + /* initialize global API mutex lock */ + pthread_mutex_init ( &listMutex, &ma); + pthread_mutexattr_destroy(&ma); ++#endif + #endif + /* file is special and has its own table, which needs to be + * created, before we register the listDestroy exit handler */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011081711.0A8HBWRY090922>