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

with some minor PLIST and etc fixes by me.

1 files changed, 231 insertions, 330 deletions

diff --git a/parallel/mpi-ch/PLIST b/parallel/mpi-ch/PLIST
index a3a6b18d99d..a6ba4043252 100644
--- a/parallel/mpi-ch/PLIST
+++ b/parallel/mpi-ch/PLIST
@@ -1,12 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2003/12/03 21:06:17 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/03/03 12:01:30 garbled Exp $
 bin/clog2alog
-bin/clog2slog
 bin/clog_print
-bin/logviewer
-bin/mpereconfig
-bin/mpereconfig.dat
-bin/mpiCC
 bin/mpicc
+bin/mpichversion
+bin/mpicxx
 bin/mpif77
 bin/mpiman
 bin/mpireconfig
@@ -25,13 +22,8 @@ bin/mpirun_dbg.ladebug
 bin/mpirun_dbg.totalview
 bin/mpirun_dbg.xxgdb
 bin/serv_p4
-bin/slog_print
 bin/tarch
 bin/tdevice
-bin/upshot
-etc/mpichconf.h.dat
-etc/mpichlib.conf
-etc/mpif77.conf
 include/mpi.h
 include/mpi2c++/comm.h
 include/mpi2c++/comm_inln.h
@@ -516,203 +508,6 @@ sbin/mpiuninstall
 sbin/mpiuninstall.not
 sbin/tstmachines
 share/doc/html/mpi-ch/index.html
