update to 1.6.6

changes:
-minor feature additions to the command line tools
-C++ API: Added support for Szip
-bugfixes

pkgsrc changes:
-fixes for the cxx option (should be a separate pkg)
-fixes for the threadsafe option -- replaced a pthread_equal() by a
 simple "==" to make it usable with non-threaded apps
 (not 100% portable, but should be fine for the platforms in question)
 The shared libraries should not be linked against libpthread, but
 that would require serious changes to the autoconf/make machinery
 so I've left it alone for now.
 If that is fixed, "threadsafe" could be made default.
-Don't try to strip scripts on install.

13 files changed, 168 insertions, 318 deletions

diff --git a/devel/hdf5/Makefile b/devel/hdf5/Makefile
index 7e113fd0888..41e9aab639d 100644
--- a/devel/hdf5/Makefile
+++ b/devel/hdf5/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2006/06/22 21:23:28 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2007/09/18 18:58:08 drochner Exp $
 
-DISTNAME=	hdf5-1.6.5
-PKGREVISION=	2
+DISTNAME=	hdf5-1.6.6
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/hdf5-1.6.5/src/
+MASTER_SITES=	ftp://ftp.hdfgroup.org/HDF5/current/src/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://hdf.ncsa.uiuc.edu/HDF5/
@@ -22,6 +21,8 @@ CHECK_WRKREF_SKIP=	${PREFIX}/lib/libhdf5.settings
 
 .include "options.mk"
 
+INSTALL_ENV+=	INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
+
 post-extract:
 	${CP} ${WRKSRC}/config/freebsd ${WRKSRC}/config/netbsd
 	${CP} ${WRKSRC}/config/freebsd ${WRKSRC}/config/netbsdelf
diff --git a/devel/hdf5/PLIST b/devel/hdf5/PLIST
index ca1b873cbbc..fc7643ad99f 100644
--- a/devel/hdf5/PLIST
+++ b/devel/hdf5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2006/06/17 20:36:26 rillig Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/09/18 18:58:08 drochner Exp $
 bin/gif2h5
 bin/h52gif
 ${CXX}bin/h5c++
@@ -14,27 +14,11 @@ 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
@@ -48,43 +32,59 @@ 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
 include/H5public.h
 include/hdf5.h
+${CXX}include/H5AbstractDs.h
+${CXX}include/H5ArrayType.h
+${CXX}include/H5AtomType.h
+${CXX}include/H5Attribute.h
+${CXX}include/H5Classes.h
+${CXX}include/H5CommonFG.h
+${CXX}include/H5CompType.h
+${CXX}include/H5Cpp.h
+${CXX}include/H5CppDoc.h
+${CXX}include/H5DataSet.h
+${CXX}include/H5DataSpace.h
+${CXX}include/H5DataType.h
+${CXX}include/H5DcreatProp.h
+${CXX}include/H5DxferProp.h
+${CXX}include/H5EnumType.h
+${CXX}include/H5Exception.h
+${CXX}include/H5FaccProp.h
+${CXX}include/H5FcreatProp.h
+${CXX}include/H5File.h
+${CXX}include/H5FloatType.h
+${CXX}include/H5Group.h
+${CXX}include/H5IdComponent.h
+${CXX}include/H5Include.h
+${CXX}include/H5IntType.h
+${CXX}include/H5Library.h
+${CXX}include/H5Object.h
+${CXX}include/H5PredType.h
+${CXX}include/H5PropList.h
+${CXX}include/H5StrType.h
+${CXX}include/H5VarLenType.h
+${CXX}include/H5cxx_pubconf.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
@@ -129,6 +129,13 @@ share/doc/hdf5/html/Graphics/Dependencies
 share/doc/hdf5/html/Graphics/FORTRAN.gif
 share/doc/hdf5/html/Graphics/Java.gif
 share/doc/hdf5/html/Graphics/OtherAPIs.gif
