update to 1.6.10

(yes I know there is the 1.8 branch, but I don't want to experiment
right now)
changes: many fixes, some C++ API improvements
pkgsrc change: DESTDIR support

8 files changed, 389 insertions, 222 deletions

diff --git a/devel/hdf5/Makefile b/devel/hdf5/Makefile
index 9f6ec4878d3..41a722806b7 100644
--- a/devel/hdf5/Makefile
+++ b/devel/hdf5/Makefile
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.41 2008/09/11 10:27:52 adam Exp $
+# $NetBSD: Makefile,v 1.42 2009/11/15 15:50:50 drochner Exp $
 
-DISTNAME=	hdf5-1.6.7
+DISTNAME=	hdf5-1.6.10
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.hdfgroup.org/HDF5/current16/src/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://hdf.ncsa.uiuc.edu/HDF5/
+HOMEPAGE=	http://www.hdfgroup.org/HDF5/
 COMMENT=	Hierarchical Data Format (new generation)
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pax tr
 GNU_CONFIGURE=		yes
 TEST_TARGET=		check
+PKG_DESTDIR_SUPPORT=	user-destdir
+INSTALLATION_DIRS+=	include lib bin share/examples/hdf5/c
 
 # it appears that this file is informative only and is not actually
 # used by any installed tools
@@ -28,13 +30,13 @@ 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
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/misc/h5cc ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/misc/h5redeploy.in ${DESTDIR}${PREFIX}/bin/h5redeploy
 	cd ${WRKSRC} && ${INSTALL_DATA} COPYING release_docs/HISTORY.txt \
-		release_docs/RELEASE.txt ${PREFIX}/share/doc/hdf5
+		release_docs/RELEASE.txt ${DESTDIR}${PREFIX}/share/doc/hdf5
 	# avoid installing the Makefile and Makefile.in's  They are not needed
-	cd ${WRKSRC}/doc/html && pax -s '/.*Makefile.*//' -rwpm . ${PREFIX}/share/doc/hdf5/html
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/hdf5/html
+	cd ${WRKSRC}/doc/html && pax -s '/.*Makefile.*//' -rwpm . ${DESTDIR}${PREFIX}/share/doc/hdf5/html
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/doc/hdf5/html
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/hdf5/PLIST b/devel/hdf5/PLIST
index d16a723b798..43c8489f0cd 100644
--- a/devel/hdf5/PLIST
+++ b/devel/hdf5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2009/06/14 17:48:48 joerg Exp $
+@comment $NetBSD: PLIST,v 1.19 2009/11/15 15:50:50 drochner Exp $
 bin/gif2h5
 bin/h52gif
 ${PLIST.cxx}bin/h5c++
@@ -9,19 +9,35 @@ bin/h5dump
 bin/h5import
 bin/h5jam
 bin/h5ls
+bin/h5perf
 bin/h5redeploy
 bin/h5repack
 bin/h5repart
 bin/h5unjam
 include/H5ACpublic.h
+${PLIST.cxx}include/H5AbstractDs.h
 include/H5Apublic.h
+${PLIST.cxx}include/H5ArrayType.h
+${PLIST.cxx}include/H5AtomType.h
+${PLIST.cxx}include/H5Attribute.h
 include/H5Bpublic.h
+${PLIST.cxx}include/H5Classes.h
+${PLIST.cxx}include/H5CommonFG.h
+${PLIST.cxx}include/H5CompType.h
+${PLIST.cxx}include/H5Cpp.h
+${PLIST.cxx}include/H5CppDoc.h
 include/H5Cpublic.h
+${PLIST.cxx}include/H5DataSet.h
+${PLIST.cxx}include/H5DataSpace.h
+${PLIST.cxx}include/H5DataType.h
+${PLIST.cxx}include/H5DcreatProp.h
 include/H5Dpublic.h
+${PLIST.cxx}include/H5DxferProp.h
+${PLIST.cxx}include/H5EnumType.h
 include/H5Epublic.h
+${PLIST.cxx}include/H5Exception.h
 include/H5FDcore.h
 include/H5FDfamily.h
-include/H5FDgass.h
 include/H5FDlog.h
 include/H5FDmpi.h
 include/H5FDmpio.h
@@ -29,58 +45,41 @@ include/H5FDmpiposix.h
 include/H5FDmulti.h
 include/H5FDpublic.h
 include/H5FDsec2.h
-include/H5FDsrb.h
 include/H5FDstdio.h
+${PLIST.cxx}include/H5FaccProp.h
+${PLIST.cxx}include/H5FcreatProp.h
+${PLIST.cxx}include/H5File.h
+${PLIST.cxx}include/H5FloatType.h
 include/H5Fpublic.h
 include/H5Gpublic.h
+${PLIST.cxx}include/H5Group.h
 include/H5HGpublic.h
 include/H5HLpublic.h
 include/H5IM.h
+${PLIST.cxx}include/H5IdComponent.h
+${PLIST.cxx}include/H5Include.h
+${PLIST.cxx}include/H5IntType.h
 include/H5Ipublic.h
 include/H5LT.h
+${PLIST.cxx}include/H5Library.h
 include/H5MMpublic.h
+${PLIST.cxx}include/H5Object.h
 include/H5Opublic.h
 include/H5Ppublic.h
+${PLIST.cxx}include/H5PredType.h
+${PLIST.cxx}include/H5PropList.h
 include/H5Rpublic.h
 include/H5Spublic.h
+${PLIST.cxx}include/H5StrType.h
 include/H5TA.h
 include/H5Tpublic.h
+${PLIST.cxx}include/H5VarLenType.h
 include/H5Zpublic.h
 include/H5api_adpt.h
+${PLIST.cxx}include/H5cxx_pubconf.h
 include/H5pubconf.h
 include/H5public.h
 include/hdf5.h
-${PLIST.cxx}include/H5AbstractDs.h
-${PLIST.cxx}include/H5ArrayType.h
-${PLIST.cxx}include/H5AtomType.h
-${PLIST.cxx}include/H5Attribute.h
-${PLIST.cxx}include/H5Classes.h
-${PLIST.cxx}include/H5CommonFG.h
-${PLIST.cxx}include/H5CompType.h
-${PLIST.cxx}include/H5Cpp.h
-${PLIST.cxx}include/H5CppDoc.h
-${PLIST.cxx}include/H5DataSet.h
-${PLIST.cxx}include/H5DataSpace.h
-${PLIST.cxx}include/H5DataType.h
-${PLIST.cxx}include/H5DcreatProp.h
-${PLIST.cxx}include/H5DxferProp.h
-${PLIST.cxx}include/H5EnumType.h
-${PLIST.cxx}include/H5Exception.h
-${PLIST.cxx}include/H5FaccProp.h
-${PLIST.cxx}include/H5FcreatProp.h
-${PLIST.cxx}include/H5File.h
-${PLIST.cxx}include/H5FloatType.h
-${PLIST.cxx}include/H5Group.h
-${PLIST.cxx}include/H5IdComponent.h
-${PLIST.cxx}include/H5Include.h
-${PLIST.cxx}include/H5IntType.h
-${PLIST.cxx}include/H5Library.h
-${PLIST.cxx}include/H5Object.h
-${PLIST.cxx}include/H5PredType.h
-${PLIST.cxx}include/H5PropList.h
-${PLIST.cxx}include/H5StrType.h
-${PLIST.cxx}include/H5VarLenType.h
-${PLIST.cxx}include/H5cxx_pubconf.h
 lib/libhdf5.la
 lib/libhdf5.settings
 ${PLIST.cxx}lib/libhdf5_cpp.la
