Update mpich to 1.2.1.

Besides bug fixes, 1.2.1 features full support of the MPI-1.2 standard
as well as some support for the new MPI-2 standard.

Closes PR 7486.

20 files changed, 249 insertions, 781 deletions

diff --git a/parallel/mpi-ch/patches/patch-aa b/parallel/mpi-ch/patches/patch-aa
index b41fdfe0843..e6c3cc4ab26 100644
--- a/parallel/mpi-ch/patches/patch-aa
+++ b/parallel/mpi-ch/patches/patch-aa
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.2 1998/10/14 10:55:07 agc Exp $
+$NetBSD: patch-aa,v 1.3 2001/03/21 15:28:58 wennmach Exp $
 
 --- configure.orig	Tue Jul  7 07:52:46 1998
 +++ configure	Thu Aug  6 03:18:27 1998
-@@ -6613,7 +6613,7 @@
- 	    -e 's/ksr/KSR/g'               -e 's/freebsd/FREEBSD/g'  \
- 	    -e 's/cm5/CM5/g'               -e 's/meiko/MEIKO_CS2/g'  \
-             -e 's/rs6000/RS6000/g'	   -e 's/symm_ptx/SYMMETRY_PTX/g' \
--            -e 's/sppux/HP/g'`
-+            -e 's/sppux/HP/g'		   -e 's/netbsd/NETBSD/g'`
-   fi
- echo "Finished setting p4arch..."
- #
 @@ -9791,14 +9791,9 @@
  cat > conftest.c <<EOF
  #include "confdefs.h"
@@ -29,74 +20,3 @@ $NetBSD: patch-aa,v 1.2 1998/10/14 10:55:07 agc Exp $
  }
  EOF
  eval $compile
