Addd optional support for thread safety and C++ with the options:

cxx threads

5 files changed, 75 insertions, 7 deletions

diff --git a/devel/hdf5/Makefile b/devel/hdf5/Makefile
index 13c95f95132..aa32fced1af 100644
--- a/devel/hdf5/Makefile
+++ b/devel/hdf5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/11/29 10:03:39 adam Exp $
+# $NetBSD: Makefile,v 1.32 2006/01/04 06:05:44 recht Exp $
 
 DISTNAME=	hdf5-1.6.5
 CATEGORIES=	devel
@@ -29,7 +29,7 @@ post-install:
 		release_docs/RELEASE.txt ${PREFIX}/share/doc/hdf5
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/hdf5
 	# avoid installing the Makefile and Makefile.in's  They are not needed
-	cd ${WRKSRC}/doc/html && ${PAX} -s '/.*Makefile.*//' -rw . ${PREFIX}/share/doc/html/hdf5
+	cd ${WRKSRC}/doc/html && ${PAX} -s '/.*Makefile.*//' -rwpm . ${PREFIX}/share/doc/html/hdf5
 	${CHOWN} -R ${SHAREOWN} ${PREFIX}/share/doc/html/hdf5
 	${CHGRP} -R ${SHAREGRP} ${PREFIX}/share/doc/html/hdf5
 
diff --git a/devel/hdf5/PLIST b/devel/hdf5/PLIST
index 1f6359196a9..12d797b5a1f 100644
--- a/devel/hdf5/PLIST
+++ b/devel/hdf5/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.12 2005/11/29 10:03:39 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/01/04 06:05:44 recht Exp $
 bin/gif2h5
 bin/h52gif
+${CXX}bin/h5c++
 bin/h5cc
 bin/h5debug
 bin/h5diff
@@ -13,11 +14,27 @@ bin/h5repack
 bin/h5repart
 bin/h5unjam
 include/H5ACpublic.h
+${CXX}include/H5AbstractDs.h
 include/H5Apublic.h
+${CXX}include/H5ArrayType.h
+${CXX}include/H5AtomType.h
+${CXX}include/H5Attribute.h
 include/H5Bpublic.h
+${CXX}include/H5Classes.h
+${CXX}include/H5CommonFG.h
+${CXX}include/H5CompType.h
+${CXX}include/H5Cpp.h
+${CXX}include/H5CppDoc.h
 include/H5Cpublic.h
+${CXX}include/H5DataSet.h
+${CXX}include/H5DataSpace.h
+${CXX}include/H5DataType.h
+${CXX}include/H5DcreatProp.h
 include/H5Dpublic.h
+${CXX}include/H5DxferProp.h
+${CXX}include/H5EnumType.h
 include/H5Epublic.h
+${CXX}include/H5Exception.h
 include/H5FDcore.h
 include/H5FDfamily.h
 include/H5FDgass.h
@@ -31,20 +48,34 @@ include/H5FDsec2.h
 include/H5FDsrb.h
 include/H5FDstdio.h
 include/H5FDstream.h
+${CXX}include/H5FaccProp.h
+${CXX}include/H5FcreatProp.h
+${CXX}include/H5File.h
+${CXX}include/H5FloatType.h
 include/H5Fpublic.h
 include/H5Gpublic.h
+${CXX}include/H5Group.h
 include/H5HGpublic.h
 include/H5HLpublic.h
 include/H5IM.h
+${CXX}include/H5IdComponent.h
+${CXX}include/H5Include.h
+${CXX}include/H5IntType.h
 include/H5Ipublic.h
 include/H5LT.h
+${CXX}include/H5Library.h
 include/H5MMpublic.h
+${CXX}include/H5Object.h
 include/H5Opublic.h
 include/H5Ppublic.h
+${CXX}include/H5PredType.h
+${CXX}include/H5PropList.h
 include/H5Rpublic.h
 include/H5Spublic.h
+${CXX}include/H5StrType.h
 include/H5TA.h
 include/H5Tpublic.h
+${CXX}include/H5VarLenType.h
 include/H5Zpublic.h
 include/H5api_adpt.h
 include/H5pubconf.h
@@ -52,6 +83,8 @@ include/H5public.h
 include/hdf5.h
 lib/libhdf5.la
 lib/libhdf5.settings
+${CXX}lib/libhdf5_cpp.la
+${CXX}lib/libhdf5_cpp.settings
 lib/libhdf5_hl.la
 share/doc/hdf5/COPYING
 share/doc/hdf5/HISTORY.txt
@@ -556,6 +589,7 @@ share/doc/html/hdf5/cpplus_RM/functions_0x75.html
 share/doc/html/hdf5/cpplus_RM/functions_0x76.html
 share/doc/html/hdf5/cpplus_RM/functions_0x77.html
 share/doc/html/hdf5/cpplus_RM/functions_0x7e.html