@@ -143,6 +142,298 @@ share/doc/hdf5/html/H5.sample_code.html
 share/doc/hdf5/html/H5.user.PrintGen.html
 share/doc/hdf5/html/H5.user.PrintTpg.html
 share/doc/hdf5/html/H5.user.html
+share/doc/hdf5/html/H5/H5check_version.htm
+share/doc/hdf5/html/H5/H5close.htm
+share/doc/hdf5/html/H5/H5dont_atexit.htm
+share/doc/hdf5/html/H5/H5garbage_collect.htm
+share/doc/hdf5/html/H5/H5get_libversion.htm
+share/doc/hdf5/html/H5/H5open.htm
+share/doc/hdf5/html/H5/H5set_free_list_limits.htm
+share/doc/hdf5/html/H5A/H5Aclose.htm
+share/doc/hdf5/html/H5A/H5Acreate.htm
+share/doc/hdf5/html/H5A/H5Adelete.htm
+share/doc/hdf5/html/H5A/H5Aget_name.htm
+share/doc/hdf5/html/H5A/H5Aget_num_attrs.htm
+share/doc/hdf5/html/H5A/H5Aget_space.htm
+share/doc/hdf5/html/H5A/H5Aget_type.htm
+share/doc/hdf5/html/H5A/H5Aiterate.htm
+share/doc/hdf5/html/H5A/H5Aopen_idx.htm
+share/doc/hdf5/html/H5A/H5Aopen_name.htm
+share/doc/hdf5/html/H5A/H5Aread.htm
+share/doc/hdf5/html/H5A/H5Awrite.htm
+share/doc/hdf5/html/H5D/H5Dclose.htm
+share/doc/hdf5/html/H5D/H5Dcreate.htm
+share/doc/hdf5/html/H5D/H5Dextend.htm
+share/doc/hdf5/html/H5D/H5Dfill.htm
+share/doc/hdf5/html/H5D/H5Dget_create_plist.htm
+share/doc/hdf5/html/H5D/H5Dget_offset.htm
+share/doc/hdf5/html/H5D/H5Dget_space.htm
+share/doc/hdf5/html/H5D/H5Dget_space_status.htm
+share/doc/hdf5/html/H5D/H5Dget_storage_size.htm
+share/doc/hdf5/html/H5D/H5Dget_type.htm
+share/doc/hdf5/html/H5D/H5Diterate.htm
+share/doc/hdf5/html/H5D/H5Dopen.htm
+share/doc/hdf5/html/H5D/H5Dread.htm
+share/doc/hdf5/html/H5D/H5Dvlen_get_buf_size.htm
+share/doc/hdf5/html/H5D/H5Dvlen_reclaim.htm
+share/doc/hdf5/html/H5D/H5Dwrite.htm
+share/doc/hdf5/html/H5E/H5Eclear.htm
+share/doc/hdf5/html/H5E/H5Eget_auto.htm
+share/doc/hdf5/html/H5E/H5Eget_major.htm
+share/doc/hdf5/html/H5E/H5Eget_minor.htm
+share/doc/hdf5/html/H5E/H5Eprint.htm
+share/doc/hdf5/html/H5E/H5Epush.htm
+share/doc/hdf5/html/H5E/H5Eset_auto.htm
+share/doc/hdf5/html/H5E/H5Ewalk.htm
+share/doc/hdf5/html/H5E/H5Ewalk_cb.htm
+share/doc/hdf5/html/H5F/H5Fclose.htm
+share/doc/hdf5/html/H5F/H5Fcreate.htm
+share/doc/hdf5/html/H5F/H5Fflush.htm
+share/doc/hdf5/html/H5F/H5Fget_access_plist.htm
+share/doc/hdf5/html/H5F/H5Fget_create_plist.htm
+share/doc/hdf5/html/H5F/H5Fget_filesize.htm
+share/doc/hdf5/html/H5F/H5Fget_freespace.htm
+share/doc/hdf5/html/H5F/H5Fget_name.htm
+share/doc/hdf5/html/H5F/H5Fget_obj_count.htm
+share/doc/hdf5/html/H5F/H5Fget_obj_ids.htm
+share/doc/hdf5/html/H5F/H5Fget_vfd_handle.htm
+share/doc/hdf5/html/H5F/H5Fis_hdf5.htm
+share/doc/hdf5/html/H5F/H5Fmount.htm
+share/doc/hdf5/html/H5F/H5Fopen.htm
+share/doc/hdf5/html/H5F/H5Freopen.htm
+share/doc/hdf5/html/H5F/H5Funmount.htm
+share/doc/hdf5/html/H5G/H5Gclose.htm
+share/doc/hdf5/html/H5G/H5Gcreate.htm
+share/doc/hdf5/html/H5G/H5Gget_comment.htm
+share/doc/hdf5/html/H5G/H5Gget_linkval.htm
+share/doc/hdf5/html/H5G/H5Gget_num_objs.htm
+share/doc/hdf5/html/H5G/H5Gget_objinfo.htm
+share/doc/hdf5/html/H5G/H5Gget_objname_by_idx.htm
+share/doc/hdf5/html/H5G/H5Gget_objtype_by_idx.htm
+share/doc/hdf5/html/H5G/H5Giterate.htm
+share/doc/hdf5/html/H5G/H5Glink.htm
+share/doc/hdf5/html/H5G/H5Glink2.htm
+share/doc/hdf5/html/H5G/H5Gmove.htm
+share/doc/hdf5/html/H5G/H5Gmove2.htm
+share/doc/hdf5/html/H5G/H5Gopen.htm
+share/doc/hdf5/html/H5G/H5Gset_comment.htm
+share/doc/hdf5/html/H5G/H5Gunlink.htm
+share/doc/hdf5/html/H5I/H5Idec_ref.htm
+share/doc/hdf5/html/H5I/H5Iget_file_id.htm
+share/doc/hdf5/html/H5I/H5Iget_name.htm
+share/doc/hdf5/html/H5I/H5Iget_ref.htm
+share/doc/hdf5/html/H5I/H5Iget_type.htm
+share/doc/hdf5/html/H5I/H5Iinc_ref.htm
+share/doc/hdf5/html/H5P/H5Pall_filters_avail.htm
+share/doc/hdf5/html/H5P/H5Pclose.htm
+share/doc/hdf5/html/H5P/H5Pclose_class.htm
+share/doc/hdf5/html/H5P/H5Pcopy.htm
+share/doc/hdf5/html/H5P/H5Pcopy_prop.htm
+share/doc/hdf5/html/H5P/H5Pcreate.htm
+share/doc/hdf5/html/H5P/H5Pcreate_class.htm
+share/doc/hdf5/html/H5P/H5Pequal.htm
+share/doc/hdf5/html/H5P/H5Pexist.htm
+share/doc/hdf5/html/H5P/H5Pfill_value_defined.htm
+share/doc/hdf5/html/H5P/H5Pget.htm
+share/doc/hdf5/html/H5P/H5Pget_alignment.htm
+share/doc/hdf5/html/H5P/H5Pget_alloc_time.htm
+share/doc/hdf5/html/H5P/H5Pget_btree_ratios.htm
+share/doc/hdf5/html/H5P/H5Pget_buffer.htm
+share/doc/hdf5/html/H5P/H5Pget_cache.htm
+share/doc/hdf5/html/H5P/H5Pget_chunk.htm
+share/doc/hdf5/html/H5P/H5Pget_class.htm
+share/doc/hdf5/html/H5P/H5Pget_class_name.htm
+share/doc/hdf5/html/H5P/H5Pget_class_parent.htm
+share/doc/hdf5/html/H5P/H5Pget_compression.htm
+share/doc/hdf5/html/H5P/H5Pget_deflate.htm
+share/doc/hdf5/html/H5P/H5Pget_driver.htm
+share/doc/hdf5/html/H5P/H5Pget_driver_info.htm
+share/doc/hdf5/html/H5P/H5Pget_dxpl_mpio.htm
+share/doc/hdf5/html/H5P/H5Pget_dxpl_multi.htm
+share/doc/hdf5/html/H5P/H5Pget_edc_check.htm
+share/doc/hdf5/html/H5P/H5Pget_external.htm
+share/doc/hdf5/html/H5P/H5Pget_external_count.htm
+share/doc/hdf5/html/H5P/H5Pget_family_offset.htm
+share/doc/hdf5/html/H5P/H5Pget_fapl_core.htm
+share/doc/hdf5/html/H5P/H5Pget_fapl_family.htm
+share/doc/hdf5/html/H5P/H5Pget_fapl_mpio.htm
+share/doc/hdf5/html/H5P/H5Pget_fapl_mpiposix.htm
+share/doc/hdf5/html/H5P/H5Pget_fapl_multi.htm
+share/doc/hdf5/html/H5P/H5Pget_fapl_stream.htm
+share/doc/hdf5/html/H5P/H5Pget_fclose_degree.htm
+share/doc/hdf5/html/H5P/H5Pget_fill_time.htm
+share/doc/hdf5/html/H5P/H5Pget_fill_value.htm
+share/doc/hdf5/html/H5P/H5Pget_filter.htm
+share/doc/hdf5/html/H5P/H5Pget_filter_by_id.htm
+share/doc/hdf5/html/H5P/H5Pget_gc_references.htm
+share/doc/hdf5/html/H5P/H5Pget_hyper_cache.htm
+share/doc/hdf5/html/H5P/H5Pget_hyper_vector_size.htm
+share/doc/hdf5/html/H5P/H5Pget_istore_k.htm
+share/doc/hdf5/html/H5P/H5Pget_layout.htm
+share/doc/hdf5/html/H5P/H5Pget_meta_block_size.htm
+share/doc/hdf5/html/H5P/H5Pget_multi_type.htm
+share/doc/hdf5/html/H5P/H5Pget_nfilters.htm
+share/doc/hdf5/html/H5P/H5Pget_nprops.htm
+share/doc/hdf5/html/H5P/H5Pget_preserve.htm
+share/doc/hdf5/html/H5P/H5Pget_sieve_buf_size.htm
+share/doc/hdf5/html/H5P/H5Pget_size.htm
+share/doc/hdf5/html/H5P/H5Pget_sizes.htm
+share/doc/hdf5/html/H5P/H5Pget_small_data_block_size.htm
+share/doc/hdf5/html/H5P/H5Pget_sym_k.htm
+share/doc/hdf5/html/H5P/H5Pget_userblock.htm
+share/doc/hdf5/html/H5P/H5Pget_version.htm
+share/doc/hdf5/html/H5P/H5Pget_vlen_mem_manager.htm
+share/doc/hdf5/html/H5P/H5Pinsert.htm
+share/doc/hdf5/html/H5P/H5Pisa_class.htm
+share/doc/hdf5/html/H5P/H5Piterate.htm
+share/doc/hdf5/html/H5P/H5Pmodify_filter.htm
+share/doc/hdf5/html/H5P/H5Pregister.htm
+share/doc/hdf5/html/H5P/H5Premove.htm
+share/doc/hdf5/html/H5P/H5Premove_filter.htm
+share/doc/hdf5/html/H5P/H5Pset.htm
+share/doc/hdf5/html/H5P/H5Pset_alignment.htm
+share/doc/hdf5/html/H5P/H5Pset_alloc_time.htm
+share/doc/hdf5/html/H5P/H5Pset_btree_ratios.htm
+share/doc/hdf5/html/H5P/H5Pset_buffer.htm
+share/doc/hdf5/html/H5P/H5Pset_cache.htm
+share/doc/hdf5/html/H5P/H5Pset_chunk.htm
+share/doc/hdf5/html/H5P/H5Pset_compression.htm
+share/doc/hdf5/html/H5P/H5Pset_deflate.htm
+share/doc/hdf5/html/H5P/H5Pset_driver.htm
+share/doc/hdf5/html/H5P/H5Pset_dxpl_mpio.htm
+share/doc/hdf5/html/H5P/H5Pset_dxpl_multi.htm
+share/doc/hdf5/html/H5P/H5Pset_edc_check.htm
+share/doc/hdf5/html/H5P/H5Pset_external.htm
+share/doc/hdf5/html/H5P/H5Pset_family_offset.htm
+share/doc/hdf5/html/H5P/H5Pset_fapl_core.htm
+share/doc/hdf5/html/H5P/H5Pset_fapl_family.htm
+share/doc/hdf5/html/H5P/H5Pset_fapl_log.htm
+share/doc/hdf5/html/H5P/H5Pset_fapl_mpio.htm
+share/doc/hdf5/html/H5P/H5Pset_fapl_mpiposix.htm
+share/doc/hdf5/html/H5P/H5Pset_fapl_multi.htm
+share/doc/hdf5/html/H5P/H5Pset_fapl_sec2.htm
+share/doc/hdf5/html/H5P/H5Pset_fapl_split.htm
+share/doc/hdf5/html/H5P/H5Pset_fapl_stdio.htm
+share/doc/hdf5/html/H5P/H5Pset_fapl_stream.htm
+share/doc/hdf5/html/H5P/H5Pset_fclose_degree.htm
+share/doc/hdf5/html/H5P/H5Pset_fill_time.htm
+share/doc/hdf5/html/H5P/H5Pset_fill_value.htm
+share/doc/hdf5/html/H5P/H5Pset_filter.htm
+share/doc/hdf5/html/H5P/H5Pset_filter_callback.htm
+share/doc/hdf5/html/H5P/H5Pset_fletcher32.htm
+share/doc/hdf5/html/H5P/H5Pset_gc_references.htm
+share/doc/hdf5/html/H5P/H5Pset_hyper_cache.htm
+share/doc/hdf5/html/H5P/H5Pset_hyper_vector_size.htm
+share/doc/hdf5/html/H5P/H5Pset_istore_k.htm
+share/doc/hdf5/html/H5P/H5Pset_layout.htm
+share/doc/hdf5/html/H5P/H5Pset_meta_block_size.htm
+share/doc/hdf5/html/H5P/H5Pset_multi_type.htm
+share/doc/hdf5/html/H5P/H5Pset_preserve.htm
+share/doc/hdf5/html/H5P/H5Pset_shuffle.htm
+share/doc/hdf5/html/H5P/H5Pset_sieve_buf_size.htm
+share/doc/hdf5/html/H5P/H5Pset_sizes.htm
+share/doc/hdf5/html/H5P/H5Pset_small_data_block_size.htm
+share/doc/hdf5/html/H5P/H5Pset_sym_k.htm
+share/doc/hdf5/html/H5P/H5Pset_szip.htm
+share/doc/hdf5/html/H5P/H5Pset_userblock.htm
+share/doc/hdf5/html/H5P/H5Pset_vlen_mem_manager.htm
+share/doc/hdf5/html/H5P/H5Punregister.htm
+share/doc/hdf5/html/H5R/H5Rcreate.htm
+share/doc/hdf5/html/H5R/H5Rdereference.htm
+share/doc/hdf5/html/H5R/H5Rget_obj_type.htm
+share/doc/hdf5/html/H5R/H5Rget_object_type.htm
+share/doc/hdf5/html/H5R/H5Rget_region.htm
+share/doc/hdf5/html/H5S/H5Sclose.htm
+share/doc/hdf5/html/H5S/H5Scopy.htm
+share/doc/hdf5/html/H5S/H5Screate.htm
+share/doc/hdf5/html/H5S/H5Screate_simple.htm
+share/doc/hdf5/html/H5S/H5Sextent_copy.htm
+share/doc/hdf5/html/H5S/H5Sget_select_bounds.htm
+share/doc/hdf5/html/H5S/H5Sget_select_elem_npoints.htm
+share/doc/hdf5/html/H5S/H5Sget_select_elem_pointlist.htm
+share/doc/hdf5/html/H5S/H5Sget_select_hyper_blocklist.htm
+share/doc/hdf5/html/H5S/H5Sget_select_hyper_nblocks.htm
+share/doc/hdf5/html/H5S/H5Sget_select_npoints.htm
+share/doc/hdf5/html/H5S/H5Sget_select_type.htm
+share/doc/hdf5/html/H5S/H5Sget_simple_extent_dims.htm
+share/doc/hdf5/html/H5S/H5Sget_simple_extent_ndims.htm
+share/doc/hdf5/html/H5S/H5Sget_simple_extent_npoints.htm
+share/doc/hdf5/html/H5S/H5Sget_simple_extent_type.htm
+share/doc/hdf5/html/H5S/H5Sis_simple.htm
+share/doc/hdf5/html/H5S/H5Soffset_simple.htm
+share/doc/hdf5/html/H5S/H5Sselect_all.htm
+share/doc/hdf5/html/H5S/H5Sselect_elements.htm
+share/doc/hdf5/html/H5S/H5Sselect_hyperslab.htm
+share/doc/hdf5/html/H5S/H5Sselect_none.htm
+share/doc/hdf5/html/H5S/H5Sselect_valid.htm
+share/doc/hdf5/html/H5S/H5Sset_extent_none.htm
+share/doc/hdf5/html/H5S/H5Sset_extent_simple.htm
+share/doc/hdf5/html/H5T/H5Tarray_create.htm
+share/doc/hdf5/html/H5T/H5Tclose.htm
+share/doc/hdf5/html/H5T/H5Tcommit.htm
+share/doc/hdf5/html/H5T/H5Tcommitted.htm
+share/doc/hdf5/html/H5T/H5Tconvert.htm
+share/doc/hdf5/html/H5T/H5Tcopy.htm
+share/doc/hdf5/html/H5T/H5Tcreate.htm
+share/doc/hdf5/html/H5T/H5Tdetect_class.htm
+share/doc/hdf5/html/H5T/H5Tenum_create.htm
+share/doc/hdf5/html/H5T/H5Tenum_insert.htm
+share/doc/hdf5/html/H5T/H5Tenum_nameof.htm
+share/doc/hdf5/html/H5T/H5Tenum_valueof.htm
+share/doc/hdf5/html/H5T/H5Tequal.htm
+share/doc/hdf5/html/H5T/H5Tfind.htm
+share/doc/hdf5/html/H5T/H5Tget_array_dims.htm
+share/doc/hdf5/html/H5T/H5Tget_array_ndims.htm
+share/doc/hdf5/html/H5T/H5Tget_class.htm
+share/doc/hdf5/html/H5T/H5Tget_cset.htm
+share/doc/hdf5/html/H5T/H5Tget_ebias.htm
+share/doc/hdf5/html/H5T/H5Tget_fields.htm
+share/doc/hdf5/html/H5T/H5Tget_inpad.htm
+share/doc/hdf5/html/H5T/H5Tget_member_class.htm
+share/doc/hdf5/html/H5T/H5Tget_member_index.htm
+share/doc/hdf5/html/H5T/H5Tget_member_name.htm
+share/doc/hdf5/html/H5T/H5Tget_member_offset.htm
+share/doc/hdf5/html/H5T/H5Tget_member_type.htm
+share/doc/hdf5/html/H5T/H5Tget_member_value.htm
+share/doc/hdf5/html/H5T/H5Tget_native_type.htm
+share/doc/hdf5/html/H5T/H5Tget_nmembers.htm
+share/doc/hdf5/html/H5T/H5Tget_norm.htm
+share/doc/hdf5/html/H5T/H5Tget_offset.htm
+share/doc/hdf5/html/H5T/H5Tget_order.htm
+share/doc/hdf5/html/H5T/H5Tget_overflow.htm
+share/doc/hdf5/html/H5T/H5Tget_pad.htm
+share/doc/hdf5/html/H5T/H5Tget_precision.htm
+share/doc/hdf5/html/H5T/H5Tget_sign.htm
+share/doc/hdf5/html/H5T/H5Tget_size.htm
+share/doc/hdf5/html/H5T/H5Tget_strpad.htm
+share/doc/hdf5/html/H5T/H5Tget_super.htm
+share/doc/hdf5/html/H5T/H5Tget_tag.htm
+share/doc/hdf5/html/H5T/H5Tinsert.htm
+share/doc/hdf5/html/H5T/H5Tis_variable_str.htm
+share/doc/hdf5/html/H5T/H5Tlock.htm
+share/doc/hdf5/html/H5T/H5Topen.htm
+share/doc/hdf5/html/H5T/H5Tpack.htm
+share/doc/hdf5/html/H5T/H5Tregister.htm
+share/doc/hdf5/html/H5T/H5Tset_cset.htm
+share/doc/hdf5/html/H5T/H5Tset_ebias.htm
+share/doc/hdf5/html/H5T/H5Tset_fields.htm
+share/doc/hdf5/html/H5T/H5Tset_inpad.htm
+share/doc/hdf5/html/H5T/H5Tset_norm.htm
+share/doc/hdf5/html/H5T/H5Tset_offset.htm
+share/doc/hdf5/html/H5T/H5Tset_order.htm
+share/doc/hdf5/html/H5T/H5Tset_overflow.htm
+share/doc/hdf5/html/H5T/H5Tset_pad.htm
+share/doc/hdf5/html/H5T/H5Tset_precision.htm
+share/doc/hdf5/html/H5T/H5Tset_sign.htm
+share/doc/hdf5/html/H5T/H5Tset_size.htm
+share/doc/hdf5/html/H5T/H5Tset_strpad.htm
+share/doc/hdf5/html/H5T/H5Tset_tag.htm
+share/doc/hdf5/html/H5T/H5Tunregister.htm
+share/doc/hdf5/html/H5T/H5Tvlen_create.htm
+share/doc/hdf5/html/H5Z/H5Zfilter_avail.htm
+share/doc/hdf5/html/H5Z/H5Zget_filter_info.htm
+share/doc/hdf5/html/H5Z/H5Zregister.htm
+share/doc/hdf5/html/H5Z/H5Zunregister.htm
 share/doc/hdf5/html/IH_map1.gif
 share/doc/hdf5/html/IH_map2.gif
 share/doc/hdf5/html/IH_map3.gif
