From owner-svn-ports-all@freebsd.org Tue Dec 12 13:32:57 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7F5AAE988D3; Tue, 12 Dec 2017 13:32:57 +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 mx1.freebsd.org (Postfix) with ESMTPS id D88CE7C6BC; Tue, 12 Dec 2017 13:32:55 +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 vBCDWsaK074097; Tue, 12 Dec 2017 13:32:54 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBCDWrHB074092; Tue, 12 Dec 2017 13:32:53 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201712121332.vBCDWrHB074092@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Tue, 12 Dec 2017 13:32:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456133 - 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: 456133 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.25 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: Tue, 12 Dec 2017 13:32:57 -0000 Author: sunpoet Date: Tue Dec 12 13:32:53 2017 New Revision: 456133 URL: https://svnweb.freebsd.org/changeset/ports/456133 Log: Update to 1.9.2 - Update MASTER_SITES - Update WWW Changes: https://code.mpimet.mpg.de/news/392 https://code.mpimet.mpg.de/news/387 Modified: head/science/cdo/Makefile head/science/cdo/distinfo head/science/cdo/files/patch-src-pthread_debug.cc head/science/cdo/files/patch-src-pthread_debug.h head/science/cdo/pkg-descr Modified: head/science/cdo/Makefile ============================================================================== --- head/science/cdo/Makefile Tue Dec 12 13:32:48 2017 (r456132) +++ head/science/cdo/Makefile Tue Dec 12 13:32:53 2017 (r456133) @@ -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 Modified: head/science/cdo/distinfo ============================================================================== --- head/science/cdo/distinfo Tue Dec 12 13:32:48 2017 (r456132) +++ head/science/cdo/distinfo Tue Dec 12 13:32:53 2017 (r456133) @@ -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 Modified: head/science/cdo/files/patch-src-pthread_debug.cc ============================================================================== --- head/science/cdo/files/patch-src-pthread_debug.cc Tue Dec 12 13:32:48 2017 (r456132) +++ head/science/cdo/files/patch-src-pthread_debug.cc Tue Dec 12 13:32:53 2017 (r456133) @@ -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) Modified: head/science/cdo/files/patch-src-pthread_debug.h ============================================================================== --- head/science/cdo/files/patch-src-pthread_debug.h Tue Dec 12 13:32:48 2017 (r456132) +++ head/science/cdo/files/patch-src-pthread_debug.h Tue Dec 12 13:32:53 2017 (r456133) @@ -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& 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& p_mutex); void print_pthread_attr(const char *caller, pthread_attr_t *attr); +#if defined (PTHREAD_MUTEXATTR_CONDATTR) Modified: head/science/cdo/pkg-descr ============================================================================== --- head/science/cdo/pkg-descr Tue Dec 12 13:32:48 2017 (r456132) +++ head/science/cdo/pkg-descr Tue Dec 12 13:32:53 2017 (r456133) @@ -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