update to 1.6.2

changes:
-new functions: H5Iget_ref, H5Iinc_ref and H5Idec_ref
-bugfixes
being here, move to USE_BUILDLINK3

4 files changed, 45 insertions, 23 deletions

diff --git a/devel/hdf5/Makefile b/devel/hdf5/Makefile
index 31ab13b9998..8002c5614ab 100644
--- a/devel/hdf5/Makefile
+++ b/devel/hdf5/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:37 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2004/04/22 15:00:08 drochner Exp $
 
-DISTNAME=		hdf5-1.6.0
+DISTNAME=		hdf5-1.6.2
 CATEGORIES=		devel
-MASTER_SITES=		ftp://hdf.ncsa.uiuc.edu/HDF5/hdf5-1.6.0/src/ \
-			ftp://sunsite.doc.ic.ac.uk/packages/HDF/HDF5/hdf5-1.6.0/src/ \
+MASTER_SITES=		ftp://hdf.ncsa.uiuc.edu/HDF5/hdf5-1.6.2/src/ \
+			ftp://sunsite.doc.ic.ac.uk/packages/HDF/HDF5/hdf5-1.6.2/src/ \
 			http://www.go.dlr.de/fresh/unix/src/misc/
 
 MAINTAINER=		tech-pkg@NetBSD.org
@@ -11,7 +11,9 @@ HOMEPAGE=		http://hdf.ncsa.uiuc.edu/HDF5/
 COMMENT=		Hierarchical Data Format (new generation)
 
 GNU_CONFIGURE=		# defined
-USE_BUILDLINK2=		# defined
+# XXX can't enable this until we have a shared libsz
+#CONFIGURE_ARGS+=	--with-szlib
+USE_BUILDLINK3=		# defined
 USE_LIBTOOL=		# defined
 TEST_TARGET=		check
 
@@ -25,5 +27,7 @@ post-install:
 	cd ${WRKSRC}/doc/html && ${PAX} -rw . ${PREFIX}/share/doc/html/hdf5
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/html/hdf5
 
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+# XXX see above
+#.include "../../archivers/szip/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/hdf5/PLIST b/devel/hdf5/PLIST
index a03b4b6db4c..a6942552e34 100644
--- a/devel/hdf5/PLIST
+++ b/devel/hdf5/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2003/08/06 06:49:35 jtb Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/04/22 15:00:08 drochner Exp $
 bin/gif2h5
 bin/h52gif
 bin/h5cc
-bin/h5createU8
 bin/h5debug
 bin/h5diff
 bin/h5dump
@@ -142,6 +141,7 @@ share/doc/html/hdf5/RM_H5T.html
 share/doc/html/hdf5/RM_H5Z.html
 share/doc/html/hdf5/References.html
 share/doc/html/hdf5/TechNotes.html
+share/doc/html/hdf5/TechNotes/Basic_perform.html
 share/doc/html/hdf5/TechNotes/BigDataSmMach.html
 share/doc/html/hdf5/TechNotes/ChStudy_1000x1000.gif
 share/doc/html/hdf5/TechNotes/ChStudy_250x250.gif
@@ -390,18 +390,6 @@ share/doc/html/hdf5/fortran/F90Flags.html
 share/doc/html/hdf5/fortran/F90UserNotes.html
 share/doc/html/hdf5/fortran/Makefile
 share/doc/html/hdf5/fortran/Makefile.in
-share/doc/html/hdf5/fortran/h5_FORTRAN.html
-share/doc/html/hdf5/fortran/h5a_FORTRAN.html
-share/doc/html/hdf5/fortran/h5d_FORTRAN.html
-share/doc/html/hdf5/fortran/h5e_FORTRAN.html
-share/doc/html/hdf5/fortran/h5f_FORTRAN.html
-share/doc/html/hdf5/fortran/h5g_FORTRAN.html
-share/doc/html/hdf5/fortran/h5i_FORTRAN.html
-share/doc/html/hdf5/fortran/h5p_FORTRAN.html
-share/doc/html/hdf5/fortran/h5r_FORTRAN.html
-share/doc/html/hdf5/fortran/h5s_FORTRAN.html
-share/doc/html/hdf5/fortran/h5t_FORTRAN.html
-share/doc/html/hdf5/fortran/h5z_FORTRAN.html
 share/doc/html/hdf5/group_p1.gif
 share/doc/html/hdf5/group_p2.gif
 share/doc/html/hdf5/group_p3.gif
diff --git a/devel/hdf5/buildlink3.mk b/devel/hdf5/buildlink3.mk
new file mode 100644
index 00000000000..de603985cb7
--- /dev/null
+++ b/devel/hdf5/buildlink3.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/22 15:00:08 drochner Exp $
+# XXX
+# XXX This file was created automatically using createbuildlink-3.4.
+# XXX After this file as been verified as correct, the comment lines
+# XXX beginning with "XXX" should be removed.  Please do not commit
+# XXX unverified buildlink[23].mk files.
+# XXX
+# XXX Packages that only install static libraries or headers should
+# XXX include the following line:
+# XXX
+# XXX	BUILDLINK_DEPMETHOD.hdf5?=	build
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+HDF5_BUILDLINK3_MK:=	${HDF5_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	hdf5
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nhdf5}
+BUILDLINK_PACKAGES+=	hdf5
+
+.if !empty(HDF5_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.hdf5+=	hdf5>=1.6.2
+BUILDLINK_PKGSRCDIR.hdf5?=	../../devel/hdf5
+.endif	# HDF5_BUILDLINK3_MK
+
+.include "../../devel/zlib/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/hdf5/distinfo b/devel/hdf5/distinfo
index 0f55bc8d8e9..df7594b6a22 100644
--- a/devel/hdf5/distinfo
+++ b/devel/hdf5/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2003/08/04 17:26:59 jtb Exp $
+$NetBSD: distinfo,v 1.9 2004/04/22 15:00:08 drochner Exp $
 
-SHA1 (hdf5-1.6.0.tar.gz) = e310800d8a9b9a1cd571adc7a37b8662aa947db6
-Size (hdf5-1.6.0.tar.gz) = 3788918 bytes
+SHA1 (hdf5-1.6.2.tar.gz) = 1afa977b371c01e53dd6e0bd3a0d879a3f2ae5a2
+Size (hdf5-1.6.2.tar.gz) = 3879147 bytes
 SHA1 (patch-aa) = 1638df4bf53fb0c326ba7aaa2f2a01f8e03f9d56