Attachment #73755 for bug #106849

View | Details | Raw Unified | Return to bug 106849
Collapse All | Expand All




#

PORTNAME=	cdo
PORTVERSION=	1.0.6
CATEGORIES=	science
MASTER_SITES=	http://www.mpimet.mpg.de/fileadmin/software/cdo/ \
		http://sunpoet.net/distfiles/

CONFIGURE_ARGS=	--program-transform-name=""
CONFIGURE_ENV=	CC="${CC}" \
		CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"

PLIST_FILES=	bin/cdo

OPTIONS=	HDF5	"HDF5 support" off \
		NETCDF	"NETCDF support" off

.include <bsd.port.pre.mk>

.if defined(WITH_HDF5)
CONFIGURE_ARGS+=	--with-hdf5=${LOCALBASE}
LIB_DEPENDS+=		hdf5.0:${PORTSDIR}/science/hdf5

LIB_DEPENDS+=		netcdf.1:${PORTSDIR}/science/netcdf
.endif

.include <bsd.port.mk>
EXTRA_PATCHES+=	"${PATCHDIR}/extra-patch-freebsd5-pthread"
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (cdo-1.0.2.tar.gz) = c8bbdfdb1ca43fb58a0c403c8208b9d0	1	MD5 (cdo-1.0.6.tar.gz) = 4d27edf8c576cab34eacf358073456d1
2	SHA256 (cdo-1.0.2.tar.gz) = 41dd4e63c1f5e7927942da132d03b681ccced0cfe931258d19dbfad41c6a9699	2	SHA256 (cdo-1.0.6.tar.gz) = aaf22308a446942bac9158f631ca749cd91d33e4985cca4f6e7c6cf37b474ec5
3	SIZE (cdo-1.0.2.tar.gz) = 1560719	3	SIZE (cdo-1.0.6.tar.gz) = 2279653




--- src/cdo_pthread.c.orig	Wed Mar 22 22:04:18 2006
+++ src/cdo_pthread.c	Mon Dec  4 11:46:11 2006
@@ -32,8 +32,10 @@
 {
 #if  defined  (HAVE_LIBPTHREAD)
   pthread_attr_t attr;
+/*
   pthread_mutexattr_t m_attr;
   pthread_condattr_t c_attr;
+*/
 
 #if defined (PTHREAD_KEYS_MAX)
   fprintf(stderr, "PTHREAD_KEYS_MAX    = %d\n", PTHREAD_KEYS_MAX);
@@ -54,6 +56,7 @@
   print_pthread_attr("Default pthread attr", &attr);
   pthread_attr_destroy(&attr);
 
+/*
   pthread_mutexattr_init(&m_attr);
   print_pthread_mutexattr("Default pthread mutexattr", &m_attr);
   pthread_mutexattr_destroy(&m_attr);
@@ -61,6 +64,7 @@
   pthread_condattr_init(&c_attr);
   print_pthread_condattr("Default pthread condattr ", &c_attr);
   pthread_condattr_destroy(&c_attr);
+*/
 
   fprintf(stderr, "\n");
 #endif

Lines 1-11 Link Here

(-)files/patch-src-cdo.c (-11 lines)
1	--- src/cdo.c.orig Tue Sep 12 14:50:14 2006
2	+++ src/cdo.c Mon Dec 4 17:38:55 2006
3	@@ -663,7 +663,7 @@
4	fprintf(stderr, "FLT_EVAL_METHOD = %d\n", FLT_EVAL_METHOD);
5	#endif
6	#if defined (FP_FAST_FMA)
7	- fprintf(stderr, "FP_FAST_FMA = %d\n", FP_FAST_FMA);
8	+ fprintf(stderr, "FP_FAST_FMA = defined\n");
9	#endif
10	fprintf(stderr, "\n");
11




--- src/cdo_pthread.c.orig	Wed Mar 22 22:04:18 2006
+++ src/cdo_pthread.c	Mon Dec 18 10:01:00 2006
@@ -32,8 +32,10 @@
 {
 #if  defined  (HAVE_LIBPTHREAD)
   pthread_attr_t attr;
+#if __FreeBSD_version >= 600000
   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 @@
   print_pthread_attr("Default pthread attr", &attr);
   pthread_attr_destroy(&attr);
 
+#if __FreeBSD_version >= 600000
   pthread_mutexattr_init(&m_attr);
   print_pthread_mutexattr("Default pthread mutexattr", &m_attr);
   pthread_mutexattr_destroy(&m_attr);
@@ -61,6 +64,7 @@
   pthread_condattr_init(&c_attr);
   print_pthread_condattr("Default pthread condattr ", &c_attr);
   pthread_condattr_destroy(&c_attr);
+#endif
 
   fprintf(stderr, "\n");
 #endif

Line 0 Link Here

(-)files/patch-src-config.h.in (+11 lines)
	1	--- src/config.h.in.orig Wed Dec 13 21:30:19 2006
	2	+++ src/config.h.in Mon Dec 18 10:41:13 2006
	3	@@ -1,5 +1,8 @@
	4	/* src/config.h.in. Generated from configure.ac by autoheader. */
	5
	6	+#include <unistd.h>
	7	+#include <sys/param.h>
	8	+
	9	/* Compiler */
	10	#undef COMPILER
	11




--- src/pthread_debug.c.orig	Mon Dec  4 16:11:40 2006
+++ src/pthread_debug.c	Mon Dec 18 10:01:00 2006
@@ -77,6 +77,7 @@
 }
 
 
+#if __FreeBSD_version >= 600000
 void print_pthread_mutexattr(const char *caller,  pthread_mutexattr_t *m_attr)
 {
   int protocol, kind, pshared;
@@ -107,6 +108,7 @@
   POUT2(caller, pshared, PTHREAD_PROCESS_SHARED, PTHREAD_PROCESS_PRIVATE);
 #endif
 }
+#endif
 
 
 int PTHREAD_Debug = 0;




--- src/pthread_debug.h.orig	Wed Feb 15 21:22:38 2006
+++ src/pthread_debug.h	Mon Dec 18 10:01:00 2006
@@ -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
 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)

