update mpich to 1.2.6, with most work provided by Phil Nelson in PR pkg/27273

with some minor PLIST and etc fixes by me.

14 files changed, 74 insertions, 170 deletions

diff --git a/parallel/mpi-ch/patches/patch-aa b/parallel/mpi-ch/patches/patch-aa
index e0f9622cada..2082100e953 100644
--- a/parallel/mpi-ch/patches/patch-aa
+++ b/parallel/mpi-ch/patches/patch-aa
@@ -1,22 +1,12 @@
-$NetBSD: patch-aa,v 1.5 2003/11/26 12:42:12 wennmach Exp $
-
---- configure.orig	Mon Mar 24 16:28:18 2003
-+++ configure	Mon Mar 24 16:29:00 2003
-@@ -9779,14 +9779,9 @@
-     cat > conftest.c <<EOF
- #include "confdefs.h"
- main () {
--  /* Are we little or big endian?  From Harbison&Steele.  */
--  union
--  {
--    long l;
--    char c[sizeof (long)];
--  } u;
--  u.l = 1;
--  exit (u.c[sizeof (long) - 1] == 1);
-+	int     indian = 1;
-+	
-+	exit(1 - *(char *)&indian);
- }
- EOF
-         if test -n "$compile" ; then 
+$NetBSD: patch-aa,v 1.6 2005/03/03 12:01:30 garbled Exp $
+--- mpe/slog2sdk/sbin/install-package.in.orig	2005-03-03 02:45:22.000000000 -0700
++++ mpe/slog2sdk/sbin/install-package.in	2005-03-03 02:46:00.000000000 -0700
+@@ -364,7 +364,7 @@
+     bindir=$prefix/bin
+     sbindir=$prefix/sbin
+     docdir=$prefix/doc
+-    etcdir=$prefix/etc
++    etcdir=$prefix/mpi-ch/etc
+     sharedir=$prefix/share
+     logfilesdir=$prefix/logfiles
+     if [ $appendUninstall = 0 ] ; then
diff --git a/parallel/mpi-ch/patches/patch-ak b/parallel/mpi-ch/patches/patch-ak
deleted file mode 100644
index d2673b248fc..00000000000
--- a/parallel/mpi-ch/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2001/03/21 15:29:00 wennmach Exp $
-
---- mpe/profiling/nupshot/Makefile.in.orig	Mon Mar 19 20:17:14 2001
-+++ mpe/profiling/nupshot/Makefile.in	Mon Mar 19 20:18:11 2001
-@@ -40,8 +40,8 @@
- TK_LIB      = $(TK_DIR)/lib/libtk.a -L$(TK_DIR)/lib
- TCLTK_LIB   = $(TK_LIB) $(TCL_LIB)
- 
--TCL_INC     = -I@TCLINCDIR@/include
--TK_INC      = -I@TKINCDIR@/include
-+TCL_INC     = -I@TCLINCDIR@/include -I@TCLINCDIR@/include/tcl8.0
-+TK_INC      = -I@TKINCDIR@/include  -I@TKINCDIR@/include/tk8.0
- TCLTK_INC   = $(TCL_INC) $(TK_INC)
- 
- 
diff --git a/parallel/mpi-ch/patches/patch-al b/parallel/mpi-ch/patches/patch-al
index b92a9cb1ee1..85442163a38 100644
--- a/parallel/mpi-ch/patches/patch-al
+++ b/parallel/mpi-ch/patches/patch-al
@@ -1,7 +1,15 @@
-$NetBSD: patch-al,v 1.6 2003/03/27 21:07:05 jschauma Exp $
-
---- util/mpiinstall.in.orig	Mon Jan 13 18:12:29 2003
-+++ util/mpiinstall.in	Thu Mar 27 12:04:15 2003
+$NetBSD: patch-al,v 1.7 2005/03/03 12:01:30 garbled Exp $
+--- util/mpiinstall.in.orig	2004-07-02 10:34:43.000000000 -0700
++++ util/mpiinstall.in	2005-03-03 02:43:21.000000000 -0700
+@@ -172,7 +172,7 @@
+     bindir=$prefix/bin
+     sbindir=$prefix/sbin
+     includedir=$prefix/include
+-    sysconfdir=$prefix/etc
++    sysconfdir=$prefix/mpi-ch/etc
+     libdir=$prefix/lib
+     sharedlib_dir=$libdir/shared
+     messagecat_dir=$libdir
 @@ -453,9 +453,11 @@
  MkDir $docdir
  MkDir $sysconfdir