+share/doc/hdf5/html/Graphics/THGnoTextSm.jpg
+share/doc/hdf5/html/Graphics/THGwTextSm.jpg
+share/doc/hdf5/html/Graphics/XRD100.gif
+share/doc/hdf5/html/Graphics/hdf2.gif
+share/doc/hdf5/html/Graphics/help.gif
+share/doc/hdf5/html/Graphics/help.jpg
+share/doc/hdf5/html/Graphics/help.png
 share/doc/hdf5/html/Groups.html
 share/doc/hdf5/html/H5.api_map.html
 share/doc/hdf5/html/H5.format.html
@@ -610,6 +617,8 @@ share/doc/hdf5/html/cpplus_RM/functions_func_0x76.html
 share/doc/hdf5/html/cpplus_RM/functions_func_0x77.html
 share/doc/hdf5/html/cpplus_RM/functions_func_0x7e.html
 share/doc/hdf5/html/cpplus_RM/functions_vars.html
+share/doc/hdf5/html/cpplus_RM/globals.html
+share/doc/hdf5/html/cpplus_RM/globals_defs.html
 share/doc/hdf5/html/cpplus_RM/h5group_8cpp-example.html
 share/doc/hdf5/html/cpplus_RM/header.html
 share/doc/hdf5/html/cpplus_RM/header_files/Dependencies
@@ -633,6 +642,7 @@ share/doc/hdf5/html/ed_libs/NavBar_Intro.lbi
 share/doc/hdf5/html/ed_libs/NavBar_RM.lbi
 share/doc/hdf5/html/ed_libs/NavBar_TechN.lbi
 share/doc/hdf5/html/ed_libs/NavBar_UG.lbi
+share/doc/hdf5/html/ed_libs/copyright-html.lbi
 share/doc/hdf5/html/ed_libs/styles_Format.lbi
 share/doc/hdf5/html/ed_libs/styles_Gen.lbi
 share/doc/hdf5/html/ed_libs/styles_Index.lbi
@@ -663,22 +673,29 @@ share/doc/hdf5/html/group_p3.gif
 share/doc/hdf5/html/h5s.examples
 share/doc/hdf5/html/hdf2.jpg
 share/doc/hdf5/html/index.html
-share/doc/hdf5/html/ph5design.html
-share/doc/hdf5/html/ph5example.c
-share/doc/hdf5/html/ph5implement.txt
 share/doc/hdf5/html/pipe1.gif
 share/doc/hdf5/html/pipe2.gif
 share/doc/hdf5/html/pipe3.gif
 share/doc/hdf5/html/pipe4.gif
 share/doc/hdf5/html/pipe5.gif
 share/doc/hdf5/html/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/ex_image1.c
+share/examples/hdf5/c/ex_image2.c
+share/examples/hdf5/c/ex_lite1.c
+share/examples/hdf5/c/ex_lite2.c
+share/examples/hdf5/c/ex_lite3.c
+share/examples/hdf5/c/ex_table_01.c
+share/examples/hdf5/c/ex_table_02.c
+share/examples/hdf5/c/ex_table_03.c
+share/examples/hdf5/c/ex_table_04.c
+share/examples/hdf5/c/ex_table_05.c
+share/examples/hdf5/c/ex_table_06.c
+share/examples/hdf5/c/ex_table_07.c
+share/examples/hdf5/c/ex_table_08.c
+share/examples/hdf5/c/ex_table_09.c
+share/examples/hdf5/c/ex_table_10.c
+share/examples/hdf5/c/ex_table_11.c
+share/examples/hdf5/c/ex_table_12.c
 share/examples/hdf5/c/h5_attribute.c
 share/examples/hdf5/c/h5_chunk_read.c
 share/examples/hdf5/c/h5_compound.c
@@ -691,6 +708,14 @@ 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}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++/strtype.cpp
+${CXX}share/examples/hdf5/c++/writedata.cpp
 ${CXX}@dirrm share/examples/hdf5/c++
 @dirrm share/examples/hdf5/c
 @dirrm share/examples/hdf5
diff --git a/devel/hdf5/distinfo b/devel/hdf5/distinfo
index 18d1c682204..1ccdf775d82 100644
--- a/devel/hdf5/distinfo
+++ b/devel/hdf5/distinfo
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.20 2006/10/02 16:20:05 dmcmahill Exp $
+$NetBSD: distinfo,v 1.21 2007/09/18 18:58:08 drochner Exp $
 