@@ -155,6 +446,8 @@ share/doc/hdf5/html/Intro/IntroExamples.html
 share/doc/hdf5/html/MountingFiles.html
 share/doc/hdf5/html/NCSAfooterlogo.gif
 share/doc/hdf5/html/PSandPDF/Dependencies
+share/doc/hdf5/html/PSandPDF/HDF5_RM_r166.pdf
+share/doc/hdf5/html/PSandPDF/HDF5_UG_r166.pdf
 share/doc/hdf5/html/Performance.html
 share/doc/hdf5/html/PredefDTypes.html
 share/doc/hdf5/html/Properties.html
@@ -216,154 +509,22 @@ share/doc/hdf5/html/TechNotes/pipe5.gif
 share/doc/hdf5/html/TechNotes/shuffling-algorithm-report.pdf
 share/doc/hdf5/html/TechNotes/version.gif
 share/doc/hdf5/html/Tools.html
-share/doc/hdf5/html/Tutor/Contents.html
-share/doc/hdf5/html/Tutor/ContentsAdd.html
-share/doc/hdf5/html/Tutor/ContentsAdv.html
-share/doc/hdf5/html/Tutor/ContentsFull.html
-share/doc/hdf5/html/Tutor/ContentsIntro.html
-share/doc/hdf5/html/Tutor/Copyright.html
-share/doc/hdf5/html/Tutor/Dependencies
-share/doc/hdf5/html/Tutor/Graphics/AddInfo.gif
-share/doc/hdf5/html/Tutor/Graphics/AdvTopics.gif
-share/doc/hdf5/html/Tutor/Graphics/BLANK.gif
-share/doc/hdf5/html/Tutor/Graphics/ChunkExt.gif
-share/doc/hdf5/html/Tutor/Graphics/CompDTypes.gif
-share/doc/hdf5/html/Tutor/Graphics/Copy.gif
-share/doc/hdf5/html/Tutor/Graphics/CreateAttr.gif
-share/doc/hdf5/html/Tutor/Graphics/CreateDset1.gif
-share/doc/hdf5/html/Tutor/Graphics/CreateDset2.gif
-share/doc/hdf5/html/Tutor/Graphics/CreateFile.gif
-share/doc/hdf5/html/Tutor/Graphics/CreateGrp1.gif
-share/doc/hdf5/html/Tutor/Graphics/CreateGrp2.gif
-share/doc/hdf5/html/Tutor/Graphics/Dependencies
-share/doc/hdf5/html/Tutor/Graphics/Examples.gif
-share/doc/hdf5/html/Tutor/Graphics/FileOrg.gif
-share/doc/hdf5/html/Tutor/Graphics/FullTOC1.gif
-share/doc/hdf5/html/Tutor/Graphics/FullTOC2.gif
-share/doc/hdf5/html/Tutor/Graphics/Glossary.gif
-share/doc/hdf5/html/Tutor/Graphics/H5API.gif
-share/doc/hdf5/html/Tutor/Graphics/Intro.gif
-share/doc/hdf5/html/Tutor/Graphics/IntroTopics.gif
-share/doc/hdf5/html/Tutor/Graphics/Iterate.gif
-share/doc/hdf5/html/Tutor/Graphics/MountFile.gif
-share/doc/hdf5/html/Tutor/Graphics/Quiz.gif
-share/doc/hdf5/html/Tutor/Graphics/QuizAns.gif
-share/doc/hdf5/html/Tutor/Graphics/RdWrDataset.gif
-share/doc/hdf5/html/Tutor/Graphics/RefObject.gif
-share/doc/hdf5/html/Tutor/Graphics/RefRegion.gif
-share/doc/hdf5/html/Tutor/Graphics/References.gif
-share/doc/hdf5/html/Tutor/Graphics/SelectElemCp.gif
-share/doc/hdf5/html/Tutor/Graphics/SelectHyp.gif
-share/doc/hdf5/html/Tutor/Graphics/TOC.gif
-share/doc/hdf5/html/Tutor/Graphics/TOCFull.gif
-share/doc/hdf5/html/Tutor/Graphics/TOCShort.gif
-share/doc/hdf5/html/Tutor/Graphics/TitlePg.gif
-share/doc/hdf5/html/Tutor/Graphics/Utilities.gif
-share/doc/hdf5/html/Tutor/answers.html
-share/doc/hdf5/html/Tutor/api.html
-share/doc/hdf5/html/Tutor/bighdf2sp.JPG
-share/doc/hdf5/html/Tutor/compound.html
-share/doc/hdf5/html/Tutor/crtatt.html
-share/doc/hdf5/html/Tutor/crtdat.html
-share/doc/hdf5/html/Tutor/crtfile.html
-share/doc/hdf5/html/Tutor/crtgrp.html
-share/doc/hdf5/html/Tutor/crtgrpar.html
-share/doc/hdf5/html/Tutor/crtgrpd.html
-share/doc/hdf5/html/Tutor/examples/Dependencies
-share/doc/hdf5/html/Tutor/examples/attrexample.f90
-share/doc/hdf5/html/Tutor/examples/chunk.f90
-share/doc/hdf5/html/Tutor/examples/compound.f90
-share/doc/hdf5/html/Tutor/examples/dsetexample.f90
-share/doc/hdf5/html/Tutor/examples/fileexample.f90
-share/doc/hdf5/html/Tutor/examples/groupexample.f90
-share/doc/hdf5/html/Tutor/examples/grpdsetexample.f90
-share/doc/hdf5/html/Tutor/examples/grpit.f90
-share/doc/hdf5/html/Tutor/examples/grpsexample.f90
-share/doc/hdf5/html/Tutor/examples/h5_compound.c
-share/doc/hdf5/html/Tutor/examples/h5_copy.c
-share/doc/hdf5/html/Tutor/examples/h5_crtatt.c
-share/doc/hdf5/html/Tutor/examples/h5_crtdat.c
-share/doc/hdf5/html/Tutor/examples/h5_crtfile.c
-share/doc/hdf5/html/Tutor/examples/h5_crtgrp.c
-share/doc/hdf5/html/Tutor/examples/h5_crtgrpar.c
-share/doc/hdf5/html/Tutor/examples/h5_crtgrpd.c
-share/doc/hdf5/html/Tutor/examples/h5_extend.c
-share/doc/hdf5/html/Tutor/examples/h5_hyperslab.c
-share/doc/hdf5/html/Tutor/examples/h5_iterate.c
-share/doc/hdf5/html/Tutor/examples/h5_mount.c
-share/doc/hdf5/html/Tutor/examples/h5_rdwt.c
-share/doc/hdf5/html/Tutor/examples/h5_read.c
-share/doc/hdf5/html/Tutor/examples/h5_ref2objr.c
-share/doc/hdf5/html/Tutor/examples/h5_ref2objw.c
-share/doc/hdf5/html/Tutor/examples/h5_ref2regr.c
-share/doc/hdf5/html/Tutor/examples/h5_ref2regw.c
-share/doc/hdf5/html/Tutor/examples/h5_reference.c
-share/doc/hdf5/html/Tutor/examples/hyperslab.f90
-share/doc/hdf5/html/Tutor/examples/java/Compound.java
-share/doc/hdf5/html/Tutor/examples/java/Copy.java
-share/doc/hdf5/html/Tutor/examples/java/CreateAttribute.java
-share/doc/hdf5/html/Tutor/examples/java/CreateDataset.java
-share/doc/hdf5/html/Tutor/examples/java/CreateFile.java
-share/doc/hdf5/html/Tutor/examples/java/CreateFileInput.java
-share/doc/hdf5/html/Tutor/examples/java/CreateGroup.java
-share/doc/hdf5/html/Tutor/examples/java/CreateGroupAR.java
-share/doc/hdf5/html/Tutor/examples/java/CreateGroupDataset.java
-share/doc/hdf5/html/Tutor/examples/java/DatasetRdWt.java
-share/doc/hdf5/html/Tutor/examples/java/Dependencies
-share/doc/hdf5/html/Tutor/examples/java/HyperSlab.java
-share/doc/hdf5/html/Tutor/examples/java/README
-share/doc/hdf5/html/Tutor/examples/java/readme.html
-share/doc/hdf5/html/Tutor/examples/java/runCompound.sh
-share/doc/hdf5/html/Tutor/examples/java/runCompound.sh.in
-share/doc/hdf5/html/Tutor/examples/java/runCopy.sh
-share/doc/hdf5/html/Tutor/examples/java/runCopy.sh.in
-share/doc/hdf5/html/Tutor/examples/java/runCreateAttribute.sh
-share/doc/hdf5/html/Tutor/examples/java/runCreateAttribute.sh.in
-share/doc/hdf5/html/Tutor/examples/java/runCreateDataset.sh
-share/doc/hdf5/html/Tutor/examples/java/runCreateDataset.sh.in
-share/doc/hdf5/html/Tutor/examples/java/runCreateFile.sh
-share/doc/hdf5/html/Tutor/examples/java/runCreateFile.sh.in
-share/doc/hdf5/html/Tutor/examples/java/runCreateFileInput.sh
-share/doc/hdf5/html/Tutor/examples/java/runCreateFileInput.sh.in
-share/doc/hdf5/html/Tutor/examples/java/runCreateGroup.sh
-share/doc/hdf5/html/Tutor/examples/java/runCreateGroup.sh.in
-share/doc/hdf5/html/Tutor/examples/java/runCreateGroupAR.sh
-share/doc/hdf5/html/Tutor/examples/java/runCreateGroupAR.sh.in
-share/doc/hdf5/html/Tutor/examples/java/runCreateGroupDataset.sh
-share/doc/hdf5/html/Tutor/examples/java/runCreateGroupDataset.sh.in
-share/doc/hdf5/html/Tutor/examples/java/runDatasetRdWt.sh
-share/doc/hdf5/html/Tutor/examples/java/runDatasetRdWt.sh.in
-share/doc/hdf5/html/Tutor/examples/java/runHyperSlab.sh
-share/doc/hdf5/html/Tutor/examples/java/runHyperSlab.sh.in
-share/doc/hdf5/html/Tutor/examples/mountexample.f90
-share/doc/hdf5/html/Tutor/examples/refobjexample.f90
-share/doc/hdf5/html/Tutor/examples/refregexample.f90
-share/doc/hdf5/html/Tutor/examples/rwdsetexample.f90
-share/doc/hdf5/html/Tutor/examples/selectele.f90
-share/doc/hdf5/html/Tutor/extend.html
-share/doc/hdf5/html/Tutor/fileorg.html
-share/doc/hdf5/html/Tutor/footer-ncsalogo.gif
-share/doc/hdf5/html/Tutor/glossary.html
-share/doc/hdf5/html/Tutor/img001.gif
-share/doc/hdf5/html/Tutor/img002.gif
-share/doc/hdf5/html/Tutor/img003.gif
-share/doc/hdf5/html/Tutor/img004.gif
-share/doc/hdf5/html/Tutor/img005.gif
-share/doc/hdf5/html/Tutor/index.html
-share/doc/hdf5/html/Tutor/intro.html
-share/doc/hdf5/html/Tutor/iterate.html
-share/doc/hdf5/html/Tutor/mount.html
-share/doc/hdf5/html/Tutor/property.html
-share/doc/hdf5/html/Tutor/questions.html
-share/doc/hdf5/html/Tutor/rdwt.html
-share/doc/hdf5/html/Tutor/references.html
-share/doc/hdf5/html/Tutor/reftoobj.html
-share/doc/hdf5/html/Tutor/reftoreg.html
-share/doc/hdf5/html/Tutor/select.html
-share/doc/hdf5/html/Tutor/selectc.html
-share/doc/hdf5/html/Tutor/software.html
-share/doc/hdf5/html/Tutor/title.html
-share/doc/hdf5/html/Tutor/util.html
+share/doc/hdf5/html/Tools/gif2h5.htm
+share/doc/hdf5/html/Tools/h4toh5.htm
+share/doc/hdf5/html/Tools/h52gif.htm
+share/doc/hdf5/html/Tools/h5c++.htm
+share/doc/hdf5/html/Tools/h5cc_and_h5pcc.htm
+share/doc/hdf5/html/Tools/h5diff.htm
+share/doc/hdf5/html/Tools/h5dump.htm
+share/doc/hdf5/html/Tools/h5fc_and_h5pfc.htm
+share/doc/hdf5/html/Tools/h5import.htm
+share/doc/hdf5/html/Tools/h5jam_and_h5unjam.htm
+share/doc/hdf5/html/Tools/h5ls.htm
+share/doc/hdf5/html/Tools/h5perf.htm
+share/doc/hdf5/html/Tools/h5redeploy.htm
+share/doc/hdf5/html/Tools/h5repack.htm
+share/doc/hdf5/html/Tools/h5repart.htm
+share/doc/hdf5/html/Tools/h5toh4.htm
 share/doc/hdf5/html/Version.html
 share/doc/hdf5/html/chunk1.gif
 share/doc/hdf5/html/compat.html
