Index: head/science/cdo/Makefile =================================================================== --- head/science/cdo/Makefile (revision 449460) +++ head/science/cdo/Makefile (revision 449461) @@ -1,73 +1,74 @@ # Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ PORTNAME= cdo -PORTVERSION= 1.8.2 -PORTREVISION= 1 +PORTVERSION= 1.9.0 CATEGORIES= science -MASTER_SITES= https://code.zmaw.de/attachments/download/14686/ \ +MASTER_SITES= https://code.zmaw.de/attachments/download/15187/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= Climate Data Operators LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING OPTIONS_DEFINE= CGRIBEX HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID OPTIONS_DEFAULT=CGRIBEX HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID OPTIONS_SUB= yes CGRIBEX_DESC= Use CGRIBEX library for GRIB1 files HDF5_IMPLIES= SZIP NETCDF_IMPLIES= HDF5 UUID_DESC= UUID support PORTSCOUT= site:https://code.zmaw.de/projects/cdo/files CONFIGURE_ARGS= --disable-data \ --disable-extra \ --disable-grib \ --disable-ieg \ --disable-openmp \ --disable-service \ --enable-cdi-lib \ --program-transform-name="" \ --with-zlib=/usr GNU_CONFIGURE= yes INSTALL_TARGET= install-strip +MAKE_JOBS_UNSAFE= yes TEST_TARGET= check +USE_CXXSTD= c++11 USE_LDCONFIG= yes -USES= execinfo gmake libtool localbase pathfix +USES= compiler:c++11-lib execinfo gmake libtool localbase pathfix CGRIBEX_CONFIGURE_WITH= cgribex CGRIBEX_LIB_DEPENDS= libcgribex.so:science/cgribex HDF5_CONFIGURE_WITH= hdf5 HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 JASPER_CONFIGURE_WITH= jasper JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper NETCDF_CONFIGURE_WITH= netcdf NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf PROJ_CONFIGURE_WITH= proj PROJ_LIB_DEPENDS= libproj.so:graphics/proj SZIP_CONFIGURE_WITH= szlib SZIP_LIB_DEPENDS= libsz.so:science/szip UDUNITS_CONFIGURE_WITH= udunits2 UDUNITS_LIB_DEPENDS= libudunits2.so:science/udunits UUID_CONFIGURE_OFF= ac_cv_func_uuid_create=no ac_cv_have_decl_uuid_create=no ac_cv_have_decl_uuid_generate=no ac_cv_lib_uuid_uuid_generate=no UUID_LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid .include .if ${ARCH} != "sparc64" CFLAGS+= -DPTHREAD_MUTEXATTR_CONDATTR .endif post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS = / s| contrib||' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|$$(libdir)/\($$$$pkgconfigfile\)|${PREFIX}/libdata/\1|' ${WRKSRC}/libcdi/src/Makefile.in @${REINPLACE_CMD} -e 's|unsigned32 |uint32_t |' ${WRKSRC}/libcdi/src/cdilib.c ${WRKSRC}/libcdi/src/util.c test-NETCDF-on: @cd ${WRKSRC}/ && ${SETENV} CDO_PATH=src/cdo src/cdotest .include Index: head/science/cdo/distinfo =================================================================== --- head/science/cdo/distinfo (revision 449460) +++ head/science/cdo/distinfo (revision 449461) @@ -1,3 +1,3 @@ -TIMESTAMP = 1495463430 -SHA256 (cdo-1.8.2.tar.gz) = 6ca6c1263af2237737728ac937a275f8aa27680507636a6b6320f347c69a369a -SIZE (cdo-1.8.2.tar.gz) = 9373890 +TIMESTAMP = 1503779403 +SHA256 (cdo-1.9.0.tar.gz) = df367f8c3abf4ab085bcfc61e0205b28a5ecc69b7b83ba398b4d3c874dd69008 +SIZE (cdo-1.9.0.tar.gz) = 9447614 Index: head/science/cdo/files/patch-src-cdo_pthread.c =================================================================== --- head/science/cdo/files/patch-src-cdo_pthread.c (revision 449460) +++ head/science/cdo/files/patch-src-cdo_pthread.c (nonexistent) @@ -1,29 +0,0 @@ ---- src/cdo_pthread.c.orig 2017-01-19 08:25:24 UTC -+++ src/cdo_pthread.c -@@ -32,8 +32,10 @@ void print_pthread_info() - { - #if defined(HAVE_LIBPTHREAD) - pthread_attr_t attr; -+#if defined (PTHREAD_MUTEXATTR_CONDATTR) - pthread_mutexattr_t m_attr; - pthread_condattr_t c_attr; -+#endif - - #if defined(PTHREAD_KEYS_MAX) - fprintf(stderr, "PTHREAD_KEYS_MAX = %d\n", PTHREAD_KEYS_MAX); -@@ -54,6 +56,7 @@ void print_pthread_info() - print_pthread_attr("Default pthread attr", &attr); - pthread_attr_destroy(&attr); - -+#if defined (PTHREAD_MUTEXATTR_CONDATTR) - 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() - pthread_condattr_init(&c_attr); - print_pthread_condattr("Default pthread condattr ", &c_attr); - pthread_condattr_destroy(&c_attr); -+#endif - - fprintf(stderr, "\n"); - #endif Property changes on: head/science/cdo/files/patch-src-cdo_pthread.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/science/cdo/files/patch-src-pthread_debug.c =================================================================== --- head/science/cdo/files/patch-src-pthread_debug.c (revision 449460) +++ head/science/cdo/files/patch-src-pthread_debug.c (nonexistent) @@ -1,18 +0,0 @@ ---- src/pthread_debug.c.orig 2016-06-10 08:14:45 UTC -+++ src/pthread_debug.c -@@ -76,6 +76,7 @@ void print_pthread_attr(const char *call - } - - -+#if defined (PTHREAD_MUTEXATTR_CONDATTR) - 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; - #endif - } -+#endif - - - int PTHREAD_Debug = 0; Property changes on: head/science/cdo/files/patch-src-pthread_debug.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/science/cdo/files/patch-src-cdo_pthread.cc =================================================================== --- head/science/cdo/files/patch-src-cdo_pthread.cc (nonexistent) +++ head/science/cdo/files/patch-src-cdo_pthread.cc (revision 449461) @@ -0,0 +1,29 @@ +--- src/cdo_pthread.cc.orig 2017-07-03 08:59:29 UTC ++++ src/cdo_pthread.cc +@@ -32,8 +32,10 @@ void print_pthread_info() + { + #if defined(HAVE_LIBPTHREAD) + pthread_attr_t attr; ++#if defined (PTHREAD_MUTEXATTR_CONDATTR) + pthread_mutexattr_t m_attr; + pthread_condattr_t c_attr; ++#endif + + #if defined(PTHREAD_KEYS_MAX) + fprintf(stderr, "PTHREAD_KEYS_MAX = %d\n", PTHREAD_KEYS_MAX); +@@ -54,6 +56,7 @@ void print_pthread_info() + print_pthread_attr("Default pthread attr", &attr); + pthread_attr_destroy(&attr); + ++#if defined (PTHREAD_MUTEXATTR_CONDATTR) + 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() + pthread_condattr_init(&c_attr); + print_pthread_condattr("Default pthread condattr ", &c_attr); + pthread_condattr_destroy(&c_attr); ++#endif + + fprintf(stderr, "\n"); + #endif Property changes on: head/science/cdo/files/patch-src-cdo_pthread.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/science/cdo/files/patch-src-pthread_debug.cc =================================================================== --- head/science/cdo/files/patch-src-pthread_debug.cc (nonexistent) +++ head/science/cdo/files/patch-src-pthread_debug.cc (revision 449461) @@ -0,0 +1,18 @@ +--- src/pthread_debug.cc.orig 2017-07-03 08:59:29 UTC ++++ src/pthread_debug.cc +@@ -76,6 +76,7 @@ void print_pthread_attr(const char *call + } + + ++#if defined (PTHREAD_MUTEXATTR_CONDATTR) + 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; + #endif + } ++#endif + + + int PTHREAD_Debug = 0; Property changes on: head/science/cdo/files/patch-src-pthread_debug.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/science/cdo/files/patch-src-pthread_debug.h =================================================================== --- head/science/cdo/files/patch-src-pthread_debug.h (revision 449460) +++ head/science/cdo/files/patch-src-pthread_debug.h (revision 449461) @@ -1,13 +1,24 @@ ---- src/pthread_debug.h.orig 2016-04-18 08:41:42 UTC +--- src/pthread_debug.h.orig 2017-06-16 08:43:18 UTC +++ src/pthread_debug.h -@@ -15,8 +15,10 @@ void Pthread_cond_signal(const char *cal - void Pthread_cond_wait(const char *caller, pthread_cond_t *cond, pthread_mutex_t *mutex); +@@ -8,15 +8,17 @@ 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); ++int Pthread_mutex_lock(const char *caller, pthread_mutex_t *mutex); ++int Pthread_mutex_unlock(const char *caller, pthread_mutex_t *mutex); + +-void Pthread_cond_signal(const char *caller, pthread_cond_t *cond); +-void Pthread_cond_wait(const char *caller, pthread_cond_t *cond, pthread_mutex_t *mutex); ++int Pthread_cond_signal(const char *caller, pthread_cond_t *cond); ++int Pthread_cond_wait(const char *caller, pthread_cond_t *cond, pthread_mutex_t *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_condattr(const char *caller, pthread_condattr_t *c_attr); +#endif #define pthread_create(a, b, c, d) Pthread_create(__func__, a, b, c, d)