@@ -16,7 +24,7 @@ $NetBSD: patch-al,v 1.6 2003/03/27 21:07:05 jschauma Exp $
      MkDir $includedir/mpi2c++
  fi
  
-@@ -670,7 +672,7 @@
+@@ -697,7 +699,7 @@
      #	$CPRP -r util/machines $prefix/util/machines.anl
      for file in util/machines/machines* ; do
          if [ -s $file ] ; then 
@@ -25,7 +33,7 @@ $NetBSD: patch-al,v 1.6 2003/03/27 21:07:05 jschauma Exp $
  	fi
      done
      #
-@@ -963,6 +965,8 @@
+@@ -994,6 +996,8 @@
  CopyFile $top_srcdir/util/cleanipcs $sbindir $XMODE
  #
  # Example programs
@@ -34,7 +42,7 @@ $NetBSD: patch-al,v 1.6 2003/03/27 21:07:05 jschauma Exp $
  CopyFile $top_srcdir/installtest/Makefile.in $prefix/examples
  #
  # This SHOULD use mpireconfig...
-@@ -996,14 +1000,16 @@
+@@ -1027,14 +1031,16 @@
  $Show "(cd $DESTDIR$prefix/examples ; /bin/rm -f mpirun ; \
  	  ln -s ../bin/mpirun mpirun )"
  echo "/bin/rm -f $prefix/examples/mpirun" >> $UNINSTALLFILE
@@ -53,7 +61,7 @@ $NetBSD: patch-al,v 1.6 2003/03/27 21:07:05 jschauma Exp $
    fi
  fi
  #
-@@ -1012,39 +1018,40 @@
+@@ -1043,39 +1049,40 @@
  if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then 
  # Removed the installation of these extra examples.  
      # C++ Example programs 