@@ -630,6 +791,10 @@ share/doc/hdf5/html/cpplus_RM/namespaceH5.html
 share/doc/hdf5/html/cpplus_RM/namespaces.html
 share/doc/hdf5/html/cpplus_RM/namespacestd.html
 share/doc/hdf5/html/cpplus_RM/readdata_8cpp-example.html
+share/doc/hdf5/html/cpplus_RM/tab_b.gif
+share/doc/hdf5/html/cpplus_RM/tab_l.gif
+share/doc/hdf5/html/cpplus_RM/tab_r.gif
+share/doc/hdf5/html/cpplus_RM/tabs.css
 share/doc/hdf5/html/cpplus_RM/writedata_8cpp-example.html
 share/doc/hdf5/html/dataset_p1.gif
 share/doc/hdf5/html/ddl.html
@@ -678,6 +843,14 @@ share/doc/hdf5/html/pipe3.gif
 share/doc/hdf5/html/pipe4.gif
 share/doc/hdf5/html/pipe5.gif
 share/doc/hdf5/html/version.gif
+${PLIST.cxx}share/examples/hdf5/c++/chunks.cpp
+${PLIST.cxx}share/examples/hdf5/c++/compound.cpp
+${PLIST.cxx}share/examples/hdf5/c++/create.cpp
+${PLIST.cxx}share/examples/hdf5/c++/extend_ds.cpp
+${PLIST.cxx}share/examples/hdf5/c++/h5group.cpp
+${PLIST.cxx}share/examples/hdf5/c++/readdata.cpp
+${PLIST.cxx}share/examples/hdf5/c++/strtype.cpp
+${PLIST.cxx}share/examples/hdf5/c++/writedata.cpp
 share/examples/hdf5/c/ex_image1.c
 share/examples/hdf5/c/ex_image2.c
 share/examples/hdf5/c/ex_lite1.c
