Repair compilation under solaris. Also added back the configure.in patch

instead of only keeping a configure patch.

3 files changed, 160 insertions, 5 deletions

diff --git a/devel/hdf5/distinfo b/devel/hdf5/distinfo
index 81bddd05ad3..18d1c682204 100644
--- a/devel/hdf5/distinfo
+++ b/devel/hdf5/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.19 2006/02/23 18:28:06 minskim Exp $
+$NetBSD: distinfo,v 1.20 2006/10/02 16:20:05 dmcmahill 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 (patch-aa) = 794ab1e1fbb41281c4b28a333f4bd91d37513084
 SHA1 (patch-ab) = 91829e06db57da7b96c513bd176ef33c134a1de3
-SHA1 (patch-ac) = 05c5215674ad32fe2d8f0fef06c26bdd20299536
+SHA1 (patch-ac) = d00954c3e2772eeca35817ac46c2d818504b515c
 SHA1 (patch-ad) = 4379aaf79ce58b12b69fad2419d44bee514c2a8c
 SHA1 (patch-ae) = ec0837f13fc5a0caaa444c1fd5247839bdae8a41
+SHA1 (patch-af) = 8921b48786d3436ed1dddefc8436bb086cb57f1e
diff --git a/devel/hdf5/patches/patch-ac b/devel/hdf5/patches/patch-ac
index 23b1654b915..67d825e0364 100644
--- a/devel/hdf5/patches/patch-ac
+++ b/devel/hdf5/patches/patch-ac
@@ -1,8 +1,62 @@
-$NetBSD: patch-ac,v 1.6 2005/11/29 10:03:39 adam Exp $
+$NetBSD: patch-ac,v 1.7 2006/10/02 16:20:04 dmcmahill Exp $
 
---- configure.orig	2005-11-11 01:17:39.000000000 +0100
+--- configure.orig	2005-11-10 19:17:39.000000000 -0500
 +++ configure
-@@ -8154,6 +8154,80 @@ fi
+@@ -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
  
@@ -83,3 +137,39 @@ $NetBSD: patch-ac,v 1.6 2005/11/29 10:03:39 adam Exp $
  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-af b/devel/hdf5/patches/patch-af
new file mode 100644
index 00000000000..649256beb93
--- /dev/null
+++ b/devel/hdf5/patches/patch-af
@@ -0,0 +1,64 @@
+$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...