-SHA1 (hdf5-1.6.5/hdf5-1.6.5.tar.gz) = c5b7b375c0eb23dcab0c66d39b1b06c263048546
-RMD160 (hdf5-1.6.5/hdf5-1.6.5.tar.gz) = 70db16a832f77aa6d0c97da517353665304b7b27
-Size (hdf5-1.6.5/hdf5-1.6.5.tar.gz) = 4930666 bytes
+SHA1 (hdf5-1.6.6/hdf5-1.6.6.tar.gz) = c8a9ec598cf0debb694a1d7034fd85bbd67f173b
+RMD160 (hdf5-1.6.6/hdf5-1.6.6.tar.gz) = e7cf3f8d6aa5f34ef10cabf650ed43d644e54f1b
+Size (hdf5-1.6.6/hdf5-1.6.6.tar.gz) = 5299558 bytes
 SHA1 (patch-aa) = 794ab1e1fbb41281c4b28a333f4bd91d37513084
-SHA1 (patch-ab) = 91829e06db57da7b96c513bd176ef33c134a1de3
-SHA1 (patch-ac) = d00954c3e2772eeca35817ac46c2d818504b515c
 SHA1 (patch-ad) = 4379aaf79ce58b12b69fad2419d44bee514c2a8c
-SHA1 (patch-ae) = ec0837f13fc5a0caaa444c1fd5247839bdae8a41
-SHA1 (patch-af) = 8921b48786d3436ed1dddefc8436bb086cb57f1e
+SHA1 (patch-ba) = 1ba84ee22c3307100a2c8d3df4dfb2037be8e773
+SHA1 (patch-bb) = bcfd87df515d64471f881d4d10c894d89a6bc56e
+SHA1 (patch-bc) = 05e84e19b15bb9eee771e5be8e397959ae40ca9c
+SHA1 (patch-bd) = d9347835a63ce9eccfa41992d1b1c6c934bca001
+SHA1 (patch-be) = 3510e713ac4b657d44134de62cc2148a98a7a115
+SHA1 (patch-bf) = 33ae2f49be5ff7040389a472177b95127ef6b592
diff --git a/devel/hdf5/patches/patch-ab b/devel/hdf5/patches/patch-ab
deleted file mode 100644
index c39b76fad2a..00000000000
--- a/devel/hdf5/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2005/11/29 10:03:39 adam Exp $
-
---- perform/Makefile.in.orig	2005-11-29 11:46:55.000000000 +0100
-+++ perform/Makefile.in
-@@ -31,7 +31,7 @@ LIBTOOLS=../tools/lib/libh5tools.la
- TEST_PROGS_PARA=h5perf
- TEST_PROGS=iopipe chunk overhead zip_perf perf_meta
- 
--PUB_PROGS=h5perf
-+PUB_PROGS=
- 
- ## These are the files that `make clean' (and derivatives) will remove from
- ## this directory.
diff --git a/devel/hdf5/patches/patch-ac b/devel/hdf5/patches/patch-ac
deleted file mode 100644
index 67d825e0364..00000000000
--- a/devel/hdf5/patches/patch-ac
+++ /dev/null
@@ -1,175 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2006/10/02 16:20:04 dmcmahill Exp $
-
---- configure.orig	2005-11-10 19:17:39.000000000 -0500
-+++ configure
-@@ -1638,13 +1638,48 @@ set >&5
- echo "$as_me:$LINENO: result: done" >&5
- echo "${ECHO_T}done" >&6
- 
--echo "$as_me:$LINENO: checking if tr works" >&5
--echo $ECHO_N "checking if tr works... $ECHO_C" >&6
-+# Extract the first word of "tr", so it can be a program name with args.
-+set dummy tr; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_TR+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $TR in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_TR="$TR" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_TR="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
- 
--if test "X${TR}" = "X"; then
--  TR=tr
-+  ;;
-+esac
- fi
--TR_TEST="`echo Test | ${TR} 'a-z,' 'A-Z '`"
-+TR=$ac_cv_path_TR
-+
-+if test -n "$TR"; then
-+  echo "$as_me:$LINENO: result: $TR" >&5
-+echo "${ECHO_T}$TR" >&6
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+echo "$as_me:$LINENO: checking if ${TR} works" >&5
-+echo $ECHO_N "checking if ${TR} works... $ECHO_C" >&6
-+TR_TEST="`echo Test | ${TR} [a-z], [A-Z]\ `"
- if test "X${TR_TEST}" != "XTEST"; then
-   { { echo "$as_me:$LINENO: error: tr program doesn't work" >&5
- echo "$as_me: error: tr program doesn't work" >&2;}
-@@ -8154,6 +8189,80 @@ fi
- 
- if test "`uname`" = "SunOS" -o "`uname -sr`" = "HP-UX B.11.00"; then
- 
-+echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
-+echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
-+if test "${ac_cv_lib_socket_socket+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsocket  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char socket ();
-+int
-+main ()
-+{
-+socket ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_socket_socket=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_socket_socket=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
-+if test $ac_cv_lib_socket_socket = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBSOCKET 1
-+_ACEOF
-+
-+  LIBS="-lsocket $LIBS"
-+
-+fi
-+
-+
- echo "$as_me:$LINENO: checking for xdr_int in -lnsl" >&5
- echo $ECHO_N "checking for xdr_int in -lnsl... $ECHO_C" >&6
- if test "${ac_cv_lib_nsl_xdr_int+set}" = set; then
-@@ -34749,7 +34858,7 @@ echo "${ECHO_T}$DEBUG_PKG" >&6
- esac
- 
- if test -n "$DEBUG_PKG"; then
--  for pkg in `echo $DEBUG_PKG | ${TR} 'a-z,' 'A-Z '`; do
-+  for pkg in `echo $DEBUG_PKG | ${TR} "[a-z]," "[A-Z] "`; do
-     CPPFLAGS="$CPPFLAGS -DH5${pkg}_DEBUG"
-   done
- fi
-@@ -34923,7 +35032,7 @@ echo $ECHO_N "checking for mpirun... $EC
-     if (echo $cmd | grep / >/dev/null); then
-       path="`echo $cmd | sed 's/\(.*\)\/.*$/\1/'`"
-     else
--      for path in `echo $PATH | ${TR} : ' '`; do
-+      for path in `echo $PATH | ${TR} ":" " "`; do
-         if test -x $path/$cmd; then
-           break
-         fi
-@@ -34953,7 +35062,7 @@ echo $ECHO_N "checking for mpirun_lam or
-     if (echo $cmd | grep / >/dev/null); then
-       path="`echo $cmd | sed 's/\(.*\)\/.*$/\1/'`"
-     else
--      for path in `echo $PATH | ${TR} : ' '`; do
-+      for path in `echo $PATH | ${TR} ":" " "`; do
-         if test -x $path/$cmd; then
-           break
-         fi
-@@ -36485,7 +36594,7 @@ echo "${ECHO_T}$FILTERS" >&6
- esac
- 
- if test -n "$FILTERS"; then
--  for filter in `echo $FILTERS | ${TR} 'a-z,' 'A-Z '`; do
-+  for filter in `echo $FILTERS | ${TR} "[a-z]," "[A-Z] "`; do
-                     if test $filter = "SHUFFLE"; then
- 
- cat >>confdefs.h <<\_ACEOF
diff --git a/devel/hdf5/patches/patch-ae b/devel/hdf5/patches/patch-ae
deleted file mode 100644
index a6acd81f6cb..00000000000
--- a/devel/hdf5/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$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")
diff --git a/devel/hdf5/patches/patch-af b/devel/hdf5/patches/patch-af
deleted file mode 100644
index 649256beb93..00000000000
--- a/devel/hdf5/patches/patch-af
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/10/02 16:20:05 dmcmahill Exp $
-
---- configure.in.orig	2005-11-10 19:15:51.000000000 -0500
-+++ configure.in
-@@ -85,12 +85,9 @@ dnl that it actually does what it's supp
- dnl since configure relies upon tr heavily and there's no use continuing
- dnl if it's broken.
- dnl
--AC_MSG_CHECKING([if tr works])
--AC_SUBST(TR)
--if test "X${TR}" = "X"; then
--  TR=tr
--fi
--TR_TEST="`echo Test | ${TR} 'a-z,' 'A-Z '`"
-+AC_PATH_PROG(TR, tr)
-+AC_MSG_CHECKING([if ${TR} works])
-+TR_TEST="`echo Test | ${TR} [[a-z]], [[A-Z]]\ `"
- if test "X${TR_TEST}" != "XTEST"; then
-   AC_MSG_ERROR([tr program doesn't work])
- else
-@@ -555,6 +552,7 @@ AC_CHECK_LIB([m], [ceil])
- 
- if test "`uname`" = "SunOS" -o "`uname -sr`" = "HP-UX B.11.00"; then
-   dnl ...for Solaris
-+  AC_CHECK_LIB([socket], [socket])
-   AC_CHECK_LIB([nsl], [xdr_int])
- fi
- 
-@@ -1672,7 +1670,7 @@ case "X-$DEBUG_PKG" in
- esac
- 
- if test -n "$DEBUG_PKG"; then
--  for pkg in `echo $DEBUG_PKG | ${TR} 'a-z,' 'A-Z '`; do
-+  for pkg in `echo $DEBUG_PKG | ${TR} "[[a-z]]," "[[A-Z]] "`; do
-     CPPFLAGS="$CPPFLAGS -DH5${pkg}_DEBUG"
-   done
- fi
-@@ -1839,7 +1837,7 @@ case "$CC_BASENAME" in
-     if (echo $cmd | grep / >/dev/null); then
-       path="`echo $cmd | sed 's/\(.*\)\/.*$/\1/'`"
-     else
--      for path in `echo $PATH | ${TR} : ' '`; do
-+      for path in `echo $PATH | ${TR} ":" " "`; do
-         if test -x $path/$cmd; then
-           break
-         fi
-@@ -1870,7 +1868,7 @@ case "$CC_BASENAME" in
-     if (echo $cmd | grep / >/dev/null); then
-       path="`echo $cmd | sed 's/\(.*\)\/.*$/\1/'`"
-     else
--      for path in `echo $PATH | ${TR} : ' '`; do
-+      for path in `echo $PATH | ${TR} ":" " "`; do
-         if test -x $path/$cmd; then
-           break
-         fi
-@@ -2146,7 +2144,7 @@ case "X-$FILTERS" in
- esac
- 
- if test -n "$FILTERS"; then
--  for filter in `echo $FILTERS | ${TR} 'a-z,' 'A-Z '`; do
-+  for filter in `echo $FILTERS | ${TR} "[[a-z]]," "[[A-Z]] "`; do
-     dnl ------------------------------------------------------------------
-     dnl Have to use separate 'if' construct for each filter, so that
-     dnl autoheader can detect the AC_DEFINE for each one...
diff --git a/devel/hdf5/patches/patch-ba b/devel/hdf5/patches/patch-ba
new file mode 100644
index 00000000000..1486640e252
--- /dev/null
+++ b/devel/hdf5/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2007/09/18 18:58:11 drochner Exp $
+
+--- ./src/H5TS.c.orig	2007-09-18 15:59:02.000000000 +0200
++++ ./src/H5TS.c
+@@ -150,7 +150,7 @@ H5TS_mutex_lock(H5TS_mutex_t *mutex)
+     if (ret_value)
+         return ret_value;
+ 
+-    if (mutex->owner_valid && pthread_equal(pthread_self(), mutex->owner_thread)) {
++    if (mutex->owner_valid && pthread_self() == mutex->owner_thread) {
+         /* already owned by self - increment count */
+         mutex->lock_count++;
+     } else if (!mutex->owner_valid) {
diff --git a/devel/hdf5/patches/patch-bb b/devel/hdf5/patches/patch-bb
new file mode 100644
index 00000000000..0d20a117f5b
--- /dev/null
+++ b/devel/hdf5/patches/patch-bb
@@ -0,0 +1,14 @@
+$NetBSD: patch-bb,v 1.1 2007/09/18 18:58:12 drochner Exp $
+
+--- tools/misc/Makefile.in.orig	2007-09-18 17:07:03.000000000 +0200
++++ tools/misc/Makefile.in
+@@ -37,7 +37,8 @@ LIBHDF5=$(top_builddir)/src/libhdf5.la
+ 
+ ## h5cc is generated by configure.  Remove it only when distclean.
+ BUILD_PROGS=h5debug h5redeploy h5repart
+-PUB_PROGS=h5cc $(BUILD_PROGS)
++PUB_PROGS=h5debug h5repart
++PUB_SCRIPTS=h5cc h5redeploy
+ PROGS=$(BUILD_PROGS) $(TEST_PROGS)
+ DISTCLEAN=h5cc
+ 
diff --git a/devel/hdf5/patches/patch-bc b/devel/hdf5/patches/patch-bc
new file mode 100644
index 00000000000..dcf6ef80a5b
--- /dev/null
+++ b/devel/hdf5/patches/patch-bc
@@ -0,0 +1,16 @@
+$NetBSD: patch-bc,v 1.1 2007/09/18 18:58:12 drochner Exp $
+
+--- config/conclude.in.orig	2007-09-18 16:20:36.000000000 +0200
++++ config/conclude.in
+@@ -201,6 +201,11 @@ install: $(AUX_LIB) $(PUB_LIB) $(PUB_HDR
+ 	     fi;							      \
+ 	   fi;							              \
+ 	done
++	@for f in X $(PUB_SCRIPTS); do \
++		if test $$f != X; then \
++			(${INSTALL_SCRIPT} $$f $(bindir)/. || exit 1); \
++		fi; \
++	done
+ 	@for d in X $(SUBDIRS); do                                            \
+ 	    if test $$d != X; then                                            \
+ 	       (set -x; cd $$d && $(MAKE) $@) || exit 1;                      \
diff --git a/devel/hdf5/patches/patch-bd b/devel/hdf5/patches/patch-bd
new file mode 100644
index 00000000000..f0e49985834
--- /dev/null
+++ b/devel/hdf5/patches/patch-bd
@@ -0,0 +1,13 @@
+$NetBSD: patch-bd,v 1.1 2007/09/18 18:58:13 drochner Exp $
+
+--- c++/src/Makefile.in.orig	2007-09-18 16:17:48.000000000 +0200
++++ c++/src/Makefile.in
+@@ -51,7 +51,7 @@ PUB_HDR=H5Cpp.h H5AbstractDs.h H5AtomTyp
+         H5PropList.h H5StrType.h H5CppDoc.h H5ArrayType.h H5VarLenType.h        \
+         H5cxx_pubconf.h
+ 
+-PUB_PROGS=h5c++
++PUB_SCRIPTS=h5c++
+ 
+ ARFLAGS=rs
+ 
diff --git a/devel/hdf5/patches/patch-be b/devel/hdf5/patches/patch-be
new file mode 100644
index 00000000000..eb7202f6b75
--- /dev/null
+++ b/devel/hdf5/patches/patch-be
@@ -0,0 +1,16 @@
+$NetBSD: patch-be,v 1.1 2007/09/18 18:58:13 drochner Exp $
+
+--- c++/config/conclude.in.orig	2007-09-18 17:01:22.000000000 +0200
++++ c++/config/conclude.in
+@@ -130,6 +130,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; \
++	done
+ 
+ install-examples: $(EXAMPLE_PROGS) $(EXAMPLEDIR)
+ 	@for f in X $(EXAMPLE_PROGS); do				      \
diff --git a/devel/hdf5/patches/patch-bf b/devel/hdf5/patches/patch-bf
new file mode 100644
index 00000000000..64e8681867f
--- /dev/null
+++ b/devel/hdf5/patches/patch-bf
@@ -0,0 +1,14 @@
+$NetBSD: patch-bf,v 1.1 2007/09/18 18:58:14 drochner Exp $
+
+--- test/ttsafe_cancel.c.orig	2007-09-18 17:58:43.000000000 +0200
++++ test/ttsafe_cancel.c
+@@ -73,6 +73,9 @@ void tts_cancel(void)
+     hid_t dataset;
+     int buffer;
+ 
++    pthread_mutex_init(&mutex, 0);
++    pthread_cond_init(&cond, 0);
++
+     /* make thread scheduling global */
+     pthread_attr_init(&attribute);
+ #ifdef H5_HAVE_SYSTEM_SCOPE_THREADS