@@ -706,12 +879,3 @@ share/examples/hdf5/c/h5_read.c
 share/examples/hdf5/c/h5_reference.c
 share/examples/hdf5/c/h5_select.c
 share/examples/hdf5/c/h5_write.c
-share/examples/hdf5/c/ph5example.c
-${PLIST.cxx}share/examples/hdf5/c++/chunks.cpp
-${PLIST.cxx}share/examples/hdf5/c++/compound.cpp
-${PLIST.cxx}share/examples/hdf5/c++/create.cpp
-${PLIST.cxx}share/examples/hdf5/c++/extend_ds.cpp
-${PLIST.cxx}share/examples/hdf5/c++/h5group.cpp
-${PLIST.cxx}share/examples/hdf5/c++/readdata.cpp
-${PLIST.cxx}share/examples/hdf5/c++/strtype.cpp
-${PLIST.cxx}share/examples/hdf5/c++/writedata.cpp
diff --git a/devel/hdf5/distinfo b/devel/hdf5/distinfo
index 6e8ef5c437e..88139a6cdba 100644
--- a/devel/hdf5/distinfo
+++ b/devel/hdf5/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.24 2008/09/17 05:01:15 adam Exp $
+$NetBSD: distinfo,v 1.25 2009/11/15 15:50:50 drochner Exp $
 