diff --git a/parallel/mpi-ch/patches/patch-am b/parallel/mpi-ch/patches/patch-am
deleted file mode 100644
index 13d0906bf04..00000000000
--- a/parallel/mpi-ch/patches/patch-am
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-am,v 1.2 2001/03/21 15:29:00 wennmach Exp $
-
---- mpe/profiling/nupshot/tkAppInit.c.orig	Thu Aug  6 05:46:29 1998
-+++ mpe/profiling/nupshot/tkAppInit.c	Thu Aug  6 05:46:42 1998
-@@ -100,3 +100,3 @@
- 
--    tcl_RcFileName = "~/.wishrc";
-+/*    tcl_RcFileName = "~/.wishrc";*/
-     return TCL_OK;
diff --git a/parallel/mpi-ch/patches/patch-ao b/parallel/mpi-ch/patches/patch-ao
deleted file mode 100644
index 8f99afa3555..00000000000
--- a/parallel/mpi-ch/patches/patch-ao
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2001/03/21 15:29:01 wennmach Exp $
-
-Add "NETBSD" where appropriate.
-
---- mpid/ch_p4/p4/usc/usc.h.orig	Mon Mar 19 21:58:59 2001
-+++ mpid/ch_p4/p4/usc/usc.h	Mon Mar 19 21:59:23 2001
-@@ -126,7 +126,7 @@
- 
- #if defined(SUN) || defined(DEC5000) || defined(HP) \
-     || defined(SUN_SOLARIS) || defined(FREEBSD) || defined(LINUX) \
--    || defined(I86_SOLARIS) \
-+    || defined(I86_SOLARIS) || defined(NETBSD) \
-     || defined(IBM3090) || defined(RS6000) \
-     || defined(NEXT) || defined(TITAN) || defined(GP_1000) \
-     || defined(KSR) \
diff --git a/parallel/mpi-ch/patches/patch-ap b/parallel/mpi-ch/patches/patch-ap
deleted file mode 100644
index b7b878ce235..00000000000
--- a/parallel/mpi-ch/patches/patch-ap
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2001/03/21 15:29:01 wennmach Exp $
-
-Add "NETBSD" where appropriate.
-
---- mpid/ch_p4/p4/usc/usc_sys.h.orig	Mon Mar 19 22:01:11 2001
-+++ mpid/ch_p4/p4/usc/usc_sys.h	Mon Mar 19 22:01:49 2001
-@@ -68,7 +68,7 @@
- 
- #if defined(SUN) || defined(DEC5000) || defined(HP) \
-     || defined(SUN_SOLARIS) || defined(FREEBSD) || defined(LINUX) \
--    || defined(I86_SOLARIS) \
-+    || defined(I86_SOLARIS) || defined(NETBSD) \
-     || defined(BALANCE) \
-     || defined(IBM3090) || defined(RS6000) \
-     || defined(NEXT) || defined(TITAN) || defined(GP_1000) \
diff --git a/parallel/mpi-ch/patches/patch-ar b/parallel/mpi-ch/patches/patch-ar
deleted file mode 100644
index d4b5118ca82..00000000000
--- a/parallel/mpi-ch/patches/patch-ar
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2003/03/27 21:07:06 jschauma Exp $
-
---- mpe/viewers/sbin/install-viewers.in.orig	Mon Mar 24 16:45:55 2003
-+++ mpe/viewers/sbin/install-viewers.in	Mon Mar 24 16:46:31 2003
-@@ -384,7 +384,7 @@
-     if [ -d $binbuild_dir/../$pkg ] ; then
-         ( cd $binbuild_dir/../$pkg ; \
-           if [ -x ./sbin/install-viewer ] ; then \
--              ./sbin/install-viewer -prefix=$datadir/$pkg \
-+              ./sbin/install-viewer -prefix=$prefix \
-                                     -uninstall=$UNINSTALLFILE \
- 				    -mode=$MODE -xmode=$XMODE ; \
-           fi )
diff --git a/parallel/mpi-ch/patches/patch-as b/parallel/mpi-ch/patches/patch-as
deleted file mode 100644
index d732e7258b9..00000000000
--- a/parallel/mpi-ch/patches/patch-as
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-as,v 1.1 2001/03/21 15:29:01 wennmach Exp $
-
-Adopt to pkg hierarchy.
-
---- mpe/viewers/upshot/sbin/install-viewer.in.orig	Wed Jun 28 00:08:08 2000
-+++ mpe/viewers/upshot/sbin/install-viewer.in	Wed Mar 21 13:57:07 2001
-@@ -333,8 +333,8 @@
- if [ "$prefix_override" = 1 ] ; then
-     bindir=$prefix/bin
-     sbindir=$prefix/sbin
--    bitmapsdir=$prefix/bitmaps
--    logfilesdir=$prefix/logfiles
-+    bitmapsdir=$prefix/share/upshot/bitmaps
-+    logfilesdir=$prefix/share/upshot/logfiles
-     if [ $appendUninstall = 0 ] ; then
-         UNINSTALLFILE=${sbindir}/${UNINSTALL_base}
-     fi
diff --git a/parallel/mpi-ch/patches/patch-at b/parallel/mpi-ch/patches/patch-at
index 46b15818651..114a519b27d 100644
--- a/parallel/mpi-ch/patches/patch-at
+++ b/parallel/mpi-ch/patches/patch-at
@@ -1,10 +1,7 @@
-$NetBSD: patch-at,v 1.1 2001/03/21 15:29:01 wennmach Exp $
-
-Adopt to pkg hierarchy.
-
---- mpe/sbin/mpeinstall.in.orig	Fri Aug 25 17:03:17 2000
-+++ mpe/sbin/mpeinstall.in	Wed Mar 21 14:42:37 2001
-@@ -410,7 +410,7 @@
+$NetBSD: patch-at,v 1.2 2005/03/03 12:01:30 garbled Exp $
+--- mpe/sbin/mpeinstall.in.orig	2004-03-04 14:33:48.000000000 -0800
++++ mpe/sbin/mpeinstall.in	2004-10-15 09:32:29.000000000 -0700
+@@ -420,7 +420,7 @@
  MkDir $datadir
  
  # Set the Examples directory where the sample MPE programs are located
