[pkgsrc/trunk]: pkgsrc/devel/hdf5 one more try at expanding the portability o...

[dmcmahill <dmcmahill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/94ba388ee63c
branches:  trunk
changeset: 498678:94ba388ee63c
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Tue Aug 30 01:31:21 2005 +0000

description:
one more try at expanding the portability of the 'tr' usage to keep this
happy on systems such as solaris which have suboptimal tr's.  Now this works
with /usr/bin/tr.

diffstat:

 devel/hdf5/distinfo         |   6 +++---
 devel/hdf5/patches/patch-ab |  12 ++++++------
 devel/hdf5/patches/patch-ac |  12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diffs (123 lines):

diff -r ad07e861d519 -r 94ba388ee63c devel/hdf5/distinfo
--- a/devel/hdf5/distinfo       Tue Aug 30 00:32:46 2005 +0000
+++ b/devel/hdf5/distinfo       Tue Aug 30 01:31:21 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2005/08/17 02:45:48 dmcmahill Exp $
+$NetBSD: distinfo,v 1.15 2005/08/30 01:31:21 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) = 49b04f85265e4c4c8625e4dd94885a8e1036870e
-SHA1 (patch-ac) = abaa81033c039c2ba3d8793cc162ae384feecf76
+SHA1 (patch-ab) = 9e4316f83e2103ffc4ce24ebbb4519307d3c30a3
+SHA1 (patch-ac) = 64ef0b2c6785d8cf2f52ec946090a8c69b3e35e8
diff -r ad07e861d519 -r 94ba388ee63c devel/hdf5/patches/patch-ab
--- a/devel/hdf5/patches/patch-ab       Tue Aug 30 00:32:46 2005 +0000
+++ b/devel/hdf5/patches/patch-ab       Tue Aug 30 01:31:21 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2005/08/17 02:45:49 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.5 2005/08/30 01:31:21 dmcmahill Exp $
 
 --- configure.in.orig  2005-03-15 21:36:03.000000000 -0500
 +++ configure.in
@@ -10,7 +10,7 @@
 -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\ `"
++TR_TEST="`echo Test | ${TR} [a-z], [A-Z]\ `"
  if test $TR_TEST != "TEST"; then
    AC_MSG_ERROR([tr program doesn't work])
  else
@@ -27,7 +27,7 @@
  
  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
++  for pkg in `echo $DEBUG_PKG | ${TR} "[a-z]," "[A-Z] "`; do
      CPPFLAGS="$CPPFLAGS -DH5${pkg}_DEBUG"
    done
  fi
@@ -36,7 +36,7 @@
        path="`echo $cmd | sed 's/\(.*\)\/.*$/\1/'`"
      else
 -      for path in `echo $PATH | tr : ' '`; do
-+      for path in `echo $PATH | ${TR} : \ `; do
++      for path in `echo $PATH | ${TR} ":" " "`; do
          if test -x $path/$cmd; then
            break
          fi
@@ -45,7 +45,7 @@
        path="`echo $cmd | sed 's/\(.*\)\/.*$/\1/'`"
      else
 -      for path in `echo $PATH | tr : ' '`; do
-+      for path in `echo $PATH | ${TR} : \ `; do
++      for path in `echo $PATH | ${TR} ":" " "`; do
          if test -x $path/$cmd; then
            break
          fi
@@ -54,7 +54,7 @@
  
  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
++  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 -r ad07e861d519 -r 94ba388ee63c devel/hdf5/patches/patch-ac
--- a/devel/hdf5/patches/patch-ac       Tue Aug 30 00:32:46 2005 +0000
+++ b/devel/hdf5/patches/patch-ac       Tue Aug 30 01:31:21 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2005/08/17 02:45:49 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.5 2005/08/30 01:31:21 dmcmahill Exp $
 
 --- configure.orig     2005-03-15 21:38:09.000000000 -0500
 +++ configure
@@ -59,7 +59,7 @@
 +
 +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\ `"
++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;}
@@ -149,7 +149,7 @@
  
  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
++  for pkg in `echo $DEBUG_PKG | ${TR} "[a-z]," "[A-Z] "`; do
      CPPFLAGS="$CPPFLAGS -DH5${pkg}_DEBUG"
    done
  fi
@@ -158,7 +158,7 @@
        path="`echo $cmd | sed 's/\(.*\)\/.*$/\1/'`"
      else
 -      for path in `echo $PATH | tr : ' '`; do
-+      for path in `echo $PATH | ${TR} : \ `; do
++      for path in `echo $PATH | ${TR} ":" " "`; do
          if test -x $path/$cmd; then
            break
          fi
@@ -167,7 +167,7 @@
        path="`echo $cmd | sed 's/\(.*\)\/.*$/\1/'`"
      else
 -      for path in `echo $PATH | tr : ' '`; do
-+      for path in `echo $PATH | ${TR} : \ `; do
++      for path in `echo $PATH | ${TR} ":" " "`; do
          if test -x $path/$cmd; then
            break
          fi
@@ -176,7 +176,7 @@
  
  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
++  for filter in `echo $FILTERS | ${TR} "[a-z]," "[A-Z] "`; do
                      if test $filter = "SHUFFLE"; then
  
  cat >>confdefs.h <<\_ACEOF