Update to mpich2-1.0.7. From pkgsrc-wip, contributed by Aleksej Saushev.

MPICH2 is an all-new implementation of MPI from the group at Argonne
National Laboratory.  It shares many goals with the original MPICH but
no actual code.  It is a portable, high-performance implementation of
the entire MPI-2 standard.  This release has all MPI-2 functions and
features required by the standard with the exception of support for the
"external32" portable I/O format.

19 files changed, 164 insertions, 639 deletions

diff --git a/parallel/mpi-ch/patches/patch-aa b/parallel/mpi-ch/patches/patch-aa
index 2082100e953..a7acd7af130 100644
--- a/parallel/mpi-ch/patches/patch-aa
+++ b/parallel/mpi-ch/patches/patch-aa
@@ -1,12 +1,52 @@
-$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
+$NetBSD: patch-aa,v 1.7 2008/05/29 20:25:53 tnn Exp $
+
+Fix scripts installation.
+Install configuration files into example directory.
+
+--- src/env/Makefile.in.orig	2008-04-05 02:03:18.000000000 +0400
++++ src/env/Makefile.in	2008-04-15 23:58:49.000000000 +0400
+@@ -17,6 +17,7 @@
+ prefix          = @prefix@
+ exec_prefix     = @exec_prefix@
+ bindir          = @bindir@
++datadir		= @datadir@
+ sysconfdir      = @sysconfdir@
+ DEFS            = @DEFS@ -I. -I${srcdir}
+ CPPFLAGS        = @CPPFLAGS@
+@@ -38,6 +39,8 @@
+ INCLUDES = -I../include
+ doc_sources = mpicc.txt mpif77.txt mpicxx.txt mpif90.txt mpiexec.txt
+ 
++exampledir	= ${datadir}/examples
++
+ .SUFFIXES:
+ .SUFFIXES: .o .lo .c .man .html .latex .txt 
+ .c.o:
+@@ -114,17 +117,17 @@
+ 	if [ ! -d ${DESTDIR}${exec_prefix} ] ; then $(MKDIR_P) ${DESTDIR}${exec_prefix} ; fi
+ 	if [ ! -d ${DESTDIR}${prefix} ] ; then $(MKDIR_P) ${DESTDIR}${prefix} ; fi
+ 	if [ ! -d ${DESTDIR}${bindir} ] ; then $(MKDIR_P) ${DESTDIR}${bindir} ; fi
+-	$(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpicc ${DESTDIR}${bindir}/mpicc
++	$(BSD_INSTALL_SCRIPT) mpicc ${DESTDIR}${bindir}/mpicc
+ 	$(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpich2version ${DESTDIR}${bindir}/mpich2version
+-	$(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) parkill ${DESTDIR}${bindir}/parkill
+-	if [ ! -d ${DESTDIR}${sysconfdir} ] ; then $(MKDIR_P) ${DESTDIR}${sysconfdir} ; fi
+-	$(INSTALL_DATA) mpicc.conf ${DESTDIR}${sysconfdir}/mpicc.conf
+-	if [ -s mpicxx ] ; then $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpicxx ${DESTDIR}${bindir}/mpicxx ; fi
+-	if [ -s mpif77 ] ; then $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpif77 ${DESTDIR}${bindir}/mpif77 ; fi
+-	if [ -s mpif90 ] ; then $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpif90 ${DESTDIR}${bindir}/mpif90 ; fi
+-	if [ -s mpicxx.conf ] ; then $(INSTALL_DATA) mpicxx.conf ${DESTDIR}${sysconfdir}/mpicxx.conf ; fi
+-	if [ -s mpif77.conf ] ; then $(INSTALL_DATA) mpif77.conf ${DESTDIR}${sysconfdir}/mpif77.conf ; fi
+-	if [ -s mpif90.conf ] ; then $(INSTALL_DATA) mpif90.conf ${DESTDIR}${sysconfdir}/mpif90.conf ; fi
++	$(BSD_INSTALL_SCRIPT) parkill ${DESTDIR}${bindir}/parkill
++	if [ ! -d ${DESTDIR}${exampledir} ] ; then $(MKDIR_P) ${DESTDIR}${exampledir} ; fi
++	$(INSTALL_DATA) mpicc.conf ${DESTDIR}${exampledir}/mpicc.conf
++	if [ -s mpicxx ] ; then $(BSD_INSTALL_SCRIPT) mpicxx ${DESTDIR}${bindir}/mpicxx ; fi
++	if [ -s mpif77 ] ; then $(BSD_INSTALL_SCRIPT) mpif77 ${DESTDIR}${bindir}/mpif77 ; fi
++	if [ -s mpif90 ] ; then $(BSD_INSTALL_SCRIPT) mpif90 ${DESTDIR}${bindir}/mpif90 ; fi
++	if [ -s mpicxx.conf ] ; then $(INSTALL_DATA) mpicxx.conf ${DESTDIR}${exampledir}/mpicxx.conf ; fi
++	if [ -s mpif77.conf ] ; then $(INSTALL_DATA) mpif77.conf ${DESTDIR}${exampledir}/mpif77.conf ; fi
++	if [ -s mpif90.conf ] ; then $(INSTALL_DATA) mpif90.conf ${DESTDIR}${exampledir}/mpif90.conf ; fi
+ 
+ install-strip:
+ 	$(MAKE) INSTALL_STRIP_FLAG=-s install
diff --git a/parallel/mpi-ch/patches/patch-ab b/parallel/mpi-ch/patches/patch-ab
index 0501bc76e3c..176efb60ac7 100644
--- a/parallel/mpi-ch/patches/patch-ab
+++ b/parallel/mpi-ch/patches/patch-ab
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.3 2006/03/14 01:10:49 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2008/05/29 20:25:54 tnn Exp $
 
---- bin/tarch.orig	2006-03-13 19:02:55.000000000 +0000
-+++ bin/tarch
-@@ -137,7 +137,7 @@ for LARCH in $ARCHLIST ; do
-         cray|CRAY*)      GARCH=CRAY ;;
-         next)            FARCH=NeXT ; break ;;	
- 	KSR1|KSR2)       FARCH=ksr ; break ;;	
--        FreeBSD)         FARCH=freebsd ; break ;;
-+        FreeBSD|DragonFly)         FARCH=freebsd ; break ;;
- 	NetBSD)          FARCH=netbsd ; break ;;
- 	i386)            GARCH=ipsc2 ;;
- 	ULTRIX|RISC)     GARCH=dec5000 ;;
+Fix installation of script.
+
+--- src/pkgconfig/Makefile.in.orig	2008-02-15 21:35:01.000000000 +0300
++++ src/pkgconfig/Makefile.in	2008-03-19 22:23:34.000000000 +0300
+@@ -74,7 +74,7 @@
+ # Install target
+ install:  FORCE_TARGET 
+ 	if [ ! -d ${DESTDIR}${pkgconfigdir} ] ; then $(MKDIR_P) ${DESTDIR}${pkgconfigdir} ; fi
+-	if [ -s mpich2-@DEVICE_NAME@.pc ] ; then $(INSTALL_PROGRAM) mpich2-@DEVICE_NAME@.pc ${DESTDIR}${pkgconfigdir}/mpich2-@DEVICE_NAME@.pc ; fi
++	if [ -s mpich2-@DEVICE_NAME@.pc ] ; then $(INSTALL_DATA) mpich2-@DEVICE_NAME@.pc ${DESTDIR}${pkgconfigdir}/mpich2-@DEVICE_NAME@.pc ; fi
+ 
+ install-strip:
+ 	$(MAKE) INSTALL_STRIP_FLAG=-s install
diff --git a/parallel/mpi-ch/patches/patch-ac b/parallel/mpi-ch/patches/patch-ac
index b2f24e0fb27..ace2fc31aa7 100644
--- a/parallel/mpi-ch/patches/patch-ac
+++ b/parallel/mpi-ch/patches/patch-ac
@@ -1,12 +1,28 @@
-$NetBSD: patch-ac,v 1.4 2006/03/14 01:10:49 joerg Exp $
+$NetBSD: patch-ac,v 1.5 2008/05/29 20:25:54 tnn Exp $
 
