Update to version 1.4.3. Changes include:

* Changed internal error handling macros to reduce code size of library by
      about 10%.
* API changes.
* Performance improvements
* ``h5cc'' script which helps compilation of HDF5 programs
* Bug fixes.

6 files changed, 79 insertions, 45 deletions

diff --git a/devel/hdf5/Makefile b/devel/hdf5/Makefile
index 79dc3ffbca7..cab1ee1b464 100644
--- a/devel/hdf5/Makefile
+++ b/devel/hdf5/Makefile
@@ -1,32 +1,31 @@
-# $NetBSD: Makefile,v 1.12 2002/02/06 16:58:12 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/05/03 20:51:33 jtb Exp $
 
-DISTNAME=		hdf5-1.4.1
+DISTNAME=		hdf5-1.4.3
 CATEGORIES=		devel
-MASTER_SITES=		ftp://hdf.ncsa.uiuc.edu/HDF5/hdf5-1.4.0/src/ \
-			ftp://sunsite.doc.ic.ac.uk/packages/HDF/HDF5/hdf5-1.4.0/src/ \
+MASTER_SITES=		ftp://hdf.ncsa.uiuc.edu/HDF5/hdf5-1.4.3/src/ \
+			ftp://sunsite.doc.ic.ac.uk/packages/HDF/HDF5/hdf5-1.4.3/src/ \
 			http://www.go.dlr.de/fresh/unix/src/misc/
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://hdf.ncsa.uiuc.edu/HDF5/
-COMMENT=		Hierarchical Data Format (version 5)
+COMMENT=		Hierarchical Data Format (new generation)
 
-DEPENDS+=		jpeg-6b:../../graphics/jpeg
-
-GNU_CONFIGURE=		#defined
-USE_LIBTOOL=		#defined
+GNU_CONFIGURE=		# defined
+USE_BUILDLINK_ONLY=	# defined
+USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/bin/ltconfig
 
-pre-install:
-	${LIBTOOL} --mode=install ${INSTALL_DATA} \
-	  ${WRKSRC}/tools/lib/libh5tools.la ${PREFIX}/lib
+CONFIGURE_ENV+=		H5CC_CFLAGS=-I${BUILDLINK_PREFIX.zlib}/include
+CONFIGURE_ENV+=		H5CC_LDFLAGS="-Wl,-R${BUILDLINK_PREFIX.zlib}/lib -L${BUILDLINK_PREFIX.zlib}/lib"
 
 post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/misc/h5cc ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hdf5
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${WRKSRC}/README	\
-	${WRKSRC}/RELEASE.txt ${PREFIX}/share/doc/hdf5
+	cd ${WRKSRC} && ${INSTALL_DATA} COPYING release_docs/HISTORY.txt \
+		release_docs/RELEASE.txt ${PREFIX}/share/doc/hdf5
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/hdf5
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}/doc/html/
-	(cd ${WRKSRC}/doc/html; ${GTAR} cpf - . ) |		\
-	(cd ${PREFIX}/share/doc/html/hdf5/; ${GTAR} xpf - )
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}/doc/html
+	cd ${WRKSRC}/doc/html && ${PAX} -rw . ${PREFIX}/share/doc/html/hdf5
 
+.include "../../devel/zlib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/hdf5/PLIST b/devel/hdf5/PLIST
index a93349ce79e..8b4b49702ff 100644
--- a/devel/hdf5/PLIST
+++ b/devel/hdf5/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:10 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/05/03 20:51:33 jtb Exp $
+bin/gif2h5
+bin/h52gif
+bin/h5cc
 bin/h5debug
 bin/h5dump
 bin/h5import
@@ -10,7 +13,6 @@ include/H5Bpublic.h
 include/H5Dpublic.h
 include/H5Epublic.h
 include/H5FDcore.h
-include/H5FDdpss.h
 include/H5FDfamily.h
 include/H5FDgass.h
 include/H5FDlog.h