-@@ -14280,14 +14275,15 @@
-     /usr/bin \
-     /Tools/tcl \
-     /usr/sgitcl \
-+    /usr/pkg \
-     /local/encap/tcl-7.1 ; do
--    if test -r $dir/include/tcl.h ; then 
-+    if test -r $dir/include/tcl8.0/tcl.h ; then 
- 	# Check for correct version
- 	
--	tclversion=`grep 'TCL_MAJOR_VERSION' $dir/include/tcl.h | \
-+	tclversion=`grep 'TCL_MAJOR_VERSION' $dir/include/tcl8.0/tcl.h | \
- 		sed -e 's/^.*TCL_MAJOR_VERSION[^0-9]*\([0-9]*\).*$/\1/'`
- 	
--	if test "$tclversion" != "7" ; then
-+	if test "$tclversion" != "8" ; then
- 	    # Skip if it is the wrong version
- 	    continue
- 	fi
-@@ -14305,9 +14301,9 @@
- fi
- if test -n "$TCL_DIR" ; then 
-   if test -z "$ac_echo_test" -a 1 = 1 ; then
--echo "$ac_t""found $TCL_DIR/include/tcl.h and $TCL_DIR/lib/libtcl"
-+echo "$ac_t""found $TCL_DIR/include/tcl8.0/tcl.h and $TCL_DIR/lib/libtcl"
- else
--echo "$ac_t""found $TCL_DIR/include/tcl.h and $TCL_DIR/lib/libtcl" 1>&1
-+echo "$ac_t""found $TCL_DIR/include/tcl8.0/tcl.h and $TCL_DIR/lib/libtcl" 1>&1
- fi
- else
-   if test -n "$TCL_DIR_W" ; then
-@@ -14396,14 +14392,15 @@
-     /usr/bin \
-     /Tools/tk \
-     /usr/sgitcl \
-+    /usr/pkg \
-     /local/encap/tk-3.4 $TCL_DIR ; do
--    if test -r $dir/include/tk.h ; then 
-+    if test -r $dir/include/tk8.0/tk.h ; then 
- 	# Check for correct version
- 	
--	tkversion=`grep 'TK_MAJOR_VERSION' $dir/include/tk.h | \
-+	tkversion=`grep 'TK_MAJOR_VERSION' $dir/include/tk8.0/tk.h | \
- 		sed -e 's/^.*TK_MAJOR_VERSION[^0-9]*\([0-9]*\).*$/\1/'`
- 	
--	if test "$tkversion" != "3" ; then
-+	if test "$tkversion" != "8" ; then
- 	    # Skip if it is the wrong version
- 	    continue
- 	fi
-@@ -14421,9 +14418,9 @@
- fi
- if test -n "$TK_DIR" ; then 
-   if test -z "$ac_echo_test" -a 1 = 1 ; then
--echo "$ac_t""found $TK_DIR/include/tk.h and $TK_DIR/lib/libtk"
-+echo "$ac_t""found $TK_DIR/include/tk8.0/tk.h and $TK_DIR/lib/libtk"
- else
--echo "$ac_t""found $TK_DIR/include/tk.h and $TK_DIR/lib/libtk" 1>&1
-+echo "$ac_t""found $TK_DIR/include/tk8.0/tk.h and $TK_DIR/lib/libtk" 1>&1
- fi
- else
-   if test -n "$TK_DIR_W" ; then
-@@ -14846,7 +14843,7 @@
- # Tk is going to load X11; if no X11, skip this step
- if test -z "$no_x" -a -n "$TK_DIR" -a -n "$TCL_DIR" ; then
-   CFLAGSsave="$CFLAGS"
--  CFLAGS="$CFLAGS -I$TK_DIR/include -I$TCL_DIR/include $XINCLUDES"
-+  CFLAGS="$CFLAGS -I$TK_DIR/include/tk8.0 -I$TCL_DIR/include/tcl8.0 $XINCLUDES"
-   
- 
- if test "$cross_compiling" = 1 -a -z "$TESTCC" ; then
diff --git a/parallel/mpi-ch/patches/patch-ab b/parallel/mpi-ch/patches/patch-ab
deleted file mode 100644
index fab50d60d72..00000000000
--- a/parallel/mpi-ch/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- romio/configure.orig	Wed Aug  5 09:47:54 1998
-+++ romio/configure	Wed Aug  5 09:50:05 1998
-@@ -691,2 +691,24 @@
- fi    
-+if test -n "$arch_netbsd" ; then
-+    CC=${CC:-gcc}
-+    F77=${FC:-f77}
-+    CFLAGS="$CFLAGS -D__FREEBSD"
-+    longlongsize=${longlongsize:-0}
-+# printf doesn't work properly and no integer*8 as far as I can tell
-+    if test $DEBUG = 1; then
-+        CFLAGS="$CFLAGS -g -D__NO_AIO"
-+    else 
-+        CFLAGS="$CFLAGS -O -D__NO_AIO"
-+    fi
-+    if test -z "$MPI" ; then
-+        MPI=mpich
-+        mpi_mpich=1
-+    fi
-+    if test -z "$FILE_SYSTEM" ; then
-+        file_system_ufs=1
-+        file_system_nfs=1
-+        FILE_SYSTEM="ufs nfs"
-+        echo "configuring for file systems ufs and nfs"
-+    fi
-+fi    
- #
diff --git a/parallel/mpi-ch/patches/patch-ac b/parallel/mpi-ch/patches/patch-ac
deleted file mode 100644
index 87e037ab0ab..00000000000
--- a/parallel/mpi-ch/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1998/10/14 10:52:43 agc Exp $
-
---- mpid/ch_p4/p4/configure.orig	Wed Jul  1 12:55:53 1998
-+++ mpid/ch_p4/p4/configure	Wed Aug  5 23:55:15 1998
-@@ -243,6 +243,13 @@
-       DEFINE_SYSV_IPC="#define SYSV_IPC"
-     fi
- fi
-+#                                              Any machine running NetBSD
-+if test -n "$p4arch_NETBSD"; then
-+    P4ARCH=NETBSD
-+    #if test -n "p4comm_shared"; then
-+    #  DEFINE_SYSV_IPC="#define SYSV_IPC"
-+    #fi
-+fi
- #						486 running Linux
- if test -n "$p4arch_LINUX"; then
-     P4ARCH=LINUX
diff --git a/parallel/mpi-ch/patches/patch-ad b/parallel/mpi-ch/patches/patch-ad
deleted file mode 100644
index c36b3d36542..00000000000
--- a/parallel/mpi-ch/patches/patch-ad
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- mpid/ch_shmem/p2ptest/configure.orig	Wed Aug  5 09:56:05 1998
-+++ mpid/ch_shmem/p2ptest/configure	Wed Aug  5 09:56:43 1998
-@@ -143,2 +143,5 @@
- fi
-+if test -n "$p4arch_NETBSD"; then
-+P4ARCH=NETBSD
-+fi
- if test -n "$p4arch_FREEBSD"; then
diff --git a/parallel/mpi-ch/patches/patch-ae b/parallel/mpi-ch/patches/patch-ae
deleted file mode 100644
index b1fe381e2d5..00000000000
--- a/parallel/mpi-ch/patches/patch-ae
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- mpid/ch_p4/p4/MACHINES.orig	Wed Aug  5 19:23:57 1998
-+++ mpid/ch_p4/p4/MACHINES	Wed Aug  5 19:24:12 1998
-@@ -2,2 +2,3 @@
-     LINUX
-+    NETBSD
-     FREEBSD
diff --git a/parallel/mpi-ch/patches/patch-af b/parallel/mpi-ch/patches/patch-af
deleted file mode 100644
index 5c4414ba235..00000000000
--- a/parallel/mpi-ch/patches/patch-af
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- mpid/ch_p4/p4/lib/p4_MD.h.orig	Wed Aug  5 19:35:35 1998
-+++ mpid/ch_p4/p4/lib/p4_MD.h	Wed Aug  5 19:44:58 1998
-@@ -74,2 +74,6 @@
- 
-+#if defined(NETBSD)
-+#define P4_MACHINE_TYPE "NETBSD"
-+#endif
-+
- #if defined(FREEBSD)
-@@ -94,3 +98,3 @@
- /* Rumor has it LINUX support VPRINTF */
--#if defined(FX2800)  || defined(FX2800_SWITCH) || defined(FREEBSD)
-+#if defined(FX2800)  || defined(FX2800_SWITCH) || defined(FREEBSD) || defined(NETBSD)
- #define VPRINTF
-@@ -117,3 +121,3 @@
-     defined(NEXT)       || defined(KSR)      || defined(FREEBSD) || \
--    defined(SYMMETRY)   || defined(BALANCE)  || \
-+    defined(SYMMETRY)   || defined(BALANCE)  || defined(NETBSD) || \
-     defined(ALLIANT)    || defined(MULTIMAX) ||  defined(CM5) || \
-@@ -127,3 +131,3 @@
-     defined(NEXT)       || defined(KSR)      || defined(FREEBSD) || \
--    defined(SYMMETRY)   || defined(BALANCE)  || \
-+    defined(SYMMETRY)   || defined(BALANCE)  || defined(NETBSD) || \
-     defined(ALLIANT)    || defined(MULTIMAX) || \
-@@ -411,3 +415,3 @@
-     || defined(RS6000)  || defined(IBM3090) || defined(FREEBSD) \
--    || defined(TITAN)  \
-+    || defined(TITAN)   || defined(NETBSD) \
-     || defined(HP)
diff --git a/parallel/mpi-ch/patches/patch-ag b/parallel/mpi-ch/patches/patch-ag
deleted file mode 100644
index 2ab9fe8b65d..00000000000
--- a/parallel/mpi-ch/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- mpid/ch_p4/p4/lib/p4_MD.c.orig	Wed Aug  5 19:40:58 1998
-+++ mpid/ch_p4/p4/lib/p4_MD.c	Wed Aug  5 19:45:56 1998
-@@ -1305,2 +1305,3 @@
-  || defined(MULTIMAX) || defined(IBM3090) || defined(FREEBSD) \
-+ || defined(NETBSD) \
-  || (defined(HP)  &&  !defined(SUN_SOLARIS))
-@@ -1355,2 +1356,3 @@
-  || defined(MULTIMAX) || defined(IBM3090) || defined(FREEBSD) \
-+ || defined(NETBSD) \
-  || (defined(HP)  &&  !defined(SUN_SOLARIS))
-@@ -1584,2 +1586,3 @@
-     if (strcmp(machine_type, "FREEBSD") == 0)         return 2;
-+    if (strcmp(machine_type, "NETBSD") == 0)         return 2;
-     if (strcmp(machine_type, "I86_SOLARIS") == 0)     return 2;
diff --git a/parallel/mpi-ch/patches/patch-ah b/parallel/mpi-ch/patches/patch-ah
deleted file mode 100644
index fedd2036020..00000000000
--- a/parallel/mpi-ch/patches/patch-ah
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- romio/.config_params.orig	Thu Aug  6 00:40:54 1998
-+++ romio/.config_params	Thu Aug  6 00:41:03 1998
-@@ -18,2 +18,3 @@
- _freebsd_
-+_netbsd_
- _LINUX_
diff --git a/parallel/mpi-ch/patches/patch-ai b/parallel/mpi-ch/patches/patch-ai
deleted file mode 100644
index 483d8ee079e..00000000000
--- a/parallel/mpi-ch/patches/patch-ai
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- bin/tarch.orig	Thu Aug  6 00:52:15 1998
-+++ bin/tarch	Thu Aug  6 00:52:54 1998
-@@ -96,2 +96,3 @@
-         FreeBSD)         FARCH=freebsd ; break ;;
-+	NetBSD)		 FARCH=netbsd ; break ;;
- 	i386)            GARCH=ipsc2 ;;
diff --git a/parallel/mpi-ch/patches/patch-aj b/parallel/mpi-ch/patches/patch-aj
deleted file mode 100644
index 87ddd235ddf..00000000000
--- a/parallel/mpi-ch/patches/patch-aj
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- mpe/profiling/nupshot/configure.orig	Sat Jul  4 07:50:32 1998
-+++ mpe/profiling/nupshot/configure	Thu Aug  6 05:42:48 1998
-@@ -1219,9 +1219,9 @@
-     /local/encap/tcl-7.1 ; do
--    if test -r $dir/include/tcl.h ; then 
-+    if test -r $dir/include/tcl8.0/tcl.h ; then 
- 	# Check for correct version
- 	
--	tclversion=`grep 'TCL_MAJOR_VERSION' $dir/include/tcl.h | \
-+	tclversion=`grep 'TCL_MAJOR_VERSION' $dir/include/tcl8.0/tcl.h | \
- 		sed -e 's/^.*TCL_MAJOR_VERSION[^0-9]*\([0-9]*\).*$/\1/'`
- 	
--	if test "$tclversion" != "7" ; then
-+	if test "$tclversion" != "8" ; then
- 	    # Skip if it is the wrong version
-@@ -1243,5 +1243,5 @@
-   if test -z "$ac_echo_test" -a 1 = 1 ; then
--echo "$ac_t""found $TCL_DIR/include/tcl.h and $TCL_DIR/lib/libtcl"
-+echo "$ac_t""found $TCL_DIR/include/tcl8.0/tcl.h and $TCL_DIR/lib/libtcl"
- else
--echo "$ac_t""found $TCL_DIR/include/tcl.h and $TCL_DIR/lib/libtcl" 1>&1
-+echo "$ac_t""found $TCL_DIR/include/tcl8.0/tcl.h and $TCL_DIR/lib/libtcl" 1>&1
- fi
-@@ -1335,9 +1335,9 @@
-     /local/encap/tk-3.4 $TCL_DIR ; do
--    if test -r $dir/include/tk.h ; then 
-+    if test -r $dir/include/tk8.0/tk.h ; then 
- 	# Check for correct version
- 	
--	tkversion=`grep 'TK_MAJOR_VERSION' $dir/include/tk.h | \
-+	tkversion=`grep 'TK_MAJOR_VERSION' $dir/include/tk8.0/tk.h | \
- 		sed -e 's/^.*TK_MAJOR_VERSION[^0-9]*\([0-9]*\).*$/\1/'`
- 	
--	if test "$tkversion" != "3" ; then
-+	if test "$tkversion" != "8" ; then
- 	    # Skip if it is the wrong version
-@@ -1359,3 +1359,3 @@
-   if test -z "$ac_echo_test" -a 1 = 1 ; then
--echo "$ac_t""found $TK_DIR/include/tk.h and $TK_DIR/lib/libtk"
-+echo "$ac_t""found $TK_DIR/include/tk8.0/tk.h and $TK_DIR/lib/libtk"
- else
-@@ -1431,3 +1431,3 @@
-   CFLAGSsave="$CFLAGS"
--  CFLAGS="$CFLAGS -I$TK_DIR/include -I$TCL_DIR/include $XINCLUDES"
-+  CFLAGS="$CFLAGS -I$TK_DIR/include/tk8.0 -I$TCL_DIR/include/tcl8.0 $XINCLUDES"
-   
-@@ -1565,4 +1565,4 @@
- 
--if test "$TK_VERSION" != 3.6 ; then
--    print_error "This version of nupshot requires tk 3.6  The version in"
-+if test "$TK_VERSION" != 8.0 ; then
-+    print_error "This version of nupshot requires tk 8.0  The version in"
-     print_error "$TK_DIR seems to be version $TK_VERSION."
diff --git a/parallel/mpi-ch/patches/patch-ak b/parallel/mpi-ch/patches/patch-ak
index 22759eea105..d2673b248fc 100644
--- a/parallel/mpi-ch/patches/patch-ak
+++ b/parallel/mpi-ch/patches/patch-ak
@@ -1,10 +1,15 @@
-$NetBSD: patch-ak,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- mpe/profiling/nupshot/Makefile.in.orig	Thu Aug  6 03:30:37 1998
-+++ mpe/profiling/nupshot/Makefile.in	Thu Aug  6 03:31:16 1998
-@@ -34,4 +34,4 @@
+$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$(TCL_DIR)/include
--TK_INC      = -I$(TK_DIR)/include
-+TCL_INC     = -I$(TCL_DIR)/include/tcl8.0
-+TK_INC      = -I$(TK_DIR)/include/tk8.0
+-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 152c9e0f158..8752ce7bfb4 100644
--- a/parallel/mpi-ch/patches/patch-al
+++ b/parallel/mpi-ch/patches/patch-al
@@ -1,543 +1,142 @@
-$NetBSD: patch-al,v 1.4 2000/03/02 23:47:35 wiz Exp $
+$NetBSD: patch-al,v 1.5 2001/03/21 15:29:00 wennmach Exp $
 