---- mpid/ch_p4/p4/servers/serv_p4.c.orig	2006-03-13 23:25:07.000000000 +0000
-+++ mpid/ch_p4/p4/servers/serv_p4.c
-@@ -74,7 +74,6 @@ extern char *crypt();
- extern char *sys_errlist[];
- #define strerror(n) sys_errlist[n]
- #endif
--extern int errno;
+Install sample configuration files in example directory.
+
+--- src/mpe2/sbin/mpeinstall.in.orig	2007-11-29 00:51:40.000000000 +0300
++++ src/mpe2/sbin/mpeinstall.in	2008-04-16 00:32:18.000000000 +0400
+@@ -38,6 +38,8 @@
+ htmldir=@htmldir@
+ docdir=@docdir@
  
- char tmpbuf[1024];
- char *fromhost;
++exampledir=${datadir}/examples
++
+ # Assume PROF_LIBNAME=MPE_LIBNAME.
+ PROF_LIBNAME=@MPE_LIBNAME@
+ MPI_IMPL=@MPI_IMPL@
+@@ -466,10 +468,10 @@
+ if [ -n "$etcbuild_dir" ] ; then
+     if [ -d $etcbuild_dir ] ; then
+          echo "Installing $pkgname configuration files to $DESTDIR$sysconfdir"
+-         InstallDirRecur $etcbuild_dir $sysconfdir $MODE
++         InstallDirRecur $etcbuild_dir $exampledir $MODE
+          cd $etcbuild_dir && \
+          for file in *.conf ; do \
+-             FixInstallFile $file $sysconfdir/$file ; \
++             FixInstallFile $file $exampledir/$file ; \
+          done
+     fi
+ fi
diff --git a/parallel/mpi-ch/patches/patch-ad b/parallel/mpi-ch/patches/patch-ad
index 054f53e0972..63af1c068cc 100644
--- a/parallel/mpi-ch/patches/patch-ad
+++ b/parallel/mpi-ch/patches/patch-ad
@@ -1,12 +1,15 @@
-$NetBSD: patch-ad,v 1.3 2006/03/14 01:10:49 joerg Exp $
+$NetBSD: patch-ad,v 1.4 2008/05/29 20:25:54 tnn Exp $
 
---- mpid/server/serv_p4.c.orig	2006-03-14 00:20:07.000000000 +0000
-+++ mpid/server/serv_p4.c
-@@ -170,7 +170,6 @@ extern char *crypt();
- extern char *sys_errlist[];
- #define strerror(n) sys_errlist[n]
- #endif
--extern int errno;
+"test ==" portability fix.
+
+--- configure.orig	Thu May 15 12:20:15 2008
++++ configure	Thu May 15 12:26:13 2008
+@@ -30782,7 +30782,7 @@
+ 	    ;;
+     esac
  
