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.

18 files changed, 327 insertions, 525 deletions

diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index 737a348821d..5d86bfa623d 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2005/01/12 15:32:01 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2005/03/03 12:01:30 garbled Exp $
 
-DISTNAME=		mpich-1.2.5.2
-PKGREVISION=		1
+DISTNAME=		mpich-1.2.6
 CATEGORIES=		parallel
 MASTER_SITES=		ftp://ftp.mcs.anl.gov/pub/mpi/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} mpich-docs.tgz
@@ -13,14 +12,14 @@ COMMENT=		Free implementation of the Message Passing Interface
 .if !exists(/usr/bin/ssh)
 DEPENDS+=		{openssh-[0-9]*,ssh{,6}-1.2.27*}:../../security/openssh
 .endif
-DEPENDS+=		tk>=8.3.0:../../x11/tk83
 
 BUILD_TARGET=		ALL examples
 INSTALL_TARGET=		install-all
 USE_PERL5=		yes
 HAS_CONFIGURE=		yes
 USE_X11=		yes
-USE_LANGUAGES=		fortran
+USE_FORTRAN=		yes
+PKG_SYSCONFSUBDIR=	mpi-ch
 
 MPI_RSH?=		ssh
 
@@ -30,12 +29,14 @@ CONFIGURE_ARGS=		-prefix=${PREFIX}
 CONFIGURE_ARGS+=	-docdir=${PREFIX}/share/doc/mpi-ch
 CONFIGURE_ARGS+=	-htmldir=${PREFIX}/share/doc/html/mpi-ch
 CONFIGURE_ARGS+=	-opt=-O
+CONFIGURE_ARGS+=	-rsh=${MPI_RSH}
 CONFIGURE_ARGS+=	--with-arch=netbsd
 CONFIGURE_ARGS+=	--with-comm=ch_p4
 CONFIGURE_ARGS+=	--with-mpe
 CONFIGURE_ARGS+=	--disable-devdebug
 CONFIGURE_ARGS+=	--disable-f90
 CONFIGURE_ARGS+=	--disable-f90modules
+CONFIGURE_ENV+=		sysconfdir=${PKG_SYSCONFDIR}
 
 .include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mgcc-3*)
@@ -90,3 +91,5 @@ post-install:
 .if exists(${WRKDIR}/with-java)
 PLIST_SRC+=		${PKGDIR}/PLIST.java
 .endif