-share/doc/html/mpi-ch/install/blueball.gif
-share/doc/html/mpi-ch/install/greenball.gif
-share/doc/html/mpi-ch/install/img0.xbm
-share/doc/html/mpi-ch/install/next.xbm
-share/doc/html/mpi-ch/install/node1.htm
-share/doc/html/mpi-ch/install/node15.htm
-share/doc/html/mpi-ch/install/node16.htm
-share/doc/html/mpi-ch/install/node17.htm
-share/doc/html/mpi-ch/install/node18.htm
-share/doc/html/mpi-ch/install/node19.htm
-share/doc/html/mpi-ch/install/node2.htm
-share/doc/html/mpi-ch/install/node20.htm
-share/doc/html/mpi-ch/install/node21.htm
-share/doc/html/mpi-ch/install/node22.htm
-share/doc/html/mpi-ch/install/node23.htm
-share/doc/html/mpi-ch/install/node24.htm
-share/doc/html/mpi-ch/install/node29.htm
-share/doc/html/mpi-ch/install/node3.htm
-share/doc/html/mpi-ch/install/node30.htm
-share/doc/html/mpi-ch/install/node31.htm
-share/doc/html/mpi-ch/install/node32.htm
-share/doc/html/mpi-ch/install/node33.htm
-share/doc/html/mpi-ch/install/node34.htm
-share/doc/html/mpi-ch/install/node35.htm
-share/doc/html/mpi-ch/install/node38.htm
-share/doc/html/mpi-ch/install/node39.htm
-share/doc/html/mpi-ch/install/node4.htm
-share/doc/html/mpi-ch/install/node40.htm
-share/doc/html/mpi-ch/install/node41.htm
-share/doc/html/mpi-ch/install/node43.htm
-share/doc/html/mpi-ch/install/node44.htm
-share/doc/html/mpi-ch/install/node45.htm
-share/doc/html/mpi-ch/install/node46.htm
-share/doc/html/mpi-ch/install/node47.htm
-share/doc/html/mpi-ch/install/node48.htm
-share/doc/html/mpi-ch/install/node49.htm
-share/doc/html/mpi-ch/install/node5.htm
-share/doc/html/mpi-ch/install/node51.htm
-share/doc/html/mpi-ch/install/node52.htm
-share/doc/html/mpi-ch/install/node53.htm
-share/doc/html/mpi-ch/install/node54.htm
-share/doc/html/mpi-ch/install/node55.htm
-share/doc/html/mpi-ch/install/node56.htm
-share/doc/html/mpi-ch/install/node57.htm
-share/doc/html/mpi-ch/install/node58.htm
-share/doc/html/mpi-ch/install/node59.htm
-share/doc/html/mpi-ch/install/node6.htm
-share/doc/html/mpi-ch/install/node60.htm
-share/doc/html/mpi-ch/install/node61.htm
-share/doc/html/mpi-ch/install/node62.htm
-share/doc/html/mpi-ch/install/node64.htm
-share/doc/html/mpi-ch/install/node65.htm
-share/doc/html/mpi-ch/install/node7.htm
-share/doc/html/mpi-ch/install/node74.htm
-share/doc/html/mpi-ch/install/node75.htm
-share/doc/html/mpi-ch/install/node76.htm
-share/doc/html/mpi-ch/install/node77.htm
-share/doc/html/mpi-ch/install/node78.htm
-share/doc/html/mpi-ch/install/node8.htm
-share/doc/html/mpi-ch/install/paper.htm
-share/doc/html/mpi-ch/install/previous.xbm
-share/doc/html/mpi-ch/install/purpleball.gif
-share/doc/html/mpi-ch/install/redball.gif
-share/doc/html/mpi-ch/install/up.xbm
-share/doc/html/mpi-ch/install/yellowball.gif
-share/doc/html/mpi-ch/mpeguide/blueball.gif
-share/doc/html/mpi-ch/mpeguide/greenball.gif
-share/doc/html/mpi-ch/mpeguide/img0.xbm
-share/doc/html/mpi-ch/mpeguide/jumpshot.gif
-share/doc/html/mpi-ch/mpeguide/next.xbm
-share/doc/html/mpi-ch/mpeguide/node1.htm
-share/doc/html/mpi-ch/mpeguide/node12.htm
-share/doc/html/mpi-ch/mpeguide/node15.htm
-share/doc/html/mpi-ch/mpeguide/node16.htm
-share/doc/html/mpi-ch/mpeguide/node17.htm
-share/doc/html/mpi-ch/mpeguide/node18.htm
-share/doc/html/mpi-ch/mpeguide/node19.htm
-share/doc/html/mpi-ch/mpeguide/node2.htm
-share/doc/html/mpi-ch/mpeguide/node20.htm
-share/doc/html/mpi-ch/mpeguide/node21.htm
-share/doc/html/mpi-ch/mpeguide/node22.htm
-share/doc/html/mpi-ch/mpeguide/node23.htm
-share/doc/html/mpi-ch/mpeguide/node27.htm
-share/doc/html/mpi-ch/mpeguide/node3.htm
-share/doc/html/mpi-ch/mpeguide/node31.htm
-share/doc/html/mpi-ch/mpeguide/node32.htm
-share/doc/html/mpi-ch/mpeguide/node33.htm
-share/doc/html/mpi-ch/mpeguide/node34.htm
-share/doc/html/mpi-ch/mpeguide/node35.htm
-share/doc/html/mpi-ch/mpeguide/node36.htm
-share/doc/html/mpi-ch/mpeguide/node39.htm
-share/doc/html/mpi-ch/mpeguide/node4.htm
-share/doc/html/mpi-ch/mpeguide/node42.htm
-share/doc/html/mpi-ch/mpeguide/node43.htm
-share/doc/html/mpi-ch/mpeguide/node44.htm
-share/doc/html/mpi-ch/mpeguide/node45.htm
-share/doc/html/mpi-ch/mpeguide/node46.htm
-share/doc/html/mpi-ch/mpeguide/node47.htm
-share/doc/html/mpi-ch/mpeguide/node48.htm
-share/doc/html/mpi-ch/mpeguide/node49.htm
-share/doc/html/mpi-ch/mpeguide/node5.htm
-share/doc/html/mpi-ch/mpeguide/node6.htm
-share/doc/html/mpi-ch/mpeguide/node7.htm
-share/doc/html/mpi-ch/mpeguide/paper.htm
-share/doc/html/mpi-ch/mpeguide/previous.xbm
-share/doc/html/mpi-ch/mpeguide/purpleball.gif
-share/doc/html/mpi-ch/mpeguide/redball.gif
-share/doc/html/mpi-ch/mpeguide/up.xbm
-share/doc/html/mpi-ch/mpeguide/upshot1.gif
-share/doc/html/mpi-ch/mpeguide/yellowball.gif
-share/doc/html/mpi-ch/userguide/blueball.gif
-share/doc/html/mpi-ch/userguide/greenball.gif
-share/doc/html/mpi-ch/userguide/img0.xbm
-share/doc/html/mpi-ch/userguide/img1.xbm
-share/doc/html/mpi-ch/userguide/jumpshot.gif
-share/doc/html/mpi-ch/userguide/mpds-all.gif
-share/doc/html/mpi-ch/userguide/mpds-console.gif
-share/doc/html/mpi-ch/userguide/mpds-only.gif
-share/doc/html/mpi-ch/userguide/next.xbm
-share/doc/html/mpi-ch/userguide/node1.htm
-share/doc/html/mpi-ch/userguide/node10.htm
-share/doc/html/mpi-ch/userguide/node100.htm
-share/doc/html/mpi-ch/userguide/node101.htm
-share/doc/html/mpi-ch/userguide/node102.htm
-share/doc/html/mpi-ch/userguide/node103.htm
-share/doc/html/mpi-ch/userguide/node104.htm
-share/doc/html/mpi-ch/userguide/node105.htm
-share/doc/html/mpi-ch/userguide/node106.htm
-share/doc/html/mpi-ch/userguide/node11.htm
-share/doc/html/mpi-ch/userguide/node19.htm
-share/doc/html/mpi-ch/userguide/node2.htm
-share/doc/html/mpi-ch/userguide/node24.htm
-share/doc/html/mpi-ch/userguide/node25.htm
-share/doc/html/mpi-ch/userguide/node26.htm
-share/doc/html/mpi-ch/userguide/node28.htm
-share/doc/html/mpi-ch/userguide/node29.htm
-share/doc/html/mpi-ch/userguide/node3.htm
-share/doc/html/mpi-ch/userguide/node30.htm
-share/doc/html/mpi-ch/userguide/node31.htm
-share/doc/html/mpi-ch/userguide/node32.htm
-share/doc/html/mpi-ch/userguide/node33.htm
-share/doc/html/mpi-ch/userguide/node34.htm
-share/doc/html/mpi-ch/userguide/node35.htm
-share/doc/html/mpi-ch/userguide/node36.htm
-share/doc/html/mpi-ch/userguide/node40.htm
-share/doc/html/mpi-ch/userguide/node41.htm
-share/doc/html/mpi-ch/userguide/node43.htm
-share/doc/html/mpi-ch/userguide/node44.htm
-share/doc/html/mpi-ch/userguide/node45.htm
-share/doc/html/mpi-ch/userguide/node46.htm
-share/doc/html/mpi-ch/userguide/node47.htm
-share/doc/html/mpi-ch/userguide/node48.htm
-share/doc/html/mpi-ch/userguide/node49.htm
-share/doc/html/mpi-ch/userguide/node5.htm
-share/doc/html/mpi-ch/userguide/node50.htm
-share/doc/html/mpi-ch/userguide/node51.htm
-share/doc/html/mpi-ch/userguide/node53.htm
-share/doc/html/mpi-ch/userguide/node54.htm
-share/doc/html/mpi-ch/userguide/node55.htm
-share/doc/html/mpi-ch/userguide/node56.htm
-share/doc/html/mpi-ch/userguide/node57.htm
-share/doc/html/mpi-ch/userguide/node58.htm
-share/doc/html/mpi-ch/userguide/node59.htm
-share/doc/html/mpi-ch/userguide/node6.htm
-share/doc/html/mpi-ch/userguide/node60.htm
-share/doc/html/mpi-ch/userguide/node61.htm
-share/doc/html/mpi-ch/userguide/node62.htm
-share/doc/html/mpi-ch/userguide/node63.htm
-share/doc/html/mpi-ch/userguide/node64.htm
-share/doc/html/mpi-ch/userguide/node65.htm
-share/doc/html/mpi-ch/userguide/node66.htm
-share/doc/html/mpi-ch/userguide/node67.htm
-share/doc/html/mpi-ch/userguide/node68.htm
-share/doc/html/mpi-ch/userguide/node69.htm
-share/doc/html/mpi-ch/userguide/node70.htm
-share/doc/html/mpi-ch/userguide/node71.htm
-share/doc/html/mpi-ch/userguide/node75.htm
-share/doc/html/mpi-ch/userguide/node76.htm
-share/doc/html/mpi-ch/userguide/node81.htm
-share/doc/html/mpi-ch/userguide/node82.htm
-share/doc/html/mpi-ch/userguide/node84.htm
-share/doc/html/mpi-ch/userguide/node85.htm
-share/doc/html/mpi-ch/userguide/node9.htm
-share/doc/html/mpi-ch/userguide/node90.htm
-share/doc/html/mpi-ch/userguide/node91.htm
-share/doc/html/mpi-ch/userguide/node94.htm
-share/doc/html/mpi-ch/userguide/node95.htm
-share/doc/html/mpi-ch/userguide/node97.htm
-share/doc/html/mpi-ch/userguide/node98.htm
-share/doc/html/mpi-ch/userguide/node99.htm
-share/doc/html/mpi-ch/userguide/paper.htm
-share/doc/html/mpi-ch/userguide/previous.xbm
-share/doc/html/mpi-ch/userguide/purpleball.gif
-share/doc/html/mpi-ch/userguide/redball.gif
-share/doc/html/mpi-ch/userguide/up.xbm
-share/doc/html/mpi-ch/userguide/upshot1.gif
-share/doc/html/mpi-ch/userguide/yellowball.gif
 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