Line 0 Link Here

(-)pkg-message (+7 lines)
	1	In CDO version 1.0.6, three new environment variables were introduced:
	2	- CDO_DISABLE_HISTORY:
	3	If set to 1, the netCDF history attribute of input datasets is not used.
	4	- CDO_DISABLE_FILESUFFIX:
	5	If set to 1, file suffix (.grb, .nc, ...) will not be added to the output file name of split*.
	6	- IGNORE_ATT_COORDINATES:
	7	If set to 1, netCDF variable attribute "coordinates" will be ignored.

Return to bug 106849

Lines 7-13 Link Here

(-)Makefile (-8 / +3 lines)
7	#	7	#
8		8
9	PORTNAME= cdo	9	PORTNAME= cdo
10	PORTVERSION= 1.0.2	10	PORTVERSION= 1.0.6
11	CATEGORIES= science	11	CATEGORIES= science
12	MASTER_SITES= http://www.mpimet.mpg.de/fileadmin/software/cdo/ \	12	MASTER_SITES= http://www.mpimet.mpg.de/fileadmin/software/cdo/ \
13	http://sunpoet.net/distfiles/	13	http://sunpoet.net/distfiles/
Lines 20-25 Link Here
20	CONFIGURE_ARGS= --program-transform-name=""	20	CONFIGURE_ARGS= --program-transform-name=""
21	CONFIGURE_ENV= CC="${CC}" \	21	CONFIGURE_ENV= CC="${CC}" \
22	CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \	22	CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
		23	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
23	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"	24	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
24		25
25	PLIST_FILES= bin/cdo	26	PLIST_FILES= bin/cdo
Lines 27-34 Link Here
27	OPTIONS= HDF5 "HDF5 support" off \	28	OPTIONS= HDF5 "HDF5 support" off \
28	NETCDF "NETCDF support" off	29	NETCDF "NETCDF support" off
29		30
30	.include <bsd.port.pre.mk>
31
32	.if defined(WITH_HDF5)	31	.if defined(WITH_HDF5)
33	CONFIGURE_ARGS+= --with-hdf5=${LOCALBASE}	32	CONFIGURE_ARGS+= --with-hdf5=${LOCALBASE}
34	LIB_DEPENDS+= hdf5.0:${PORTSDIR}/science/hdf5	33	LIB_DEPENDS+= hdf5.0:${PORTSDIR}/science/hdf5
Lines 39-46 Link Here
39	LIB_DEPENDS+= netcdf.1:${PORTSDIR}/science/netcdf	38	LIB_DEPENDS+= netcdf.1:${PORTSDIR}/science/netcdf
40	.endif	39	.endif
41		40
42	.if ${OSVERSION} <= 600000	41	.include <bsd.port.mk>
43	EXTRA_PATCHES+= "${PATCHDIR}/extra-patch-freebsd5-pthread"
44	.endif
45
46	.include <bsd.port.post.mk>

Lines 1-29 Link Here