-SHA1 (hdf5-1.6.7.tar.gz) = 9c26fe09cdad269c9a6757933f70ca164a47b8e8
-RMD160 (hdf5-1.6.7.tar.gz) = 2dbbcccd32986dcd66ce804c5e90ac6c949b71f6
-Size (hdf5-1.6.7.tar.gz) = 5299219 bytes
-SHA1 (patch-aa) = 7c035a6821e02ad79569022507b01f73324ac87d
+SHA1 (hdf5-1.6.10.tar.gz) = ccac439841977ab4e460fcb4c1fc2c2692a841d7
+RMD160 (hdf5-1.6.10.tar.gz) = 7fd773f80265b5d8afc5c5765c499c22bd22f0c8
+Size (hdf5-1.6.10.tar.gz) = 7435318 bytes
+SHA1 (patch-aa) = 8e02e2b5decde21bb7d223f3870330832db399ba
 SHA1 (patch-ab) = aa4911184b72d4818f6e65d3adf86110db9bd379
 SHA1 (patch-ac) = 77e3762e4e41274550cb1a25f4a1c2ffaa45dcdf
-SHA1 (patch-ad) = c0aa25378c987ca3675566ccab8bab246def1d53
+SHA1 (patch-ad) = 0b58c169e0d12cc25fc6206fc49086a89d2836b7
 SHA1 (patch-ba) = 1ba84ee22c3307100a2c8d3df4dfb2037be8e773
 SHA1 (patch-bb) = bcfd87df515d64471f881d4d10c894d89a6bc56e