@@ -1008,6 +803,203 @@ share/doc/html/mpi-ch/www4/MPE_Stop_log.html
 share/doc/html/mpi-ch/www4/MPE_TagsEnd.html
 share/doc/html/mpi-ch/www4/MPE_Update.html
 share/doc/html/mpi-ch/www4/index.html
+share/doc/html/mpi-ch/install/purpleball.gif
+share/doc/html/mpi-ch/install/previous.xbm
+share/doc/html/mpi-ch/install/next.xbm
+share/doc/html/mpi-ch/install/greenball.gif
+share/doc/html/mpi-ch/install/up.xbm
+share/doc/html/mpi-ch/install/yellowball.gif
+share/doc/html/mpi-ch/install/redball.gif
+share/doc/html/mpi-ch/install/blueball.gif
+share/doc/html/mpi-ch/install/paper.htm
+share/doc/html/mpi-ch/install/node1.htm
+share/doc/html/mpi-ch/install/node2.htm
+share/doc/html/mpi-ch/install/node3.htm
+share/doc/html/mpi-ch/install/node4.htm
+share/doc/html/mpi-ch/install/node5.htm
+share/doc/html/mpi-ch/install/node6.htm
+share/doc/html/mpi-ch/install/node7.htm
+share/doc/html/mpi-ch/install/node8.htm
+share/doc/html/mpi-ch/install/node15.htm
+share/doc/html/mpi-ch/install/node16.htm
+share/doc/html/mpi-ch/install/node17.htm
+share/doc/html/mpi-ch/install/node18.htm
+share/doc/html/mpi-ch/install/node19.htm
+share/doc/html/mpi-ch/install/node20.htm
+share/doc/html/mpi-ch/install/node21.htm
+share/doc/html/mpi-ch/install/node22.htm
+share/doc/html/mpi-ch/install/img0.xbm
+share/doc/html/mpi-ch/install/node23.htm
+share/doc/html/mpi-ch/install/node24.htm
+share/doc/html/mpi-ch/install/node29.htm
+share/doc/html/mpi-ch/install/node30.htm
+share/doc/html/mpi-ch/install/node31.htm
+share/doc/html/mpi-ch/install/node32.htm
+share/doc/html/mpi-ch/install/node33.htm
+share/doc/html/mpi-ch/install/node34.htm
+share/doc/html/mpi-ch/install/node38.htm
+share/doc/html/mpi-ch/install/node39.htm
+share/doc/html/mpi-ch/install/node40.htm
+share/doc/html/mpi-ch/install/node43.htm
+share/doc/html/mpi-ch/install/node44.htm
+share/doc/html/mpi-ch/install/node45.htm
+share/doc/html/mpi-ch/install/node46.htm
+share/doc/html/mpi-ch/install/node48.htm
+share/doc/html/mpi-ch/install/node51.htm
+share/doc/html/mpi-ch/install/node52.htm
+share/doc/html/mpi-ch/install/node53.htm
+share/doc/html/mpi-ch/install/node54.htm
+share/doc/html/mpi-ch/install/node55.htm
+share/doc/html/mpi-ch/install/node56.htm
+share/doc/html/mpi-ch/install/node57.htm
+share/doc/html/mpi-ch/install/node58.htm
+share/doc/html/mpi-ch/install/node59.htm
+share/doc/html/mpi-ch/install/node60.htm
+share/doc/html/mpi-ch/install/node61.htm
+share/doc/html/mpi-ch/install/node64.htm
+share/doc/html/mpi-ch/install/node74.htm
+share/doc/html/mpi-ch/install/node76.htm
+share/doc/html/mpi-ch/install/node77.htm
+share/doc/html/mpi-ch/install/node35.htm
+share/doc/html/mpi-ch/install/node41.htm
+share/doc/html/mpi-ch/install/node47.htm
+share/doc/html/mpi-ch/install/node49.htm
+share/doc/html/mpi-ch/install/node62.htm
+share/doc/html/mpi-ch/install/node65.htm
+share/doc/html/mpi-ch/install/node75.htm
+share/doc/html/mpi-ch/install/node78.htm
+share/doc/html/mpi-ch/userguide/purpleball.gif
+share/doc/html/mpi-ch/userguide/previous.xbm
+share/doc/html/mpi-ch/userguide/next.xbm
+share/doc/html/mpi-ch/userguide/greenball.gif
+share/doc/html/mpi-ch/userguide/up.xbm
+share/doc/html/mpi-ch/userguide/mpds-only.gif
+share/doc/html/mpi-ch/userguide/redball.gif
+share/doc/html/mpi-ch/userguide/blueball.gif
+share/doc/html/mpi-ch/userguide/mpds-console.gif
+share/doc/html/mpi-ch/userguide/yellowball.gif
+share/doc/html/mpi-ch/userguide/paper.htm
+share/doc/html/mpi-ch/userguide/node1.htm
+share/doc/html/mpi-ch/userguide/node2.htm
+share/doc/html/mpi-ch/userguide/node3.htm
+share/doc/html/mpi-ch/userguide/node5.htm
+share/doc/html/mpi-ch/userguide/node6.htm
+share/doc/html/mpi-ch/userguide/node9.htm
+share/doc/html/mpi-ch/userguide/node10.htm
+share/doc/html/mpi-ch/userguide/node11.htm
+share/doc/html/mpi-ch/userguide/node19.htm
+share/doc/html/mpi-ch/userguide/node24.htm
+share/doc/html/mpi-ch/userguide/node25.htm
+share/doc/html/mpi-ch/userguide/node28.htm
+share/doc/html/mpi-ch/userguide/node29.htm
+share/doc/html/mpi-ch/userguide/node30.htm
+share/doc/html/mpi-ch/userguide/node31.htm
+share/doc/html/mpi-ch/userguide/node32.htm
+share/doc/html/mpi-ch/userguide/img0.xbm
+share/doc/html/mpi-ch/userguide/node33.htm
+share/doc/html/mpi-ch/userguide/node34.htm
+share/doc/html/mpi-ch/userguide/node35.htm
+share/doc/html/mpi-ch/userguide/upshot1.gif
+share/doc/html/mpi-ch/userguide/node40.htm
+share/doc/html/mpi-ch/userguide/jumpshot.gif
+share/doc/html/mpi-ch/userguide/node43.htm
+share/doc/html/mpi-ch/userguide/node44.htm
+share/doc/html/mpi-ch/userguide/node45.htm
+share/doc/html/mpi-ch/userguide/node46.htm
+share/doc/html/mpi-ch/userguide/node47.htm
+share/doc/html/mpi-ch/userguide/node48.htm
+share/doc/html/mpi-ch/userguide/node49.htm
+share/doc/html/mpi-ch/userguide/node50.htm
+share/doc/html/mpi-ch/userguide/node53.htm
+share/doc/html/mpi-ch/userguide/node54.htm
+share/doc/html/mpi-ch/userguide/node55.htm
+share/doc/html/mpi-ch/userguide/node56.htm
+share/doc/html/mpi-ch/userguide/node57.htm
+share/doc/html/mpi-ch/userguide/node58.htm
+share/doc/html/mpi-ch/userguide/node59.htm
+share/doc/html/mpi-ch/userguide/node60.htm
+share/doc/html/mpi-ch/userguide/node61.htm
+share/doc/html/mpi-ch/userguide/node62.htm
+share/doc/html/mpi-ch/userguide/node63.htm
+share/doc/html/mpi-ch/userguide/node64.htm
+share/doc/html/mpi-ch/userguide/node65.htm
+share/doc/html/mpi-ch/userguide/node66.htm
+share/doc/html/mpi-ch/userguide/node67.htm
+share/doc/html/mpi-ch/userguide/node68.htm
+share/doc/html/mpi-ch/userguide/node70.htm
+share/doc/html/mpi-ch/userguide/node75.htm
+share/doc/html/mpi-ch/userguide/node81.htm
+share/doc/html/mpi-ch/userguide/node84.htm
+share/doc/html/mpi-ch/userguide/node90.htm
+share/doc/html/mpi-ch/userguide/node94.htm
+share/doc/html/mpi-ch/userguide/node97.htm
+share/doc/html/mpi-ch/userguide/node98.htm
+share/doc/html/mpi-ch/userguide/node99.htm
+share/doc/html/mpi-ch/userguide/node100.htm
+share/doc/html/mpi-ch/userguide/node101.htm
+share/doc/html/mpi-ch/userguide/node104.htm
+share/doc/html/mpi-ch/userguide/img1.xbm
+share/doc/html/mpi-ch/userguide/node105.htm
+share/doc/html/mpi-ch/userguide/node26.htm
+share/doc/html/mpi-ch/userguide/node36.htm
+share/doc/html/mpi-ch/userguide/node41.htm
+share/doc/html/mpi-ch/userguide/node51.htm
+share/doc/html/mpi-ch/userguide/node69.htm
+share/doc/html/mpi-ch/userguide/node71.htm
+share/doc/html/mpi-ch/userguide/node76.htm
+share/doc/html/mpi-ch/userguide/node82.htm
+share/doc/html/mpi-ch/userguide/node85.htm
+share/doc/html/mpi-ch/userguide/node91.htm
+share/doc/html/mpi-ch/userguide/node95.htm
+share/doc/html/mpi-ch/userguide/node102.htm
+share/doc/html/mpi-ch/userguide/node103.htm
+share/doc/html/mpi-ch/userguide/node106.htm
+share/doc/html/mpi-ch/userguide/mpds-all.gif
+share/doc/html/mpi-ch/mpeguide/purpleball.gif
+share/doc/html/mpi-ch/mpeguide/previous.xbm
+share/doc/html/mpi-ch/mpeguide/next.xbm
+share/doc/html/mpi-ch/mpeguide/greenball.gif
+share/doc/html/mpi-ch/mpeguide/up.xbm
+share/doc/html/mpi-ch/mpeguide/yellowball.gif
+share/doc/html/mpi-ch/mpeguide/redball.gif
+share/doc/html/mpi-ch/mpeguide/blueball.gif
+share/doc/html/mpi-ch/mpeguide/paper.htm
+share/doc/html/mpi-ch/mpeguide/node1.htm
+share/doc/html/mpi-ch/mpeguide/node2.htm
+share/doc/html/mpi-ch/mpeguide/node3.htm
+share/doc/html/mpi-ch/mpeguide/node4.htm
+share/doc/html/mpi-ch/mpeguide/node5.htm
+share/doc/html/mpi-ch/mpeguide/img0.xbm
+share/doc/html/mpi-ch/mpeguide/node6.htm
+share/doc/html/mpi-ch/mpeguide/node7.htm
+share/doc/html/mpi-ch/mpeguide/node12.htm
+share/doc/html/mpi-ch/mpeguide/upshot1.gif
+share/doc/html/mpi-ch/mpeguide/jumpshot.gif
+share/doc/html/mpi-ch/mpeguide/node15.htm
+share/doc/html/mpi-ch/mpeguide/node16.htm
+share/doc/html/mpi-ch/mpeguide/node17.htm
+share/doc/html/mpi-ch/mpeguide/node18.htm
+share/doc/html/mpi-ch/mpeguide/node19.htm
+share/doc/html/mpi-ch/mpeguide/node20.htm
+share/doc/html/mpi-ch/mpeguide/node21.htm
+share/doc/html/mpi-ch/mpeguide/node22.htm
+share/doc/html/mpi-ch/mpeguide/node23.htm
+share/doc/html/mpi-ch/mpeguide/node27.htm
+share/doc/html/mpi-ch/mpeguide/node31.htm
+share/doc/html/mpi-ch/mpeguide/node32.htm
+share/doc/html/mpi-ch/mpeguide/node33.htm
+share/doc/html/mpi-ch/mpeguide/node34.htm
+share/doc/html/mpi-ch/mpeguide/node35.htm
+share/doc/html/mpi-ch/mpeguide/node36.htm
+share/doc/html/mpi-ch/mpeguide/node39.htm
+share/doc/html/mpi-ch/mpeguide/node42.htm
+share/doc/html/mpi-ch/mpeguide/node43.htm
+share/doc/html/mpi-ch/mpeguide/node44.htm
+share/doc/html/mpi-ch/mpeguide/node45.htm
+share/doc/html/mpi-ch/mpeguide/node46.htm
+share/doc/html/mpi-ch/mpeguide/node47.htm
+share/doc/html/mpi-ch/mpeguide/node48.htm
+share/doc/html/mpi-ch/mpeguide/node49.htm
 share/doc/mpi-ch/mpeman.pdf
 share/doc/mpi-ch/mpeman.ps.gz
 share/doc/mpi-ch/mpichman-chp4.pdf
