CVS commit: pkgsrc/devel/hdf5

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jan  2 09:58:47 UTC 2018

Modified Files:
        pkgsrc/devel/hdf5: distinfo
Added Files:
        pkgsrc/devel/hdf5/patches: patch-src_H5private.h

Log Message:
hdf5: Avoid existing ERR definition.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/hdf5/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/hdf5/patches/patch-src_H5private.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/hdf5/distinfo
diff -u pkgsrc/devel/hdf5/distinfo:1.39 pkgsrc/devel/hdf5/distinfo:1.40
--- pkgsrc/devel/hdf5/distinfo:1.39     Wed Nov 15 20:28:27 2017
+++ pkgsrc/devel/hdf5/distinfo  Tue Jan  2 09:58:47 2018
@@ -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_Makefile.in)
 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

Added files:

Index: pkgsrc/devel/hdf5/patches/patch-src_H5private.h
diff -u /dev/null pkgsrc/devel/hdf5/patches/patch-src_H5private.h:1.1
--- /dev/null   Tue Jan  2 09:58:47 2018
+++ pkgsrc/devel/hdf5/patches/patch-src_H5private.h     Tue Jan  2 09:58:47 2018
@@ -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]))