-SHA1 (patch-bc) = 05e84e19b15bb9eee771e5be8e397959ae40ca9c
+SHA1 (patch-bc) = 54c25f32c1303ed616e94a7a28036ef033a66c40
 SHA1 (patch-bd) = d9347835a63ce9eccfa41992d1b1c6c934bca001
-SHA1 (patch-be) = 3510e713ac4b657d44134de62cc2148a98a7a115
+SHA1 (patch-be) = cb45e1ff8af301de1be1f5c71fbf730b365576bb
 SHA1 (patch-bf) = 33ae2f49be5ff7040389a472177b95127ef6b592
diff --git a/devel/hdf5/options.mk b/devel/hdf5/options.mk
index ec506160be1..c537ef3ecd8 100644
--- a/devel/hdf5/options.mk
+++ b/devel/hdf5/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2008/04/12 22:42:59 jlam Exp $
+# $NetBSD: options.mk,v 1.5 2009/11/15 15:50:50 drochner Exp $
 
 PKG_OPTIONS_VAR=PKG_OPTIONS.hdf5
 PKG_SUPPORTED_OPTIONS=	szip cxx threads
@@ -21,5 +21,6 @@ PLIST.cxx=		yes
 
 .if !empty(PKG_OPTIONS:Mthreads)
 CONFIGURE_ARGS+=	--enable-threadsafe