diff --git a/parallel/mpi-ch/patches/patch-au b/parallel/mpi-ch/patches/patch-au
index 880a02128bc..ef990ce9807 100644
--- a/parallel/mpi-ch/patches/patch-au
+++ b/parallel/mpi-ch/patches/patch-au
@@ -1,8 +1,7 @@
-$NetBSD: patch-au,v 1.1 2003/03/27 21:07:06 jschauma Exp $
-
---- examples/perftest/Makefile.in.orig	Mon Jan 13 17:20:14 2003
-+++ examples/perftest/Makefile.in	Thu Mar 27 10:40:39 2003
-@@ -101,7 +101,7 @@
+$NetBSD: patch-au,v 1.2 2005/03/03 12:01:30 garbled Exp $
+--- examples/perftest/Makefile.in.orig	2004-08-04 09:08:28.000000000 -0700
++++ examples/perftest/Makefile.in	2004-10-15 09:34:01.000000000 -0700
+@@ -114,7 +114,7 @@
  vectest_SOURCES = vectest.f
  stress_SOURCES = stress.c daytime.c getopts.c
  tcomm_SOURCES = tcomm.c mpe_seq.c getopts.c
@@ -11,7 +10,7 @@ $NetBSD: patch-au,v 1.1 2003/03/27 21:07:06 jschauma Exp $
  
  # Distribution modifications
  EXTRA_DIST = config ${EXTRA_SCRIPTS}
-@@ -115,7 +115,7 @@
+@@ -128,7 +128,7 @@
  DEFS = @DEFS@ -I. -I$(srcdir) -I.
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
@@ -20,7 +19,7 @@ $NetBSD: patch-au,v 1.1 2003/03/27 21:07:06 jschauma Exp $
  tunepkt_SOURCES = tunepkt.c
  tunepkt_OBJECTS =  tunepkt.o
  tunepkt_LDADD = $(LDADD)
-@@ -126,7 +126,7 @@
+@@ -139,7 +139,7 @@
  pktuse_LDADD = $(LDADD)
  pktuse_DEPENDENCIES = 
  pktuse_LDFLAGS = 
@@ -29,7 +28,7 @@ $NetBSD: patch-au,v 1.1 2003/03/27 21:07:06 jschauma Exp $
  copytest_LDADD = $(LDADD)
  copytest_DEPENDENCIES = 
  copytest_LDFLAGS = 
-@@ -260,12 +260,18 @@
+@@ -276,12 +276,18 @@
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -49,7 +48,7 @@ $NetBSD: patch-au,v 1.1 2003/03/27 21:07:06 jschauma Exp $
  
  uninstall-binPROGRAMS:
  	@$(NORMAL_UNINSTALL)
-@@ -326,7 +332,7 @@
+@@ -342,7 +348,7 @@
  
  mpptest: $(mpptest_OBJECTS) $(mpptest_DEPENDENCIES)
  	@rm -f mpptest
@@ -58,7 +57,7 @@ $NetBSD: patch-au,v 1.1 2003/03/27 21:07:06 jschauma Exp $
  
  goptest: $(goptest_OBJECTS) $(goptest_DEPENDENCIES)
  	@rm -f goptest
-@@ -440,7 +446,7 @@
+@@ -456,7 +462,7 @@
  install: install-am
  uninstall-am: uninstall-binPROGRAMS
  uninstall: uninstall-am
diff --git a/parallel/mpi-ch/patches/patch-av b/parallel/mpi-ch/patches/patch-av
index 62d8bdf38e3..6e45de910a1 100644
--- a/parallel/mpi-ch/patches/patch-av
+++ b/parallel/mpi-ch/patches/patch-av
@@ -1,8 +1,7 @@
-$NetBSD: patch-av,v 1.1 2003/03/27 21:07:06 jschauma Exp $
-
---- Makefile.in.orig	Thu Mar 27 10:51:11 2003
-+++ Makefile.in	Thu Mar 27 10:52:47 2003
-@@ -711,10 +711,9 @@
+$NetBSD: patch-av,v 1.2 2005/03/03 12:01:30 garbled Exp $
+--- Makefile.in.orig	2004-08-04 09:10:38.000000000 -0700
++++ Makefile.in	2004-10-15 09:38:33.000000000 -0700
+@@ -712,10 +712,9 @@
  # Install adds ALL of the examples to the installation area
  # This is an initial version.
  install-all: install
