- Update to 1.4.7

Changes:        https://code.zmaw.de/news/41

6 files changed, 20 insertions, 28 deletions

diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index fcf8aec1c3c9..41da02de221b 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=		cdo
-PORTVERSION=		1.4.6
+PORTVERSION=		1.4.7
 CATEGORIES=		science
-MASTER_SITES=		https://code.zmaw.de/attachments/download/466/ \
+MASTER_SITES=		https://code.zmaw.de/attachments/download/704/ \
 			LOCAL/sunpoet
 
 MAINTAINER=		sunpoet@FreeBSD.org
@@ -67,7 +67,6 @@ PLIST_SUB+=		JPEG2000=""
 
 .if !defined(WITHOUT_NETCDF)
 CONFIGURE_ARGS+=	--with-netcdf=${LOCALBASE}
-EXTRA_PATCHES+=		${FILESDIR}/extra-patch-src-Makefile.in
 .if (${NETCDF_VER} == 4)
 LIB_DEPENDS+=		netcdf.6:${PORTSDIR}/science/netcdf4
 .else
@@ -86,6 +85,14 @@ CONFIGURE_ARGS+=	--with-szlib=${LOCALBASE}
 LIB_DEPENDS+=		sz.2:${PORTSDIR}/science/szip
 .endif
 
+post-patch:
+.if !defined(WITHOUT_NETCDF)
+	${REINPLACE_CMD} \
+		-e '/bin_PROGRAMS = / s|$$| cdotest$$(EXEEXT)|' \
+		-e '/noinst_PROGRAMS = / s| cdotest$$(EXEEXT)||' \
+			${WRKSRC}/src/Makefile.in
+.endif
+
 post-build:
 .if !defined(WITHOUT_NETCDF) && (${OSVERSION} >= 700000)
 	@cd "${WRKSRC}/src" && ${SETENV} CDO_PATH="${WRKSRC}/src/cdo" "${WRKSRC}/src/cdotest"
diff --git a/science/cdo/distinfo b/science/cdo/distinfo
index 4b9aef68fba4..9c8e4869c9a1 100644
--- a/science/cdo/distinfo
+++ b/science/cdo/distinfo
@@ -1,3 +1,2 @@
-MD5 (cdo-1.4.6.tar.gz) = 05ddb0481b39c30aa7f25a15405e7f9d
-SHA256 (cdo-1.4.6.tar.gz) = 766ff70f96eb271f10c13821a7decf4e2c378cb956193b618483f2ff93077f75
-SIZE (cdo-1.4.6.tar.gz) = 4541953
+SHA256 (cdo-1.4.7.tar.gz) = 731311518112c48be95e9ad79bf6d4b7c441835abf68115040fd47ca5a66fee4
+SIZE (cdo-1.4.7.tar.gz) = 5156585
diff --git a/science/cdo/files/extra-patch-src-Makefile.in b/science/cdo/files/extra-patch-src-Makefile.in
deleted file mode 100644
index 191455d73a65..000000000000
--- a/science/cdo/files/extra-patch-src-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Makefile.in.orig	2010-10-03 01:21:26.000000000 +0800
-+++ src/Makefile.in	2010-10-03 01:23:05.000000000 +0800
-@@ -34,9 +34,9 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--bin_PROGRAMS = cdo$(EXEEXT) $(am__EXEEXT_1)
-+bin_PROGRAMS = cdo$(EXEEXT) cdotest$(EXEEXT) $(am__EXEEXT_1)
- @ENABLE_ALL_STATIC_TRUE@am__append_1 = cdo_static
--noinst_PROGRAMS = cdotest$(EXEEXT)
-+noinst_PROGRAMS =
- subdir = src
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(srcdir)/config.h.in
diff --git a/science/cdo/files/patch-src-cdo_pthread.c b/science/cdo/files/patch-src-cdo_pthread.c
index 62c65884d54b..f2a66c09d771 100644
--- a/science/cdo/files/patch-src-cdo_pthread.c
+++ b/science/cdo/files/patch-src-cdo_pthread.c
@@ -1,5 +1,5 @@
 --- src/cdo_pthread.c.orig	2007-08-29 17:15:32.000000000 +0800
-+++ src/cdo_pthread.c	2007-10-25 16:30:35.000000000 +0800
++++ src/cdo_pthread.c	2011-02-26 03:30:00.000000000 +0800
 @@ -32,8 +32,10 @@
  {
  #if  defined  (HAVE_LIBPTHREAD)
diff --git a/science/cdo/files/patch-src-pthread_debug.c b/science/cdo/files/patch-src-pthread_debug.c
index b5e5c9a018e7..84ef54caf588 100644
--- a/science/cdo/files/patch-src-pthread_debug.c
+++ b/science/cdo/files/patch-src-pthread_debug.c
@@ -1,5 +1,5 @@
---- src/pthread_debug.c.orig	2007-05-14 14:30:15.000000000 +0800
-+++ src/pthread_debug.c	2007-10-25 16:30:35.000000000 +0800
+--- 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 @@
  }
  
@@ -7,8 +7,8 @@
 +#if defined (PTHREAD_MUTEXATTR_CONDATTR)
  void print_pthread_mutexattr(const char *caller,  pthread_mutexattr_t *m_attr)
  {
- #if defined (_POSIX_THREAD_PRIO_PROTECT) && defined (_POSIX_THREAD_PRIO_INHERIT)
-@@ -115,6 +116,7 @@
+   /*
+@@ -116,6 +117,7 @@
    }
  #endif
  }
diff --git a/science/cdo/files/patch-src-pthread_debug.h b/science/cdo/files/patch-src-pthread_debug.h
index f4ea67d9892e..98aa1b06a5fb 100644
--- a/science/cdo/files/patch-src-pthread_debug.h
+++ b/science/cdo/files/patch-src-pthread_debug.h
@@ -1,5 +1,5 @@
---- src/pthread_debug.h.orig	2006-02-15 21:22:38.000000000 +0800
-+++ src/pthread_debug.h	2007-10-25 16:30:35.000000000 +0800
+--- 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 @@
  void Pthread_cond_wait(const char *caller, pthread_cond_t *cond, pthread_mutex_t *mutex);
  
@@ -10,4 +10,4 @@
 +#endif
  
  
- #define  pthread_create(a, b, c, d)    Pthread_create(func, a, b, c, d)
+ #define  pthread_create(a, b, c, d)    Pthread_create(__func__, a, b, c, d)