- char tmpbuf[1024];
- char *fromhost;
+-    if test "$cpu_gcc_x86_cycle" == "no" ; then
++    if test "$cpu_gcc_x86_cycle" = "no" ; then
+         { { echo "$as_me:$LINENO: error: Linux86 cycle counter is not available on this system and or with the $CC compiler" >&5
+ echo "$as_me: error: Linux86 cycle counter is not available on this system and or with the $CC compiler" >&2;}
+    { (exit 1); exit 1; }; }
diff --git a/parallel/mpi-ch/patches/patch-ae b/parallel/mpi-ch/patches/patch-ae
index 6a222b4c65b..5454a0212ad 100644
--- a/parallel/mpi-ch/patches/patch-ae
+++ b/parallel/mpi-ch/patches/patch-ae
@@ -1,13 +1,60 @@
-$NetBSD: patch-ae,v 1.3 2006/05/16 22:01:19 joerg Exp $
+$NetBSD: patch-ae,v 1.4 2008/05/29 20:25:54 tnn Exp $
 
---- src/fortran/Makefile.in.orig	2006-05-14 16:34:37.000000000 +0000
-+++ src/fortran/Makefile.in
-@@ -54,7 +54,7 @@ install: src/lib${FLIBNAME}.a
- 	cp ${libbuild_dir}/lib${FWRAPNAME}.a ${f77libdir}/lib${FWRAPNAME}.a
- 	cp ${libbuild_dir}/lib${FLIBNAME}fsup.a ${f77libdir}/lib${FLIBNAME}fsup.a
- 	cp src/mpif77 ${f77bindir}/mpif77${subname}
--	cp src/mpif77.conf ${sysconfdir}/mpif77${subname}.conf
-+	cp src/mpif77.conf ${prefix}/share/examples/mpi-ch/mpif77${subname}.conf
- 
- uninstall:
- 	-rm ${f77includedir}/mpif.h
+"test ==" portability fixes.
+
+--- src/mpid/ch3/channels/nemesis/configure.orig	Sat Apr  5 02:04:06 2008
++++ src/mpid/ch3/channels/nemesis/configure	Thu May 15 12:29:54 2008
+@@ -3249,7 +3249,7 @@
+ fi
+ fi;
+ 
+-if test "${nemesis_network}" == "gm" ; then
++if test "${nemesis_network}" = "gm" ; then
+     ac_safe=`echo "gm.h" | sed 'y%./+-%__p_%'`
+ echo "$as_me:$LINENO: checking for gm.h" >&5
+ echo $ECHO_N "checking for gm.h... $ECHO_C" >&6
+@@ -3444,7 +3444,7 @@
+ fi
+ fi;
+ 
+-if test "${nemesis_network}" == "ib" ; then
++if test "${nemesis_network}" = "ib" ; then
+     ac_safe=`echo "verbs.h" | sed 'y%./+-%__p_%'`
+ echo "$as_me:$LINENO: checking for verbs.h" >&5
+ echo $ECHO_N "checking for verbs.h... $ECHO_C" >&6
+@@ -3639,7 +3639,7 @@
+ fi
+ fi;
+ 
+-if test "${nemesis_network}" == "mx" ; then
++if test "${nemesis_network}" = "mx" ; then
+     ac_safe=`echo "myriexpress.h" | sed 'y%./+-%__p_%'`
+ echo "$as_me:$LINENO: checking for myriexpress.h" >&5
+ echo $ECHO_N "checking for myriexpress.h... $ECHO_C" >&6
+@@ -3844,7 +3844,7 @@
+ fi
+ fi;
+ 
+-if test "${nemesis_network}" == "elan" ; then
++if test "${nemesis_network}" = "elan" ; then
+ echo "=== You're about to use the experimental Nemesis/Elan network module."
+ echo "=== This module has not been thoroughly tested and some performance issues remain."
+ 
+@@ -4042,7 +4042,7 @@
+ fi
+ fi;
+ 
+-if test "${nemesis_network}" == "sctp" ; then
++if test "${nemesis_network}" = "sctp" ; then
+     ac_safe=`echo "netinet/sctp.h" | sed 'y%./+-%__p_%'`
+ echo "$as_me:$LINENO: checking for netinet/sctp.h" >&5
+ echo $ECHO_N "checking for netinet/sctp.h... $ECHO_C" >&6
+@@ -4237,7 +4237,7 @@
+ fi
+ fi;
+ 
+-if test "${nemesis_network}" == "psm" ; then
++if test "${nemesis_network}" = "psm" ; then
+     ac_safe=`echo "psm.h" | sed 'y%./+-%__p_%'`
+ echo "$as_me:$LINENO: checking for psm.h" >&5
+ echo $ECHO_N "checking for psm.h... $ECHO_C" >&6
diff --git a/parallel/mpi-ch/patches/patch-al b/parallel/mpi-ch/patches/patch-al
deleted file mode 100644
index 44e15472dba..00000000000
--- a/parallel/mpi-ch/patches/patch-al
+++ /dev/null
@@ -1,200 +0,0 @@
-$NetBSD: patch-al,v 1.8 2006/05/16 22:01:19 joerg Exp $
-
---- util/mpiinstall.in.orig	2004-07-02 17:34:43.000000000 +0000
-+++ util/mpiinstall.in
-@@ -172,7 +172,7 @@ if [ "$prefix_override" = 1 ] ; then
-     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
-@@ -451,11 +451,13 @@ MkDir $sbindir
- MkDir $includedir
- MkDir $datadir
- MkDir $docdir
--MkDir $sysconfdir
-+#MkDir $sysconfdir
- 
--MkDir $prefix/examples
-+MkDir $prefix/share/util
-+MkDir $prefix/share/util/machines
-+MkDir $prefix/share/examples/mpi-ch
- if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then 
--    MkDir $prefix/examples/$CPP_DIR
-+    MkDir $prefix/share/examples/mpi-ch/$CPP_DIR
-     MkDir $includedir/mpi2c++
- fi
- 
-@@ -478,14 +480,14 @@ chmod +x $UNINSTALLFILE
- if [ -z "$libonly" ] ; then
-     CopyFile ${top_srcdir}/bin/tarch $bindir $XMODE
-     CopyFile ${top_srcdir}/bin/tdevice $bindir $XMODE
--    CopyFile util/mpichlib.conf ${sysconfdir} 
-+    CopyFile util/mpichlib.conf ${prefix}/share/examples/mpi-ch
-     if [ -x "bin/mpichversion.exe" ] ; then
-         CopyFile bin/mpichversion.exe $bindir $XMODE
-     else 
-         CopyFile bin/mpichversion $bindir $XMODE
-     fi
-     # Copy the source file for mpichversion to the sysconfdir
--    CopyFile ${top_srcdir}/util/mpichversion.c ${sysconfdir}
-+    CopyFile ${top_srcdir}/util/mpichversion.c ${prefix}/share/examples/mpi-ch
-     #
-     # mpiman
-     $Show /bin/rm -f $DESTDIR$bindir/mpiman
-@@ -566,12 +568,12 @@ if [ -z "$libonly" ] ; then
-     FixupFile2 bin/mpicc $bindir/mpicc $XMODE
-     if [ -x src/fortran/src/mpif77 -a "@NOF77@" = "0" ] ; then
-         CopyFile src/fortran/src/mpif77 $bindir/mpif77 $XMODE
--        CopyFile src/fortran/src/mpif77.conf $sysconfdir
-+        CopyFile src/fortran/src/mpif77.conf ${prefix}/share/examples/mpi-ch
-         CopyFile $includebuild_dir/mpif.h $includedir
-     fi
-     if [ -x src/fortran/src/mpif90 -a "@NO_F90@" = "0" ] ; then
-         CopyFile src/fortran/src/mpif90 $bindir/mpif90 $XMODE
--	CopyFile src/fortran/src/mpif90.conf $sysconfdir
-+	CopyFile src/fortran/src/mpif90.conf ${prefix}/share/examples/mpi-ch
-     fi
-     #
-     # mpiCC, if C++ selected
-@@ -623,23 +625,23 @@ else
-     else 
-         CopyFile bin/mpichversion $bindir $XMODE
-     fi
--    CopyFile util/mpichlib.conf ${sysconfdir}
-+    CopyFile util/mpichlib.conf ${prefix}/share/examples/mpi-ch
-     # Copy the source file for mpichversion to the sysconfdir
--    CopyFile $top_srcdir/util/mpichversion.c ${sysconfdir}
-+    CopyFile $top_srcdir/util/mpichversion.c ${prefix}/share/examples/mpi-ch
-     FixupFile $top_srcdir/util/mpireconfig.in $bindir/mpireconfig $XMODE
-     # No user include uses mpichconf.h
--    CopyFile $includebuild_dir/mpichconf.h $sysconfdir/mpichconf.h.dat
-+    CopyFile $includebuild_dir/mpichconf.h ${prefix}/share/examples/mpi-ch/mpichconf.h.dat
-     CopyFile $includebuild_dir/mpidefs.h $includedir 
-     CopyFile $includebuild_dir/mpi.h $includedir
-     if [ -s $includebuild_dir/mpif.h -a "@NOF77@" = "0" ] ; then
-         CopyFile $includebuild_dir/mpi_fortdefs.h $includedir
-         CopyFile src/fortran/src/mpif77 $bindir/mpif77 $XMODE
--	CopyFile src/fortran/src/mpif77.conf $sysconfdir
-+	CopyFile src/fortran/src/mpif77.conf ${prefix}/share/examples/mpi-ch
-         CopyFile $includebuild_dir/mpif.h $includedir
-     fi
-     if [ -x src/fortran/src/mpif90 -a "@NO_F90@" = "0" ] ; then
-         CopyFile src/fortran/src/mpif90 $bindir/mpif90 $XMODE
--	CopyFile src/fortran/src/mpif90.conf $sysconfdir
-+	CopyFile src/fortran/src/mpif90.conf ${prefix}/share/examples/mpi-ch
-     fi
-     if [ -s romio/include/mpio.h ] ; then
-         CopyFile romio/include/mpio.h $includedir
-@@ -697,7 +699,7 @@ if [ -z "$libonly" ] ; then
-     #	$CPRP -r util/machines $prefix/util/machines.anl
-     for file in util/machines/machines* ; do
-         if [ -s $file ] ; then 
--            CopyFile $file $datadir
-+            CopyFile $file $prefix/share/util/machines
- 	fi
-     done
-     #
-@@ -710,7 +712,7 @@ if [ -z "$libonly" ] ; then
-     #CopyFile include/protofix.h $includedir
-     #CopyFile include/patchlevel.h $includedir
-     # No user include uses mpichconf.h
--    CopyFile $includebuild_dir/mpichconf.h $sysconfdir/mpichconf.h.dat
-+    CopyFile $includebuild_dir/mpichconf.h ${prefix}/share/examples/mpi-ch/mpichconf.h.dat
-     CopyFile $includebuild_dir/mpidefs.h $includedir
-     # Install ROMIO files
-     if [ -s romio/include/mpio.h ] ; then
-@@ -994,6 +996,8 @@ fi
- CopyFile $top_srcdir/util/cleanipcs $sbindir $XMODE
- #
- # Example programs
-+# We install all example programs, so we can skip these
-+if [ ! true ]; then
- CopyFile $top_srcdir/installtest/Makefile.in $prefix/examples
- #
- # This SHOULD use mpireconfig...
-@@ -1027,14 +1031,16 @@ CopyFile $top_srcdir/installtest/README 
- $Show "(cd $DESTDIR$prefix/examples ; /bin/rm -f mpirun ; \
- 	  ln -s ../bin/mpirun mpirun )"
- echo "/bin/rm -f $prefix/examples/mpirun" >> $UNINSTALLFILE
-+
-+fi # no examples
- #
- echo "About to run installation test..."
- if [ "x$DESTDIR" = "x" ]; then
-   # only works when DESTDIR is blank, and installing on final location.
--  $Show "(cd $DESTDIR$prefix/examples; $MAKE all ; $MAKE clean )"
-+  $Show "(cd $prefix/share/examples/mpi-ch; $MAKE all ; $MAKE clean )"
-   if [ @SHAREDKIND@ != "ignore" ] ; then
-     echo "About to run installation test for shared libraries ..."
--    $Show "(cd $DESTDIR$prefix/examples; MPICH_USE_SHLIB="yes"; export MPICH_USE_SHLIB; $MAKE all ; $MAKE clean )"
-+    $Show "(cd $prefix/share/examples/mpi-ch; MPICH_USE_SHLIB="yes"; export MPICH_USE_SHLIB; $MAKE all ; $MAKE clean )"
-   fi
- fi
- #
-@@ -1043,39 +1049,40 @@ Savevar=$prefix
- if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then 
- # Removed the installation of these extra examples.  
-     # C++ Example programs 
--#    CopyFile $top_srcdir/installtest/mpi-2-c++/Makefile.in $prefix/examples/$CPP_DIR
-+    CopyFile $top_srcdir/installtest/mpi-2-c++/Makefile.in $prefix/share/examples/mpi-ch/$CPP_DIR
-     #
-     prefix=$APREFIX
--#      CPPEXDIR=$top_srcdir/$CPP_DIR/contrib/examples
-+      CPPEXDIR=$top_srcdir/$CPP_DIR/contrib/examples
- #      # This isn't correct because it doesn't handle all of the fields in
- #      # the C++ examples Makefile, particularly the TEMPLATE_REP field
- #      # The intent here is to update the directories; but we also need
- #      # to update a few additional fields
--#      (cd $prefix/examples/$CPP_DIR ; $bindir/mpireconfig Makefile )
--#      echo "(cd $prefix/examples/$CPP_DIR ; $MAKE clean)" >> $UNINSTALLFILE
--#      echo "/bin/rm -f $prefix/examples/$CPP_DIR/Makefile" >> $UNINSTALLFILE
--#      prefix=$Savevar
--#      CopyFile $CPPEXDIR/hello_world.cc $prefix/examples/$CPP_DIR
--#      CopyFile $CPPEXDIR/ring.cc $prefix/examples/$CPP_DIR
--#      CopyFile $CPPEXDIR/topology.cc $prefix/examples/$CPP_DIR
--#      CopyFile $CPPEXDIR/user_bcast.cc $prefix/examples/$CPP_DIR
--#      CopyFile $CPPEXDIR/chapter_10_mpi2.cc $prefix/examples/$CPP_DIR
--#      CopyFile $CPPEXDIR/pi.cc $prefix/examples/$CPP_DIR
--#      CopyFile $CPPEXDIR/README $prefix/examples/$CPP_DIR
-+	(cd $prefix/share/examples/mpi-ch/$CPP_DIR ; $bindir/mpireconfig Makefile )
-+	echo "(cd $prefix/share/examples/mpi-ch/$CPP_DIR ; $MAKE clean)" >> $UNINSTALLFILE
-+	echo "/bin/rm -f $prefix/share/examples/mpi-ch/$CPP_DIR/Makefile" >> $UNINSTALLFILE
-+      prefix=$Savevar
-+    CopyFile $CPPEXDIR/hello_world.cc $prefix/share/examples/mpi-ch/$CPP_DIR
-+    CopyFile $CPPEXDIR/ring.cc $prefix/share/examples/mpi-ch/$CPP_DIR
-+    CopyFile $CPPEXDIR/topology.cc $prefix/share/examples/mpi-ch/$CPP_DIR
-+    CopyFile $CPPEXDIR/user_bcast.cc $prefix/share/examples/mpi-ch/$CPP_DIR
-+    CopyFile $CPPEXDIR/chapter_10_mpi2.cc $prefix/share/examples/mpi-ch/$CPP_DIR
-+    CopyFile $CPPEXDIR/pi.cc $prefix/share/examples/mpi-ch/$CPP_DIR
-+    CopyFile $CPPEXDIR/README $prefix/share/examples/mpi-ch/$CPP_DIR
-+
- #      #
- #      # Test build the C++ examples
--#      $Show "(cd $prefix/examples/$CPP_DIR ; /bin/rm -f mpirun ; \
--#  	      ln -s ../../bin/mpirun mpirun )"
--#      echo "/bin/rm -f $prefix/examples/$CPP_DIR/mpirun" >> $UNINSTALLFILE
--#      #
--#      echo "About to run C++ installation test..."
--#      $Show "(cd $prefix/examples/$CPP_DIR; $MAKE ; $MAKE clean)"
-+    $Show "(cd $prefix/share/examples/mpi-ch/$CPP_DIR ; /bin/rm -f mpirun ; \
-+       ln -s $bindir/mpirun mpirun )"
-+    echo "/bin/rm -f $prefix/share/examples/mpi-ch/$CPP_DIR/mpirun" >> $UNINSTALLFILE
-+
-+      echo "About to run C++ installation test..."
-+      $Show "(cd $prefix/share/examples/mpi-ch/$CPP_DIR; $MAKE ; $MAKE clean)"
- #      # A temporary fix because C++ clean doesn't remove any template 
- #      # directories.  This will eventually need to be changed into a for loop
- #      # (even better, the clean target in the Makefile should be fixed)
--#      if [ -d $prefix/examples/$CPP_DIR/ii_files ] ; then
--#          $Show rm -rf $prefix/examples/$CPP_DIR/ii_files
--#      fi
-+      if [ -d $prefix/share/examples/mpi-ch/$CPP_DIR/ii_files ] ; then
-+          $Show rm -rf $prefix/share/examples/mpi-ch/$CPP_DIR/ii_files
-+      fi
-     #
- fi
- #
diff --git a/parallel/mpi-ch/patches/patch-at b/parallel/mpi-ch/patches/patch-at
deleted file mode 100644
index 114a519b27d..00000000000
--- a/parallel/mpi-ch/patches/patch-at
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
--examplesdir=$datadir/examples
-+examplesdir=$datadir/examples/mpi-ch/mpe
- MkDir $examplesdir
- 
- #
diff --git a/parallel/mpi-ch/patches/patch-au b/parallel/mpi-ch/patches/patch-au
deleted file mode 100644
index ef990ce9807..00000000000
--- a/parallel/mpi-ch/patches/patch-au
+++ /dev/null
@@ -1,68 +0,0 @@
-$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
--copytest_SOURCES = copytest.c duff.c
-+copytest_SOURCES = copytest.c
- 
- # Distribution modifications
- EXTRA_DIST = config ${EXTRA_SCRIPTS}
-@@ -128,7 +128,7 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I.
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lm
- tunepkt_SOURCES = tunepkt.c
- tunepkt_OBJECTS =  tunepkt.o
- tunepkt_LDADD = $(LDADD)
-@@ -139,7 +139,7 @@
- pktuse_LDADD = $(LDADD)
- pktuse_DEPENDENCIES = 
- pktuse_LDFLAGS = 
--copytest_OBJECTS =  copytest.o duff.o
-+copytest_OBJECTS =  copytest.o
- copytest_LDADD = $(LDADD)
- copytest_DEPENDENCIES = 
- copytest_LDFLAGS = 
-@@ -276,12 +276,18 @@
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
--	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	@list='$(bin_PROGRAMS) $(EXTRA_PROGRAMS)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
- 	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- 	  else :; fi; \
- 	done
-+	@list='$(EXTRA_SCRIPTS)'; for p in $$list; do \
-+	  if test -f $$p; then \
-+	    echo "  $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+	     $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	  else :; fi; \
-+	done
- 
- uninstall-binPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
-@@ -342,7 +348,7 @@
- 
- mpptest: $(mpptest_OBJECTS) $(mpptest_DEPENDENCIES)
- 	@rm -f mpptest
--	$(LINK) $(mpptest_LDFLAGS) $(mpptest_OBJECTS) $(mpptest_LDADD) $(LIBS)
-+	$(LINK) $(mpptest_LDFLAGS) $(mpptest_OBJECTS) $(mpptest_LDADD) $(LIBS) -lm
- 
- goptest: $(goptest_OBJECTS) $(goptest_DEPENDENCIES)
- 	@rm -f goptest
-@@ -456,7 +462,7 @@
- install: install-am
- uninstall-am: uninstall-binPROGRAMS
- uninstall: uninstall-am
--all-am: Makefile $(PROGRAMS) $(HEADERS) mpptestconf.h
-+all-am: Makefile $(PROGRAMS) $(EXTRA_PROGRAMS) $(HEADERS) mpptestconf.h
- all-redirect: all-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
diff --git a/parallel/mpi-ch/patches/patch-av b/parallel/mpi-ch/patches/patch-av
deleted file mode 100644
index 6e45de910a1..00000000000
--- a/parallel/mpi-ch/patches/patch-av
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
--	(rm $(PREFIX)/examples/*)
--	-$(CPRP) -r examples $(PREFIX)
-+	-$(CPRP) -r examples/* $(PREFIX)/share/examples/mpi-ch
- 	# Update the makefiles
--	(cd $(PREFIX)/examples && \
-+	(cd $(PREFIX)/share/examples/mpi-ch && \
- 		$(bindir)/mpireconfig Makefile ; \
- 		for dir in `find . -type d -print` ; do \
- 			(cd $$dir && \
diff --git a/parallel/mpi-ch/patches/patch-aw b/parallel/mpi-ch/patches/patch-aw
deleted file mode 100644
index 746530e0da5..00000000000
--- a/parallel/mpi-ch/patches/patch-aw
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2003/03/27 21:07:06 jschauma Exp $
-
---- man/man1/MPI.1.orig	Mon Jan 13 17:20:16 2003
-+++ man/man1/MPI.1	Thu Mar 27 13:33:25 2003
-@@ -27,12 +27,12 @@
- 
- Add MPI to your path
- .nf
--% set path = ( $path /usr/local/mpi/bin )
-+% set path = ( $path @PREFIX@/bin )
- .fi
- 
- Compute pi to a given resolution on 8 processors or threads
- .nf
--% mpirun -np 8 /usr/local/mpi/examples/basic/fpi
-+% mpirun -np 8 @PREFIX@/share/examples/mpi-ch/basic/fpi
- .fi
- 
- Try 10000 intervals at the prompt.  Fortran source is available
-@@ -40,7 +40,7 @@
- 
- A coarse timing program is also available here
- .nf
--% mpirun -np 8 /usr/local/mpi/examples/basic/systest
-+% mpirun -np 8 @PREFIX@/share/examples/mpi-ch/basic/systest
- .fi
- 
- More sophisticated timing programs may be found in the source for the MPICH
-@@ -61,8 +61,7 @@
- .SH DOCUMENTATION
- 
- Postscript documentation can be found in directory
--/usr/local/mpi/doc/.  These include an introductory guide
--(guide.ps) and a user manual (manual.ps).
-+@PREFIX@/share/doc/mpi-ch.
- 
- Man pages exist for every MPI subroutine and function.  The command
- .I mpiman
-@@ -92,14 +91,12 @@
- .SH FILES
- 
- .nf
--/usr/local/mpi/                 MPI software directory
--/usr/local/mpi/COPYRIGHT        Copyright notice
--/usr/local/mpi/README           various notes and instructions
--/usr/local/mpi/bin/             binaries, including mpirun
--/usr/local/mpi/examples/basic   elementary MPI programs
--/usr/local/mpi/doc/             documentation
--/usr/local/mpi/include/         include files
--/usr/local/mpi/lib/             library files
-+@PREFIX@/bin/                          binaries, including mpirun
-+@PREFIX@/share/examples/mpi-ch/basic   elementary MPI programs
-+@PREFIX@/share/doc/mpi-ch              documentation
-+@PREFIX@/share/doc/html/mpi-ch         documentation
-+@PREFIX@/include/                      include files
-+@PREFIX@/mpi/lib/                      library files
- .fi
- 
- 
-@@ -111,6 +108,3 @@
- 
- .SH ACKNOWLEDGEMENT
- Thanks to Richard Frost for suggesting this page and providing a sample.
--
--.SH LOCATION
--/home/MPI/mansrc/manpage
diff --git a/parallel/mpi-ch/patches/patch-ax b/parallel/mpi-ch/patches/patch-ax
deleted file mode 100644
index 3b4b1ab3190..00000000000
--- a/parallel/mpi-ch/patches/patch-ax
+++ /dev/null
@@ -1,18 +0,0 @@
-$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: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: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: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
-             fi
-         done
diff --git a/parallel/mpi-ch/patches/patch-ay b/parallel/mpi-ch/patches/patch-ay
deleted file mode 100644
index 6750e4daac8..00000000000
--- a/parallel/mpi-ch/patches/patch-ay
+++ /dev/null
@@ -1,51 +0,0 @@
-$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
--  rm -rf conftest*
-   libmpi_found=yes
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
--  rm -rf conftest*
-   libmpi_found=no
- fi
--rm -f conftest*
-+rm -rf conftest*
- if test "$libmpi_found" = "yes"; then
-     echo "$ac_t""yes" 1>&6
- else
-@@ -3491,12 +3489,10 @@
- ; return 0; }
- EOF
- if { (eval echo configure:3448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
-   use_pending=yes
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
--  rm -rf conftest*
-   use_pending=no
- fi
- rm -f conftest*
-@@ -4002,7 +3998,7 @@
- EOF
- 
- fi
--/bin/rm -f conftest*
-+rm -f conftest*
- 
- # Don't ask.  It's an AIX thing.  <sob>
- if test "$?host" = "0"; then
-@@ -4078,7 +4074,7 @@
- EOF
- 
- fi
--/bin/rm -f conftest*
-+rm -f conftest*
- 
- LDFLAGS=$SAVE_LDFLAGS
- LIBS=$SAVE_LIBS
diff --git a/parallel/mpi-ch/patches/patch-az b/parallel/mpi-ch/patches/patch-az
deleted file mode 100644
index af7e49c40fc..00000000000
--- a/parallel/mpi-ch/patches/patch-az
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-az,v 1.1 2003/12/03 21:06:17 jschauma Exp $
-
---- ./MPI-2-C++/contrib/examples/hello_world.cc.orig	2003-12-02 22:56:44.000000000 -0500
-+++ ./MPI-2-C++/contrib/examples/hello_world.cc	2003-12-02 22:57:04.000000000 -0500
-@@ -27,9 +27,11 @@
- // Additional copyrights may follow.
- //
- 
--#include <iostream.h>
-+#include <iostream>
- #include "mpi++.h"
- 
-+using namespace std;
-+
- int
- main(int argc, char *argv[])
- {
diff --git a/parallel/mpi-ch/patches/patch-ba b/parallel/mpi-ch/patches/patch-ba
deleted file mode 100644
index 2f85e95f6ab..00000000000
--- a/parallel/mpi-ch/patches/patch-ba
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2003/12/03 21:06:17 jschauma Exp $
-
---- ./MPI-2-C++/contrib/examples/ring.cc.orig	2003-12-02 23:04:51.000000000 -0500
-+++ ./MPI-2-C++/contrib/examples/ring.cc	2003-12-02 23:05:08.000000000 -0500
-@@ -27,9 +27,10 @@
- // Additional copyrights may follow.
- //
- 
--#include <iostream.h> 
-+#include <iostream> 
- #include <mpi++.h>
- 
-+using namespace std;
- 
- int
- main(int argc, char *argv[])
diff --git a/parallel/mpi-ch/patches/patch-bb b/parallel/mpi-ch/patches/patch-bb
deleted file mode 100644
index b14f5de67bf..00000000000
--- a/parallel/mpi-ch/patches/patch-bb
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2003/12/03 21:06:17 jschauma Exp $
-
---- MPI-2-C++/contrib/examples/topology.cc.orig	2003-12-02 23:07:49.000000000 -0500
-+++ MPI-2-C++/contrib/examples/topology.cc	2003-12-02 23:08:04.000000000 -0500
-@@ -27,10 +27,12 @@
- // Additional copyrights may follow.
- //
- 
--#include <iostream.h> 
-+#include <iostream> 
- #include <mpi++.h>
- #include <assert.h>
- 
-+using namespace std;
-+
- void cartesian();
- void graph();
- 
diff --git a/parallel/mpi-ch/patches/patch-bc b/parallel/mpi-ch/patches/patch-bc
deleted file mode 100644
index a1925ee76e7..00000000000
--- a/parallel/mpi-ch/patches/patch-bc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2003/12/03 21:06:17 jschauma Exp $
-
---- MPI-2-C++/contrib/examples/user_bcast.cc.orig	2003-12-02 23:09:27.000000000 -0500
-+++ MPI-2-C++/contrib/examples/user_bcast.cc	2003-12-02 23:09:38.000000000 -0500
-@@ -27,9 +27,10 @@
- // Additional copyrights may follow.
- //
- 
--#include <iostream.h>
-+#include <iostream>
- #include <mpi++.h>
- 
-+using namespace std;
- 
- void user_bcast(int buffer[], int count, MPI::Intracomm comm);
- 
diff --git a/parallel/mpi-ch/patches/patch-bd b/parallel/mpi-ch/patches/patch-bd
deleted file mode 100644
index 760bb1a0aae..00000000000
--- a/parallel/mpi-ch/patches/patch-bd
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2003/12/03 21:06:17 jschauma Exp $
-
---- MPI-2-C++/contrib/examples/chapter_10_mpi2.cc.orig	2003-12-02 23:10:53.000000000 -0500
-+++ MPI-2-C++/contrib/examples/chapter_10_mpi2.cc	2003-12-02 23:11:08.000000000 -0500
-@@ -27,9 +27,11 @@
- // Additional copyrights may follow.
- // 
- 
--#include <iostream.h>
-+#include <iostream>
- #include <mpi++.h>
- 
-+using namespace std;
-+
- void example10_2(void);
- void example10_3(void);
- void example10_4(void);
diff --git a/parallel/mpi-ch/patches/patch-be b/parallel/mpi-ch/patches/patch-be
deleted file mode 100644
index d515f66dc1f..00000000000
--- a/parallel/mpi-ch/patches/patch-be
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-be,v 1.1 2003/12/03 21:06:17 jschauma Exp $
-
---- MPI-2-C++/contrib/examples/pi.cc.orig	2003-12-02 23:11:55.000000000 -0500
-+++ MPI-2-C++/contrib/examples/pi.cc	2003-12-02 23:12:15.000000000 -0500
-@@ -28,9 +28,11 @@
- //
- 
- #include <math.h>
--#include <iostream.h>
-+#include <iostream>
- #include "mpi++.h"
- 
-+using namespace std;
-+
- int
- main(int argc, char *argv[])
- {
diff --git a/parallel/mpi-ch/patches/patch-ca b/parallel/mpi-ch/patches/patch-ca
deleted file mode 100644
index c8bed7bde39..00000000000
--- a/parallel/mpi-ch/patches/patch-ca
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ca,v 1.3 2005/09/06 08:10:59 abs 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>
-+#if __NetBSD_Version__ >= 299000900
-+#define NETBSD_STATVFS
-+#define f_basetype f_fstypename
-+#endif
-+#endif
-+
-+#if (defined(HPUX) || defined(SPPUX) || defined(IRIX) || defined(SOLARIS) || defined(AIX) || defined(DEC) || defined(CRAY) || defined(NETBSD_STATVFS))
- #include <sys/statvfs.h>
- #endif
- #ifdef LINUX
-@@ -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)) 
-     struct statvfs vfsbuf;
- #endif
--#if (defined(LINUX) || defined(FREEBSD) || defined(tflops))
-+#if (defined(LINUX) || defined(FREEBSD) || defined(tflops)) && !defined(NETBSD_STATVFS)
-     struct statfs fsbuf;
- #endif
- #ifdef PARAGON
-@@ -174,7 +182,7 @@
- 
-     *error_code = MPI_SUCCESS;
- 
--#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))
-     do {
- 	err = statvfs(filename, &vfsbuf);
-     } while (err && (errno == ESTALE));
-@@ -226,7 +234,7 @@
- #endif
- 	else *fstype = ADIO_UFS;
-     }
--#elif (defined(FREEBSD) && defined(HAVE_MOUNT_NFS))
-+#elif (defined(FREEBSD) && defined(HAVE_MOUNT_NFS)) && !defined(NETBSD_STATVFS)
-     do {
- 	err = statfs(filename, &fsbuf);
-     } while (err && (errno == ESTALE));