@@ -10,8 +9,8 @@ $NetBSD: patch-av,v 1.1 2003/03/27 21:07:06 jschauma Exp $
 -	-$(CPRP) -r examples $(PREFIX)
 +	-$(CPRP) -r examples/* $(PREFIX)/share/examples/mpi-ch
  	# Update the makefiles
--	(cd $(PREFIX)/examples ; \
-+	(cd $(PREFIX)/share/examples/mpi-ch ; \
+-	(cd $(PREFIX)/examples && \
++	(cd $(PREFIX)/share/examples/mpi-ch && \
  		$(bindir)/mpireconfig Makefile ; \
  		for dir in `find . -type d -print` ; do \
- 			(cd $$dir ; \
+ 			(cd $$dir && \
diff --git a/parallel/mpi-ch/patches/patch-ax b/parallel/mpi-ch/patches/patch-ax
index 336b9eaa21e..3b4b1ab3190 100644
--- a/parallel/mpi-ch/patches/patch-ax
+++ b/parallel/mpi-ch/patches/patch-ax
@@ -1,17 +1,16 @@
-$NetBSD: patch-ax,v 1.2 2003/12/03 21:06:17 jschauma Exp $
-
---- src/fortran/configure.orig	2003-09-11 12:19:17.000000000 -0400
-+++ src/fortran/configure	2003-12-02 22:42:57.000000000 -0500
-@@ -4620,12 +4620,12 @@
+$NetBSD: patch-ax,v 1.3 2005/03/03 12:01:30 garbled Exp $
+--- src/fortran/configure.orig	2004-08-04 09:08:27.000000000 -0700
++++ src/fortran/configure	2004-10-15 09:43:00.000000000 -0700
+@@ -4842,12 +4842,12 @@
      ac_fcompileforlib='${F77-f77} -c $FFLAGS conftest1.f 1>&5'
-     if { (eval echo configure:4622: \"$ac_fcompileforlib\") 1>&5; (eval $ac_fcompileforlib) 2>&5; } && test -s conftest1.o ; then
+     if { (eval echo configure:4844: \"$ac_fcompileforlib\") 1>&5; (eval $ac_fcompileforlib) 2>&5; } && test -s conftest1.o ; then
          if test ! -d conftest ; then mkdir conftest2 ; fi
--	        { ac_try='${ARCMD-"ar"} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
-+	        { ac_try='${ARCMD-ar} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
-         { ac_try='${RANLIB-ranlib} conftest2/libconftest.a'; { (eval echo configure:4625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+-	        { ac_try='${ARCMD-"ar"} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
++	        { ac_try='${ARCMD-ar} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+         { ac_try='${RANLIB-ranlib} conftest2/libconftest.a'; { (eval echo configure:4847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
          ac_fcompileldtest='${F77-f77} -o conftest $FFLAGS ${ldir}conftest2 conftest.f -lconftest $LDFLAGS 1>&5'
          for ldir in "-L" "-Wl,-L," ; do
-             if { (eval echo configure:4628: \"$ac_fcompileldtest\") 1>&5; (eval $ac_fcompileldtest) 2>&5; } && test -s conftest ; then
+             if { (eval echo configure:4850: \"$ac_fcompileldtest\") 1>&5; (eval $ac_fcompileldtest) 2>&5; } && test -s conftest ; then
 -	        pac_cv_prog_f77_library_dir_flag="$ldir"
 +	        pac_cv_prog_f77_library_dir_flag="${ldir}"
  	        break
diff --git a/parallel/mpi-ch/patches/patch-ay b/parallel/mpi-ch/patches/patch-ay
index b90d13368e5..6750e4daac8 100644
--- a/parallel/mpi-ch/patches/patch-ay
+++ b/parallel/mpi-ch/patches/patch-ay
@@ -1,10 +1,7 @@
-$NetBSD: patch-ay,v 1.1 2003/11/27 17:02:25 wennmach Exp $
-
-"rm -rf" with no arguments causes "usage" error messages; avoid this.
-
---- MPI-2-C++/configure.orig	Wed Nov 26 23:33:22 2003
-+++ MPI-2-C++/configure	Wed Nov 26 23:33:37 2003
-@@ -3249,15 +3249,13 @@
+$NetBSD: patch-ay,v 1.2 2005/03/03 12:01:30 garbled Exp $
+--- MPI-2-C++/configure.orig	2004-07-27 09:37:34.000000000 -0700
++++ MPI-2-C++/configure	2004-10-15 09:44:12.000000000 -0700
+@@ -3275,15 +3275,13 @@
  ; return 0; }
  EOF
  if { (eval echo configure:3232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -21,7 +18,7 @@ $NetBSD: patch-ay,v 1.1 2003/11/27 17:02:25 wennmach Exp $
  if test "$libmpi_found" = "yes"; then
      echo "$ac_t""yes" 1>&6
  else
-@@ -3465,12 +3463,10 @@
+@@ -3491,12 +3489,10 @@
  ; return 0; }
  EOF
  if { (eval echo configure:3448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@@ -34,7 +31,7 @@ $NetBSD: patch-ay,v 1.1 2003/11/27 17:02:25 wennmach Exp $
    use_pending=no
  fi
  rm -f conftest*
-@@ -3976,7 +3972,7 @@
+@@ -4002,7 +3998,7 @@
  EOF
  
  fi
@@ -43,7 +40,7 @@ $NetBSD: patch-ay,v 1.1 2003/11/27 17:02:25 wennmach Exp $
  
  # Don't ask.  It's an AIX thing.  <sob>
  if test "$?host" = "0"; then
-@@ -4052,7 +4048,7 @@
+@@ -4078,7 +4074,7 @@
  EOF
  
  fi
diff --git a/parallel/mpi-ch/patches/patch-ca b/parallel/mpi-ch/patches/patch-ca
index f7a1e89dd2c..24c2c3c7b0f 100644
--- a/parallel/mpi-ch/patches/patch-ca
+++ b/parallel/mpi-ch/patches/patch-ca
@@ -1,11 +1,10 @@
-$NetBSD: patch-ca,v 1.1 2004/06/24 17:32:14 drochner Exp $
-
---- romio/adio/common/ad_fstype.c.orig	2002-12-04 00:38:23.000000000 +0100
-+++ romio/adio/common/ad_fstype.c
-@@ -12,7 +12,15 @@
+$NetBSD: patch-ca,v 1.2 2005/03/03 12:01:30 garbled Exp $
+--- romio/adio/common/ad_fstype.c.orig	2003-09-04 13:24:44.000000000 -0700
++++ romio/adio/common/ad_fstype.c	2004-10-15 09:54:55.000000000 -0700
+@@ -11,7 +11,15 @@
+  */
  
  #include "adio.h"