---- ./util/mpiinstall.in.orig	Sun Jul 12 17:28:14 1998
-+++ ./util/mpiinstall.in	Fri Mar  3 00:20:21 2000
-@@ -120,12 +120,12 @@
- # script from the library directory itself.
- if [ -n "$libonly" ] ; then
- #   trialname=`sed -n -e "s/DEFAULT_MACHINE='\(.*\)'/\1/p" \
--#	lib/$ARCH/$COMM/config.status`
-+#	libdata/$ARCH/$COMM/config.status`
- #   if [ -n "$trialname" ] ; then 
- #	DEFAULT_MACHINE="$trialname"
- #   fi
--    if [ $inlib = 0 -a -x lib/$ARCH/$COMM/mpiinstall ] ; then
--        ./lib/$ARCH/$COMM/mpiinstall -inlib "$@"
-+    if [ $inlib = 0 -a -x libdata/$ARCH/$COMM/mpiinstall ] ; then
-+        ./libdata/$ARCH/$COMM/mpiinstall -inlib "$@"
-         exit $?
-     fi
- fi
-@@ -134,15 +134,15 @@
- # These work by extracting the syntax for specifying the library, and then
- # adding the correct destination to it.
- NFLIB_PATH=`echo "@FLIB_PATH@" | \
--	sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/lib/$ARCH/$COMM%g"`
-+	sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/libdata/$ARCH/$COMM%g"`
- NF90LIB_PATH=`echo "@F90LIB_PATH@" | \
--	sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/lib/$ARCH/$COMM%g"`
-+	sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/libdata/$ARCH/$COMM%g"`
- NF90INC=`echo "@F90INC@" | \
- 	sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/include%g"`
- # This one is especially tricky because the default include path goes to the
- # source directory for the C++ interface
- NCPPFLAGS=`echo "A$CPPFLAGS" | \
--    sed -e "s%-I.*/MPI-2-C++/src%-I$PREFIX/lib/$ARCH/$COMM/c++%g" \
-+    sed -e "s%-I.*/MPI-2-C++/src%-I$PREFIX/libdata/$ARCH/$COMM/c++%g" \
-         -e "s/^A//g"`
- #
- # Remove old uninstall file
-@@ -269,9 +269,10 @@
-     if [ -f $dest ] ; then $Show /bin/rm -f $dest ; fi
-     if [ $just_testing = 0 ] ; then
-         sed \
-+	-e "s%/lib/%/libdata/%g" \
- 	-e "s%\#ARCH\#%$ARCH%g" \
- 	-e "s%\#AUTOMOUNTFIX\#%@AUTOMOUNTFIX@%g" \
--        -e "s%\#BITMAP_DIR\#%$PREFIX/lib/bitmaps%g" \
-+        -e "s%\#BITMAP_DIR\#%$PREFIX/libdata/bitmaps%g" \
- 	-e "s%\#CC\#%@CC@%g" \
- 	-e "s%\#CFLAGS\#%@CFLAGS@%g" \
- 	-e "s%\#USER_CFLAGS\#%@USER_CFLAGS@%g" \
-@@ -280,7 +281,7 @@
- 	-e "s%\#DEFAULT_ARCH\#%$ARCH%g" \
- 	-e "s%\#DEFAULT_DEVICE\#%$DEVICE%g" \
- 	-e "s%\#DEFAULT_MACHINE\#%$DEFAULT_MACHINE%g" \
--       	-e "s%\#EXECER_DIR\#%$PREFIX/util%g" \
-+       	-e "s%\#EXECER_DIR\#%$PREFIX/share/util%g" \
- 	-e "s%\#F77\#%@F77@%g" \
- 	-e "s%\#FFLAGS\#%@FFLAGS@%g" \
- 	-e "s%\#FLIB_PATH_LEADER\#%@FLIB_PATH_LEADER@%g" \
-@@ -342,7 +343,7 @@
-     # the LIB_PATH to contain multiple names, as long as the MPICH libpath
-     # is first
-     NLIBPATH=`echo "@LIB_PATH@" | \
--	sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/lib/$ARCH/$COMM%g"`
-+	sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/libdata/$ARCH/$COMM%g"`
- if [ -d $2 ] ; then
-     dest=$2/`basename $1`
- else
-@@ -356,11 +357,12 @@
-     if [ -f $dest ] ; then $Show /bin/rm -f $dest ; fi
-     if [ $just_testing = 0 ] ; then
-         sed \
-+	-e "s%/lib/%/libdata/%g" \
- 	-e "s%[@]ARCH[@]%$ARCH%g" \
- 	-e "s%[@]AUTOMOUNTFIX[@]%@AUTOMOUNTFIX@%g" \
- 	-e "s%[@]FINC[@]%$NFINC%g" \
- 	-e "s%[@]F90INC[@]%$NF90INC%g" \
--        -e "s%[@]BITMAP_DIR[@]%$PREFIX/lib/bitmaps%g" \
-+        -e "s%[@]BITMAP_DIR[@]%$PREFIX/libdata/bitmaps%g" \
- 	-e "s%[@]CC[@]%@CC@%g" \
- 	-e "s%[@]CCC[@]%@CCC@%g" \
- 	-e "s%[@]CPP_COMPILER[@]%@CPP_COMPILER@%g" \
-@@ -375,7 +377,7 @@
- 	-e "s%[@]DEFAULT_ARCH[@]%$ARCH%g" \
- 	-e "s%[@]DEFAULT_DEVICE[@]%$DEVICE%g" \
- 	-e "s%[@]DEFAULT_MACHINE[@]%$DEFAULT_MACHINE%g" \
--       	-e "s%[@]EXECER_DIR[@]%$PREFIX/util%g" \
-+       	-e "s%[@]EXECER_DIR[@]%$PREFIX/share/util%g" \
- 	-e "s%[@]F77[@]%@F77@%g" \
- 	-e "s%[@]FFLAGS[@]%@FFLAGS@%g" \
- 	-e "s%[@]FLIB_PATH_LEADER[@]%@FLIB_PATH_LEADER@%g" \
-@@ -455,22 +457,23 @@
-     MkDir $PREFIX 
- fi
+Adopt to pkg hierarchy.
+
+--- util/mpiinstall.in.orig	Thu Aug 24 18:21:36 2000
++++ util/mpiinstall.in	Wed Mar 21 14:40:13 2001
+@@ -446,9 +446,11 @@
+ MkDir $docdir
+ MkDir $sysconfdir
  
