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.

parallel/mpi-ch/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2001/02/17 17:53:00 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/03/21 15:28:57 wennmach Exp $
 
-DISTNAME=		mpich-1.1.1
+DISTNAME=		mpich-1.2.1
 CATEGORIES=		parallel
-MASTER_SITES=		ftp://ftp.mcs.anl.gov/pub/mpi/old/
+MASTER_SITES=		ftp://ftp.mcs.anl.gov/pub/mpi/
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.mcs.anl.gov/mpi/mpich/index.html
@@ -12,18 +12,31 @@ COMMENT=		Free implementation of the Message Passing Interface
 DEPENDS+=		{openssh-*,ssh{,6}-1.2.27*}:../../security/ssh
 .endif
 
-WRKSRC=			${WRKDIR}/mpich
+DEPENDS+=		tk>=8.3.0:../../x11/tk
+
 ALL_TARGET=		ALL
 USE_PERL5=		yes
 HAS_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_X11=		yes
 CONFIGURE_ARGS=		-prefix=${PREFIX} -arch=netbsd -comm=ch_p4
-CONFIGURE_ARGS+=	-nof77 -make=${GMAKE} -mpe -rsh=ssh -opt=-O -nodevdebug
+CONFIGURE_ARGS+=	-docdir=${PREFIX}/share/doc/mpi-ch
+CONFIGURE_ARGS+=	-htmldir=${PREFIX}/share/doc/html/mpi-ch
+CONFIGURE_ARGS+=	-make=${GMAKE} --with-mpe -rsh=ssh -opt=-O -nodevdebug
+CONFIGURE_ARGS+=	--disable-f90 --disable-f90modules
 
 post-install:
-	${RM} ${PREFIX}/mpiuninstall
-	${RM} ${PREFIX}/man/mandesc
-	${RMDIR} ${PREFIX}/share/doc/mpi
+	@${RM} ${PREFIX}/man/mandesc
+	@${MV} ${PREFIX}/sbin/mpiuninstall ${PREFIX}/sbin/mpiuninstall.not
+	@${CHMOD} 444 ${PREFIX}/sbin/mpiuninstall.not
+	@${ECHO} "#!/bin/sh" > ${PREFIX}/sbin/mpiuninstall
+	@${ECHO} "echo Please use the pkg_delete command to uninstall MPICH." \
+	    >> ${PREFIX}/sbin/mpiuninstall
+	@${ECHO} "echo The original mpiuninstall script is provided in" \
+	    >> ${PREFIX}/sbin/mpiuninstall
+	@${ECHO} "echo ${PREFIX}/sbin/mpiuninstall.not for reference." \
+	    >> ${PREFIX}/sbin/mpiuninstall
+	@${ECHO} "exit" >> ${PREFIX}/sbin/mpiuninstall
+	@${CHMOD} 755 ${PREFIX}/sbin/mpiuninstall
 
 .include "../../mk/bsd.pkg.mk"

parallel/mpi-ch/files/md5

@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/10/07 01:47:28 hubertf Exp $
+$NetBSD: md5,v 1.4 2001/03/21 15:28:57 wennmach Exp $
 
-MD5 (mpich-1.1.1.tar.gz) = 276d639e4ba661a8647e72f26a2dbd77
+MD5 (mpich-1.2.1.tar.gz) = d5efae9f23df2aa6f0f28492a7697c35

parallel/mpi-ch/files/patch-sum

@@ -1,15 +1,13 @@
-$NetBSD: patch-sum,v 1.2 2000/03/02 23:47:35 wiz Exp $
+$NetBSD: patch-sum,v 1.3 2001/03/21 15:28:57 wennmach Exp $
 
-MD5 (patch-aa) = 5a663ee65fcba7816802259b6756506f
-MD5 (patch-ab) = edfb74afa3e9207d94680496fdd78014
-MD5 (patch-ac) = f6bafa8ac843b9a726ebe4507d8a1f0d
-MD5 (patch-ad) = 8f52eb90f3ba952622ac38baa30ebf6b
-MD5 (patch-ae) = 96d95062994934198d1c8a1be052d23a
-MD5 (patch-af) = 76ae7d1e705dbb205f9d9037343abbd2
-MD5 (patch-ag) = 7d21df0d4260b576fc2849b91b6c9f63
-MD5 (patch-ah) = 546bfde51a5a081aff1e1ac07285c13d
-MD5 (patch-ai) = a450a840ca9b11dc02faf9bb94a5acc2
-MD5 (patch-aj) = c453bc520f777078052747e647eebcf4
-MD5 (patch-ak) = eb1aac4dffc5bf30c7d470e50cca1e8b
-MD5 (patch-al) = 95a0cb94ac76b392c84fefd1baed7360
-MD5 (patch-am) = 8ba07bf04dcc5e7771563769a14b1272
+SHA1 (patch-aa) = 00d28f9b6bf45ecab975a15dc589afda420b01d0
+SHA1 (patch-ak) = 8ad7340a9a95087649a96c823e5d0965922e209b
+SHA1 (patch-al) = 57c5d8249aeff57e82956314828aeadcdf95cd89
+SHA1 (patch-am) = ebebecac0ee222284ba75ea300d0fedc99c7fea8
+SHA1 (patch-an) = f70b13803dd93768f6b72ba81ea73badc6155a9d
+SHA1 (patch-ao) = 61b36fd1e38131a3f20db586ee6810f1d506b3dd
+SHA1 (patch-ap) = 5320ef47b74691e52f247d9560954257762b5dd2
+SHA1 (patch-aq) = 764b1707c5d7b2bf8b61d59646985485228017ff
+SHA1 (patch-ar) = 4b84772ce42136f0a278bf5c12a3fd7dc72ef61d
+SHA1 (patch-as) = 5c3c3de705e9ddca64e95bf9781b4a5147ba788d
+SHA1 (patch-at) = faeec80f8e35546e830873886d00e4332444a29a

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

parallel/mpi-ch/patches/patch-ab

@@ -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    
- #

parallel/mpi-ch/patches/patch-ac

@@ -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

parallel/mpi-ch/patches/patch-ad

@@ -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

parallel/mpi-ch/patches/patch-ae

@@ -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

parallel/mpi-ch/patches/patch-af

@@ -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)

parallel/mpi-ch/patches/patch-ag

@@ -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;

parallel/mpi-ch/patches/patch-ah

@@ -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_

parallel/mpi-ch/patches/patch-ai

@@ -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 ;;

parallel/mpi-ch/patches/patch-aj

@@ -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."

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)
+ 
+ 

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 
+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/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
  
--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
- 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++
- 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
--CopyFile installtest/README $PREFIX/examples
-+CopyFile installtest/README $PREFIX/share/examples/mpi
+ 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 $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
  #

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 @@

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) || \

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) \

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) \

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
+ 

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

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

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
+ 
+ #

parallel/mpi-ch/pkg/PLIST

@@ -1,23 +1,88 @@
-@comment $NetBSD: PLIST,v 1.2 1998/10/20 22:24:22 garbled Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/03/21 15:29:02 wennmach Exp $
 bin/tarch
 bin/tdevice
 bin/mpiman
