From owner-svn-ports-all@freebsd.org Sun Nov 8 17:11:36 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6FEAC466852; Sun, 8 Nov 2020 17:11:36 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CTgdg4NS6z3vbC; Sun, 8 Nov 2020 17:11:35 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 69F3823198; Sun, 8 Nov 2020 17:11:33 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A8HBXR8090927; Sun, 8 Nov 2020 17:11:33 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A8HBWRY090922; Sun, 8 Nov 2020 17:11:32 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202011081711.0A8HBWRY090922@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 8 Nov 2020 17:11:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554488 - in head/science/cdo: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/science/cdo: . files X-SVN-Commit-Revision: 554488 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2020 17:11:36 -0000 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 .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 */