Date: Sat, 7 Apr 2007 15:09:49 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/111346: [science/cdo] update to latest version (1.0.7) Message-ID: <20070407070949.D63821704F@sunpoet.net> Resent-Message-ID: <200704070710.l377A4YN073389@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 111346 >Category: ports >Synopsis: [science/cdo] update to latest version (1.0.7) >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Apr 07 07:10:04 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 6.2-STABLE i386 >Organization: SUNPOET.net >Environment: System: FreeBSD IRIS.sunpoet.net 6.2-STABLE FreeBSD 6.2-STABLE #1: Mon Feb 12 03:43:56 CST 2007 sunpoet@IRIS.sunpoet.net:/usr/obj/usr/src/sys/sunpoet i386 >Description: Update to latest version (1.0.7) >How-To-Repeat: >Fix: diff -ruN cdo.orig/Makefile cdo/Makefile --- cdo.orig/Makefile Tue Dec 26 09:43:21 2006 +++ cdo/Makefile Sat Apr 7 05:06:07 2007 @@ -7,7 +7,7 @@ # PORTNAME= cdo -PORTVERSION= 1.0.6 +PORTVERSION= 1.0.7 CATEGORIES= science MASTER_SITES= http://www.mpimet.mpg.de/fileadmin/software/cdo/ \ http://sunpoet.net/distfiles/ @@ -28,6 +28,12 @@ OPTIONS= HDF5 "HDF5 support" off \ NETCDF "NETCDF support" off +.include <bsd.port.pre.mk> + +.if (${OSVERSION} > 700000) || (${ARCH} != "sparc64" && ${OSVERSION} > 600000) +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -DPTHREAD_MUTEXATTR_CONDATTR" +.endif + .if defined(WITH_HDF5) CONFIGURE_ARGS+= --with-hdf5=${LOCALBASE} LIB_DEPENDS+= hdf5.0:${PORTSDIR}/science/hdf5 @@ -35,10 +41,10 @@ .if defined(WITH_NETCDF) CONFIGURE_ARGS+= --with-netcdf=${LOCALBASE} -LIB_DEPENDS+= netcdf.1:${PORTSDIR}/science/netcdf +LIB_DEPENDS+= netcdf.4:${PORTSDIR}/science/netcdf .endif post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -ruN cdo.orig/distinfo cdo/distinfo --- cdo.orig/distinfo Tue Dec 19 09:18:51 2006 +++ cdo/distinfo Sat Apr 7 00:20:19 2007 @@ -1,3 +1,3 @@ -MD5 (cdo-1.0.6.tar.gz) = 4d27edf8c576cab34eacf358073456d1 -SHA256 (cdo-1.0.6.tar.gz) = aaf22308a446942bac9158f631ca749cd91d33e4985cca4f6e7c6cf37b474ec5 -SIZE (cdo-1.0.6.tar.gz) = 2279653 +MD5 (cdo-1.0.7.tar.gz) = ee087cbd434f3bacc7b4154300f2cffe +SHA256 (cdo-1.0.7.tar.gz) = 9aee78fcd0fc500b64e527bee10dea9b9bb607832e0bf40db50685f370ab9d58 +SIZE (cdo-1.0.7.tar.gz) = 2315855 diff -ruN cdo.orig/files/extra-patch-src-config.h.in cdo/files/extra-patch-src-config.h.in --- cdo.orig/files/extra-patch-src-config.h.in Thu Jan 1 08:00:00 1970 +++ cdo/files/extra-patch-src-config.h.in Sat Apr 7 01:26:52 2007 @@ -0,0 +1,10 @@ +--- src/config.h.in.orig Tue Dec 19 19:07:07 2006 ++++ src/config.h.in Sat Apr 7 01:22:21 2007 +@@ -1,5 +1,7 @@ + /* src/config.h.in. Generated from configure.ac by autoheader. */ + ++#define PTHREAD_MUTEXATTR_CONDATTR 1 ++ + /* Compiler */ + #undef COMPILER + diff -ruN cdo.orig/files/patch-src-cdo_pthread.c cdo/files/patch-src-cdo_pthread.c --- cdo.orig/files/patch-src-cdo_pthread.c Mon Dec 18 13:41:16 2006 +++ cdo/files/patch-src-cdo_pthread.c Sat Apr 7 01:25:15 2007 @@ -1,10 +1,10 @@ --- src/cdo_pthread.c.orig Wed Mar 22 22:04:18 2006 -+++ src/cdo_pthread.c Mon Dec 18 10:01:00 2006 ++++ src/cdo_pthread.c Sat Apr 7 01:07:02 2007 @@ -32,8 +32,10 @@ { #if defined (HAVE_LIBPTHREAD) pthread_attr_t attr; -+#if __FreeBSD_version >= 600000 ++#if defined (PTHREAD_MUTEXATTR_CONDATTR) pthread_mutexattr_t m_attr; pthread_condattr_t c_attr; +#endif @@ -15,7 +15,7 @@ print_pthread_attr("Default pthread attr", &attr); pthread_attr_destroy(&attr); -+#if __FreeBSD_version >= 600000 ++#if defined (PTHREAD_MUTEXATTR_CONDATTR) pthread_mutexattr_init(&m_attr); print_pthread_mutexattr("Default pthread mutexattr", &m_attr); pthread_mutexattr_destroy(&m_attr); diff -ruN cdo.orig/files/patch-src-config.h.in cdo/files/patch-src-config.h.in --- cdo.orig/files/patch-src-config.h.in Mon Dec 18 13:41:16 2006 +++ cdo/files/patch-src-config.h.in Sat Apr 7 04:01:40 2007 @@ -1,11 +1,10 @@ ---- src/config.h.in.orig Wed Dec 13 21:30:19 2006 -+++ src/config.h.in Mon Dec 18 10:41:13 2006 -@@ -1,5 +1,8 @@ - /* src/config.h.in. Generated from configure.ac by autoheader. */ +--- src/config.h.in.orig Tue Dec 19 19:07:07 2006 ++++ src/config.h.in Sat Apr 7 04:00:39 2007 +@@ -107,3 +107,7 @@ -+#include <unistd.h> -+#include <sys/param.h> + /* Define for large files, on AIX-style hosts. */ + #undef _LARGE_FILES + - /* Compiler */ - #undef COMPILER - ++#if defined (HAVE_UNISTD_H) ++#include <unistd.h> ++#endif diff -ruN cdo.orig/files/patch-src-pthread_debug.c cdo/files/patch-src-pthread_debug.c --- cdo.orig/files/patch-src-pthread_debug.c Mon Dec 18 13:41:16 2006 +++ cdo/files/patch-src-pthread_debug.c Sat Apr 7 01:25:15 2007 @@ -1,10 +1,10 @@ --- src/pthread_debug.c.orig Mon Dec 4 16:11:40 2006 -+++ src/pthread_debug.c Mon Dec 18 10:01:00 2006 ++++ src/pthread_debug.c Sat Apr 7 01:12:05 2007 @@ -77,6 +77,7 @@ } -+#if __FreeBSD_version >= 600000 ++#if defined (PTHREAD_MUTEXATTR_CONDATTR) void print_pthread_mutexattr(const char *caller, pthread_mutexattr_t *m_attr) { int protocol, kind, pshared; diff -ruN cdo.orig/files/patch-src-pthread_debug.h cdo/files/patch-src-pthread_debug.h --- cdo.orig/files/patch-src-pthread_debug.h Mon Dec 18 13:41:16 2006 +++ cdo/files/patch-src-pthread_debug.h Sat Apr 7 01:25:15 2007 @@ -1,10 +1,10 @@ --- src/pthread_debug.h.orig Wed Feb 15 21:22:38 2006 -+++ src/pthread_debug.h Mon Dec 18 10:01:00 2006 ++++ src/pthread_debug.h Sat Apr 7 01:13:25 2007 @@ -15,8 +15,10 @@ 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 __FreeBSD_version >= 600000 ++#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 diff -ruN cdo.orig/pkg-message cdo/pkg-message --- cdo.orig/pkg-message Tue Dec 19 10:54:41 2006 +++ cdo/pkg-message Sat Apr 7 00:49:31 2007 @@ -1,4 +1,4 @@ -In CDO version 1.0.6, three new environment variables were introduced: +Since CDO version 1.0.6, three new environment variables were introduced: - CDO_DISABLE_HISTORY: If set to 1, the netCDF history attribute of input datasets is not used. - CDO_DISABLE_FILESUFFIX: >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070407070949.D63821704F>