-bin/upshot
-bin/mpireconfig
-bin/mpirun.args
-bin/mpirun.pg
-bin/mpirun.ch_p4
-bin/tstmachines
 bin/mpirun
+bin/mpirun.args
+bin/mpirun.ch_p4
+bin/mpirun.ch_p4.args
+bin/mpirun.p4shmem
+bin/mpirun.pg
+bin/mpirun.rand
 bin/execer
+bin/mpirun_dbg.dbx
+bin/mpirun_dbg.ddd
+bin/mpireconfig
+bin/mpirun_dbg.gdb
+bin/mpirun_dbg.totalview
+bin/mpirun_dbg.xxgdb
+bin/mpireconfig.dat
 bin/mpicc
 bin/mpif77
-bin/mpif90
 bin/mpiCC
 bin/serv_p4
-bin/server
+bin/mpereconfig
+bin/mpereconfig.dat
+bin/logviewer
+bin/upshot
+etc/mpif77.conf
+etc/mpichlib.conf
+etc/mpichconf.h.dat
+include/mpi2c++/comm.h
+include/mpi2c++/comm_inln.h
+include/mpi2c++/constants.h
+include/mpi2c++/datatype.h
+include/mpi2c++/datatype_inln.h
+include/mpi2c++/errhandler.h
+include/mpi2c++/errhandler_inln.h
+include/mpi2c++/exception.h
+include/mpi2c++/functions.h
+include/mpi2c++/functions_inln.h
+include/mpi2c++/group.h
+include/mpi2c++/group_inln.h
+include/mpi2c++/intercomm.h
+include/mpi2c++/intercomm_inln.h
+include/mpi2c++/intracomm.h
+include/mpi2c++/intracomm_inln.h
+include/mpi2c++/mpi++.h
+include/mpi2c++/mpi2c++_config.h
+include/mpi2c++/mpi2c++_list.h
+include/mpi2c++/mpi2c++_map.h
+include/mpi2c++/op.h
+include/mpi2c++/op_inln.h
+include/mpi2c++/pcomm.h
+include/mpi2c++/pdatatype.h
+include/mpi2c++/perrhandler.h
+include/mpi2c++/pexception.h
+include/mpi2c++/pgroup.h
+include/mpi2c++/pgroup_inln.h
+include/mpi2c++/pintercomm.h
+include/mpi2c++/pintracomm.h
+include/mpi2c++/pmpi++.h
+include/mpi2c++/pop.h
+include/mpi2c++/pop_inln.h
+include/mpi2c++/prequest.h
+include/mpi2c++/prequest_inln.h
+include/mpi2c++/pstatus.h
+include/mpi2c++/pstatus_inln.h
+include/mpi2c++/ptopology.h
+include/mpi2c++/request.h
+include/mpi2c++/request_inln.h
+include/mpi2c++/status.h
+include/mpi2c++/status_inln.h
+include/mpi2c++/topology.h
+include/mpi2c++/topology_inln.h
+include/mpif.h
+include/mpi.h
+include/mpi_errno.h
+include/mpidefs.h
+include/mpi_fortdefs.h
+include/mpio.h
+include/mpiof.h
+man/man1/Jumpshots.1
 man/man1/MPI.1
 man/man1/chp4_servs.1
+man/man1/cleanipcs.1
 man/man1/mpiCC.1
 man/man1/mpicc.1
 man/man1/mpif77.1
@@ -27,7 +92,10 @@ man/man1/mpireconfig.1
 man/man1/mpirun.1
 man/man1/tstmachines.1
 man/man3/Constants.3
-man/man3/MPIR_Init.3
+man/man3/MPIO_Request_c2f.3
+man/man3/MPIO_Request_f2c.3
+man/man3/MPIO_Test.3
+man/man3/MPIO_Wait.3
 man/man3/MPI_2COMPLEX.3
 man/man3/MPI_2DOUBLE_COMPLEX.3
 man/man3/MPI_2DOUBLE_PRECISION.3
@@ -67,9 +135,9 @@ man/man3/MPI_COMM_WORLD.3
 man/man3/MPI_COMPLEX.3
 man/man3/MPI_CONGRUENT.3
 man/man3/MPI_Cancel.3
+man/man3/MPI_Cart_get.3
 man/man3/MPI_Cart_coords.3
 man/man3/MPI_Cart_create.3
-man/man3/MPI_Cart_get.3
 man/man3/MPI_Cart_map.3
 man/man3/MPI_Cart_rank.3
 man/man3/MPI_Cart_shift.3
@@ -86,13 +154,13 @@ man/man3/MPI_Comm_remote_size.3
 man/man3/MPI_Comm_size.3
 man/man3/MPI_Comm_split.3
 man/man3/MPI_Comm_test_inter.3
+man/man3/MPI_DOUBLE.3
 man/man3/MPI_Copy_function.3
 man/man3/MPI_DATATYPE_NULL.3
-man/man3/MPI_DOUBLE.3
-man/man3/MPI_DUP_FN.3
 man/man3/MPI_DOUBLE_COMPLEX.3
 man/man3/MPI_DOUBLE_INT.3
 man/man3/MPI_DOUBLE_PRECISION.3
+man/man3/MPI_DUP_FN.3
 man/man3/MPI_Delete_function.3
 man/man3/MPI_Dims_create.3
 man/man3/MPI_ERRHANDLER_NULL.3
@@ -107,7 +175,6 @@ man/man3/MPI_ERR_COMM.3
 man/man3/MPI_ERR_COMM_INTER.3
 man/man3/MPI_ERR_COMM_INTRA.3
 man/man3/MPI_ERR_COMM_NULL.3
-man/man3/MPI_FLOAT.3
 man/man3/MPI_ERR_COUNT.3
 man/man3/MPI_ERR_DIMS.3
 man/man3/MPI_ERR_ERRORCODE.3
@@ -140,13 +207,70 @@ man/man3/MPI_Errhandler_get.3
 man/man3/MPI_Errhandler_set.3
 man/man3/MPI_Error_class.3
 man/man3/MPI_Error_string.3
+man/man3/MPI_FLOAT.3
 man/man3/MPI_FLOAT_INT.3