--MkDir $PREFIX/lib
--MkDir $PREFIX/lib/$ARCH
--MkDir $PREFIX/lib/$ARCH/$COMM
--MkDir $PREFIX/lib/bitmaps
-+MkDir $PREFIX/libdata
-+MkDir $PREFIX/libdata/$ARCH
-+MkDir $PREFIX/libdata/$ARCH/$COMM
-+MkDir $PREFIX/libdata/bitmaps
+-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/$CPP_DIR
--    MkDir $PREFIX/$CPP_DIR/examples
--    MkDir $PREFIX/lib/$ARCH/$COMM/c++
-+#    MkDir $PREFIX/libdata/$CPP_DIR
-+    MkDir $PREFIX/share/examples/$CPP_DIR
-+    MkDir $PREFIX/libdata/$ARCH/$COMM/c++
+-    MkDir $prefix/examples/$CPP_DIR
++    MkDir $prefix/share/examples/mpi-ch/$CPP_DIR
+     MkDir $includedir/mpi2c++
  fi
--MkDir $PREFIX/util
--MkDir $PREFIX/util/machines
-+MkDir $PREFIX/share/util
-+MkDir $PREFIX/share/util/machines
- MkDir $PREFIX/include
--MkDir $PREFIX/examples
-+MkDir $PREFIX/share/examples/mpi
- MkDir $PREFIX/bin
- MkDir $PREFIX/man
--MkDir $PREFIX/doc
-+MkDir $PREFIX/share/doc
-+MkDir $PREFIX/share/doc/mpi
- if [ -z "$libonly" ] ; then
-     CopyFile bin/tarch $PREFIX/bin $XMODE
-     CopyFile bin/tdevice $PREFIX/bin $XMODE
-@@ -478,7 +481,7 @@
-     # mpiman
-     $Show /bin/rm -f $PREFIX/bin/mpiman
-     FixupFile util/mpiman.in $PREFIX/bin/mpiman $XMODE
--    CopyFile $PREFIX/bin/mpiman $PREFIX/lib/$ARCH/$COMM $XMODE
-+    CopyFile $PREFIX/bin/mpiman $PREFIX/libdata/$ARCH/$COMM $XMODE
-     #
-     # Upshot and Nupshot
-     # Do Upshot/Nupshot early in case there is a problem.
-@@ -488,7 +491,7 @@
-         #
-         # Should clean nupshot sources  (*.c/h) 
-         if [ -n "@TCL_DIR@" -a -z "$cpnupshot" -a -n "@TK_DIR@" -a \
--	   "@TK_VERSION@" = "3.6" ] ; then 
-+	   "@TK_VERSION@" = "8.0" ] ; then 
-             echo "Attempting to build nupshot... "
-             $Show $CPRP -r mpe/profiling/nupshot $PREFIX
- 	    echo "/bin/rm -rf $PREFIX/nupshot" >> $UNINSTALLFILE
-@@ -526,16 +529,16 @@
-             echo "Creating $PREFIX/bin/$bfile from $file"
-         fi
-         FixupFile $file $PREFIX/bin/$bfile $XMODE
--        $Show /bin/rm -f $PREFIX/lib/$ARCH/$COMM/$bfile 
--        CopyFile $PREFIX/bin/$bfile $PREFIX/lib/$ARCH/$COMM $XMODE
-+        $Show /bin/rm -f $PREFIX/libdata/$ARCH/$COMM/$bfile 
-+        CopyFile $PREFIX/bin/$bfile $PREFIX/libdata/$ARCH/$COMM $XMODE
-     done
-     $Show mv $PREFIX/bin/mpirun.sh $PREFIX/bin/mpirun
-     echo "/bin/rm -f $PREFIX/bin/mpirun" >> $UNINSTALLFILE
--    $Show mv $PREFIX/lib/$ARCH/$COMM/mpirun.sh $PREFIX/lib/$ARCH/$COMM/mpirun
--    echo "/bin/rm -f $PREFIX/lib/$ARCH/$COMM/mpirun" >> $UNINSTALLFILE
--    if [ ! -r $PREFIX/lib/$ARCH/$COMM/tarch ] ; then
--	( cd $PREFIX/lib/$ARCH/$COMM ; 	ln -s ../../../bin/tarch tarch )
--        echo "/bin/rm -f $PREFIX/lib/$ARCH/$COMM/tarch" >> $UNINSTALLFILE
-+    $Show mv $PREFIX/libdata/$ARCH/$COMM/mpirun.sh $PREFIX/libdata/$ARCH/$COMM/mpirun
-+    echo "/bin/rm -f $PREFIX/libdata/$ARCH/$COMM/mpirun" >> $UNINSTALLFILE
-+    if [ ! -r $PREFIX/libdata/$ARCH/$COMM/tarch ] ; then
-+	( cd $PREFIX/libdata/$ARCH/$COMM ; 	ln -s ../../../bin/tarch tarch )
-+        echo "/bin/rm -f $PREFIX/libdata/$ARCH/$COMM/tarch" >> $UNINSTALLFILE
-     fi
-     #
-     $Show /bin/rm -f $PREFIX/bin/mpireconfig
-@@ -543,22 +546,22 @@
-         echo "Creating mpireconfig from util/mpireconfig.in"
-     fi
-     FixupFile util/mpireconfig.in $PREFIX/bin/mpireconfig $XMODE
--    CopyFile $PREFIX/bin/mpireconfig $PREFIX/lib/$ARCH/$COMM $XMODE
-+    CopyFile $PREFIX/bin/mpireconfig $PREFIX/libdata/$ARCH/$COMM $XMODE
-     $Show /bin/rm -f $PREFIX/bin/execer
-     CopyFile util/execer $PREFIX/bin/execer $XMODE
-     #
-     # mpicc, mpif77, mpif90
-     FixupFileWithAt util/mpicc.in $PREFIX/bin/mpicc $XMODE
--    CopyFile $PREFIX/bin/mpicc $PREFIX/lib/$ARCH/$COMM $XMODE
-+    CopyFile $PREFIX/bin/mpicc $PREFIX/libdata/$ARCH/$COMM $XMODE
-     FixupFileWithAt util/mpif77.in $PREFIX/bin/mpif77 $XMODE
--    CopyFile $PREFIX/bin/mpif77 $PREFIX/lib/$ARCH/$COMM $XMODE
-+    CopyFile $PREFIX/bin/mpif77 $PREFIX/libdata/$ARCH/$COMM $XMODE
-     FixupFileWithAt util/mpif90.in $PREFIX/bin/mpif90 $XMODE
--    CopyFile $PREFIX/bin/mpif90 $PREFIX/lib/$ARCH/$COMM $XMODE
-+    CopyFile $PREFIX/bin/mpif90 $PREFIX/libdata/$ARCH/$COMM $XMODE
-     #
-     # mpiCC, if C++ selected
-     if [ -n "@CPP_COMPILER@" ] ; then
- 	FixupFileWithAt util/mpiCC.in $PREFIX/bin/mpiCC $XMODE
--        CopyFile $PREFIX/bin/mpiCC $PREFIX/lib/$ARCH/$COMM $XMODE
-+        CopyFile $PREFIX/bin/mpiCC $PREFIX/libdata/$ARCH/$COMM $XMODE
-     fi
- else
-     # libonly
-@@ -568,28 +571,28 @@
-     for file in util/mpirun.*.in util/tstmachines.in ; do
-         bfile=`basename $file .in`
-         if [ $verbose = 1 ] ; then 
--            echo "Creating $PREFIX/lib/$ARCH/$COMM/$bfile from $file"
-+            echo "Creating $PREFIX/libdata/$ARCH/$COMM/$bfile from $file"
- 	fi
--        FixupFile $file $PREFIX/lib/$ARCH/$COMM/$bfile $XMODE
-+        FixupFile $file $PREFIX/libdata/$ARCH/$COMM/$bfile $XMODE
-     done
--    $Show mv $PREFIX/lib/$ARCH/$COMM/mpirun.sh $PREFIX/lib/$ARCH/$COMM/mpirun
--    if [ ! -r $PREFIX/lib/$ARCH/$COMM/tarch ] ; then
--	( cd $PREFIX/lib/$ARCH/$COMM ; 	ln -s ../../../bin/tarch tarch )
--        echo "/bin/rm -f $PREFIX/lib/$ARCH/$COMM/tarch" >> $UNINSTALLFILE
-+    $Show mv $PREFIX/libdata/$ARCH/$COMM/mpirun.sh $PREFIX/libdata/$ARCH/$COMM/mpirun
-+    if [ ! -r $PREFIX/libdata/$ARCH/$COMM/tarch ] ; then
-+	( cd $PREFIX/libdata/$ARCH/$COMM ; 	ln -s ../../../bin/tarch tarch )
-+        echo "/bin/rm -f $PREFIX/libdata/$ARCH/$COMM/tarch" >> $UNINSTALLFILE
-     fi
--    FixupFileWithAt util/mpicc.in $PREFIX/lib/$ARCH/$COMM/mpicc $XMODE
-+    FixupFileWithAt util/mpicc.in $PREFIX/libdata/$ARCH/$COMM/mpicc $XMODE
-     if [ -n "@CPP_COMPILER@" ] ; then
--        FixupFileWithAt util/mpiCC.in $PREFIX/lib/$ARCH/$COMM/mpiCC $XMODE
-+        FixupFileWithAt util/mpiCC.in $PREFIX/libdata/$ARCH/$COMM/mpiCC $XMODE
-     fi
--    FixupFileWithAt util/mpif77.in $PREFIX/lib/$ARCH/$COMM/mpif77 $XMODE
--    FixupFileWithAt util/mpif90.in $PREFIX/lib/$ARCH/$COMM/mpif90 $XMODE
--    FixupFile util/mpireconfig.in $PREFIX/lib/$ARCH/$COMM/mpireconfig $XMODE
--    CopyFile lib/$ARCH/$COMM/mpichconf.h $PREFIX/lib/$ARCH/$COMM
--    CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/lib/$ARCH/$COMM
--    CopyFile lib/$ARCH/$COMM/mpif.h    $PREFIX/lib/$ARCH/$COMM
-+    FixupFileWithAt util/mpif77.in $PREFIX/libdata/$ARCH/$COMM/mpif77 $XMODE
-+    FixupFileWithAt util/mpif90.in $PREFIX/libdata/$ARCH/$COMM/mpif90 $XMODE
-+    FixupFile util/mpireconfig.in $PREFIX/libdata/$ARCH/$COMM/mpireconfig $XMODE
-+    CopyFile lib/$ARCH/$COMM/mpichconf.h $PREFIX/libdata/$ARCH/$COMM
-+    CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/libdata/$ARCH/$COMM
-+    CopyFile lib/$ARCH/$COMM/mpif.h    $PREFIX/libdata/$ARCH/$COMM
-     if [ -s romio/include/mpio.h ] ; then
--        CopyFile romio/include/mpio.h $PREFIX/lib/$ARCH/$COMM
--        CopyFile romio/include/mpiof.h $PREFIX/lib/$ARCH/$COMM
-+        CopyFile romio/include/mpio.h $PREFIX/libdata/$ARCH/$COMM
-+        CopyFile romio/include/mpiof.h $PREFIX/libdata/$ARCH/$COMM
-     fi
- fi
- #
-@@ -599,28 +602,28 @@
-     echo "Attempting to build ch_p4 secure server"
-     $Show "( cd mpid/ch_p4/p4/servers ; $MAKE serv_p4 ; )" 
-     CopyFile mpid/ch_p4/p4/bin/serv_p4 $PREFIX/bin $XMODE
--    CopyFile $PREFIX/bin/serv_p4 $PREFIX/lib/$ARCH/$COMM $XMODE
-+    CopyFile $PREFIX/bin/serv_p4 $PREFIX/libdata/$ARCH/$COMM $XMODE
-     $Show /bin/rm -f util/chp4_servs
--    FixupFile util/chp4_servs.in $PREFIX/util/chp4_servs $XMODE
--    CopyFile $PREFIX/util/chp4_servs $PREFIX/lib/$ARCH/$COMM $XMODE
--    CopyFile util/chkserv $PREFIX/util/chkserv $XMODE
--    CopyFile $PREFIX/util/chkserv $PREFIX/lib/$ARCH/$COMM $XMODE
-+    FixupFile util/chp4_servs.in $PREFIX/share/util/chp4_servs $XMODE
-+    CopyFile $PREFIX/share/util/chp4_servs $PREFIX/libdata/$ARCH/$COMM $XMODE
-+    CopyFile util/chkserv $PREFIX/share/util/chkserv $XMODE
-+    CopyFile $PREFIX/share/util/chkserv $PREFIX/libdata/$ARCH/$COMM $XMODE
- fi
- #
- # P4
- if [ "$DEVICE" = "ch_p4" ] ; then
-     if [ ! -x mpid/server/server ] ; then
- 	echo "Attempting to build alternate ch_p4 secure server"
--	$Show "( cd mpid/server ; configure ; $MAKE server )"
-+	$Show "( cd mpid/server ; ./configure ; $MAKE server )"
-     fi
-     if [ -x mpid/server/server ] ; then 
- 	CopyFile mpid/server/server $PREFIX/bin $XMODE
--        CopyFile mpid/server/server $PREFIX/lib/$ARCH/$COMM $XMODE
-+        CopyFile mpid/server/server $PREFIX/libdata/$ARCH/$COMM $XMODE
- 	$Show /bin/rm -f util/chp4_servs
--	FixupFile util/chp4_servs.in $PREFIX/util/chp4_servs $XMODE
--	CopyFile $PREFIX/util/chp4_servs $PREFIX/lib/$ARCH/$COMM $XMODE
--	CopyFile util/chkserv $PREFIX/util/chkserv $XMODE
--	CopyFile $PREFIX/util/chkserv $PREFIX/lib/$ARCH/$COMM $XMODE
-+	FixupFile util/chp4_servs.in $PREFIX/share/util/chp4_servs $XMODE
-+	CopyFile $PREFIX/share/util/chp4_servs $PREFIX/libdata/$ARCH/$COMM $XMODE
-+	CopyFile util/chkserv $PREFIX/share/util/chkserv $XMODE
-+	CopyFile $PREFIX/share/util/chkserv $PREFIX/libdata/$ARCH/$COMM $XMODE
-     else
-         echo "Server not available"
-     fi
-@@ -629,15 +632,15 @@
- if [ -z "$libonly" ] ; then
-     #
-     # Machines database
--    #	if [ ! -d $PREFIX/util/machines.anl ] ; then \
--    #	    mkdir $PREFIX/util/machines.anl ; fi
--    #	$CPRP -r util/machines $PREFIX/util/machines.anl
-+    #	if [ ! -d $PREFIX/share/util/machines.anl ] ; then \
-+    #	    mkdir $PREFIX/share/util/machines.anl ; fi
-+    #	$CPRP -r util/machines $PREFIX/share/util/machines.anl
+ 
+@@ -648,7 +650,7 @@
+     #	$CPRP -r util/machines $prefix/util/machines.anl
      for file in util/machines/machines* ; do
