Index: head/science/cdo/Makefile =================================================================== --- head/science/cdo/Makefile (revision 434221) +++ head/science/cdo/Makefile (revision 434222) @@ -1,73 +1,72 @@ # Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ PORTNAME= cdo -PORTVERSION= 1.7.2 -PORTREVISION= 1 +PORTVERSION= 1.8.0 CATEGORIES= science -MASTER_SITES= https://code.zmaw.de/attachments/download/12760/ \ +MASTER_SITES= https://code.zmaw.de/attachments/download/13772/ \ 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 TEST_TARGET= check USE_LDCONFIG= yes USES= 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 434221) +++ head/science/cdo/distinfo (revision 434222) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479408559 -SHA256 (cdo-1.7.2.tar.gz) = 4c43eba7a95f77457bfe0d30fb82382b3b5f2b0cf90aca6f0f0a008f6cc7e697 -SIZE (cdo-1.7.2.tar.gz) = 9041971 +TIMESTAMP = 1487174387 +SHA256 (cdo-1.8.0.tar.gz) = 2008c72740d9d485d2c857d99b8e26d801db5de3f5873fbec717d824441acf70 +SIZE (cdo-1.8.0.tar.gz) = 9275335 Index: head/science/cdo/files/patch-src-cdo_pthread.c =================================================================== --- head/science/cdo/files/patch-src-cdo_pthread.c (revision 434221) +++ head/science/cdo/files/patch-src-cdo_pthread.c (revision 434222) @@ -1,29 +1,29 @@ ---- src/cdo_pthread.c.orig 2007-08-29 17:15:32.000000000 +0800 -+++ src/cdo_pthread.c 2011-02-26 03:30:00.000000000 +0800 -@@ -32,8 +32,10 @@ +--- 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) + #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) + #if defined(PTHREAD_KEYS_MAX) fprintf(stderr, "PTHREAD_KEYS_MAX = %d\n", PTHREAD_KEYS_MAX); -@@ -54,6 +56,7 @@ +@@ -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 @@ +@@ -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 Index: head/science/cdo/files/patch-src-pthread_debug.c =================================================================== --- head/science/cdo/files/patch-src-pthread_debug.c (revision 434221) +++ head/science/cdo/files/patch-src-pthread_debug.c (revision 434222) @@ -1,18 +1,18 @@ ---- src/pthread_debug.c.orig 2010-11-12 20:22:44.000000000 +0800 -+++ src/pthread_debug.c 2011-02-26 03:30:00.000000000 +0800 -@@ -77,6 +77,7 @@ +--- 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) { - /* -@@ -116,6 +117,7 @@ - } + (void) caller; +@@ -120,6 +121,7 @@ void print_pthread_condattr(const char * + (void) c_attr; #endif } +#endif int PTHREAD_Debug = 0; Index: head/science/cdo/files/patch-src-pthread_debug.h =================================================================== --- head/science/cdo/files/patch-src-pthread_debug.h (revision 434221) +++ head/science/cdo/files/patch-src-pthread_debug.h (revision 434222) @@ -1,13 +1,13 @@ ---- src/pthread_debug.h.orig 2010-11-12 20:19:20.000000000 +0800 -+++ src/pthread_debug.h 2011-02-26 03:30:00.000000000 +0800 -@@ -15,8 +15,10 @@ +--- src/pthread_debug.h.orig 2016-04-18 08:41:42 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); 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)