+man/man3/MPI_File_c2f.3
+man/man3/MPI_File_f2c.3
+man/man3/MPI_File_close.3
+man/man3/MPI_File_delete.3
+man/man3/MPI_File_get_amode.3
+man/man3/MPI_File_get_atomicity.3
+man/man3/MPI_File_get_byte_offset.3
+man/man3/MPI_File_get_errhandler.3
+man/man3/MPI_File_get_group.3
+man/man3/MPI_File_get_info.3
+man/man3/MPI_File_get_position.3
+man/man3/MPI_File_get_position_shared.3
+man/man3/MPI_File_get_size.3
+man/man3/MPI_File_get_type_extent.3
+man/man3/MPI_File_get_view.3
+man/man3/MPI_File_iread.3
+man/man3/MPI_File_iread_at.3
+man/man3/MPI_GRAPH.3
+man/man3/MPI_File_iread_shared.3
+man/man3/MPI_File_iwrite.3
+man/man3/MPI_File_iwrite_at.3
+man/man3/MPI_File_open.3
+man/man3/MPI_File_iwrite_shared.3
+man/man3/MPI_File_preallocate.3
+man/man3/MPI_File_read.3
+man/man3/MPI_File_read_all.3
+man/man3/MPI_File_read_all_begin.3
+man/man3/MPI_File_read_all_end.3
+man/man3/MPI_File_read_at.3
+man/man3/MPI_File_read_at_all.3
+man/man3/MPI_File_read_at_all_begin.3
+man/man3/MPI_File_read_at_all_end.3
+man/man3/MPI_File_read_ordered.3
+man/man3/MPI_HOST.3
+man/man3/MPI_File_read_ordered_begin.3
+man/man3/MPI_File_read_ordered_end.3
+man/man3/MPI_File_read_shared.3
+man/man3/MPI_File_seek.3
+man/man3/MPI_File_seek_shared.3
+man/man3/MPI_File_set_atomicity.3
+man/man3/MPI_File_set_errhandler.3
+man/man3/MPI_File_set_info.3
+man/man3/MPI_File_set_size.3
+man/man3/MPI_File_set_view.3
+man/man3/MPI_File_sync.3
+man/man3/MPI_File_write.3
+man/man3/MPI_File_write_all.3
+man/man3/MPI_File_write_all_begin.3
+man/man3/MPI_File_write_all_end.3
+man/man3/MPI_File_write_at.3
+man/man3/MPI_File_write_at_all.3
+man/man3/MPI_File_write_at_all_begin.3
+man/man3/MPI_File_write_at_all_end.3
+man/man3/MPI_File_write_ordered.3
+man/man3/MPI_File_write_ordered_begin.3
+man/man3/MPI_File_write_ordered_end.3
+man/man3/MPI_File_write_shared.3
 man/man3/MPI_Finalize.3
 man/man3/MPI_Finalized.3
-man/man3/MPI_GRAPH.3
 man/man3/MPI_GROUP_EMPTY.3
-man/man3/MPI_Gather.3
 man/man3/MPI_GROUP_NULL.3
+man/man3/MPI_Gather.3
 man/man3/MPI_Gatherv.3
 man/man3/MPI_Get_count.3
 man/man3/MPI_Get_elements.3
@@ -163,14 +287,13 @@ man/man3/MPI_Group_difference.3
 man/man3/MPI_Group_excl.3
 man/man3/MPI_Group_free.3
 man/man3/MPI_Group_incl.3
-man/man3/MPI_Group_rank.3
 man/man3/MPI_Group_intersection.3
 man/man3/MPI_Group_range_excl.3
 man/man3/MPI_Group_range_incl.3
+man/man3/MPI_Group_rank.3
 man/man3/MPI_Group_size.3
 man/man3/MPI_Group_translate_ranks.3
 man/man3/MPI_Group_union.3
-man/man3/MPI_HOST.3
 man/man3/MPI_Handler_function.3
 man/man3/MPI_IDENT.3
 man/man3/MPI_INT.3
@@ -188,10 +311,11 @@ man/man3/MPI_Info_f2c.3
 man/man3/MPI_Info_free.3
 man/man3/MPI_Info_get.3
 man/man3/MPI_Info_get_nkeys.3
+man/man3/MPI_Info_set.3
 man/man3/MPI_Info_get_nthkey.3
 man/man3/MPI_Info_get_valuelen.3
-man/man3/MPI_Info_set.3
 man/man3/MPI_Init.3
+man/man3/MPI_Init_thread.3
 man/man3/MPI_Initialized.3
 man/man3/MPI_Int2handle.3
 man/man3/MPI_Intercomm_create.3
@@ -243,13 +367,13 @@ man/man3/MPI_Reduce_scatter.3
 man/man3/MPI_Request_c2f.3
 man/man3/MPI_Request_free.3
 man/man3/MPI_Rsend.3
-man/man3/MPI_SHORT.3
 man/man3/MPI_Rsend_init.3
+man/man3/MPI_SHORT.3
 man/man3/MPI_SHORT_INT.3
 man/man3/MPI_SIMILAR.3
 man/man3/MPI_SOURCE.3
-man/man3/MPI_SUCCESS.3
 man/man3/MPI_SUM.3
+man/man3/MPI_SUCCESS.3
 man/man3/MPI_Scan.3
 man/man3/MPI_Scatter.3
 man/man3/MPI_Scatterv.3
@@ -262,7 +386,8 @@ man/man3/MPI_Ssend_init.3
 man/man3/MPI_Start.3
 man/man3/MPI_Startall.3
 man/man3/MPI_Status_c2f.3
-man/man3/MPI_Status_f2c.3
+man/man3/MPI_Status_set_cancelled.3
+man/man3/MPI_Status_set_elements.3
 man/man3/MPI_TAG.3
 man/man3/MPI_TAG_UB.3
 man/man3/MPI_Test.3
@@ -273,7 +398,6 @@ man/man3/MPI_Testsome.3
 man/man3/MPI_Topo_test.3
 man/man3/MPI_Type_commit.3
 man/man3/MPI_Type_contiguous.3
-man/man3/MPI_Type_count.3
 man/man3/MPI_Type_create_darray.3
 man/man3/MPI_Type_create_indexed_block.3
 man/man3/MPI_Type_create_subarray.3
@@ -282,7 +406,6 @@ man/man3/MPI_Type_free.3
 man/man3/MPI_Type_get_contents.3
 man/man3/MPI_Type_get_envelope.3
 man/man3/MPI_Type_hindexed.3
-man/man3/MPI_UB.3
 man/man3/MPI_Type_hvector.3
 man/man3/MPI_Type_indexed.3
 man/man3/MPI_Type_lb.3
@@ -290,6 +413,7 @@ man/man3/MPI_Type_size.3
 man/man3/MPI_Type_struct.3
 man/man3/MPI_Type_ub.3
 man/man3/MPI_Type_vector.3
+man/man3/MPI_UB.3
 man/man3/MPI_UNDEFINED.3
 man/man3/MPI_UNDEFINED_RANK.3
 man/man3/MPI_UNEQUAL.3
@@ -306,43 +430,6 @@ man/man3/MPI_Waitany.3
 man/man3/MPI_Waitsome.3
 man/man3/MPI_Wtick.3
 man/man3/MPI_Wtime.3
-man/man3/MPIO_Request_c2f.3
-man/man3/MPIO_Request_f2c.3
-man/man3/MPIO_Test.3
-man/man3/MPIO_Wait.3
-man/man3/MPI_File_c2f.3
-man/man3/MPI_File_close.3
-man/man3/MPI_File_delete.3
-man/man3/MPI_File_f2c.3
-man/man3/MPI_File_get_amode.3
-man/man3/MPI_File_get_atomicity.3
-man/man3/MPI_File_get_byte_offset.3
-man/man3/MPI_File_get_group.3
-man/man3/MPI_File_get_info.3
-man/man3/MPI_File_get_position.3
-man/man3/MPI_File_get_size.3
-man/man3/MPI_File_get_type_extent.3
-man/man3/MPI_File_get_view.3
-man/man3/MPI_File_iread.3
-man/man3/MPI_File_iread_at.3
-man/man3/MPI_File_iwrite.3
-man/man3/MPI_File_iwrite_at.3
-man/man3/MPI_File_open.3
-man/man3/MPI_File_preallocate.3
-man/man3/MPI_File_read.3
-man/man3/MPI_File_read_all.3
-man/man3/MPI_File_read_at.3
-man/man3/MPI_File_read_at_all.3
-man/man3/MPI_File_seek.3
-man/man3/MPI_File_set_atomicity.3
-man/man3/MPI_File_set_info.3
-man/man3/MPI_File_set_size.3
-man/man3/MPI_File_set_view.3
-man/man3/MPI_File_sync.3
-man/man3/MPI_File_write.3
-man/man3/MPI_File_write_all.3
-man/man3/MPI_File_write_at.3
-man/man3/MPI_File_write_at_all.3
 man/man4/CLOG_Finalize.4
 man/man4/CLOG_Init.4
 man/man4/CLOG_Output.4