- 
 -#if (defined(HPUX) || defined(SPPUX) || defined(IRIX) || defined(SOLARIS) || defined(AIX) || defined(DEC) || defined(CRAY))
 +#ifdef __NetBSD__
 +#include <sys/param.h>
@@ -19,12 +18,12 @@ $NetBSD: patch-ca,v 1.1 2004/06/24 17:32:14 drochner Exp $
  #include <sys/statvfs.h>
  #endif
  #ifdef LINUX
-@@ -143,10 +151,10 @@ static void ADIO_FileSysType_fncall(char
+@@ -159,10 +167,10 @@
      char *dir;
      int err;
  #endif
 -#if (defined(HPUX) || defined(SPPUX) || defined(IRIX) || defined(SOLARIS) || defined(AIX) || defined(DEC) || defined(CRAY))
-+#if (defined(HPUX) || defined(SPPUX) || defined(IRIX) || defined(SOLARIS) || defined(AIX) || defined(DEC) || defined(CRAY) || defined(NETBSD_STATVFS))
++#if (defined(HPUX) || defined(SPPUX) || defined(IRIX) || defined(SOLARIS) || defined(AIX) || defined(DEC) || defined(CRAY) || defined(NETBSD_STATVFS)) 
      struct statvfs vfsbuf;
  #endif
 -#if (defined(LINUX) || defined(FREEBSD) || defined(tflops))
@@ -32,7 +31,7 @@ $NetBSD: patch-ca,v 1.1 2004/06/24 17:32:14 drochner Exp $
      struct statfs fsbuf;
  #endif
  #ifdef PARAGON
-@@ -158,7 +166,7 @@ static void ADIO_FileSysType_fncall(char
+@@ -174,7 +182,7 @@
  
      *error_code = MPI_SUCCESS;
  
@@ -41,8 +40,8 @@ $NetBSD: patch-ca,v 1.1 2004/06/24 17:32:14 drochner Exp $
      do {
  	err = statvfs(filename, &vfsbuf);
      } while (err && (errno == ESTALE));
-@@ -207,7 +215,7 @@ static void ADIO_FileSysType_fncall(char
- # endif
+@@ -226,7 +234,7 @@
+ #endif
  	else *fstype = ADIO_UFS;
      }
 -#elif (defined(FREEBSD) && defined(HAVE_MOUNT_NFS))