@@ -1049,115 +1041,50 @@ share/examples/mpi-ch/basic/systest.c
 share/examples/mpi-ch/basic/unsafe.c
 share/examples/mpi-ch/io/Makefile
 share/examples/mpi-ch/io/Makefile.in
+share/examples/mpi-ch/io/Mfile.in
 share/examples/mpi-ch/io/README
-share/examples/mpi-ch/io/async
 share/examples/mpi-ch/io/async.c
-share/examples/mpi-ch/io/async.o
-share/examples/mpi-ch/io/atomicity
 share/examples/mpi-ch/io/atomicity.c
-share/examples/mpi-ch/io/atomicity.o
-share/examples/mpi-ch/io/coll_perf
 share/examples/mpi-ch/io/coll_perf.c
-share/examples/mpi-ch/io/coll_perf.o
-share/examples/mpi-ch/io/coll_test
 share/examples/mpi-ch/io/coll_test.c
-share/examples/mpi-ch/io/coll_test.o
-share/examples/mpi-ch/io/error
+share/examples/mpi-ch/io/creat_excl.c
 share/examples/mpi-ch/io/error.c
-share/examples/mpi-ch/io/error.o
-share/examples/mpi-ch/io/excl
 share/examples/mpi-ch/io/excl.c
-share/examples/mpi-ch/io/excl.o
-share/examples/mpi-ch/io/fcoll_test
-share/examples/mpi-ch/io/fcoll_test.o
 share/examples/mpi-ch/io/fcoll_test.f
 share/examples/mpi-ch/io/fcoll_test.f.in