@@ -351,14 +438,18 @@ man/man4/CLOG_cput.4
 man/man4/CLOG_csync.4
 man/man4/CLOG_get_new_event.4
 man/man4/CLOG_get_new_state.4
+man/man4/CLOG_init_buffers.4
 man/man4/CLOG_mergelogs.4
 man/man4/CLOG_mergend.4
 man/man4/CLOG_msgtype.4
 man/man4/CLOG_newbuff.4
+man/man4/CLOG_nodebuffer2disk.4
 man/man4/CLOG_procbuf.4
 man/man4/CLOG_reclen.4
 man/man4/CLOG_rectype.4
+man/man4/CLOG_reinit_buff.4
 man/man4/CLOG_treesetup.4
+man/man4/MPE.4
 man/man4/MPE_Add_RGB_color.4
 man/man4/MPE_CaptureFile.4
 man/man4/MPE_Close_graphics.4
@@ -375,7 +466,6 @@ man/man4/MPE_Draw_logic.4
 man/man4/MPE_Draw_point.4
 man/man4/MPE_Draw_points.4
 man/man4/MPE_Draw_string.4
-man/man4/MPE_Errors_call_debugger.4
 man/man4/MPE_Fill_circle.4
 man/man4/MPE_Fill_rectangle.4
 man/man4/MPE_Finish_log.4
@@ -384,6 +474,7 @@ man/man4/MPE_Get_mouse_press.4
 man/man4/MPE_IO_Stdout_to_file.4
 man/man4/MPE_Iget_mouse_press.4
 man/man4/MPE_Init_log.4
+man/man4/MPE_Initialized_logging.4
 man/man4/MPE_Line_thickness.4
 man/man4/MPE_Log_event.4
 man/man4/MPE_Log_get_event_number.4
@@ -394,154 +485,378 @@ man/man4/MPE_Num_colors.4
 man/man4/MPE_Open_graphics.4
 man/man4/MPE_Print_datatype_pack_action.4
 man/man4/MPE_Print_datatype_unpack_action.4
-man/man4/MPE_Ptime.4
 man/man4/MPE_ReturnTags.4
 man/man4/MPE_Seq_begin.4
 man/man4/MPE_Seq_end.4
-man/man4/MPE_Signals_call_debugger.4
 man/man4/MPE_Start_log.4
 man/man4/MPE_Stop_log.4
 man/man4/MPE_TagsEnd.4
 man/man4/MPE_Update.4
