-fix MASTER_SITES and distinfo cksum

-make NetBSD ("netbsdelf") a recognized configuration, copied from
 "freebsd"; this pulls in definitions for gcc, in particular it
 disables some optimization
-work around a memory corruption problem in H5FDstream which appearently
 is caused by use of free()d memory
The latter 2 changes make the library survive its selftests, and help
the "pytables" pkg as well.

bump PKGREVISION, raise BUILDLINK_RECOMMENDED

4 files changed, 25 insertions, 9 deletions

diff --git a/devel/hdf5/Makefile b/devel/hdf5/Makefile
index aa32fced1af..f5fa5d4217b 100644
--- a/devel/hdf5/Makefile
+++ b/devel/hdf5/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2006/01/04 06:05:44 recht Exp $
+# $NetBSD: Makefile,v 1.33 2006/02/10 19:56:13 drochner Exp $
 
 DISTNAME=	hdf5-1.6.5
+PKGREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/hdf5-1.6.4/src/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/HDF/HDF5/hdf5-1.6.4/src/ \
-		http://www.go.dlr.de/fresh/unix/src/misc/
+MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/hdf5-1.6.5/src/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://hdf.ncsa.uiuc.edu/HDF5/
@@ -14,6 +13,7 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		tr
 GNU_CONFIGURE=		yes
 TEST_TARGET=		check
+#CONFIGURE_ARGS+= --disable-production --enable-debug
 
 # it appears that this file is informative only and is not actually
 # used by any installed tools
@@ -21,6 +21,9 @@ CHECK_WRKREF_SKIP=	${PREFIX}/lib/libhdf5.settings
 
 .include "options.mk"
 
+post-extract:
+	${CP} ${WRKSRC}/config/freebsd ${WRKSRC}/config/netbsdelf
+
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/misc/h5cc ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/misc/h5redeploy.in ${PREFIX}/bin/h5redeploy
diff --git a/devel/hdf5/buildlink3.mk b/devel/hdf5/buildlink3.mk
index d9c217439af..04cf2e1ca09 100644
--- a/devel/hdf5/buildlink3.mk
+++ b/devel/hdf5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/05/19 15:41:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/02/10 19:56:13 drochner Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HDF5_BUILDLINK3_MK:=	${HDF5_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	hdf5
 
 .if !empty(HDF5_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.hdf5+=	hdf5>=1.6.2
-BUILDLINK_RECOMMENDED.hdf5+=	hdf5>=1.6.2nb1
+BUILDLINK_RECOMMENDED.hdf5+=	hdf5>=1.6.5nb1
 BUILDLINK_PKGSRCDIR.hdf5?=	../../devel/hdf5
 .endif	# HDF5_BUILDLINK3_MK
 
diff --git a/devel/hdf5/distinfo b/devel/hdf5/distinfo
index 6273b2a9fae..078f47755af 100644
--- a/devel/hdf5/distinfo
+++ b/devel/hdf5/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.17 2006/01/04 06:05:44 recht Exp $
+$NetBSD: distinfo,v 1.18 2006/02/10 19:56:13 drochner Exp $
 
-SHA1 (hdf5-1.6.5.tar.gz) = ce27eb324b1acbf0da3d2b24b3c38f1fc03c2442
-RMD160 (hdf5-1.6.5.tar.gz) = 544c668d9349e9943767e776f5ece9c1aab75fcf
+SHA1 (hdf5-1.6.5.tar.gz) = c5b7b375c0eb23dcab0c66d39b1b06c263048546
+RMD160 (hdf5-1.6.5.tar.gz) = 70db16a832f77aa6d0c97da517353665304b7b27
 Size (hdf5-1.6.5.tar.gz) = 4930666 bytes
 SHA1 (patch-aa) = 794ab1e1fbb41281c4b28a333f4bd91d37513084
 SHA1 (patch-ab) = 91829e06db57da7b96c513bd176ef33c134a1de3
 SHA1 (patch-ac) = 05c5215674ad32fe2d8f0fef06c26bdd20299536
 SHA1 (patch-ad) = 4379aaf79ce58b12b69fad2419d44bee514c2a8c
+SHA1 (patch-ae) = ec0837f13fc5a0caaa444c1fd5247839bdae8a41
diff --git a/devel/hdf5/patches/patch-ae b/devel/hdf5/patches/patch-ae
new file mode 100644
index 00000000000..a6acd81f6cb
--- /dev/null
+++ b/devel/hdf5/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2006/02/10 19:56:13 drochner Exp $
+
+--- src/H5FDstream.c.orig	2006-02-10 20:31:57.000000000 +0100
++++ src/H5FDstream.c
+@@ -684,6 +684,7 @@ H5FD_stream_open (const char *filename,
+         /* update the port ID in the file access property
+            so that it can be queried via H5P_get_fapl_stream() later on */
+         H5P_set_driver (plist, H5FD_STREAM, &stream->fapl);
++	fapl = H5P_get_driver_info (plist);
+       }
+       else
+         HGOTO_ERROR(H5E_IO, H5E_CANTOPENFILE, NULL, "can't open internal socket")