-share/examples/mpi-ch/io/file_info
 share/examples/mpi-ch/io/file_info.c
-share/examples/mpi-ch/io/file_info.o
-share/examples/mpi-ch/io/fmisc
-share/examples/mpi-ch/io/fmisc.o
 share/examples/mpi-ch/io/fmisc.f
 share/examples/mpi-ch/io/fmisc.f.in
 share/examples/mpi-ch/io/fperf.f
 share/examples/mpi-ch/io/fperf.f.in
-share/examples/mpi-ch/io/fperf.o
-share/examples/mpi-ch/io/fperf
-share/examples/mpi-ch/io/i_noncontig
 share/examples/mpi-ch/io/i_noncontig.c
-share/examples/mpi-ch/io/i_noncontig.o
-share/examples/mpi-ch/io/large_array
 share/examples/mpi-ch/io/large_array.c
-share/examples/mpi-ch/io/large_array.o
-share/examples/mpi-ch/io/large_file
 share/examples/mpi-ch/io/large_file.c
 share/examples/mpi-ch/io/large_file.c.in
-share/examples/mpi-ch/io/large_file.o
-share/examples/mpi-ch/io/misc
 share/examples/mpi-ch/io/misc.c
 share/examples/mpi-ch/io/misc.c.in
-share/examples/mpi-ch/io/misc.o
-share/examples/mpi-ch/io/noncontig
 share/examples/mpi-ch/io/noncontig.c