-man/man4/MPE_Wtime.4
-libdata/netbsd/ch_p4/c++/comm.h
-libdata/netbsd/ch_p4/c++/comm_inln.h
-libdata/netbsd/ch_p4/c++/config.h
-libdata/netbsd/ch_p4/c++/constants.h
-libdata/netbsd/ch_p4/c++/datatype.h
-libdata/netbsd/ch_p4/c++/datatype_inln.h
-libdata/netbsd/ch_p4/c++/errhandler.h
-libdata/netbsd/ch_p4/c++/errhandler_inln.h
-libdata/netbsd/ch_p4/c++/exception.h
-libdata/netbsd/ch_p4/c++/functions.h
-libdata/netbsd/ch_p4/c++/functions_inln.h
-libdata/netbsd/ch_p4/c++/group.h
-libdata/netbsd/ch_p4/c++/group_inln.h
-libdata/netbsd/ch_p4/c++/header.h
-libdata/netbsd/ch_p4/c++/intercomm.h
-libdata/netbsd/ch_p4/c++/intercomm_inln.h
-libdata/netbsd/ch_p4/c++/intracomm.h
-libdata/netbsd/ch_p4/c++/intracomm_inln.h
-libdata/netbsd/ch_p4/c++/list.h
-libdata/netbsd/ch_p4/c++/map.h
-libdata/netbsd/ch_p4/c++/mpi++.h
-libdata/netbsd/ch_p4/c++/op.h
-libdata/netbsd/ch_p4/c++/op_inln.h
-libdata/netbsd/ch_p4/c++/pcomm.h
-libdata/netbsd/ch_p4/c++/pdatatype.h
-libdata/netbsd/ch_p4/c++/perrhandler.h
-libdata/netbsd/ch_p4/c++/pexception.h
-libdata/netbsd/ch_p4/c++/pgroup.h
-libdata/netbsd/ch_p4/c++/pgroup_inln.h
-libdata/netbsd/ch_p4/c++/pintercomm.h
-libdata/netbsd/ch_p4/c++/pintracomm.h
-libdata/netbsd/ch_p4/c++/pmpi++.h
-libdata/netbsd/ch_p4/c++/pop.h
-libdata/netbsd/ch_p4/c++/pop_inln.h
-libdata/netbsd/ch_p4/c++/prequest.h
-libdata/netbsd/ch_p4/c++/prequest_inln.h
-libdata/netbsd/ch_p4/c++/pstatus.h
-libdata/netbsd/ch_p4/c++/pstatus_inln.h
-libdata/netbsd/ch_p4/c++/ptopology.h
-libdata/netbsd/ch_p4/c++/request.h
-libdata/netbsd/ch_p4/c++/request_inln.h
-libdata/netbsd/ch_p4/c++/status.h
-libdata/netbsd/ch_p4/c++/status_inln.h
-libdata/netbsd/ch_p4/c++/topology.h
-libdata/netbsd/ch_p4/c++/topology_inln.h
-libdata/netbsd/ch_p4/mpiman
-libdata/netbsd/ch_p4/tarch
-libdata/netbsd/ch_p4/mpirun.args
-libdata/netbsd/ch_p4/mpirun.pg
-libdata/netbsd/ch_p4/mpirun.ch_p4
-libdata/netbsd/ch_p4/tstmachines
-libdata/netbsd/ch_p4/mpirun
-libdata/netbsd/ch_p4/mpireconfig
-libdata/netbsd/ch_p4/mpicc
-libdata/netbsd/ch_p4/mpif77
-libdata/netbsd/ch_p4/mpif90
-libdata/netbsd/ch_p4/mpiCC
-libdata/netbsd/ch_p4/serv_p4
-libdata/netbsd/ch_p4/chp4_servs
-libdata/netbsd/ch_p4/chkserv
-libdata/netbsd/ch_p4/server
-libdata/netbsd/ch_p4/mpichconf.h
-libdata/netbsd/ch_p4/mpidefs.h
-libdata/netbsd/ch_p4/mpio.h
-libdata/netbsd/ch_p4/mpiof.h
-libdata/netbsd/ch_p4/config.status
-libdata/netbsd/ch_p4/Makefile.sample
-libdata/netbsd/ch_p4/libampi.a
-libdata/netbsd/ch_p4/libfmpich.a
-libdata/netbsd/ch_p4/libmpe.a
-libdata/netbsd/ch_p4/libmpe_nompi.a
-libdata/netbsd/ch_p4/libmpich++.a
-libdata/netbsd/ch_p4/libmpich.a
-libdata/netbsd/ch_p4/libpmpich.a
-libdata/netbsd/ch_p4/libtmpi.a
-libdata/netbsd/ch_p4/liblmpi.a
-libdata/netbsd/mpich.En_US.cat
-libdata/netbsd/mpich.cat
-libdata/bitmaps/2x2
-libdata/bitmaps/black
-libdata/bitmaps/boxes
-libdata/bitmaps/dimple3
-libdata/bitmaps/dllines3
-libdata/bitmaps/dllines4
-libdata/bitmaps/drlines3
-libdata/bitmaps/drlines4
-libdata/bitmaps/gray
-libdata/bitmaps/gray2
-libdata/bitmaps/gray3
-libdata/bitmaps/hlines2
-libdata/bitmaps/hlines3
-libdata/bitmaps/hlines4
-libdata/bitmaps/light_gray
-libdata/bitmaps/vlines2
-libdata/bitmaps/vlines3
-libdata/bitmaps/vlines4
-libdata/bitmaps/white
-share/examples/mpi/mpif.h
-share/examples/mpi/Makefile.in
-share/examples/mpi/Makefile
-share/examples/mpi/cpi.c
-share/examples/mpi/pi3.f
-share/examples/mpi/cpilog.c
-share/examples/mpi/hello++.cc
-share/examples/mpi/simpleio.c
-share/examples/mpi/README
-share/examples/mpi/mpirun
+sbin/mpiuninstall
+sbin/tstmachines
+sbin/chp4_servs
+sbin/chkserv
+sbin/cleanipcs
+sbin/mpiuninstall.not
+share/doc/mpi-ch/guide.ps.gz
+share/doc/mpi-ch/install.ps.gz
+share/doc/html/mpi-ch/index.html
+share/doc/html/mpi-ch/www1/Jumpshots.html
+share/doc/html/mpi-ch/www1/MPI.html
+share/doc/html/mpi-ch/www1/chp4_servs.html
+share/doc/html/mpi-ch/www1/cleanipcs.html
+share/doc/html/mpi-ch/www1/index.html
+share/doc/html/mpi-ch/www1/mpiCC.html
+share/doc/html/mpi-ch/www1/mpicc.html
+share/doc/html/mpi-ch/www1/mpif77.html
+share/doc/html/mpi-ch/www1/mpif90.html
+share/doc/html/mpi-ch/www1/mpiman.html
+share/doc/html/mpi-ch/www1/mpireconfig.html
+share/doc/html/mpi-ch/www1/mpirun.html
+share/doc/html/mpi-ch/www1/tstmachines.html
+share/doc/html/mpi-ch/www3/Constants.html
+share/doc/html/mpi-ch/www3/MPIO_Request_c2f.html
+share/doc/html/mpi-ch/www3/MPIO_Request_f2c.html
+share/doc/html/mpi-ch/www3/MPIO_Test.html
+share/doc/html/mpi-ch/www3/MPIO_Wait.html
+share/doc/html/mpi-ch/www3/MPI_Abort.html
+share/doc/html/mpi-ch/www3/MPI_Address.html
+share/doc/html/mpi-ch/www3/MPI_Allgather.html
+share/doc/html/mpi-ch/www3/MPI_Allgatherv.html
+share/doc/html/mpi-ch/www3/MPI_Allreduce.html
+share/doc/html/mpi-ch/www3/MPI_Alltoall.html
+share/doc/html/mpi-ch/www3/MPI_Alltoallv.html
+share/doc/html/mpi-ch/www3/MPI_Attr_delete.html
+share/doc/html/mpi-ch/www3/MPI_Attr_get.html
+share/doc/html/mpi-ch/www3/MPI_Attr_put.html
+share/doc/html/mpi-ch/www3/MPI_Barrier.html
+share/doc/html/mpi-ch/www3/MPI_Bcast.html
+share/doc/html/mpi-ch/www3/index.html
+share/doc/html/mpi-ch/www3/MPI_Bsend.html
+share/doc/html/mpi-ch/www3/MPI_Bsend_init.html
+share/doc/html/mpi-ch/www3/MPI_Buffer_attach.html
+share/doc/html/mpi-ch/www3/MPI_Buffer_detach.html
+share/doc/html/mpi-ch/www3/MPI_CHAR.html
+share/doc/html/mpi-ch/www3/MPI_Cancel.html
+share/doc/html/mpi-ch/www3/MPI_Cart_coords.html
+share/doc/html/mpi-ch/www3/MPI_Cart_create.html
+share/doc/html/mpi-ch/www3/MPI_Cart_get.html
+share/doc/html/mpi-ch/www3/MPI_Cart_map.html
+share/doc/html/mpi-ch/www3/MPI_Cart_rank.html
+share/doc/html/mpi-ch/www3/MPI_Cart_shift.html
+share/doc/html/mpi-ch/www3/MPI_Cart_sub.html
+share/doc/html/mpi-ch/www3/MPI_Cartdim_get.html
+share/doc/html/mpi-ch/www3/MPI_Comm_compare.html
+share/doc/html/mpi-ch/www3/MPI_Comm_create.html
+share/doc/html/mpi-ch/www3/MPI_Comm_dup.html
+share/doc/html/mpi-ch/www3/MPI_Comm_free.html
+share/doc/html/mpi-ch/www3/MPI_Comm_group.html
+share/doc/html/mpi-ch/www3/MPI_Comm_rank.html
+share/doc/html/mpi-ch/www3/MPI_Comm_remote_group.html
+share/doc/html/mpi-ch/www3/MPI_Comm_remote_size.html
+share/doc/html/mpi-ch/www3/MPI_Comm_size.html
+share/doc/html/mpi-ch/www3/MPI_Comm_split.html
+share/doc/html/mpi-ch/www3/MPI_Comm_test_inter.html
+share/doc/html/mpi-ch/www3/MPI_DUP_FN.html
+share/doc/html/mpi-ch/www3/MPI_Dims_create.html
+share/doc/html/mpi-ch/www3/MPI_Errhandler_create.html
+share/doc/html/mpi-ch/www3/MPI_Errhandler_free.html
+share/doc/html/mpi-ch/www3/MPI_Errhandler_get.html
+share/doc/html/mpi-ch/www3/MPI_Errhandler_set.html
+share/doc/html/mpi-ch/www3/MPI_Error_class.html
+share/doc/html/mpi-ch/www3/MPI_Error_string.html
+share/doc/html/mpi-ch/www3/MPI_File_c2f.html
+share/doc/html/mpi-ch/www3/MPI_File_close.html
+share/doc/html/mpi-ch/www3/MPI_File_delete.html
+share/doc/html/mpi-ch/www3/MPI_File_f2c.html
+share/doc/html/mpi-ch/www3/MPI_File_get_amode.html
+share/doc/html/mpi-ch/www3/MPI_File_get_atomicity.html
+share/doc/html/mpi-ch/www3/MPI_File_get_byte_offset.html
+share/doc/html/mpi-ch/www3/MPI_File_get_errhandler.html
+share/doc/html/mpi-ch/www3/MPI_File_get_group.html
+share/doc/html/mpi-ch/www3/MPI_File_get_info.html
+share/doc/html/mpi-ch/www3/MPI_File_get_position.html
+share/doc/html/mpi-ch/www3/MPI_File_get_position_shared.html
+share/doc/html/mpi-ch/www3/MPI_File_get_size.html
+share/doc/html/mpi-ch/www3/MPI_File_get_type_extent.html
+share/doc/html/mpi-ch/www3/MPI_File_get_view.html
+share/doc/html/mpi-ch/www3/MPI_File_iread.html
+share/doc/html/mpi-ch/www3/MPI_File_iread_at.html
+share/doc/html/mpi-ch/www3/MPI_File_iread_shared.html
+share/doc/html/mpi-ch/www3/MPI_File_iwrite.html
+share/doc/html/mpi-ch/www3/MPI_File_iwrite_at.html
+share/doc/html/mpi-ch/www3/MPI_File_iwrite_shared.html
+share/doc/html/mpi-ch/www3/MPI_File_open.html
+share/doc/html/mpi-ch/www3/MPI_File_preallocate.html
+share/doc/html/mpi-ch/www3/MPI_File_read.html
+share/doc/html/mpi-ch/www3/MPI_File_read_all.html
+share/doc/html/mpi-ch/www3/MPI_File_read_all_begin.html
+share/doc/html/mpi-ch/www3/MPI_File_read_all_end.html
+share/doc/html/mpi-ch/www3/MPI_File_read_at.html
+share/doc/html/mpi-ch/www3/MPI_File_read_at_all.html
+share/doc/html/mpi-ch/www3/MPI_File_read_at_all_begin.html
+share/doc/html/mpi-ch/www3/MPI_File_read_at_all_end.html
+share/doc/html/mpi-ch/www3/MPI_File_read_ordered.html
+share/doc/html/mpi-ch/www3/MPI_File_read_ordered_begin.html
+share/doc/html/mpi-ch/www3/MPI_File_read_ordered_end.html
+share/doc/html/mpi-ch/www3/MPI_File_read_shared.html
+share/doc/html/mpi-ch/www3/MPI_File_seek.html
+share/doc/html/mpi-ch/www3/MPI_File_seek_shared.html
+share/doc/html/mpi-ch/www3/MPI_File_set_atomicity.html
+share/doc/html/mpi-ch/www3/MPI_File_set_errhandler.html
+share/doc/html/mpi-ch/www3/MPI_File_set_info.html
+share/doc/html/mpi-ch/www3/MPI_File_set_size.html
+share/doc/html/mpi-ch/www3/MPI_File_set_view.html
+share/doc/html/mpi-ch/www3/MPI_File_sync.html
+share/doc/html/mpi-ch/www3/MPI_File_write.html
+share/doc/html/mpi-ch/www3/MPI_Gather.html
+share/doc/html/mpi-ch/www3/MPI_File_write_all.html
+share/doc/html/mpi-ch/www3/MPI_File_write_all_begin.html
+share/doc/html/mpi-ch/www3/MPI_File_write_all_end.html
+share/doc/html/mpi-ch/www3/MPI_File_write_at.html
+share/doc/html/mpi-ch/www3/MPI_File_write_at_all.html
+share/doc/html/mpi-ch/www3/MPI_File_write_at_all_begin.html
+share/doc/html/mpi-ch/www3/MPI_File_write_at_all_end.html
+share/doc/html/mpi-ch/www3/MPI_File_write_ordered.html
+share/doc/html/mpi-ch/www3/MPI_File_write_ordered_begin.html
+share/doc/html/mpi-ch/www3/MPI_File_write_ordered_end.html
+share/doc/html/mpi-ch/www3/MPI_File_write_shared.html
+share/doc/html/mpi-ch/www3/MPI_Finalize.html
+share/doc/html/mpi-ch/www3/MPI_Finalized.html
+share/doc/html/mpi-ch/www3/MPI_Gatherv.html
+share/doc/html/mpi-ch/www3/MPI_Get_count.html
+share/doc/html/mpi-ch/www3/MPI_Get_elements.html
+share/doc/html/mpi-ch/www3/MPI_Get_processor_name.html
+share/doc/html/mpi-ch/www3/MPI_Get_version.html
+share/doc/html/mpi-ch/www3/MPI_Graph_create.html
+share/doc/html/mpi-ch/www3/MPI_Graph_get.html
+share/doc/html/mpi-ch/www3/MPI_Graph_map.html
+share/doc/html/mpi-ch/www3/MPI_Graph_neighbors.html
+share/doc/html/mpi-ch/www3/MPI_Graph_neighbors_count.html
+share/doc/html/mpi-ch/www3/MPI_Graphdims_get.html
+share/doc/html/mpi-ch/www3/MPI_Group_compare.html
+share/doc/html/mpi-ch/www3/MPI_Group_difference.html
+share/doc/html/mpi-ch/www3/MPI_Group_excl.html
+share/doc/html/mpi-ch/www3/MPI_Group_free.html
+share/doc/html/mpi-ch/www3/MPI_Group_incl.html
+share/doc/html/mpi-ch/www3/MPI_Group_intersection.html
+share/doc/html/mpi-ch/www3/MPI_Group_range_excl.html
+share/doc/html/mpi-ch/www3/MPI_Group_range_incl.html
+share/doc/html/mpi-ch/www3/MPI_Group_rank.html
+share/doc/html/mpi-ch/www3/MPI_Group_size.html
+share/doc/html/mpi-ch/www3/MPI_Group_translate_ranks.html
+share/doc/html/mpi-ch/www3/MPI_Group_union.html
+share/doc/html/mpi-ch/www3/MPI_Ibsend.html
+share/doc/html/mpi-ch/www3/MPI_Info_c2f.html
+share/doc/html/mpi-ch/www3/MPI_Info_create.html
+share/doc/html/mpi-ch/www3/MPI_Info_delete.html
+share/doc/html/mpi-ch/www3/MPI_Info_dup.html
+share/doc/html/mpi-ch/www3/MPI_Info_f2c.html
+share/doc/html/mpi-ch/www3/MPI_Info_free.html
+share/doc/html/mpi-ch/www3/MPI_Info_get.html
+share/doc/html/mpi-ch/www3/MPI_Info_get_nkeys.html
+share/doc/html/mpi-ch/www3/MPI_Info_get_nthkey.html
+share/doc/html/mpi-ch/www3/MPI_Info_get_valuelen.html
+share/doc/html/mpi-ch/www3/MPI_Info_set.html
+share/doc/html/mpi-ch/www3/MPI_Init.html
+share/doc/html/mpi-ch/www3/MPI_Init_thread.html
+share/doc/html/mpi-ch/www3/MPI_Initialized.html
+share/doc/html/mpi-ch/www3/MPI_Int2handle.html
+share/doc/html/mpi-ch/www3/MPI_Intercomm_create.html
+share/doc/html/mpi-ch/www3/MPI_Intercomm_merge.html
+share/doc/html/mpi-ch/www3/MPI_Iprobe.html
+share/doc/html/mpi-ch/www3/MPI_Irecv.html
+share/doc/html/mpi-ch/www3/MPI_Irsend.html
+share/doc/html/mpi-ch/www3/MPI_Isend.html
+share/doc/html/mpi-ch/www3/MPI_Issend.html
+share/doc/html/mpi-ch/www3/MPI_Keyval_create.html
+share/doc/html/mpi-ch/www3/MPI_Keyval_free.html
+share/doc/html/mpi-ch/www3/MPI_NULL_COPY_FN.html
+share/doc/html/mpi-ch/www3/MPI_NULL_DELETE_FN.html
+share/doc/html/mpi-ch/www3/MPI_Op_create.html
+share/doc/html/mpi-ch/www3/MPI_Op_free.html
+share/doc/html/mpi-ch/www3/MPI_Pack.html
+share/doc/html/mpi-ch/www3/MPI_Pack_size.html
+share/doc/html/mpi-ch/www3/MPI_Pcontrol.html
+share/doc/html/mpi-ch/www3/MPI_Probe.html
+share/doc/html/mpi-ch/www3/MPI_Recv.html
+share/doc/html/mpi-ch/www3/MPI_Recv_init.html
+share/doc/html/mpi-ch/www3/MPI_Reduce.html
+share/doc/html/mpi-ch/www3/MPI_Reduce_scatter.html
+share/doc/html/mpi-ch/www3/MPI_Request_c2f.html
+share/doc/html/mpi-ch/www3/MPI_Request_free.html
+share/doc/html/mpi-ch/www3/MPI_Rsend.html
+share/doc/html/mpi-ch/www3/MPI_Rsend_init.html
+share/doc/html/mpi-ch/www3/MPI_Scan.html
+share/doc/html/mpi-ch/www3/MPI_Scatter.html
+share/doc/html/mpi-ch/www3/MPI_Scatterv.html
+share/doc/html/mpi-ch/www3/MPI_Send.html
+share/doc/html/mpi-ch/www3/MPI_Ssend.html
+share/doc/html/mpi-ch/www3/MPI_Send_init.html
+share/doc/html/mpi-ch/www3/MPI_Sendrecv.html
+share/doc/html/mpi-ch/www3/MPI_Sendrecv_replace.html
+share/doc/html/mpi-ch/www3/MPI_Ssend_init.html
+share/doc/html/mpi-ch/www3/MPI_Start.html
+share/doc/html/mpi-ch/www3/MPI_Startall.html
+share/doc/html/mpi-ch/www3/MPI_Status_c2f.html
+share/doc/html/mpi-ch/www3/MPI_Status_set_cancelled.html
+share/doc/html/mpi-ch/www3/MPI_Status_set_elements.html
+share/doc/html/mpi-ch/www3/MPI_Test.html
+share/doc/html/mpi-ch/www3/MPI_Test_cancelled.html
+share/doc/html/mpi-ch/www3/MPI_Testall.html
+share/doc/html/mpi-ch/www3/MPI_Testany.html
+share/doc/html/mpi-ch/www3/MPI_Testsome.html
+share/doc/html/mpi-ch/www3/MPI_Topo_test.html
+share/doc/html/mpi-ch/www3/MPI_Type_commit.html
+share/doc/html/mpi-ch/www3/MPI_Type_extent.html
+share/doc/html/mpi-ch/www3/MPI_Type_contiguous.html
+share/doc/html/mpi-ch/www3/MPI_Type_create_darray.html
+share/doc/html/mpi-ch/www3/MPI_Type_create_indexed_block.html
+share/doc/html/mpi-ch/www3/MPI_Type_create_subarray.html
+share/doc/html/mpi-ch/www3/MPI_Type_free.html
+share/doc/html/mpi-ch/www3/MPI_Type_get_contents.html
+share/doc/html/mpi-ch/www3/MPI_Type_get_envelope.html
+share/doc/html/mpi-ch/www3/MPI_Type_hindexed.html
+share/doc/html/mpi-ch/www3/MPI_Type_hvector.html
+share/doc/html/mpi-ch/www3/MPI_Type_indexed.html
+share/doc/html/mpi-ch/www3/MPI_Type_lb.html
+share/doc/html/mpi-ch/www3/MPI_Type_size.html
+share/doc/html/mpi-ch/www3/MPI_Type_struct.html
+share/doc/html/mpi-ch/www3/MPI_Type_ub.html
+share/doc/html/mpi-ch/www3/MPI_Type_vector.html
+share/doc/html/mpi-ch/www3/MPI_Unpack.html
+share/doc/html/mpi-ch/www3/MPI_Wait.html
+share/doc/html/mpi-ch/www3/MPI_Waitall.html
+share/doc/html/mpi-ch/www3/MPI_Waitany.html
+share/doc/html/mpi-ch/www3/MPI_Waitsome.html
+share/doc/html/mpi-ch/www3/MPI_Wtick.html
+share/doc/html/mpi-ch/www3/MPI_Wtime.html
+share/doc/html/mpi-ch/www4/CLOG_Finalize.html
+share/doc/html/mpi-ch/www4/CLOG_Init.html
+share/doc/html/mpi-ch/www4/CLOG_Output.html
+share/doc/html/mpi-ch/www4/CLOG_commtype.html
+share/doc/html/mpi-ch/www4/CLOG_cput.html
+share/doc/html/mpi-ch/www4/CLOG_csync.html
+share/doc/html/mpi-ch/www4/CLOG_get_new_event.html
+share/doc/html/mpi-ch/www4/CLOG_get_new_state.html
+share/doc/html/mpi-ch/www4/CLOG_init_buffers.html
+share/doc/html/mpi-ch/www4/CLOG_mergelogs.html
+share/doc/html/mpi-ch/www4/CLOG_mergend.html
+share/doc/html/mpi-ch/www4/CLOG_msgtype.html
+share/doc/html/mpi-ch/www4/CLOG_newbuff.html
+share/doc/html/mpi-ch/www4/CLOG_nodebuffer2disk.html
+share/doc/html/mpi-ch/www4/CLOG_procbuf.html
+share/doc/html/mpi-ch/www4/CLOG_reclen.html
+share/doc/html/mpi-ch/www4/CLOG_rectype.html
+share/doc/html/mpi-ch/www4/CLOG_reinit_buff.html
+share/doc/html/mpi-ch/www4/CLOG_treesetup.html
+share/doc/html/mpi-ch/www4/MPE.html
+share/doc/html/mpi-ch/www4/MPE_Add_RGB_color.html
+share/doc/html/mpi-ch/www4/MPE_CaptureFile.html
+share/doc/html/mpi-ch/www4/MPE_Close_graphics.html
+share/doc/html/mpi-ch/www4/MPE_Comm_global_rank.html
+share/doc/html/mpi-ch/www4/MPE_Counter_create.html
+share/doc/html/mpi-ch/www4/MPE_Counter_free.html
+share/doc/html/mpi-ch/www4/MPE_Counter_nxtval.html
+share/doc/html/mpi-ch/www4/MPE_Decomp1d.html
+share/doc/html/mpi-ch/www4/MPE_Describe_event.html
+share/doc/html/mpi-ch/www4/MPE_Describe_state.html
+share/doc/html/mpi-ch/www4/MPE_Draw_circle.html
+share/doc/html/mpi-ch/www4/MPE_Draw_line.html
+share/doc/html/mpi-ch/www4/MPE_Draw_logic.html
+share/doc/html/mpi-ch/www4/MPE_Update.html
+share/doc/html/mpi-ch/www4/MPE_Draw_point.html
+share/doc/html/mpi-ch/www4/MPE_Draw_points.html
+share/doc/html/mpi-ch/www4/MPE_Draw_string.html
+share/doc/html/mpi-ch/www4/MPE_Fill_circle.html
+share/doc/html/mpi-ch/www4/MPE_Fill_rectangle.html
+share/doc/html/mpi-ch/www4/MPE_Finish_log.html
+share/doc/html/mpi-ch/www4/MPE_GetTags.html
+share/doc/html/mpi-ch/www4/MPE_Get_mouse_press.html
+share/doc/html/mpi-ch/www4/MPE_IO_Stdout_to_file.html
+share/doc/html/mpi-ch/www4/MPE_Iget_mouse_press.html
+share/doc/html/mpi-ch/www4/MPE_Init_log.html
+share/doc/html/mpi-ch/www4/MPE_Initialized_logging.html
+share/doc/html/mpi-ch/www4/MPE_Line_thickness.html
+share/doc/html/mpi-ch/www4/MPE_Log_event.html
+share/doc/html/mpi-ch/www4/MPE_Log_get_event_number.html
+share/doc/html/mpi-ch/www4/index.html
+share/doc/html/mpi-ch/www4/MPE_Log_receive.html
+share/doc/html/mpi-ch/www4/MPE_Log_send.html
+share/doc/html/mpi-ch/www4/MPE_Make_color_array.html
+share/doc/html/mpi-ch/www4/MPE_Num_colors.html
+share/doc/html/mpi-ch/www4/MPE_Open_graphics.html
+share/doc/html/mpi-ch/www4/MPE_Print_datatype_pack_action.html
+share/doc/html/mpi-ch/www4/MPE_Print_datatype_unpack_action.html
+share/doc/html/mpi-ch/www4/MPE_ReturnTags.html
+share/doc/html/mpi-ch/www4/MPE_Seq_begin.html
+share/doc/html/mpi-ch/www4/MPE_Seq_end.html
+share/doc/html/mpi-ch/www4/MPE_Start_log.html
+share/doc/html/mpi-ch/www4/MPE_Stop_log.html
+share/doc/html/mpi-ch/www4/MPE_TagsEnd.html
+share/examples/mpi-ch/MPI-2-C++/Makefile.in
+share/examples/mpi-ch/MPI-2-C++/Makefile
+share/examples/mpi-ch/MPI-2-C++/hello_world.cc
+share/examples/mpi-ch/MPI-2-C++/ring.cc
+share/examples/mpi-ch/MPI-2-C++/topology.cc
+share/examples/mpi-ch/MPI-2-C++/user_bcast.cc
+share/examples/mpi-ch/MPI-2-C++/chapter_10_mpi2.cc
+share/examples/mpi-ch/MPI-2-C++/pi.cc
+share/examples/mpi-ch/MPI-2-C++/README
+share/examples/mpi-ch/MPI-2-C++/mpirun
+share/examples/mpi-ch/mpe/Makefile
+share/examples/mpi-ch/mpe/Makefile.in
+share/examples/mpi-ch/mpe/cpi.c
+share/examples/mpi-ch/mpe/cpilog.c
+share/examples/mpi-ch/mpe/fpi.f
+share/examples/mpi-ch/mpe/mpirun
+share/examples/mpi-ch/mpe/srtest.c    
+share/examples/mpi-ch/Makefile.in
+share/examples/mpi-ch/Makefile
+share/examples/mpi-ch/Makefile.sample
+share/examples/mpi-ch/cpi.c
+share/examples/mpi-ch/cpip.c
+share/examples/mpi-ch/cpilog.c
+share/examples/mpi-ch/hello++.cc
+share/examples/mpi-ch/pi3.f
+share/examples/mpi-ch/pi3p.f
+share/examples/mpi-ch/simpleio.c
+share/examples/mpi-ch/README
+share/examples/mpi-ch/mpirun
+share/upshot/bitmaps/2x2
+share/upshot/bitmaps/black
+share/upshot/bitmaps/boxes
+share/upshot/bitmaps/dimple3
+share/upshot/bitmaps/dllines3
+share/upshot/bitmaps/dllines4
+share/upshot/bitmaps/drlines3
+share/upshot/bitmaps/drlines4
+share/upshot/bitmaps/gray
+share/upshot/bitmaps/gray2
+share/upshot/bitmaps/gray3
+share/upshot/bitmaps/hlines2
+share/upshot/bitmaps/hlines3
+share/upshot/bitmaps/hlines4
+share/upshot/bitmaps/light_gray
+share/upshot/bitmaps/vlines2
+share/upshot/bitmaps/vlines3
+share/upshot/bitmaps/vlines4
+share/upshot/bitmaps/white          
+share/upshot/logfiles/fft.trf
+share/upshot/logfiles/sam_hyp.16.log
 share/util/machines/machines.netbsd
 share/util/machines/machines.sample