@@ -37,8 +39,6 @@ include/H5api_adpt.h
 include/H5pubconf.h
 include/H5public.h
 include/hdf5.h
-lib/libh5tools.a
-lib/libh5tools.la
 lib/libhdf5.a
 lib/libhdf5.la
 lib/libhdf5.settings
@@ -46,7 +46,7 @@ lib/libhdf5.so
 lib/libhdf5.so.0
 lib/libhdf5.so.0.0
 share/doc/hdf5/COPYING
-share/doc/hdf5/README
+share/doc/hdf5/HISTORY.txt
 share/doc/hdf5/RELEASE.txt
 share/doc/html/hdf5/ADGuide.html
 share/doc/html/hdf5/ADGuide/Changes.html
@@ -312,6 +312,7 @@ share/doc/html/hdf5/Tutor/examples/rwdsetexample.f90
 share/doc/html/hdf5/Tutor/examples/selectele.f90
 share/doc/html/hdf5/Tutor/extend.html
 share/doc/html/hdf5/Tutor/fileorg.html
+share/doc/html/hdf5/Tutor/footer-ncsalogo.gif
 share/doc/html/hdf5/Tutor/glossary.html
 share/doc/html/hdf5/Tutor/img001.gif
 share/doc/html/hdf5/Tutor/img002.gif
@@ -377,16 +378,15 @@ share/doc/html/hdf5/pipe3.gif
 share/doc/html/hdf5/pipe4.gif
 share/doc/html/hdf5/pipe5.gif
 share/doc/html/hdf5/version.gif
-@dirrm share/doc/hdf5
-@dirrm share/doc/html/hdf5/ADGuide
-@dirrm share/doc/html/hdf5/Graphics
-@dirrm share/doc/html/hdf5/Intro
-@dirrm share/doc/html/hdf5/PSandPDF
-@dirrm share/doc/html/hdf5/TechNotes
+@dirrm share/doc/html/hdf5/fortran
+@dirrm share/doc/html/hdf5/cpplus
 @dirrm share/doc/html/hdf5/Tutor/examples/java
-@dirrm share/doc/html/hdf5/Tutor/Graphics
 @dirrm share/doc/html/hdf5/Tutor/examples
-@dirrm share/doc/html/hdf5/cpplus
-@dirrm share/doc/html/hdf5/fortran
+@dirrm share/doc/html/hdf5/Tutor/Graphics
 @dirrm share/doc/html/hdf5/Tutor
+@dirrm share/doc/html/hdf5/TechNotes
+@dirrm share/doc/html/hdf5/PSandPDF
+@dirrm share/doc/html/hdf5/Intro
+@dirrm share/doc/html/hdf5/Graphics
+@dirrm share/doc/html/hdf5/ADGuide
 @dirrm share/doc/html/hdf5
diff --git a/devel/hdf5/distinfo b/devel/hdf5/distinfo
index 5220bf4c79a..bf0a5ceb3af 100644
--- a/devel/hdf5/distinfo
+++ b/devel/hdf5/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/04/30 00:26:20 jtb Exp $
+$NetBSD: distinfo,v 1.4 2002/05/03 20:51:33 jtb Exp $
 
-SHA1 (hdf5-1.4.1.tar.gz) = 95ddb704233e10905369c50fbcb7b10113ec91c3
-Size (hdf5-1.4.1.tar.gz) = 2973699 bytes
-SHA1 (patch-aa) = b46bb91c2865229381d69f4927feb1698f8df1a8
+SHA1 (hdf5-1.4.3.tar.gz) = 9777259603d8c753c6a7a10726dc63afbdfd5688
+Size (hdf5-1.4.3.tar.gz) = 3282122 bytes
+SHA1 (patch-aa) = 35fd7543ccb3dd4088873151b74431788fe7f0f0
+SHA1 (patch-ab) = 7fc0279c8026b2be3a202bbfbc5cb35f6bf8eb0b
+SHA1 (patch-ac) = 50afdf52d3bc22f314c0fcf172c375b07cfb3679
diff --git a/devel/hdf5/patches/patch-aa b/devel/hdf5/patches/patch-aa
index 38420e279c3..25dae6f1e63 100644
--- a/devel/hdf5/patches/patch-aa
+++ b/devel/hdf5/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2001/03/04 18:05:24 jtb Exp $
+$NetBSD: patch-aa,v 1.4 2002/05/03 20:51:33 jtb Exp $
 