-share/examples/mpi-ch/io/noncontig.o
-share/examples/mpi-ch/io/noncontig_coll
 share/examples/mpi-ch/io/noncontig_coll.c
-share/examples/mpi-ch/io/noncontig_coll.o
-share/examples/mpi-ch/io/noncontig_coll2
 share/examples/mpi-ch/io/noncontig_coll2.c
-share/examples/mpi-ch/io/noncontig_coll2.c.rej
-share/examples/mpi-ch/io/noncontig_coll2.o
-share/examples/mpi-ch/io/perf
 share/examples/mpi-ch/io/perf.c
-share/examples/mpi-ch/io/perf.o
-share/examples/mpi-ch/io/pfcoll_test
-share/examples/mpi-ch/io/pfcoll_test.o
 share/examples/mpi-ch/io/pfcoll_test.f
 share/examples/mpi-ch/io/pfcoll_test.f.in
-share/examples/mpi-ch/io/psimple
 share/examples/mpi-ch/io/psimple.c
-share/examples/mpi-ch/io/psimple.o
+share/examples/mpi-ch/io/rtest.in
 share/examples/mpi-ch/io/runtests
 share/examples/mpi-ch/io/runtests.in
-share/examples/mpi-ch/io/shared_fp
 share/examples/mpi-ch/io/shared_fp.c
-share/examples/mpi-ch/io/shared_fp.o
-share/examples/mpi-ch/io/simple
 share/examples/mpi-ch/io/simple.c
-share/examples/mpi-ch/io/simple.o
-share/examples/mpi-ch/io/split_coll
 share/examples/mpi-ch/io/split_coll.c
-share/examples/mpi-ch/io/split_coll.o
-share/examples/mpi-ch/io/status
 share/examples/mpi-ch/io/status.c
-share/examples/mpi-ch/io/status.o
-share/examples/mpi-ch/io/std/async.std
-share/examples/mpi-ch/io/std/atomicity.std
-share/examples/mpi-ch/io/std/coll_test.std
-share/examples/mpi-ch/io/std/error.std
-share/examples/mpi-ch/io/std/excl.std
-share/examples/mpi-ch/io/std/fcoll_test.std
-share/examples/mpi-ch/io/std/file_info.std
-share/examples/mpi-ch/io/std/fmisc.std
-share/examples/mpi-ch/io/std/i_noncontig.std
-share/examples/mpi-ch/io/std/misc.std
-share/examples/mpi-ch/io/std/noncontig.std
-share/examples/mpi-ch/io/std/noncontig_coll.std
-share/examples/mpi-ch/io/std/noncontig_coll2.std
-share/examples/mpi-ch/io/std/pfcoll_test.std
-share/examples/mpi-ch/io/std/psimple.std
-share/examples/mpi-ch/io/std/shared_fp.std
-share/examples/mpi-ch/io/std/simple.std
-share/examples/mpi-ch/io/std/split_coll.std
-share/examples/mpi-ch/io/std/status.std
 share/examples/mpi-ch/mpe/Makefile
+share/examples/mpi-ch/mpe/mpirun
 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/cxgraphics.c
 share/examples/mpi-ch/mpe/fpi.f
 share/examples/mpi-ch/mpe/fxgraphics.f
-share/examples/mpi-ch/mpe/mpirun
 share/examples/mpi-ch/mpe/srtest.c
 share/examples/mpi-ch/nt/basic/cpi.c
 share/examples/mpi-ch/nt/basic/cpi.dsp
@@ -1191,6 +1118,7 @@ share/examples/mpi-ch/nt/mpptest/getopts.c
 share/examples/mpi-ch/nt/mpptest/getopts.h
 share/examples/mpi-ch/nt/mpptest/gopf.c
 share/examples/mpi-ch/nt/mpptest/grph.c
+share/examples/mpi-ch/nt/mpptest/halo.c
 share/examples/mpi-ch/nt/mpptest/mpe_seq.c
 share/examples/mpi-ch/nt/mpptest/mpptest.c
 share/examples/mpi-ch/nt/mpptest/mpptest.dsp
@@ -1200,7 +1128,6 @@ share/examples/mpi-ch/nt/mpptest/ovlap.c
 share/examples/mpi-ch/nt/mpptest/pair.c
 share/examples/mpi-ch/nt/mpptest/pattern.c
 share/examples/mpi-ch/nt/mpptest/rate.c
-share/examples/mpi-ch/nt/mpptest/util.c
 share/examples/mpi-ch/nt/netpipe/GetOpt.cpp
 share/examples/mpi-ch/nt/netpipe/GetOpt.h
 share/examples/mpi-ch/nt/netpipe/makefile