-share/util/chp4_servs
-share/util/chkserv
-include/mpi.h
-include/mpif.h
-include/mpi_errno.h
-include/binding.h
-include/protofix.h
-include/mpeexten.h
-include/patchlevel.h
-include/mpe.h
-include/mpe_graphics.h
-include/mpe_log.h
-include/mpetools.h
-include/basex11.h
-share/examples/MPI-2-C++/Makefile.in
-share/examples/MPI-2-C++/Makefile
-share/examples/MPI-2-C++/hello_world.cc
-share/examples/MPI-2-C++/ring.cc
-share/examples/MPI-2-C++/topology.cc
-share/examples/MPI-2-C++/user_bcast.cc
-share/examples/MPI-2-C++/chapter_10_mpi2.cc
-share/examples/MPI-2-C++/pi.cc
-share/examples/MPI-2-C++/README
-share/examples/MPI-2-C++/mpirun
-@dirrm libdata/netbsd/ch_p4/c++
-@dirrm libdata/netbsd/ch_p4
-@dirrm libdata/netbsd
-@dirrm libdata/bitmaps
-@dirrm share/examples/MPI-2-C++
-@dirrm share/examples/mpi
+@dirrm include/mpi2c++
+@dirrm share/doc/mpi-ch
+@dirrm share/doc/html/mpi-ch/www1
+@dirrm share/doc/html/mpi-ch/www3
+@dirrm share/doc/html/mpi-ch/www4
+@dirrm share/doc/html/mpi-ch
+@dirrm share/examples/mpi-ch/MPI-2-C++
+@dirrm share/examples/mpi-ch/mpe
+@dirrm share/examples/mpi-ch
+@dirrm share/upshot/bitmaps
+@dirrm share/upshot/logfiles
+@dirrm share/upshot
 @dirrm share/util/machines
 @dirrm share/util