- add tr to the tools list

- check for -lsocket so that solaris can find socket() and friends.

4 files changed, 255 insertions, 2 deletions

diff --git a/devel/hdf5/Makefile b/devel/hdf5/Makefile
index 62e65580cfe..fc31b39f2fa 100644
--- a/devel/hdf5/Makefile
+++ b/devel/hdf5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/06/15 01:51:32 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.30 2005/08/16 22:02:10 dmcmahill Exp $
 
 DISTNAME=	hdf5-1.6.4
 PKGREVISION=	1
@@ -11,6 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://hdf.ncsa.uiuc.edu/HDF5/
 COMMENT=	Hierarchical Data Format (new generation)
 
+USE_TOOLS+=		tr
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 TEST_TARGET=		check
diff --git a/devel/hdf5/distinfo b/devel/hdf5/distinfo
index bff074a7313..f8e5ac358c9 100644
--- a/devel/hdf5/distinfo
+++ b/devel/hdf5/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.12 2005/05/18 13:39:05 adam Exp $
+$NetBSD: distinfo,v 1.13 2005/08/16 22:02:10 dmcmahill Exp $
 
 SHA1 (hdf5-1.6.4.tar.gz) = e419e81097b8093d16d96708b764bd85db053e86
 RMD160 (hdf5-1.6.4.tar.gz) = 8175af3153bb0a5a1278c01af2d3940f4fd5084f
 Size (hdf5-1.6.4.tar.gz) = 4862437 bytes
 SHA1 (patch-aa) = 187f8f866e0ba43cc704995f782828b35eebbbe5
+SHA1 (patch-ab) = 25b377a1e657139a4665f52f789ca460a96101a5
+SHA1 (patch-ac) = ff7e56e5be4c550215db8488e439f40305ba815c
diff --git a/devel/hdf5/patches/patch-ab b/devel/hdf5/patches/patch-ab
new file mode 100644
index 00000000000..cd68cc3eb8a
--- /dev/null
+++ b/devel/hdf5/patches/patch-ab
@@ -0,0 +1,60 @@
+$NetBSD: patch-ab,v 1.3 2005/08/16 22:02:10 dmcmahill Exp $
+
+--- configure.in.orig	2005-03-15 21:36:03.000000000 -0500
++++ configure.in
+@@ -71,8 +71,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])
+-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 $TR_TEST != "TEST"; then
+   AC_MSG_ERROR([tr program doesn't work])
+ else
+@@ -528,6 +529,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
+ 
+@@ -1652,7 +1654,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
+@@ -1819,7 +1821,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
+@@ -1850,7 +1852,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
+@@ -2100,7 +2102,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-ac b/devel/hdf5/patches/patch-ac
new file mode 100644
index 00000000000..9c0eeaa55a2
--- /dev/null
+++ b/devel/hdf5/patches/patch-ac
@@ -0,0 +1,190 @@
+$NetBSD: patch-ac,v 1.3 2005/08/16 22:02:10 dmcmahill Exp $
+
+--- configure.orig	2005-03-15 21:38:09.000000000 -0500
++++ configure
+@@ -473,7 +473,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS DEFAULT_LIBS HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT config_dirs subdirs LT_STATIC_EXEC PERL AR SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL USE_FILTER_DEFLATE USE_FILTER_SZIP SSL GASS TESTGASS SRB TESTSRB PDB2HDF PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL SEARCH SETX LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS DEFAULT_LIBS TR HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT config_dirs subdirs LT_STATIC_EXEC PERL AR SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL USE_FILTER_DEFLATE USE_FILTER_SZIP SSL GASS TESTGASS SRB TESTSRB PDB2HDF PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL SEARCH SETX LIBOBJS LTLIBOBJS'
+ ac_subst_files='DEPEND COMMENCE CONCLUDE'
+ 
+ # Initialize some variables set by options.
+@@ -1630,9 +1630,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
+-TR_TEST="`echo Test | tr 'a-z,' 'A-Z '`"
++# 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
++
++  ;;
++esac
++fi
++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 $TR_TEST != "TEST"; then
+   { { echo "$as_me:$LINENO: error: tr program doesn't work" >&5
+ echo "$as_me: error: tr program doesn't work" >&2;}
+@@ -8141,6 +8180,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
+@@ -34825,7 +34938,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
+@@ -34999,7 +35112,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
+@@ -35029,7 +35142,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
+@@ -36455,7 +36568,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
+@@ -37344,6 +37457,7 @@ s,@host_vendor@,$host_vendor,;t t
+ s,@host_os@,$host_os,;t t
+ s,@CPPFLAGS@,$CPPFLAGS,;t t
+ s,@DEFAULT_LIBS@,$DEFAULT_LIBS,;t t
++s,@TR@,$TR,;t t
+ s,@HSIZET@,$HSIZET,;t t
+ s,@CC@,$CC,;t t
+ s,@CFLAGS@,$CFLAGS,;t t