[pkgsrc/trunk]: pkgsrc/devel/hdf5 hdf5: Avoid existing ERR definition.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3549d65e099a
branches:  trunk
changeset: 373455:3549d65e099a
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Jan 02 09:58:47 2018 +0000

description:
hdf5: Avoid existing ERR definition.

diffstat:

 devel/hdf5/distinfo                      |   3 ++-
 devel/hdf5/patches/patch-src_H5private.h |  17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r 3352f63e80b9 -r 3549d65e099a devel/hdf5/distinfo
--- a/devel/hdf5/distinfo       Tue Jan 02 09:38:16 2018 +0000
+++ b/devel/hdf5/distinfo       Tue Jan 02 09:58:47 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2017/11/15 20:28:27 minskim Exp $
+$NetBSD: distinfo,v 1.40 2018/01/02 09:58:47 jperkin Exp $
 
 SHA1 (hdf5-1.10.1.tar.bz2) = 22edee1f4ed603ea9544daec3492874fa3028bbb
 RMD160 (hdf5-1.10.1.tar.bz2) = 759e63ead405740dcf3260bdc9644b97480f3b8b
@@ -13,4 +13,5 @@
 SHA1 (patch-hl_c++_examples_run-hlc++-ex.sh.in) = 166d7c570e93948e68308d9e0584df8d19bdfec9
 SHA1 (patch-hl_examples_Makefile.in) = df3650c121152471a045e1fec169eedeea757377
 SHA1 (patch-hl_examples_run-hlc-ex.sh.in) = 43bf6c28fb667f3ae39145be08e0a3a75f370b47
+SHA1 (patch-src_H5private.h) = dbf7e44248b653274fbe1e0f7429d723107c6cdd
 SHA1 (patch-tools_test_h5jam_testh5jam.sh.in) = c23e66454bf817b68120d360c63329ebed6ac2aa
diff -r 3352f63e80b9 -r 3549d65e099a devel/hdf5/patches/patch-src_H5private.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/hdf5/patches/patch-src_H5private.h  Tue Jan 02 09:58:47 2018 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_H5private.h,v 1.1 2018/01/02 09:58:47 jperkin Exp $
+
+Avoid existing ERR definition.
+
+--- src/H5private.h.orig       2017-04-25 21:45:02.000000000 +0000
++++ src/H5private.h
+@@ -336,6 +336,10 @@
+ #define FAIL    (-1)
+ #define UFAIL    (unsigned)(-1)
+ 
++#ifdef ERR
++#undef ERR
++#endif
++
+ /* number of members in an array */
+ #ifndef NELMTS
+ #    define NELMTS(X)    (sizeof(X)/sizeof(X[0]))