@@ -1239,7 +1166,9 @@ share/examples/mpi-ch/perftest/config/confdb/aclocal_bugfix.m4
 share/examples/mpi-ch/perftest/config/confdb/aclocal_cache.m4
 share/examples/mpi-ch/perftest/config/confdb/aclocal_cc.m4
 share/examples/mpi-ch/perftest/config/confdb/aclocal_cross.m4
+share/examples/mpi-ch/perftest/config/confdb/aclocal_csharp.m4
 share/examples/mpi-ch/perftest/config/confdb/aclocal_cxx.m4
+share/examples/mpi-ch/perftest/config/confdb/aclocal_enable.m4
 share/examples/mpi-ch/perftest/config/confdb/aclocal_f77.m4
 share/examples/mpi-ch/perftest/config/confdb/aclocal_f90.m4
 share/examples/mpi-ch/perftest/config/confdb/aclocal_java.m4
@@ -1248,9 +1177,16 @@ share/examples/mpi-ch/perftest/config/confdb/aclocal_mpi.m4
 share/examples/mpi-ch/perftest/config/confdb/aclocal_perl.m4
 share/examples/mpi-ch/perftest/config/confdb/aclocal_shl.m4
 share/examples/mpi-ch/perftest/config/confdb/aclocal_web.m4
+share/examples/mpi-ch/perftest/config/confdb/compiler_info.txt
 share/examples/mpi-ch/perftest/config/confdb/config.guess
 share/examples/mpi-ch/perftest/config/confdb/config.sub
+share/examples/mpi-ch/perftest/config/confdb/fortran90.m4
 share/examples/mpi-ch/perftest/config/confdb/install-sh
+share/examples/mpi-ch/perftest/config/confdb/libtool-2.13.m4
+share/examples/mpi-ch/perftest/config/confdb/libtool.m4
+share/examples/mpi-ch/perftest/config/confdb/ltmain-2.13.sh
+share/examples/mpi-ch/perftest/config/confdb/ltmain.sh
+share/examples/mpi-ch/perftest/config/confdb/makestrip
 share/examples/mpi-ch/perftest/config/confdb/pac.tex
 share/examples/mpi-ch/perftest/config/install-sh
 share/examples/mpi-ch/perftest/config/missing
@@ -1544,6 +1480,7 @@ share/examples/mpi-ch/test/er.xsl
 share/examples/mpi-ch/test/f90tests
 share/examples/mpi-ch/test/io/Makefile
 share/examples/mpi-ch/test/io/Makefile.in
+share/examples/mpi-ch/test/io/Mfile.in
 share/examples/mpi-ch/test/io/README
 share/examples/mpi-ch/test/io/async
 share/examples/mpi-ch/test/io/async.c
@@ -1557,6 +1494,7 @@ share/examples/mpi-ch/test/io/coll_perf.o
 share/examples/mpi-ch/test/io/coll_test
 share/examples/mpi-ch/test/io/coll_test.c
 share/examples/mpi-ch/test/io/coll_test.o
+share/examples/mpi-ch/test/io/creat_excl.c
 share/examples/mpi-ch/test/io/error
 share/examples/mpi-ch/test/io/error.c
 share/examples/mpi-ch/test/io/error.o
@@ -1564,19 +1502,19 @@ share/examples/mpi-ch/test/io/excl
 share/examples/mpi-ch/test/io/excl.c
 share/examples/mpi-ch/test/io/excl.o
 share/examples/mpi-ch/test/io/fcoll_test
-share/examples/mpi-ch/test/io/fcoll_test.o
 share/examples/mpi-ch/test/io/fcoll_test.f
 share/examples/mpi-ch/test/io/fcoll_test.f.in
+share/examples/mpi-ch/test/io/fcoll_test.o
 share/examples/mpi-ch/test/io/file_info
 share/examples/mpi-ch/test/io/file_info.c
 share/examples/mpi-ch/test/io/file_info.o
 share/examples/mpi-ch/test/io/fmisc
-share/examples/mpi-ch/test/io/fmisc.o
 share/examples/mpi-ch/test/io/fmisc.f
 share/examples/mpi-ch/test/io/fmisc.f.in
+share/examples/mpi-ch/test/io/fmisc.o
+share/examples/mpi-ch/test/io/fperf
 share/examples/mpi-ch/test/io/fperf.f
 share/examples/mpi-ch/test/io/fperf.f.in
-share/examples/mpi-ch/test/io/fperf
 share/examples/mpi-ch/test/io/fperf.o
 share/examples/mpi-ch/test/io/i_noncontig
 share/examples/mpi-ch/test/io/i_noncontig.c
@@ -1600,18 +1538,18 @@ share/examples/mpi-ch/test/io/noncontig_coll.c
 share/examples/mpi-ch/test/io/noncontig_coll.o
 share/examples/mpi-ch/test/io/noncontig_coll2
 share/examples/mpi-ch/test/io/noncontig_coll2.c
-share/examples/mpi-ch/test/io/noncontig_coll2.c.rej
 share/examples/mpi-ch/test/io/noncontig_coll2.o
 share/examples/mpi-ch/test/io/perf
 share/examples/mpi-ch/test/io/perf.c
 share/examples/mpi-ch/test/io/perf.o
 share/examples/mpi-ch/test/io/pfcoll_test
-share/examples/mpi-ch/test/io/pfcoll_test.o
 share/examples/mpi-ch/test/io/pfcoll_test.f
 share/examples/mpi-ch/test/io/pfcoll_test.f.in