(-)files/extra-patch-freebsd5-pthread (-29 lines)
1	--- src/cdo_pthread.c.orig Wed Mar 22 22:04:18 2006
2	+++ src/cdo_pthread.c Mon Dec 4 11:46:11 2006
3	@@ -32,8 +32,10 @@
4	{
5	#if defined (HAVE_LIBPTHREAD)
6	pthread_attr_t attr;
7	+/*
8	pthread_mutexattr_t m_attr;
9	pthread_condattr_t c_attr;
10	+*/
11
12	#if defined (PTHREAD_KEYS_MAX)
13	fprintf(stderr, "PTHREAD_KEYS_MAX = %d\n", PTHREAD_KEYS_MAX);
14	@@ -54,6 +56,7 @@
15	print_pthread_attr("Default pthread attr", &attr);
16	pthread_attr_destroy(&attr);
17
18	+/*
19	pthread_mutexattr_init(&m_attr);
20	print_pthread_mutexattr("Default pthread mutexattr", &m_attr);
21	pthread_mutexattr_destroy(&m_attr);
22	@@ -61,6 +64,7 @@
23	pthread_condattr_init(&c_attr);
24	print_pthread_condattr("Default pthread condattr ", &c_attr);
25	pthread_condattr_destroy(&c_attr);
26	+*/
27
28	fprintf(stderr, "\n");
29	#endif

Line 0 Link Here

(-)files/patch-src-cdo_pthread.c (+29 lines)
	1	--- src/cdo_pthread.c.orig Wed Mar 22 22:04:18 2006
	2	+++ src/cdo_pthread.c Mon Dec 18 10:01:00 2006
	3	@@ -32,8 +32,10 @@
	4	{
	5	#if defined (HAVE_LIBPTHREAD)
	6	pthread_attr_t attr;
	7	+#if __FreeBSD_version >= 600000
	8	pthread_mutexattr_t m_attr;
	9	pthread_condattr_t c_attr;
	10	+#endif
	11
	12	#if defined (PTHREAD_KEYS_MAX)
	13	fprintf(stderr, "PTHREAD_KEYS_MAX = %d\n", PTHREAD_KEYS_MAX);
	14	@@ -54,6 +56,7 @@
	15	print_pthread_attr("Default pthread attr", &attr);
	16	pthread_attr_destroy(&attr);
	17
	18	+#if __FreeBSD_version >= 600000
	19	pthread_mutexattr_init(&m_attr);
	20	print_pthread_mutexattr("Default pthread mutexattr", &m_attr);
	21	pthread_mutexattr_destroy(&m_attr);
	22	@@ -61,6 +64,7 @@
	23	pthread_condattr_init(&c_attr);
	24	print_pthread_condattr("Default pthread condattr ", &c_attr);
	25	pthread_condattr_destroy(&c_attr);
	26	+#endif
	27
	28	fprintf(stderr, "\n");
	29	#endif

Line 0 Link Here

(-)files/patch-src-pthread_debug.c (+18 lines)
	1	--- src/pthread_debug.c.orig Mon Dec 4 16:11:40 2006
	2	+++ src/pthread_debug.c Mon Dec 18 10:01:00 2006
	3	@@ -77,6 +77,7 @@
	4	}
	5
	6
	7	+#if __FreeBSD_version >= 600000
	8	void print_pthread_mutexattr(const char caller, pthread_mutexattr_t m_attr)
	9	{
	10	int protocol, kind, pshared;
	11	@@ -107,6 +108,7 @@
	12	POUT2(caller, pshared, PTHREAD_PROCESS_SHARED, PTHREAD_PROCESS_PRIVATE);
	13	#endif
	14	}
	15	+#endif
	16
	17
	18	int PTHREAD_Debug = 0;

Line 0 Link Here

(-)files/patch-src-pthread_debug.h (+13 lines)
	1	--- src/pthread_debug.h.orig Wed Feb 15 21:22:38 2006
	2	+++ src/pthread_debug.h Mon Dec 18 10:01:00 2006
	3	@@ -15,8 +15,10 @@
	4	void Pthread_cond_wait(const char caller, pthread_cond_t cond, pthread_mutex_t *mutex);
	5
	6	void print_pthread_attr(const char caller, pthread_attr_t attr);
	7	+#if __FreeBSD_version >= 600000
	8	void print_pthread_mutexattr(const char caller, pthread_mutexattr_t m_attr);
	9	void print_pthread_condattr(const char caller, pthread_condattr_t c_attr);
	10	+#endif
	11
	12
	13	#define pthread_create(a, b, c, d) Pthread_create(func, a, b, c, d)