+
+.include "../../x11/tk83/buildlink3.mk"
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++
diff --git a/parallel/mpi-ch/buildlink3.mk b/parallel/mpi-ch/buildlink3.mk
index aff86eaddd5..1a3edae3403 100644
--- a/parallel/mpi-ch/buildlink3.mk
+++ b/parallel/mpi-ch/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/03/03 12:01:30 garbled Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MPICH_BUILDLINK3_MK:=	${MPICH_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmpich}
 BUILDLINK_PACKAGES+=	mpich
 
 .if !empty(MPICH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mpich+=	mpich>=1.2.5.2
+BUILDLINK_DEPENDS.mpich+=	mpich>=1.2.6
 BUILDLINK_PKGSRCDIR.mpich?=	../../parallel/mpi-ch
 .endif	# MPICH_BUILDLINK3_MK
 
diff --git a/parallel/mpi-ch/distinfo b/parallel/mpi-ch/distinfo
index c922a91bf55..204d5a48a26 100644
--- a/parallel/mpi-ch/distinfo
+++ b/parallel/mpi-ch/distinfo
@@ -1,29 +1,23 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 12:23:31 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/03/03 12:01:30 garbled Exp $
 
-SHA1 (mpich-1.2.5.2.tar.gz) = a767e56bab24d08a13903493e627e987e1685f50
-RMD160 (mpich-1.2.5.2.tar.gz) = 2960efb9c2a9be2d496292dba1255594525ff9b4
-Size (mpich-1.2.5.2.tar.gz) = 12383519 bytes
+SHA1 (mpich-1.2.6.tar.gz) = d3dba3993bc7b0bd11ec4e4bdb70374283770cea
+RMD160 (mpich-1.2.6.tar.gz) = dae2e2920a9bc0d3ca050fcb78b32d0f99a36dcf
+Size (mpich-1.2.6.tar.gz) = 15248688 bytes
 SHA1 (mpich-docs.tgz) = fb7a9c7459998b9b74584d2afc4553027d94ad10
 RMD160 (mpich-docs.tgz) = 85c7d200794b1d494f812eb4e5de904bcf681f2b
 Size (mpich-docs.tgz) = 326405 bytes
-SHA1 (patch-aa) = fa6d5f16cbc88b850906a7cc970ad73e62bee50d
-SHA1 (patch-ak) = 8ad7340a9a95087649a96c823e5d0965922e209b
-SHA1 (patch-al) = 0f889dba558d9bd5122610f2ce2aecda6d6c5323
-SHA1 (patch-am) = ebebecac0ee222284ba75ea300d0fedc99c7fea8
-SHA1 (patch-ao) = 61b36fd1e38131a3f20db586ee6810f1d506b3dd
-SHA1 (patch-ap) = 5320ef47b74691e52f247d9560954257762b5dd2
-SHA1 (patch-ar) = 6a3518b582a29358715209ed6aa8bd47aedce10d
-SHA1 (patch-as) = 5c3c3de705e9ddca64e95bf9781b4a5147ba788d
-SHA1 (patch-at) = faeec80f8e35546e830873886d00e4332444a29a
-SHA1 (patch-au) = 00a6f439d2bb65269780f2141dbd588b147e890d
-SHA1 (patch-av) = 5d4330ea9ff8e4fe09879f092b0e4032fba54c13
+SHA1 (patch-aa) = 8a25d520a9fce5ae92cdfc0851c9e8e1abe07d00
+SHA1 (patch-al) = b2849603c42c8349fe4da56e6d56c8e8859ed170
+SHA1 (patch-at) = d329f3d8a7d76fdb7d57c60bcea8944a990e0fb4
+SHA1 (patch-au) = 453cbb33db19e47ae79d3f2ed8c131ea14c663cf
+SHA1 (patch-av) = 0c2a655aa31b823fe89530bcb0dd709bdee174e2
 SHA1 (patch-aw) = a1a98f08743cd1d33187b37ceb24ff5c4fcd731a
-SHA1 (patch-ax) = ceffb118aa3ca151dcf387c000895f7405472f87
-SHA1 (patch-ay) = 72ac437696041c4771913e8f36a6b379c9e1057a
+SHA1 (patch-ax) = bc2f39a1ea3570379c5d971f794caeb52b61f9a4
+SHA1 (patch-ay) = 38390be8f6d1778f7eeeddffe33548148a6e6835
 SHA1 (patch-az) = b81cb18c7c9f52d60dd540d1a47f16297e618a10
 SHA1 (patch-ba) = b20d05026031fd5a86c78f6bb9cdfdf821f10543
 SHA1 (patch-bb) = 7f399ed3d4bbaf00b75ec3a5ce8f114e4c6bbd23
 SHA1 (patch-bc) = e89bbf9e1ef9f2aaa6b8000d170c5a158408988d
 SHA1 (patch-bd) = 7c96f575263fbe9adc0514ed64452db04cc68212
 SHA1 (patch-be) = d21a703dbe17a48fb940ce65fd232284a57ff3cf
-SHA1 (patch-ca) = 0fdb9a96df57bb8268d6d4e62e06794248cdbcf1
+SHA1 (patch-ca) = 095f2d5b801299e56b16e17ef1014fd5cf9b3332
diff --git a/parallel/mpi-ch/patches/patch-aa b/parallel/mpi-ch/patches/patch-aa
index e0f9622cada..2082100e953 100644
--- a/parallel/mpi-ch/patches/patch-aa
+++ b/parallel/mpi-ch/patches/patch-aa
@@ -1,22 +1,12 @@
-$NetBSD: patch-aa,v 1.5 2003/11/26 12:42:12 wennmach Exp $
-
---- configure.orig	Mon Mar 24 16:28:18 2003
-+++ configure	Mon Mar 24 16:29:00 2003
-@@ -9779,14 +9779,9 @@
-     cat > conftest.c <<EOF
- #include "confdefs.h"
- main () {
--  /* Are we little or big endian?  From Harbison&Steele.  */
--  union
--  {
--    long l;
--    char c[sizeof (long)];
--  } u;
--  u.l = 1;
--  exit (u.c[sizeof (long) - 1] == 1);
-+	int     indian = 1;
-+	
-+	exit(1 - *(char *)&indian);
- }
- EOF
-         if test -n "$compile" ; then 
+$NetBSD: patch-aa,v 1.6 2005/03/03 12:01:30 garbled Exp $
+--- mpe/slog2sdk/sbin/install-package.in.orig	2005-03-03 02:45:22.000000000 -0700
++++ mpe/slog2sdk/sbin/install-package.in	2005-03-03 02:46:00.000000000 -0700
+@@ -364,7 +364,7 @@
+     bindir=$prefix/bin
+     sbindir=$prefix/sbin
+     docdir=$prefix/doc
+-    etcdir=$prefix/etc
++    etcdir=$prefix/mpi-ch/etc
+     sharedir=$prefix/share
+     logfilesdir=$prefix/logfiles
+     if [ $appendUninstall = 0 ] ; then
diff --git a/parallel/mpi-ch/patches/patch-ak b/parallel/mpi-ch/patches/patch-ak
deleted file mode 100644
index d2673b248fc..00000000000
--- a/parallel/mpi-ch/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2001/03/21 15:29:00 wennmach Exp $
-
---- mpe/profiling/nupshot/Makefile.in.orig	Mon Mar 19 20:17:14 2001
-+++ mpe/profiling/nupshot/Makefile.in	Mon Mar 19 20:18:11 2001
-@@ -40,8 +40,8 @@
- TK_LIB      = $(TK_DIR)/lib/libtk.a -L$(TK_DIR)/lib
- TCLTK_LIB   = $(TK_LIB) $(TCL_LIB)
- 
--TCL_INC     = -I@TCLINCDIR@/include
--TK_INC      = -I@TKINCDIR@/include
-+TCL_INC     = -I@TCLINCDIR@/include -I@TCLINCDIR@/include/tcl8.0
-+TK_INC      = -I@TKINCDIR@/include  -I@TKINCDIR@/include/tk8.0
- TCLTK_INC   = $(TCL_INC) $(TK_INC)
- 
- 
diff --git a/parallel/mpi-ch/patches/patch-al b/parallel/mpi-ch/patches/patch-al
index b92a9cb1ee1..85442163a38 100644
--- a/parallel/mpi-ch/patches/patch-al
+++ b/parallel/mpi-ch/patches/patch-al
@@ -1,7 +1,15 @@
-$NetBSD: patch-al,v 1.6 2003/03/27 21:07:05 jschauma Exp $
-
---- util/mpiinstall.in.orig	Mon Jan 13 18:12:29 2003
-+++ util/mpiinstall.in	Thu Mar 27 12:04:15 2003
+$NetBSD: patch-al,v 1.7 2005/03/03 12:01:30 garbled Exp $
+--- util/mpiinstall.in.orig	2004-07-02 10:34:43.000000000 -0700
++++ util/mpiinstall.in	2005-03-03 02:43:21.000000000 -0700
+@@ -172,7 +172,7 @@
+     bindir=$prefix/bin
+     sbindir=$prefix/sbin
+     includedir=$prefix/include
+-    sysconfdir=$prefix/etc
++    sysconfdir=$prefix/mpi-ch/etc
+     libdir=$prefix/lib
+     sharedlib_dir=$libdir/shared
+     messagecat_dir=$libdir
 @@ -453,9 +453,11 @@
  MkDir $docdir
  MkDir $sysconfdir
@@ -16,7 +24,7 @@ $NetBSD: patch-al,v 1.6 2003/03/27 21:07:05 jschauma Exp $
      MkDir $includedir/mpi2c++
  fi
  
-@@ -670,7 +672,7 @@
+@@ -697,7 +699,7 @@
      #	$CPRP -r util/machines $prefix/util/machines.anl
      for file in util/machines/machines* ; do
          if [ -s $file ] ; then 
@@ -25,7 +33,7 @@ $NetBSD: patch-al,v 1.6 2003/03/27 21:07:05 jschauma Exp $
  	fi
      done
      #
-@@ -963,6 +965,8 @@
+@@ -994,6 +996,8 @@
  CopyFile $top_srcdir/util/cleanipcs $sbindir $XMODE
  #
  # Example programs
@@ -34,7 +42,7 @@ $NetBSD: patch-al,v 1.6 2003/03/27 21:07:05 jschauma Exp $
  CopyFile $top_srcdir/installtest/Makefile.in $prefix/examples
  #
  # This SHOULD use mpireconfig...
-@@ -996,14 +1000,16 @@
+@@ -1027,14 +1031,16 @@
  $Show "(cd $DESTDIR$prefix/examples ; /bin/rm -f mpirun ; \
  	  ln -s ../bin/mpirun mpirun )"
  echo "/bin/rm -f $prefix/examples/mpirun" >> $UNINSTALLFILE
@@ -53,7 +61,7 @@ $NetBSD: patch-al,v 1.6 2003/03/27 21:07:05 jschauma Exp $
    fi
  fi
  #
-@@ -1012,39 +1018,40 @@
+@@ -1043,39 +1049,40 @@
  if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then 
  # Removed the installation of these extra examples.  
      # C++ Example programs 
diff --git a/parallel/mpi-ch/patches/patch-am b/parallel/mpi-ch/patches/patch-am
deleted file mode 100644
index 13d0906bf04..00000000000
--- a/parallel/mpi-ch/patches/patch-am
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-am,v 1.2 2001/03/21 15:29:00 wennmach Exp $
-
---- mpe/profiling/nupshot/tkAppInit.c.orig	Thu Aug  6 05:46:29 1998
-+++ mpe/profiling/nupshot/tkAppInit.c	Thu Aug  6 05:46:42 1998
-@@ -100,3 +100,3 @@
- 
--    tcl_RcFileName = "~/.wishrc";
-+/*    tcl_RcFileName = "~/.wishrc";*/
-     return TCL_OK;
diff --git a/parallel/mpi-ch/patches/patch-ao b/parallel/mpi-ch/patches/patch-ao
deleted file mode 100644
index 8f99afa3555..00000000000
--- a/parallel/mpi-ch/patches/patch-ao
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2001/03/21 15:29:01 wennmach Exp $
-
-Add "NETBSD" where appropriate.
-
---- mpid/ch_p4/p4/usc/usc.h.orig	Mon Mar 19 21:58:59 2001
-+++ mpid/ch_p4/p4/usc/usc.h	Mon Mar 19 21:59:23 2001
-@@ -126,7 +126,7 @@
- 
- #if defined(SUN) || defined(DEC5000) || defined(HP) \
-     || defined(SUN_SOLARIS) || defined(FREEBSD) || defined(LINUX) \
--    || defined(I86_SOLARIS) \
-+    || defined(I86_SOLARIS) || defined(NETBSD) \
-     || defined(IBM3090) || defined(RS6000) \
-     || defined(NEXT) || defined(TITAN) || defined(GP_1000) \
-     || defined(KSR) \
diff --git a/parallel/mpi-ch/patches/patch-ap b/parallel/mpi-ch/patches/patch-ap
deleted file mode 100644
index b7b878ce235..00000000000
--- a/parallel/mpi-ch/patches/patch-ap
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2001/03/21 15:29:01 wennmach Exp $
-
-Add "NETBSD" where appropriate.
-
---- mpid/ch_p4/p4/usc/usc_sys.h.orig	Mon Mar 19 22:01:11 2001
-+++ mpid/ch_p4/p4/usc/usc_sys.h	Mon Mar 19 22:01:49 2001
-@@ -68,7 +68,7 @@
- 
- #if defined(SUN) || defined(DEC5000) || defined(HP) \
-     || defined(SUN_SOLARIS) || defined(FREEBSD) || defined(LINUX) \
--    || defined(I86_SOLARIS) \
-+    || defined(I86_SOLARIS) || defined(NETBSD) \
-     || defined(BALANCE) \
-     || defined(IBM3090) || defined(RS6000) \
-     || defined(NEXT) || defined(TITAN) || defined(GP_1000) \
diff --git a/parallel/mpi-ch/patches/patch-ar b/parallel/mpi-ch/patches/patch-ar
deleted file mode 100644
index d4b5118ca82..00000000000
--- a/parallel/mpi-ch/patches/patch-ar
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2003/03/27 21:07:06 jschauma Exp $
-
---- mpe/viewers/sbin/install-viewers.in.orig	Mon Mar 24 16:45:55 2003
-+++ mpe/viewers/sbin/install-viewers.in	Mon Mar 24 16:46:31 2003
-@@ -384,7 +384,7 @@
-     if [ -d $binbuild_dir/../$pkg ] ; then
-         ( cd $binbuild_dir/../$pkg ; \
-           if [ -x ./sbin/install-viewer ] ; then \
--              ./sbin/install-viewer -prefix=$datadir/$pkg \
-+              ./sbin/install-viewer -prefix=$prefix \
-                                     -uninstall=$UNINSTALLFILE \
- 				    -mode=$MODE -xmode=$XMODE ; \
-           fi )
diff --git a/parallel/mpi-ch/patches/patch-as b/parallel/mpi-ch/patches/patch-as
deleted file mode 100644
index d732e7258b9..00000000000
--- a/parallel/mpi-ch/patches/patch-as
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-as,v 1.1 2001/03/21 15:29:01 wennmach Exp $
-
-Adopt to pkg hierarchy.
-
---- mpe/viewers/upshot/sbin/install-viewer.in.orig	Wed Jun 28 00:08:08 2000
-+++ mpe/viewers/upshot/sbin/install-viewer.in	Wed Mar 21 13:57:07 2001
-@@ -333,8 +333,8 @@
- if [ "$prefix_override" = 1 ] ; then
-     bindir=$prefix/bin
-     sbindir=$prefix/sbin
--    bitmapsdir=$prefix/bitmaps
--    logfilesdir=$prefix/logfiles
-+    bitmapsdir=$prefix/share/upshot/bitmaps
-+    logfilesdir=$prefix/share/upshot/logfiles
-     if [ $appendUninstall = 0 ] ; then
-         UNINSTALLFILE=${sbindir}/${UNINSTALL_base}
-     fi
diff --git a/parallel/mpi-ch/patches/patch-at b/parallel/mpi-ch/patches/patch-at
index 46b15818651..114a519b27d 100644
--- a/parallel/mpi-ch/patches/patch-at
+++ b/parallel/mpi-ch/patches/patch-at
@@ -1,10 +1,7 @@
-$NetBSD: patch-at,v 1.1 2001/03/21 15:29:01 wennmach Exp $
-
-Adopt to pkg hierarchy.
-
---- mpe/sbin/mpeinstall.in.orig	Fri Aug 25 17:03:17 2000
-+++ mpe/sbin/mpeinstall.in	Wed Mar 21 14:42:37 2001
-@@ -410,7 +410,7 @@
+$NetBSD: patch-at,v 1.2 2005/03/03 12:01:30 garbled Exp $
+--- mpe/sbin/mpeinstall.in.orig	2004-03-04 14:33:48.000000000 -0800
++++ mpe/sbin/mpeinstall.in	2004-10-15 09:32:29.000000000 -0700
+@@ -420,7 +420,7 @@
  MkDir $datadir
  
  # Set the Examples directory where the sample MPE programs are located
diff --git a/parallel/mpi-ch/patches/patch-au b/parallel/mpi-ch/patches/patch-au
index 880a02128bc..ef990ce9807 100644
--- a/parallel/mpi-ch/patches/patch-au
+++ b/parallel/mpi-ch/patches/patch-au
@@ -1,8 +1,7 @@
-$NetBSD: patch-au,v 1.1 2003/03/27 21:07:06 jschauma Exp $
-
---- examples/perftest/Makefile.in.orig	Mon Jan 13 17:20:14 2003
-+++ examples/perftest/Makefile.in	Thu Mar 27 10:40:39 2003
-@@ -101,7 +101,7 @@
+$NetBSD: patch-au,v 1.2 2005/03/03 12:01:30 garbled Exp $
+--- examples/perftest/Makefile.in.orig	2004-08-04 09:08:28.000000000 -0700
++++ examples/perftest/Makefile.in	2004-10-15 09:34:01.000000000 -0700
+@@ -114,7 +114,7 @@
  vectest_SOURCES = vectest.f
  stress_SOURCES = stress.c daytime.c getopts.c
  tcomm_SOURCES = tcomm.c mpe_seq.c getopts.c
@@ -11,7 +10,7 @@ $NetBSD: patch-au,v 1.1 2003/03/27 21:07:06 jschauma Exp $
  
  # Distribution modifications
  EXTRA_DIST = config ${EXTRA_SCRIPTS}
-@@ -115,7 +115,7 @@
+@@ -128,7 +128,7 @@
  DEFS = @DEFS@ -I. -I$(srcdir) -I.
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
@@ -20,7 +19,7 @@ $NetBSD: patch-au,v 1.1 2003/03/27 21:07:06 jschauma Exp $
  tunepkt_SOURCES = tunepkt.c
  tunepkt_OBJECTS =  tunepkt.o
  tunepkt_LDADD = $(LDADD)
-@@ -126,7 +126,7 @@
+@@ -139,7 +139,7 @@
  pktuse_LDADD = $(LDADD)
  pktuse_DEPENDENCIES = 
  pktuse_LDFLAGS = 
@@ -29,7 +28,7 @@ $NetBSD: patch-au,v 1.1 2003/03/27 21:07:06 jschauma Exp $
  copytest_LDADD = $(LDADD)
  copytest_DEPENDENCIES = 
  copytest_LDFLAGS = 
-@@ -260,12 +260,18 @@
+@@ -276,12 +276,18 @@
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -49,7 +48,7 @@ $NetBSD: patch-au,v 1.1 2003/03/27 21:07:06 jschauma Exp $
  
  uninstall-binPROGRAMS:
  	@$(NORMAL_UNINSTALL)
-@@ -326,7 +332,7 @@
+@@ -342,7 +348,7 @@
  
  mpptest: $(mpptest_OBJECTS) $(mpptest_DEPENDENCIES)
  	@rm -f mpptest
@@ -58,7 +57,7 @@ $NetBSD: patch-au,v 1.1 2003/03/27 21:07:06 jschauma Exp $
  
  goptest: $(goptest_OBJECTS) $(goptest_DEPENDENCIES)
  	@rm -f goptest
-@@ -440,7 +446,7 @@
+@@ -456,7 +462,7 @@
  install: install-am
  uninstall-am: uninstall-binPROGRAMS
  uninstall: uninstall-am
diff --git a/parallel/mpi-ch/patches/patch-av b/parallel/mpi-ch/patches/patch-av
index 62d8bdf38e3..6e45de910a1 100644
--- a/parallel/mpi-ch/patches/patch-av
+++ b/parallel/mpi-ch/patches/patch-av
@@ -1,8 +1,7 @@
-$NetBSD: patch-av,v 1.1 2003/03/27 21:07:06 jschauma Exp $
-
---- Makefile.in.orig	Thu Mar 27 10:51:11 2003
-+++ Makefile.in	Thu Mar 27 10:52:47 2003
-@@ -711,10 +711,9 @@
+$NetBSD: patch-av,v 1.2 2005/03/03 12:01:30 garbled Exp $
+--- Makefile.in.orig	2004-08-04 09:10:38.000000000 -0700
++++ Makefile.in	2004-10-15 09:38:33.000000000 -0700
+@@ -712,10 +712,9 @@
  # Install adds ALL of the examples to the installation area
  # This is an initial version.
  install-all: install
@@ -10,8 +9,8 @@ $NetBSD: patch-av,v 1.1 2003/03/27 21:07:06 jschauma Exp $
 -	-$(CPRP) -r examples $(PREFIX)
 +	-$(CPRP) -r examples/* $(PREFIX)/share/examples/mpi-ch
  	# Update the makefiles
--	(cd $(PREFIX)/examples ; \
-+	(cd $(PREFIX)/share/examples/mpi-ch ; \
+-	(cd $(PREFIX)/examples && \
++	(cd $(PREFIX)/share/examples/mpi-ch && \
  		$(bindir)/mpireconfig Makefile ; \
  		for dir in `find . -type d -print` ; do \
- 			(cd $$dir ; \
+ 			(cd $$dir && \
diff --git a/parallel/mpi-ch/patches/patch-ax b/parallel/mpi-ch/patches/patch-ax
index 336b9eaa21e..3b4b1ab3190 100644
--- a/parallel/mpi-ch/patches/patch-ax
+++ b/parallel/mpi-ch/patches/patch-ax
@@ -1,17 +1,16 @@
-$NetBSD: patch-ax,v 1.2 2003/12/03 21:06:17 jschauma Exp $
-
---- src/fortran/configure.orig	2003-09-11 12:19:17.000000000 -0400
-+++ src/fortran/configure	2003-12-02 22:42:57.000000000 -0500
-@@ -4620,12 +4620,12 @@
+$NetBSD: patch-ax,v 1.3 2005/03/03 12:01:30 garbled Exp $
+--- src/fortran/configure.orig	2004-08-04 09:08:27.000000000 -0700
++++ src/fortran/configure	2004-10-15 09:43:00.000000000 -0700
+@@ -4842,12 +4842,12 @@
      ac_fcompileforlib='${F77-f77} -c $FFLAGS conftest1.f 1>&5'
-     if { (eval echo configure:4622: \"$ac_fcompileforlib\") 1>&5; (eval $ac_fcompileforlib) 2>&5; } && test -s conftest1.o ; then
+     if { (eval echo configure:4844: \"$ac_fcompileforlib\") 1>&5; (eval $ac_fcompileforlib) 2>&5; } && test -s conftest1.o ; then
          if test ! -d conftest ; then mkdir conftest2 ; fi
--	        { ac_try='${ARCMD-"ar"} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
-+	        { ac_try='${ARCMD-ar} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
-         { ac_try='${RANLIB-ranlib} conftest2/libconftest.a'; { (eval echo configure:4625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+-	        { ac_try='${ARCMD-"ar"} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
++	        { ac_try='${ARCMD-ar} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+         { ac_try='${RANLIB-ranlib} conftest2/libconftest.a'; { (eval echo configure:4847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
          ac_fcompileldtest='${F77-f77} -o conftest $FFLAGS ${ldir}conftest2 conftest.f -lconftest $LDFLAGS 1>&5'
          for ldir in "-L" "-Wl,-L," ; do
-             if { (eval echo configure:4628: \"$ac_fcompileldtest\") 1>&5; (eval $ac_fcompileldtest) 2>&5; } && test -s conftest ; then
+             if { (eval echo configure:4850: \"$ac_fcompileldtest\") 1>&5; (eval $ac_fcompileldtest) 2>&5; } && test -s conftest ; then
 -	        pac_cv_prog_f77_library_dir_flag="$ldir"
 +	        pac_cv_prog_f77_library_dir_flag="${ldir}"
  	        break
diff --git a/parallel/mpi-ch/patches/patch-ay b/parallel/mpi-ch/patches/patch-ay
index b90d13368e5..6750e4daac8 100644
--- a/parallel/mpi-ch/patches/patch-ay
+++ b/parallel/mpi-ch/patches/patch-ay
@@ -1,10 +1,7 @@
-$NetBSD: patch-ay,v 1.1 2003/11/27 17:02:25 wennmach Exp $
-
-"rm -rf" with no arguments causes "usage" error messages; avoid this.
-
---- MPI-2-C++/configure.orig	Wed Nov 26 23:33:22 2003
-+++ MPI-2-C++/configure	Wed Nov 26 23:33:37 2003
-@@ -3249,15 +3249,13 @@
+$NetBSD: patch-ay,v 1.2 2005/03/03 12:01:30 garbled Exp $
+--- MPI-2-C++/configure.orig	2004-07-27 09:37:34.000000000 -0700
++++ MPI-2-C++/configure	2004-10-15 09:44:12.000000000 -0700
+@@ -3275,15 +3275,13 @@
  ; return 0; }
  EOF
  if { (eval echo configure:3232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -21,7 +18,7 @@ $NetBSD: patch-ay,v 1.1 2003/11/27 17:02:25 wennmach Exp $
  if test "$libmpi_found" = "yes"; then
      echo "$ac_t""yes" 1>&6
  else
-@@ -3465,12 +3463,10 @@
+@@ -3491,12 +3489,10 @@
  ; return 0; }
  EOF
  if { (eval echo configure:3448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@@ -34,7 +31,7 @@ $NetBSD: patch-ay,v 1.1 2003/11/27 17:02:25 wennmach Exp $
    use_pending=no
  fi
  rm -f conftest*
-@@ -3976,7 +3972,7 @@
+@@ -4002,7 +3998,7 @@
  EOF
  
  fi
@@ -43,7 +40,7 @@ $NetBSD: patch-ay,v 1.1 2003/11/27 17:02:25 wennmach Exp $
  
  # Don't ask.  It's an AIX thing.  <sob>
  if test "$?host" = "0"; then
-@@ -4052,7 +4048,7 @@
+@@ -4078,7 +4074,7 @@
  EOF
  
  fi
diff --git a/parallel/mpi-ch/patches/patch-ca b/parallel/mpi-ch/patches/patch-ca
index f7a1e89dd2c..24c2c3c7b0f 100644
--- a/parallel/mpi-ch/patches/patch-ca
+++ b/parallel/mpi-ch/patches/patch-ca
@@ -1,11 +1,10 @@
-$NetBSD: patch-ca,v 1.1 2004/06/24 17:32:14 drochner Exp $
-
---- romio/adio/common/ad_fstype.c.orig	2002-12-04 00:38:23.000000000 +0100
-+++ romio/adio/common/ad_fstype.c
-@@ -12,7 +12,15 @@
+$NetBSD: patch-ca,v 1.2 2005/03/03 12:01:30 garbled Exp $
+--- romio/adio/common/ad_fstype.c.orig	2003-09-04 13:24:44.000000000 -0700
++++ romio/adio/common/ad_fstype.c	2004-10-15 09:54:55.000000000 -0700
+@@ -11,7 +11,15 @@
+  */
  
  #include "adio.h"
- 
 -#if (defined(HPUX) || defined(SPPUX) || defined(IRIX) || defined(SOLARIS) || defined(AIX) || defined(DEC) || defined(CRAY))
 +#ifdef __NetBSD__
 +#include <sys/param.h>
@@ -19,12 +18,12 @@ $NetBSD: patch-ca,v 1.1 2004/06/24 17:32:14 drochner Exp $
  #include <sys/statvfs.h>
  #endif
  #ifdef LINUX
-@@ -143,10 +151,10 @@ static void ADIO_FileSysType_fncall(char
+@@ -159,10 +167,10 @@
      char *dir;
      int err;
  #endif
 -#if (defined(HPUX) || defined(SPPUX) || defined(IRIX) || defined(SOLARIS) || defined(AIX) || defined(DEC) || defined(CRAY))
-+#if (defined(HPUX) || defined(SPPUX) || defined(IRIX) || defined(SOLARIS) || defined(AIX) || defined(DEC) || defined(CRAY) || defined(NETBSD_STATVFS))
++#if (defined(HPUX) || defined(SPPUX) || defined(IRIX) || defined(SOLARIS) || defined(AIX) || defined(DEC) || defined(CRAY) || defined(NETBSD_STATVFS)) 
      struct statvfs vfsbuf;
  #endif
 -#if (defined(LINUX) || defined(FREEBSD) || defined(tflops))
@@ -32,7 +31,7 @@ $NetBSD: patch-ca,v 1.1 2004/06/24 17:32:14 drochner Exp $
      struct statfs fsbuf;
  #endif
  #ifdef PARAGON
-@@ -158,7 +166,7 @@ static void ADIO_FileSysType_fncall(char
+@@ -174,7 +182,7 @@
  
      *error_code = MPI_SUCCESS;
  
@@ -41,8 +40,8 @@ $NetBSD: patch-ca,v 1.1 2004/06/24 17:32:14 drochner Exp $
      do {
  	err = statvfs(filename, &vfsbuf);
      } while (err && (errno == ESTALE));
-@@ -207,7 +215,7 @@ static void ADIO_FileSysType_fncall(char
- # endif
+@@ -226,7 +234,7 @@
+ #endif
  	else *fstype = ADIO_UFS;
      }
 -#elif (defined(FREEBSD) && defined(HAVE_MOUNT_NFS))