---- configure.orig	Sun Mar  4 17:58:18 2001
-+++ configure
-@@ -1797,7 +1797,7 @@
- rm maketest
+--- tools/misc/Makefile.in.orig	Mon Aug 27 19:41:43 2001
++++ tools/misc/Makefile.in	Wed May  1 17:47:54 2002
+@@ -26,7 +26,7 @@
+ LIBTOOLS=../lib/libh5tools.la
+ LIBHDF5=$(top_builddir)/src/libhdf5.la
  
- if test "X$GCC" = "Xyes"; then
--   CFLAGS="$CFLAGS -ansi -pedantic -Wchar-subscripts -Wall -W -Wshadow -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline"
-+   CFLAGS="$CFLAGS -Wchar-subscripts -Wall -W -Wshadow -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline"
- fi
+-PUB_PROGS=h5cc h5debug h5import h5repart @PDB2HDF@
++PUB_PROGS=h5debug h5import h5repart @PDB2HDF@
+ PROGS=$(PUB_PROGS) $(TEST_PROGS)
  
- echo $ac_n "checking for production mode""... $ac_c" 1>&6
+ ## Source and object files for the library; do not install
diff --git a/devel/hdf5/patches/patch-ab b/devel/hdf5/patches/patch-ab
new file mode 100644
index 00000000000..d91e1395249
--- /dev/null
+++ b/devel/hdf5/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2002/05/03 20:51:34 jtb Exp $
+
+--- tools/misc/h5cc.in.orig	Wed May  1 17:41:49 2002
++++ tools/misc/h5cc.in	Wed May  1 17:43:34 2002
+@@ -45,8 +45,8 @@
+ SHOW="eval"
+ CCBASE="@CC@"
+ CLINKERBASE="@CC@"
+-CFLAGS="@CFLAGS@"
+-LDFLAGS="@LDFLAGS@"
++CFLAGS="@H5CC_CFLAGS@"
++LDFLAGS="@H5CC_LDFLAGS@"
+ LIBS="@LIBS@"
+ 
+ CC="${HDF5_CC:-$CCBASE}"
diff --git a/devel/hdf5/patches/patch-ac b/devel/hdf5/patches/patch-ac
new file mode 100644
index 00000000000..775a1d28848
--- /dev/null
+++ b/devel/hdf5/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.1 2002/05/03 20:51:34 jtb Exp $
+
+--- configure.orig	Wed Feb 13 23:26:27 2002
++++ configure	Wed May  1 19:02:18 2002
+@@ -9486,11 +9488,13 @@
+ $extrasub
+ s%@SHELL@%$SHELL%g
+ s%@CFLAGS@%$CFLAGS%g
++s%@H5CC_CFLAGS@%$H5CC_CFLAGS%g
+ s%@CPPFLAGS@%$CPPFLAGS%g
+ s%@CXXFLAGS@%$CXXFLAGS%g
+ s%@FFLAGS@%$FFLAGS%g
+ s%@DEFS@%$DEFS%g
+ s%@LDFLAGS@%$LDFLAGS%g
++s%@H5CC_LDFLAGS@%$H5CC_LDFLAGS%g
+ s%@LIBS@%$LIBS%g
+ s%@exec_prefix@%$exec_prefix%g
+ s%@prefix@%$prefix%g