+# XXX libraries should not be linked against -lpthread
 .include "../../mk/pthread.buildlink3.mk"
 .endif
diff --git a/devel/hdf5/patches/patch-aa b/devel/hdf5/patches/patch-aa
index 84f09c18836..5ad56737477 100644
--- a/devel/hdf5/patches/patch-aa
+++ b/devel/hdf5/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.9 2008/09/11 10:27:52 adam Exp $
+$NetBSD: patch-aa,v 1.10 2009/11/15 15:50:50 drochner Exp $
 
 --- config/commence.in.orig	2008-02-01 04:04:06.000000000 +0100
 +++ config/commence.in
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.9 2008/09/11 10:27:52 adam Exp $
  DOCDIR=$(docdir)
  SUBDOCDIR=
 -EXAMPLEDIR=$(docdir)/hdf5/examples/c
-+EXAMPLEDIR=$(prefix)/share/examples/hdf5/c
++EXAMPLEDIR=$(DESTDIR)$(prefix)/share/examples/hdf5/c
  LIB=
  LIB_SRC=
  LIB_OBJ=
diff --git a/devel/hdf5/patches/patch-ad b/devel/hdf5/patches/patch-ad
index 40da248e15b..fd86cfdb54f 100644
--- a/devel/hdf5/patches/patch-ad
+++ b/devel/hdf5/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2008/09/11 10:27:52 adam Exp $
+$NetBSD: patch-ad,v 1.3 2009/11/15 15:50:50 drochner Exp $
 
 --- c++/config/commence.in.orig	2008-02-01 04:04:06.000000000 +0100
 +++ c++/config/commence.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.2 2008/09/11 10:27:52 adam Exp $
  ## defined. The main makefile is free to redefine these to something else.
  DOCDIR=$(docdir)
 -EXAMPLEDIR=$(docdir)/hdf5/examples/c++
-+EXAMPLEDIR=$(prefix)/share/examples/hdf5/c++
++EXAMPLEDIR=$(DESTDIR)$(prefix)/share/examples/hdf5/c++
  LIB=
  LIB_SRC=
  LIB_OBJ=
diff --git a/devel/hdf5/patches/patch-bc b/devel/hdf5/patches/patch-bc
index dcf6ef80a5b..f1925c218d4 100644
--- a/devel/hdf5/patches/patch-bc
+++ b/devel/hdf5/patches/patch-bc
@@ -1,8 +1,8 @@
-$NetBSD: patch-bc,v 1.1 2007/09/18 18:58:12 drochner Exp $
+$NetBSD: patch-bc,v 1.2 2009/11/15 15:50:50 drochner Exp $
 
---- config/conclude.in.orig	2007-09-18 16:20:36.000000000 +0200
+--- config/conclude.in.orig	2009-11-10 19:01:51.000000000 +0100
 +++ config/conclude.in
-@@ -201,6 +201,11 @@ install: $(AUX_LIB) $(PUB_LIB) $(PUB_HDR
+@@ -253,6 +253,11 @@ install: $(AUX_LIB) $(PUB_LIB) $(PUB_HDR
  	     fi;							      \
  	   fi;							              \
  	done
diff --git a/devel/hdf5/patches/patch-be b/devel/hdf5/patches/patch-be
index eb7202f6b75..e7df8e98fa5 100644
--- a/devel/hdf5/patches/patch-be
+++ b/devel/hdf5/patches/patch-be
@@ -1,15 +1,15 @@
-$NetBSD: patch-be,v 1.1 2007/09/18 18:58:13 drochner Exp $
+$NetBSD: patch-be,v 1.2 2009/11/15 15:50:50 drochner Exp $
 
---- c++/config/conclude.in.orig	2007-09-18 17:01:22.000000000 +0200
+--- c++/config/conclude.in.orig	2009-11-10 19:02:00.000000000 +0100
 +++ c++/config/conclude.in
-@@ -130,6 +130,11 @@ install: $(PUB_LIB) $(PUB_HDR) $(PUB_PRO
+@@ -215,6 +215,11 @@ install: $(PUB_LIB) $(PUB_HDR) $(PUB_PRO
  	     ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1);		      \
  	   fi;							              \
  	done
-+	@for f in X $(PUB_SCRIPTS); do \
-+		if test $$f != X; then \
-+			(${INSTALL_SCRIPT} $$f $(bindir)/. || exit 1); \
-+		fi; \
++	@for f in X $(PUB_SCRIPTS); do					      \
++	   if test $$f != X; then					      \
++	     ($(INSTALL_SCRIPT) $$f $(bindir)/. || exit 1);		      \
++	   fi;							              \
 +	done
  
  install-examples: $(EXAMPLE_PROGS) $(EXAMPLEDIR)