+share/doc/html/hdf5/cpplus_RM/functions_func.html
 share/doc/html/hdf5/cpplus_RM/functions_func_0x63.html
 share/doc/html/hdf5/cpplus_RM/functions_func_0x64.html
 share/doc/html/hdf5/cpplus_RM/functions_func_0x65.html
@@ -575,7 +609,6 @@ share/doc/html/hdf5/cpplus_RM/functions_func_0x75.html
 share/doc/html/hdf5/cpplus_RM/functions_func_0x76.html
 share/doc/html/hdf5/cpplus_RM/functions_func_0x77.html
 share/doc/html/hdf5/cpplus_RM/functions_func_0x7e.html
-share/doc/html/hdf5/cpplus_RM/functions_func.html
 share/doc/html/hdf5/cpplus_RM/functions_vars.html
 share/doc/html/hdf5/cpplus_RM/h5group_8cpp-example.html
 share/doc/html/hdf5/cpplus_RM/header.html
@@ -639,6 +672,13 @@ share/doc/html/hdf5/pipe3.gif
 share/doc/html/hdf5/pipe4.gif
 share/doc/html/hdf5/pipe5.gif
 share/doc/html/hdf5/version.gif
+${CXX}share/examples/hdf5/c++/chunks.cpp
+${CXX}share/examples/hdf5/c++/compound.cpp
+${CXX}share/examples/hdf5/c++/create.cpp
+${CXX}share/examples/hdf5/c++/extend_ds.cpp
+${CXX}share/examples/hdf5/c++/h5group.cpp
+${CXX}share/examples/hdf5/c++/readdata.cpp
+${CXX}share/examples/hdf5/c++/writedata.cpp
 share/examples/hdf5/c/h5_attribute.c
 share/examples/hdf5/c/h5_chunk_read.c
 share/examples/hdf5/c/h5_compound.c
@@ -651,6 +691,7 @@ 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
+${CXX}@dirrm share/examples/hdf5/c++
 @dirrm share/examples/hdf5/c
 @dirrm share/examples/hdf5
 @dirrm share/doc/html/hdf5/fortran
diff --git a/devel/hdf5/distinfo b/devel/hdf5/distinfo
index ac2874af19e..6273b2a9fae 100644
--- a/devel/hdf5/distinfo
+++ b/devel/hdf5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2005/11/29 10:03:39 adam Exp $
+$NetBSD: distinfo,v 1.17 2006/01/04 06:05:44 recht Exp $
 
 SHA1 (hdf5-1.6.5.tar.gz) = ce27eb324b1acbf0da3d2b24b3c38f1fc03c2442
 RMD160 (hdf5-1.6.5.tar.gz) = 544c668d9349e9943767e776f5ece9c1aab75fcf
@@ -6,3 +6,4 @@ 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
diff --git a/devel/hdf5/options.mk b/devel/hdf5/options.mk
index 539af401d72..31625e1ddc4 100644
--- a/devel/hdf5/options.mk
+++ b/devel/hdf5/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2005/05/19 15:39:04 jwise Exp $
+# $NetBSD: options.mk,v 1.2 2006/01/04 06:05:44 recht Exp $
 
 PKG_OPTIONS_VAR=PKG_OPTIONS.hdf5
-PKG_SUPPORTED_OPTIONS=	szip
+PKG_SUPPORTED_OPTIONS=	szip cxx threads
 PKG_SUGGESTED_OPTIONS=	szip
 
 .include "../../mk/bsd.options.mk"
@@ -10,3 +10,16 @@ PKG_SUGGESTED_OPTIONS=	szip
 CONFIGURE_ARGS+=	--with-szlib
 .include "../../archivers/szip/buildlink3.mk"
 .endif
+
+.if !empty(PKG_OPTIONS:Mcxx)
+USE_LANGUAGES+=		c++
+CONFIGURE_ARGS+=	--enable-cxx
+PLIST_SUBST+=		CXX=
+.else
+PLIST_SUBST+=		CXX="@comment "
+.endif
+
+.if !empty(PKG_OPTIONS:Mthreads)
+CONFIGURE_ARGS+=	--enable-threadsafe
+.include "../../mk/pthread.buildlink3.mk"
+.endif
diff --git a/devel/hdf5/patches/patch-ad b/devel/hdf5/patches/patch-ad
new file mode 100644
index 00000000000..c536631b397
--- /dev/null
+++ b/devel/hdf5/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/01/04 06:05:44 recht Exp $
+
+--- ./c++/config/commence.in.orig	2005-12-24 13:16:41.000000000 +0100
++++ ./c++/config/commence.in	2005-12-24 13:17:20.000000000 +0100
+@@ -79,7 +79,7 @@
+ ## complains if it sees a reference to a variable which has never been
+ ## 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++
+ LIB=
+ LIB_SRC=
+ LIB_OBJ=