--        CopyFile $file $PREFIX/util/machines
-+        CopyFile $file $PREFIX/share/util/machines
-     done
-     for file in mpe/profiling/upshot/bitmaps/* ; do 
- 	if [ -f $file ] ; then 
--            CopyFile $file $PREFIX/lib/bitmaps
-+            CopyFile $file $PREFIX/libdata/bitmaps
+         if [ -s $file ] ; then 
+-            CopyFile $file $datadir
++            CopyFile $file $prefix/share/util/machines
  	fi
      done
      #
-@@ -649,33 +652,33 @@
-     CopyFile include/protofix.h $PREFIX/include
-     CopyFile include/mpeexten.h $PREFIX/include
-     CopyFile include/patchlevel.h $PREFIX/include
--    CopyFile lib/$ARCH/$COMM/mpichconf.h $PREFIX/lib/$ARCH/$COMM
--    CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/lib/$ARCH/$COMM
-+    CopyFile lib/$ARCH/$COMM/mpichconf.h $PREFIX/libdata/$ARCH/$COMM
-+    CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/libdata/$ARCH/$COMM
-     CopyFile mpe/mpe.h $PREFIX/include
-     CopyFile mpe/mpe_graphics.h $PREFIX/include
-     CopyFile mpe/mpe_log.h $PREFIX/include
-     CopyFile mpe/mpetools.h $PREFIX/include
-     CopyFile mpe/basex11.h $PREFIX/include
-     if [ -s romio/include/mpio.h ] ; then
--        CopyFile romio/include/mpio.h $PREFIX/lib/$ARCH/$COMM
--        CopyFile romio/include/mpiof.h $PREFIX/lib/$ARCH/$COMM
-+        CopyFile romio/include/mpio.h $PREFIX/libdata/$ARCH/$COMM
-+        CopyFile romio/include/mpiof.h $PREFIX/libdata/$ARCH/$COMM
-     fi
- fi
- #
- # Include files for C++
- if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then 
--    if [ ! -d $PREFIX/lib/$ARCH/$COMM/c++ ] ; then
--        MkDir $PREFIX/lib/$ARCH/$COMM/c++
-+    if [ ! -d $PREFIX/libdata/$ARCH/$COMM/c++ ] ; then
-+        MkDir $PREFIX/libdata/$ARCH/$COMM/c++
-     fi
-     for file in `ls MPI-2-C++/src/*.h`; do 
--        CopyFile $file $PREFIX/lib/$ARCH/$COMM/c++
-+        CopyFile $file $PREFIX/libdata/$ARCH/$COMM/c++
-     done
- fi
- #
- # Libaries (includeing shared libraries)
- for file in lib/$ARCH/$COMM/*.a lib/$ARCH/$COMM/*.so* ; do
-     if [ -f $file ] ; then 
--        CopyFileP $file $PREFIX/lib/$ARCH/$COMM
-+        CopyFileP $file $PREFIX/libdata/$ARCH/$COMM
-     fi
- done
- #
-@@ -684,7 +687,7 @@
- #     spxcp - Executable copy program for IBM SP.
- for file in spxcp ; do
-     if [ -x lib/$ARCH/$COMM/$file ] ; then 
--        CopyFileP lib/$ARCH/$COMM/$file $PREFIX/lib/$ARCH/$COMM
-+        CopyFileP lib/$ARCH/$COMM/$file $PREFIX/libdata/$ARCH/$COMM
-     fi
- done
- #
-@@ -696,18 +699,18 @@
-         if [ $file = "mpich.cat" ] ; then
- 	    # This is a link; it assumes that En_US is the default.
-             if [ -f lib/$ARCH/mpich.En_US.cat ] ; then 
--                $Show ln -s $PREFIX/lib/$ARCH/mpich.En_US.cat \
--	   		    $PREFIX/lib/$ARCH/mpich.cat
-+                $Show ln -s $PREFIX/libdata/$ARCH/mpich.En_US.cat \
-+	   		    $PREFIX/libdata/$ARCH/mpich.cat
-             fi
-         elif [ -s $file ] ; then 
- 	    # This will handle the case of no mpich.* matches
--            CopyFile $file $PREFIX/lib/$ARCH
-+            CopyFile $file $PREFIX/libdata/$ARCH
-         fi
-     done
- fi
-     
- # Other files in lib need to be updated...
--CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/lib/$ARCH/$COMM
-+CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/libdata/$ARCH/$COMM
- #
- # Documentation
- # Note that we're not doing the www pages yet.
-@@ -735,15 +738,15 @@
- if [ -z "$libonly" ] ; then
-     for file in functions.ps.Z guide.ps.Z install.ps.Z ; do
- 	if [ -f $file ] ; then 
--            CopyFile doc/$file $PREFIX/doc
-+            CopyFile doc/$file $PREFIX/share/doc/mpi
- 	fi
-     done
-     #$Show $CPRP -r doc $PREFIX
-     if [ -f ref/adiman.ps.Z ] ; then 
--        CopyFile ref/adiman.ps.Z $PREFIX/doc
-+        CopyFile ref/adiman.ps.Z $PREFIX/share/doc/mpi
-     fi
-     if [ -f ref/mpiman.ps.Z ] ; then 
--        CopyFile ref/mpiman.ps.Z $PREFIX/doc
-+        CopyFile ref/mpiman.ps.Z $PREFIX/share/doc/mpi
-     fi
- fi
- #
-@@ -755,94 +758,94 @@
- if [ $just_testing = 0 ] ; then
-     cat lib/$ARCH/$COMM/config.status | \
- 	sed -e "s%MPIR_HOME=.*\$%MPIR_HOME='$PREFIX'%g" \
--    -e "s%^LIB_PATH=\([^/ ]*\)/[^ ']*%LIB_PATH=\1$PREFIX/lib/$ARCH/$COMM%g" \
--    -e "s%^FLIB_PATH=\([^/ ]*\)/[^ ']*%FLIB_PATH=\1$PREFIX/lib/$ARCH/$COMM%g" \
-+    -e "s%^LIB_PATH=\([^/ ]*\)/[^ ']*%LIB_PATH=\1$PREFIX/libdata/$ARCH/$COMM%g" \
-+    -e "s%^FLIB_PATH=\([^/ ]*\)/[^ ']*%FLIB_PATH=\1$PREFIX/libdata/$ARCH/$COMM%g" \
- 		-e "s%MPE_DIR=.*\$%MPE_DIR='$PREFIX/mpe'%g" \
--    -e "s%^MPICC=\([^/ ]*\)/.*\$%MPICC=$PREFIX/lib/$ARCH/$COMM/mpicc%g" \
--    -e "s%^MPIF77=\([^/ ]*\)/.*\$%MPIF77=$PREFIX/lib/$ARCH/$COMM/mpif77%g" \
--    -e "s%^MPIF90=\([^/ ]*\)/.*\$%MPIF90=$PREFIX/lib/$ARCH/$COMM/mpif90%g" \
--    -e "s%^MPICPLUSPLUS=\([^/ ]*\)/.*\$%MPICPLUSPLUS=$PREFIX/lib/$ARCH/$COMM/mpiCC%g" \
--		        > $PREFIX/lib/$ARCH/$COMM/config.status 
--    echo "/bin/rm -f $PREFIX/lib/$ARCH/$COMM/config.status" >> $UNINSTALLFILE
--    chmod $XMODE $PREFIX/lib/$ARCH/$COMM/config.status 
-+    -e "s%^MPICC=\([^/ ]*\)/.*\$%MPICC=$PREFIX/libdata/$ARCH/$COMM/mpicc%g" \
-+    -e "s%^MPIF77=\([^/ ]*\)/.*\$%MPIF77=$PREFIX/libdata/$ARCH/$COMM/mpif77%g" \
-+    -e "s%^MPIF90=\([^/ ]*\)/.*\$%MPIF90=$PREFIX/libdata/$ARCH/$COMM/mpif90%g" \
-+    -e "s%^MPICPLUSPLUS=\([^/ ]*\)/.*\$%MPICPLUSPLUS=$PREFIX/libdata/$ARCH/$COMM/mpiCC%g" \
-+		        > $PREFIX/libdata/$ARCH/$COMM/config.status 
-+    echo "/bin/rm -f $PREFIX/libdata/$ARCH/$COMM/config.status" >> $UNINSTALLFILE
-+    chmod $XMODE $PREFIX/libdata/$ARCH/$COMM/config.status 
- else 
- cat <<.
- cat lib/$ARCH/$COMM/config.status | \
- 	sed -e "s%MPIR_HOME=.*\$%MPIR_HOME='$PREFIX'%g" \
--    -e "s%^LIB_PATH=\([^/ ]*\)/[^ ']*%LIB_PATH=\1$PREFIX/lib/$ARCH/$COMM%g" \
--    -e "s%^FLIB_PATH=\([^/ ]*\)/[^ ']*%FLIB_PATH=\1$PREFIX/lib/$ARCH/$COMM%g" \
-+    -e "s%^LIB_PATH=\([^/ ]*\)/[^ ']*%LIB_PATH=\1$PREFIX/libdata/$ARCH/$COMM%g" \
-+    -e "s%^FLIB_PATH=\([^/ ]*\)/[^ ']*%FLIB_PATH=\1$PREFIX/libdata/$ARCH/$COMM%g" \
- 		-e "s%MPE_DIR=.*\$%MPE_DIR='$PREFIX/mpe'%g" \
--    -e "s%^MPICC=\([^/ ]*\)/.*\$%MPICC=$PREFIX/lib/$ARCH/$COMM/mpicc%g" \
--    -e "s%^MPIF77=\([^/ ]*\)/.*\$%MPIF77=$PREFIX/lib/$ARCH/$COMM/mpif77%g" \
--    -e "s%^MPIF90=\([^/ ]*\)/.*\$%MPIF90=$PREFIX/lib/$ARCH/$COMM/mpif90%g" \
--    -e "s%^MPICPLUSPLUS=\([^/ ]*\)/.*\$%MPICPLUSPLUS=$PREFIX/lib/$ARCH/$COMM/mpiCC%g" \
--		        > $PREFIX/lib/$ARCH/$COMM/config.status
--    chmod $XMODE $PREFIX/lib/$ARCH/$COMM/config.status 
-+    -e "s%^MPICC=\([^/ ]*\)/.*\$%MPICC=$PREFIX/libdata/$ARCH/$COMM/mpicc%g" \
-+    -e "s%^MPIF77=\([^/ ]*\)/.*\$%MPIF77=$PREFIX/libdata/$ARCH/$COMM/mpif77%g" \
-+    -e "s%^MPIF90=\([^/ ]*\)/.*\$%MPIF90=$PREFIX/libdata/$ARCH/$COMM/mpif90%g" \
-+    -e "s%^MPICPLUSPLUS=\([^/ ]*\)/.*\$%MPICPLUSPLUS=$PREFIX/libdata/$ARCH/$COMM/mpiCC%g" \
-+		        > $PREFIX/libdata/$ARCH/$COMM/config.status
-+    chmod $XMODE $PREFIX/libdata/$ARCH/$COMM/config.status 
- .
- fi
- if [ -z "$libonly" ] ; then
--    #CopyFile $PREFIX/lib/$ARCH/$COMM/config.status $PREFIX
-+    #CopyFile $PREFIX/libdata/$ARCH/$COMM/config.status $PREFIX
-     #
--    $Show /bin/rm -f $PREFIX/examples/mpif.h
--    $Show ln -s $PREFIX/include/mpif.h $PREFIX/examples/mpif.h
--    echo "/bin/rm -f $PREFIX/examples/mpif.h" >> $UNINSTALLFILE
-+    $Show /bin/rm -f $PREFIX/share/examples/mpi/mpif.h
-+    $Show ln -s $PREFIX/include/mpif.h $PREFIX/share/examples/mpi/mpif.h
-+    echo "/bin/rm -f $PREFIX/share/examples/mpi/mpif.h" >> $UNINSTALLFILE
- fi
+@@ -868,7 +870,7 @@
+ CopyFile $top_srcdir/util/cleanipcs $sbindir $XMODE
  #
  # Example programs
--CopyFile installtest/Makefile.in $PREFIX/examples
-+CopyFile installtest/Makefile.in $PREFIX/share/examples/mpi
+-CopyFile $top_srcdir/installtest/Makefile.in $prefix/examples
++CopyFile $top_srcdir/installtest/Makefile.in $prefix/share/examples/mpi-ch
  #
  # This SHOULD use mpireconfig...
- Savevar=$PREFIX
- PREFIX=$APREFIX
--#FixupFile installtest/makefile.proto $PREFIX/examples/Makefile
--(cd $PREFIX/examples ; $PREFIX/lib/$ARCH/$COMM/mpireconfig Makefile )
--echo "(cd $PREFIX/examples ; $MAKE clean)" >> $UNINSTALLFILE
--echo "/bin/rm -f $PREFIX/examples/Makefile" >> $UNINSTALLFILE
-+#FixupFile installtest/makefile.proto $PREFIX/wshare/examples/mpi/Makefile
-+(cd $PREFIX/share/examples/mpi ; $PREFIX/libdata/$ARCH/$COMM/mpireconfig Makefile )
-+echo "(cd $PREFIX/share/examples/mpi ; $MAKE clean)" >> $UNINSTALLFILE
-+echo "/bin/rm -f $PREFIX/share/examples/mpi/Makefile" >> $UNINSTALLFILE
- PREFIX=$Savevar
--CopyFile $PREFIX/examples/Makefile $PREFIX/lib/$ARCH/$COMM/Makefile.sample
--CopyFile installtest/cpi.c $PREFIX/examples
--CopyFile installtest/pi3.f $PREFIX/examples
--CopyFile installtest/cpilog.c $PREFIX/examples
--CopyFile installtest/hello++.cc $PREFIX/examples
-+CopyFile $PREFIX/share/examples/mpi/Makefile $PREFIX/libdata/$ARCH/$COMM/Makefile.sample
-+CopyFile installtest/cpi.c $PREFIX/share/examples/mpi
-+CopyFile installtest/pi3.f $PREFIX/share/examples/mpi
-+CopyFile installtest/cpilog.c $PREFIX/share/examples/mpi
-+CopyFile installtest/hello++.cc $PREFIX/share/examples/mpi
- if [ -s romio/test/simple.c ] ; then 
--    CopyFile romio/test/simple.c $PREFIX/examples/simpleio.c
-+    CopyFile romio/test/simple.c $PREFIX/share/examples/mpi/simpleio.c
+ Savevar=$prefix
+@@ -876,44 +878,44 @@
+ # prefix=@prefix@ when ever prefix= starts in the first column (!)
+ # It also does this with exec_prefix (!!)
+      prefix=$APREFIX
+-(cd $prefix/examples ; $bindir/mpireconfig Makefile )
+-echo "(cd $prefix/examples ; $MAKE clean)" >> $UNINSTALLFILE
+-echo "/bin/rm -f $prefix/examples/Makefile" >> $UNINSTALLFILE
++(cd $prefix/share/examples/mpi-ch ; $bindir/mpireconfig Makefile )
++echo "(cd $prefix/share/examples/mpi-ch ; $MAKE clean)" >> $UNINSTALLFILE
++echo "/bin/rm -f $prefix/share/examples/mpi-ch/Makefile" >> $UNINSTALLFILE
+      prefix=$Savevar
+-CopyFile $prefix/examples/Makefile $datadir/Makefile.sample
+-CopyFile $top_srcdir/installtest/cpi.c $prefix/examples
+-CopyFile $top_srcdir/installtest/cpip.c $prefix/examples
+-CopyFile $top_srcdir/installtest/cpilog.c $prefix/examples
+-CopyFile $top_srcdir/installtest/hello++.cc $prefix/examples
++CopyFile $prefix/share/examples/mpi-ch/Makefile $prefix/share/examples/mpi-ch/Makefile.sample
++CopyFile $top_srcdir/installtest/cpi.c $prefix/share/examples/mpi-ch
++CopyFile $top_srcdir/installtest/cpip.c $prefix/share/examples/mpi-ch
++CopyFile $top_srcdir/installtest/cpilog.c $prefix/share/examples/mpi-ch
++CopyFile $top_srcdir/installtest/hello++.cc $prefix/share/examples/mpi-ch
+ if [ "@NOF77@" = "0" ] ; then
+-    CopyFile $top_srcdir/installtest/pi3.f $prefix/examples
+-    CopyFile $top_srcdir/installtest/pi3p.f $prefix/examples
++    CopyFile $top_srcdir/installtest/pi3.f $prefix/share/examples/mpi-ch
++    CopyFile $top_srcdir/installtest/pi3p.f $prefix/share/examples/mpi-ch
+     if [ "@NO_F90@" = "0" ] ; then
+-        CopyFile $top_srcdir/installtest/pi3f90.f90 $prefix/examples
++        CopyFile $top_srcdir/installtest/pi3f90.f90 $prefix/share/examples/mpi-ch
+     fi
+ fi
+ if [ -s $top_srcdir/romio/test/simple.c ] ; then 
+-    CopyFile $top_srcdir/romio/test/simple.c $prefix/examples/simpleio.c
++    CopyFile $top_srcdir/romio/test/simple.c $prefix/share/examples/mpi-ch/simpleio.c
  fi
--CopyFile installtest/README $PREFIX/examples
-+CopyFile installtest/README $PREFIX/share/examples/mpi
+-CopyFile $top_srcdir/installtest/README $prefix/examples
++CopyFile $top_srcdir/installtest/README $prefix/share/examples/mpi-ch
  #
  # Test build the examples
--$Show "(cd $PREFIX/examples ; /bin/rm -f mpirun ; \
-+$Show "(cd $PREFIX/share/examples/mpi ; /bin/rm -f mpirun ; \
- 	  ln -s ../bin/mpirun mpirun )"
--echo "/bin/rm -f $PREFIX/examples/mpirun" >> $UNINSTALLFILE
-+echo "/bin/rm -f $PREFIX/share/examples/mpi/mpirun" >> $UNINSTALLFILE
+-$Show "(cd $prefix/examples ; /bin/rm -f mpirun ; \
+-	  ln -s ../bin/mpirun mpirun )"
+-echo "/bin/rm -f $prefix/examples/mpirun" >> $UNINSTALLFILE
++$Show "(cd $prefix/share/examples/mpi-ch ; /bin/rm -f mpirun ; \
++	  ln -s $bindir/mpirun mpirun )"
++echo "/bin/rm -f $prefix/share/examples/mpi-ch/mpirun" >> $UNINSTALLFILE
  #
--echo "About to run installation test..."
--$Show "(cd $PREFIX/examples; $MAKE all )"
-+#echo "About to run installation test..."
-+#$Show "(cd $PREFIX/share/examples/mpi; $MAKE all )"
+ echo "About to run installation test..."
+-$Show "(cd $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 $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
  #
  # This SHOULD use mpireconfig...
- Savevar=$PREFIX
+ Savevar=$prefix
  if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then 
      # C++ Example programs 
--    CopyFile installtest/mpi-2-c++/Makefile.in $PREFIX/$CPP_DIR/examples
-+    CopyFile installtest/mpi-2-c++/Makefile.in $PREFIX/share/examples/$CPP_DIR
+-    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
--    (cd $PREFIX/$CPP_DIR/examples ; $PREFIX/lib/$ARCH/$COMM/mpireconfig Makefile )
--    echo "(cd $PREFIX/$CPP_DIR/examples ; $MAKE clean)" >> $UNINSTALLFILE
--    echo "/bin/rm -f $PREFIX/$CPP_DIR/examples/Makefile" >> $UNINSTALLFILE
-+    (cd $PREFIX/share/examples/$CPP_DIR ; $PREFIX/libdata/$ARCH/$COMM/mpireconfig Makefile )
-+    echo "(cd $PREFIX/share/examples/$CPP_DIR ; $MAKE clean)" >> $UNINSTALLFILE
-+    echo "/bin/rm -f $PREFIX/share/examples/$CPP_DIR/Makefile" >> $UNINSTALLFILE
-     PREFIX=$Savevar
--    CopyFile $CPP_DIR/contrib/examples/hello_world.cc $PREFIX/$CPP_DIR/examples
--    CopyFile $CPP_DIR/contrib/examples/ring.cc $PREFIX/$CPP_DIR/examples
--    CopyFile $CPP_DIR/contrib/examples/topology.cc $PREFIX/$CPP_DIR/examples
--    CopyFile $CPP_DIR/contrib/examples/user_bcast.cc $PREFIX/$CPP_DIR/examples
--    CopyFile $CPP_DIR/contrib/examples/chapter_10_mpi2.cc $PREFIX/$CPP_DIR/examples
--    CopyFile $CPP_DIR/contrib/examples/pi.cc $PREFIX/$CPP_DIR/examples
--    CopyFile $CPP_DIR/contrib/examples/README $PREFIX/$CPP_DIR/examples
-+    CopyFile $CPP_DIR/contrib/examples/hello_world.cc $PREFIX/share/examples/$CPP_DIR
-+    CopyFile $CPP_DIR/contrib/examples/ring.cc $PREFIX/share/examples/$CPP_DIR
-+    CopyFile $CPP_DIR/contrib/examples/topology.cc $PREFIX/share/examples/$CPP_DIR
-+    CopyFile $CPP_DIR/contrib/examples/user_bcast.cc $PREFIX/share/examples/$CPP_DIR
-+    CopyFile $CPP_DIR/contrib/examples/chapter_10_mpi2.cc $PREFIX/share/examples/$CPP_DIR
-+    CopyFile $CPP_DIR/contrib/examples/pi.cc $PREFIX/share/examples/$CPP_DIR
-+    CopyFile $CPP_DIR/contrib/examples/README $PREFIX/share/examples/$CPP_DIR
+     prefix=$APREFIX
+     CPPEXDIR=$top_srcdir/$CPP_DIR/contrib/examples
+@@ -921,25 +923,25 @@
+     # 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
++    (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/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
++    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/$CPP_DIR/examples ; /bin/rm -f mpirun ; \
-+    $Show "(cd $PREFIX/share/examples/$CPP_DIR ; /bin/rm -f mpirun ; \
- 	      ln -s ../../bin/mpirun mpirun )"
--    echo "/bin/rm -f $PREFIX/$CPP_DIR/examples/mpirun" >> $UNINSTALLFILE
-+    echo "/bin/rm -f $PREFIX/share/examples/$CPP_DIR/mpirun" >> $UNINSTALLFILE
+-    $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
++    $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/$CPP_DIR/examples; $MAKE)"
-+    #echo "About to run C++ installation test..."
-+    #$Show "(cd $PREFIX/share/examples/$CPP_DIR; $MAKE)"
+     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; $MAKE ; $MAKE clean)"
      #
  fi
  #
diff --git a/parallel/mpi-ch/patches/patch-am b/parallel/mpi-ch/patches/patch-am
index 9b0e9e61fd2..13d0906bf04 100644
--- a/parallel/mpi-ch/patches/patch-am
+++ b/parallel/mpi-ch/patches/patch-am
@@ -1,4 +1,5 @@
-$NetBSD: patch-am,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
+$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 @@
diff --git a/parallel/mpi-ch/patches/patch-an b/parallel/mpi-ch/patches/patch-an
new file mode 100644
index 00000000000..a1f54ea0157
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-an
@@ -0,0 +1,24 @@
+$NetBSD: patch-an,v 1.1 2001/03/21 15:29:01 wennmach Exp $
+
+Add "NETBSD" where appropriate.
+
+--- mpid/ch_p4/p4/usc/usc.c.orig	Mon Mar 19 20:26:34 2001
++++ mpid/ch_p4/p4/usc/usc.c	Mon Mar 19 20:28:13 2001
+@@ -88,7 +88,7 @@
+ 
+ #if defined(SUN) || defined(HP) || defined(DEC5000) || \
+     defined(SUN_SOLARIS) || defined(FREEBSD) || defined(LINUX) || \
+-    defined(I86_SOLARIS) || \
++    defined(I86_SOLARIS) || defined(NETBSD) || \
+     defined(BALANCE) || \
+     defined(RS6000)  ||  defined(IBM3090) || \
+     defined(NEXT) || defined(TITAN) || defined(GP_1000) || \
+@@ -198,7 +198,7 @@
+ 
+ #if defined(SUN) || defined(HP) || \
+     defined(SUN_SOLARIS) || defined(FREEBSD) || defined(LINUX) || \
+-    defined(I86_SOLARIS) || \
++    defined(I86_SOLARIS) || defined(NETBSD) || \
+     defined(BALANCE) || \
+     defined(RS6000) || defined(IBM3090) || \
+     defined(NEXT) || defined(TITAN) || defined(TC1000) || \
diff --git a/parallel/mpi-ch/patches/patch-ao b/parallel/mpi-ch/patches/patch-ao
new file mode 100644
index 00000000000..8f99afa3555
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-ao
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 00000000000..b7b878ce235
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-ap
@@ -0,0 +1,15 @@
+$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-aq b/parallel/mpi-ch/patches/patch-aq
new file mode 100644
index 00000000000..202a60813b6
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-aq
@@ -0,0 +1,17 @@
+$NetBSD: patch-aq,v 1.1 2001/03/21 15:29:01 wennmach Exp $
+
+PVFS symbol confusion.
+
+--- romio/adio/common/ad_fstype.c.orig	Mon Mar 19 22:55:26 2001
++++ romio/adio/common/ad_fstype.c	Mon Mar 19 22:57:50 2001
+@@ -26,7 +26,9 @@
+ #ifdef SX4
+ #include <sys/stat.h>
+ #endif
+-#ifdef PVFS
++/* NetBSD defines PVFS in sys/param.h, but that PVFS has nothing to do
++   with the PVFS file system */
++#if defined(PVFS) && !defined(__NetBSD__)
+ #include "pvfs_config.h"
+ #endif
+ 
diff --git a/parallel/mpi-ch/patches/patch-ar b/parallel/mpi-ch/patches/patch-ar
new file mode 100644
index 00000000000..1d08ceb8bc2
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-ar
@@ -0,0 +1,15 @@
+$NetBSD: patch-ar,v 1.1 2001/03/21 15:29:01 wennmach Exp $
+
+Adopt to pkg hierarchy.
+
+--- mpe/viewers/sbin/install-viewers.in.orig	Wed Mar 21 10:54:28 2001
++++ mpe/viewers/sbin/install-viewers.in	Wed Mar 21 11:01:41 2001
+@@ -382,7 +382,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 ; \
+           fi )
+     fi
diff --git a/parallel/mpi-ch/patches/patch-as b/parallel/mpi-ch/patches/patch-as
new file mode 100644
index 00000000000..d732e7258b9
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-as
@@ -0,0 +1,17 @@
+$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
new file mode 100644
index 00000000000..46b15818651
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-at
@@ -0,0 +1,15 @@
+$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 @@
+ MkDir $datadir
+ 
+ # Set the Examples directory where the sample MPE programs are located
+-examplesdir=$datadir/examples
++examplesdir=$datadir/examples/mpi-ch/mpe
+ MkDir $examplesdir
+ 
+ #