+share/examples/mpi-ch/test/io/pfcoll_test.o
 share/examples/mpi-ch/test/io/psimple
 share/examples/mpi-ch/test/io/psimple.c
 share/examples/mpi-ch/test/io/psimple.o
+share/examples/mpi-ch/test/io/rtest.in
 share/examples/mpi-ch/test/io/runtests
 share/examples/mpi-ch/test/io/runtests.in
 share/examples/mpi-ch/test/io/shared_fp
@@ -1626,25 +1564,6 @@ share/examples/mpi-ch/test/io/split_coll.o
 share/examples/mpi-ch/test/io/status
 share/examples/mpi-ch/test/io/status.c
 share/examples/mpi-ch/test/io/status.o
-share/examples/mpi-ch/test/io/std/async.std
-share/examples/mpi-ch/test/io/std/atomicity.std
-share/examples/mpi-ch/test/io/std/coll_test.std
-share/examples/mpi-ch/test/io/std/error.std
-share/examples/mpi-ch/test/io/std/excl.std
-share/examples/mpi-ch/test/io/std/fcoll_test.std
-share/examples/mpi-ch/test/io/std/file_info.std
-share/examples/mpi-ch/test/io/std/fmisc.std
-share/examples/mpi-ch/test/io/std/i_noncontig.std
-share/examples/mpi-ch/test/io/std/misc.std
-share/examples/mpi-ch/test/io/std/noncontig.std
-share/examples/mpi-ch/test/io/std/noncontig_coll.std
-share/examples/mpi-ch/test/io/std/noncontig_coll2.std
-share/examples/mpi-ch/test/io/std/pfcoll_test.std
-share/examples/mpi-ch/test/io/std/psimple.std
-share/examples/mpi-ch/test/io/std/shared_fp.std
-share/examples/mpi-ch/test/io/std/simple.std
-share/examples/mpi-ch/test/io/std/split_coll.std
-share/examples/mpi-ch/test/io/std/status.std
 share/examples/mpi-ch/test/profile/Makefile
 share/examples/mpi-ch/test/profile/Makefile.in
 share/examples/mpi-ch/test/profile/colluses
@@ -1678,6 +1597,9 @@ share/examples/mpi-ch/test/pt2pt/cancel3.o
 share/examples/mpi-ch/test/pt2pt/cancelibm
 share/examples/mpi-ch/test/pt2pt/cancelibm.c
 share/examples/mpi-ch/test/pt2pt/cancelibm.o
+share/examples/mpi-ch/test/pt2pt/cancelissend
+share/examples/mpi-ch/test/pt2pt/cancelissend.c
+share/examples/mpi-ch/test/pt2pt/cancelissend.o
 share/examples/mpi-ch/test/pt2pt/cancelmessages
 share/examples/mpi-ch/test/pt2pt/cancelmessages.c
 share/examples/mpi-ch/test/pt2pt/cancelmessages.o
@@ -1996,45 +1918,25 @@ share/examples/mpi-ch/test/topol/test.h
 share/examples/mpi-ch/test/topol/test.o
 share/examples/mpi-ch/test/topol/twod.f
 share/examples/mpi-ch/test/topol/twod2.f
-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.${LOWER_OPSYS}
 share/util/machines/machines.sample
 @dirrm share/util/machines
 @dirrm share/util
-@dirrm share/upshot/logfiles
-@dirrm share/upshot/bitmaps
-@dirrm share/upshot
 @dirrm share/examples/mpi-ch/test/topol
 @dirrm share/examples/mpi-ch/test/pt2pt/fairness
 @dirrm share/examples/mpi-ch/test/pt2pt
 @dirrm share/examples/mpi-ch/test/profile
-@dirrm share/examples/mpi-ch/test/io/std
 @dirrm share/examples/mpi-ch/test/io
 @dirrm share/examples/mpi-ch/test/env
 @dirrm share/examples/mpi-ch/test/context
 @dirrm share/examples/mpi-ch/test/command
 @dirrm share/examples/mpi-ch/test/coll
 @dirrm share/examples/mpi-ch/test
+@exec ${MKDIR} %D/share/examples/mpi-ch/perftest/config/confdb/test1
+@dirrm share/examples/mpi-ch/perftest/config/confdb/test1
+@exec ${MKDIR} %D/share/examples/mpi-ch/perftest/config/confdb/test/test1
+@dirrm share/examples/mpi-ch/perftest/config/confdb/test/test1
+@dirrm share/examples/mpi-ch/perftest/config/confdb/test
 @dirrm share/examples/mpi-ch/perftest/config/confdb
 @dirrm share/examples/mpi-ch/perftest/config
 @dirrm share/examples/mpi-ch/perftest
@@ -2044,7 +1946,6 @@ share/util/machines/machines.sample
 @dirrm share/examples/mpi-ch/nt/basic
 @dirrm share/examples/mpi-ch/nt
 @dirrm share/examples/mpi-ch/mpe
-@dirrm share/examples/mpi-ch/io/std
 @dirrm share/examples/mpi-ch/io
 @dirrm share/examples/mpi-ch/basic
 @dirrm share/examples/mpi-ch/MPI-2-C++
@@ -2053,8 +1954,8 @@ share/util/machines/machines.sample
 @dirrm share/doc/html/mpi-ch/www4
 @dirrm share/doc/html/mpi-ch/www3
 @dirrm share/doc/html/mpi-ch/www1
-@dirrm share/doc/html/mpi-ch/userguide
-@dirrm share/doc/html/mpi-ch/mpeguide
 @dirrm share/doc/html/mpi-ch/install
+@dirrm share/doc/html/mpi-ch/mpeguide
+@dirrm share/doc/html/mpi-ch/userguide
 @dirrm share/doc/html/mpi-ch
 @dirrm include/mpi2c++