Update to latest version 1.2.5-1a (pkgversion 1.2.5.1.1)

From the packages README:
Version 1.2.5 is primarily a bug-fix release.  New features include

Significantly better collective algorithms are available.

Major changes for the globus2 device and the ch_nt device.

Information on previous versions
--------------------------------
Features new or improved in Version 1.2.4 included:

SMP support has been inproved through the use of sched_yield.  SMP Systems that
are not oversubscribed can consider configuring with --disable-yeild.

A number of bugs in the ch_p4, ch_p4mpd, and ch_shmem device hae been fixed.
These could cause programs to hang or generate error messages.

Features new or improved in Version 1.2.3 included:

Bug fixes and improved-portability,
particularly in the area of Linux and Mac OS X support.  Other new features
include better support for Intel compilers, particularly for IA64 Linux,
better support for various Fortran compilers, and some fixes for rare race
conditions in the ch_p4 device.  The documentation on the ch_p4mpd device and
the MPD system has been improved.  Version 1.2.3 also includes all of the
source for both the Unix and Windows versions.  Windows users should still
use the self-installing version available through the web page.  The globus
device now supports version 2 of Globus.

Features new or improved in Version 1.2.2 included:

There are a number of improvements to the ch_p4 device that improve both
performance and reliability, particularly on Linux platforms.

Significant upgrades have been made to the MPD system of daemons that provide
fast startup of MPICH jobs, management of stdio, and a crude parallel debugger
based on gdb.

8 files changed, 234 insertions, 149 deletions

diff --git a/parallel/mpi-ch/patches/patch-aa b/parallel/mpi-ch/patches/patch-aa
index e6c3cc4ab26..9e3bc0a3687 100644
--- a/parallel/mpi-ch/patches/patch-aa
+++ b/parallel/mpi-ch/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.3 2001/03/21 15:28:58 wennmach Exp $
+$NetBSD: patch-aa,v 1.4 2003/03/27 21:07:05 jschauma Exp $
 
---- configure.orig	Tue Jul  7 07:52:46 1998
-+++ configure	Thu Aug  6 03:18:27 1998
-@@ -9791,14 +9791,9 @@
- cat > conftest.c <<EOF
+--- 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.  */
@@ -14,9 +14,9 @@ $NetBSD: patch-aa,v 1.3 2001/03/21 15:28:58 wennmach Exp $
 -  } u;
 -  u.l = 1;
 -  exit (u.c[sizeof (long) - 1] == 1);
-+        int     indian = 1;
-+
++	int     indian = 1;
++	
 +	exit(*(char *)&indian));
  }
  EOF
- eval $compile
+         if test -n "$compile" ; then 
diff --git a/parallel/mpi-ch/patches/patch-al b/parallel/mpi-ch/patches/patch-al
index 8752ce7bfb4..b92a9cb1ee1 100644
--- a/parallel/mpi-ch/patches/patch-al
+++ b/parallel/mpi-ch/patches/patch-al
@@ -1,10 +1,8 @@
-$NetBSD: patch-al,v 1.5 2001/03/21 15:29:00 wennmach Exp $
+$NetBSD: patch-al,v 1.6 2003/03/27 21:07:05 jschauma Exp $
 
-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 @@
+--- util/mpiinstall.in.orig	Mon Jan 13 18:12:29 2003
++++ util/mpiinstall.in	Thu Mar 27 12:04:15 2003
+@@ -453,9 +453,11 @@
  MkDir $docdir
  MkDir $sysconfdir
  
@@ -18,7 +16,7 @@ Adopt to pkg hierarchy.
      MkDir $includedir/mpi2c++
  fi
  
-@@ -648,7 +650,7 @@
+@@ -670,7 +672,7 @@
      #	$CPRP -r util/machines $prefix/util/machines.anl
      for file in util/machines/machines* ; do
          if [ -s $file ] ; then 
@@ -27,97 +25,63 @@ Adopt to pkg hierarchy.
  	fi
      done
      #
-@@ -868,7 +870,7 @@
+@@ -963,6 +965,8 @@
  CopyFile $top_srcdir/util/cleanipcs $sbindir $XMODE
  #
  # Example programs
--CopyFile $top_srcdir/installtest/Makefile.in $prefix/examples
-+CopyFile $top_srcdir/installtest/Makefile.in $prefix/share/examples/mpi-ch
++# We install all example programs, so we can skip these
++if [ ! true ]; then
+ CopyFile $top_srcdir/installtest/Makefile.in $prefix/examples
  #
  # This SHOULD use mpireconfig...
- Savevar=$prefix
-@@ -876,44 +878,44 @@
- # prefix=@prefix@ when ever prefix= starts in the first column (!)
- # It also does this with exec_prefix (!!)
-      prefix=$APREFIX
--(cd $prefix/examples ; $bindir/mpireconfig Makefile )
--echo "(cd $prefix/examples ; $MAKE clean)" >> $UNINSTALLFILE
--echo "/bin/rm -f $prefix/examples/Makefile" >> $UNINSTALLFILE
-+(cd $prefix/share/examples/mpi-ch ; $bindir/mpireconfig Makefile )
-+echo "(cd $prefix/share/examples/mpi-ch ; $MAKE clean)" >> $UNINSTALLFILE
-+echo "/bin/rm -f $prefix/share/examples/mpi-ch/Makefile" >> $UNINSTALLFILE
-      prefix=$Savevar
--CopyFile $prefix/examples/Makefile $datadir/Makefile.sample
--CopyFile $top_srcdir/installtest/cpi.c $prefix/examples
--CopyFile $top_srcdir/installtest/cpip.c $prefix/examples
--CopyFile $top_srcdir/installtest/cpilog.c $prefix/examples
--CopyFile $top_srcdir/installtest/hello++.cc $prefix/examples
-+CopyFile $prefix/share/examples/mpi-ch/Makefile $prefix/share/examples/mpi-ch/Makefile.sample
-+CopyFile $top_srcdir/installtest/cpi.c $prefix/share/examples/mpi-ch
-+CopyFile $top_srcdir/installtest/cpip.c $prefix/share/examples/mpi-ch
-+CopyFile $top_srcdir/installtest/cpilog.c $prefix/share/examples/mpi-ch
-+CopyFile $top_srcdir/installtest/hello++.cc $prefix/share/examples/mpi-ch
- if [ "@NOF77@" = "0" ] ; then
--    CopyFile $top_srcdir/installtest/pi3.f $prefix/examples
--    CopyFile $top_srcdir/installtest/pi3p.f $prefix/examples
-+    CopyFile $top_srcdir/installtest/pi3.f $prefix/share/examples/mpi-ch
-+    CopyFile $top_srcdir/installtest/pi3p.f $prefix/share/examples/mpi-ch
-     if [ "@NO_F90@" = "0" ] ; then
--        CopyFile $top_srcdir/installtest/pi3f90.f90 $prefix/examples
-+        CopyFile $top_srcdir/installtest/pi3f90.f90 $prefix/share/examples/mpi-ch
-     fi
- fi
- if [ -s $top_srcdir/romio/test/simple.c ] ; then 
--    CopyFile $top_srcdir/romio/test/simple.c $prefix/examples/simpleio.c
-+    CopyFile $top_srcdir/romio/test/simple.c $prefix/share/examples/mpi-ch/simpleio.c
- fi
--CopyFile $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 ; \
--	  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
+@@ -996,14 +1000,16 @@
+ $Show "(cd $DESTDIR$prefix/examples ; /bin/rm -f mpirun ; \
+ 	  ln -s ../bin/mpirun mpirun )"
+ echo "/bin/rm -f $prefix/examples/mpirun" >> $UNINSTALLFILE
++
++fi # no examples
  #
  echo "About to run installation test..."
--$Show "(cd $prefix/examples; $MAKE all ; $MAKE clean )"
-+$Show "(cd $prefix/share/examples/mpi-ch; $MAKE all ; $MAKE clean )"
- if [ @SHAREDKIND@ != "ignore" ] ; then
+ if [ "x$DESTDIR" = "x" ]; then
+   # only works when DESTDIR is blank, and installing on final location.
+-  $Show "(cd $DESTDIR$prefix/examples; $MAKE all ; $MAKE clean )"
++  $Show "(cd $prefix/share/examples/mpi-ch; $MAKE all ; $MAKE clean )"
+   if [ @SHAREDKIND@ != "ignore" ] ; then
      echo "About to run installation test for shared libraries ..."
--    $Show "(cd $prefix/examples; MPICH_USE_SHLIB="yes"; export MPICH_USE_SHLIB; $MAKE all ; $MAKE clean )"
+-    $Show "(cd $DESTDIR$prefix/examples; MPICH_USE_SHLIB="yes"; export MPICH_USE_SHLIB; $MAKE all ; $MAKE clean )"
 +    $Show "(cd $prefix/share/examples/mpi-ch; MPICH_USE_SHLIB="yes"; export MPICH_USE_SHLIB; $MAKE all ; $MAKE clean )"
+   fi
  fi
  #
- # This SHOULD use mpireconfig...
- Savevar=$prefix
+@@ -1012,39 +1018,40 @@
  if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then 
+ # Removed the installation of these extra examples.  
      # C++ Example programs 
--    CopyFile $top_srcdir/installtest/mpi-2-c++/Makefile.in $prefix/examples/$CPP_DIR
+-#    CopyFile $top_srcdir/installtest/mpi-2-c++/Makefile.in $prefix/examples/$CPP_DIR
 +    CopyFile $top_srcdir/installtest/mpi-2-c++/Makefile.in $prefix/share/examples/mpi-ch/$CPP_DIR
      #
      prefix=$APREFIX
-     CPPEXDIR=$top_srcdir/$CPP_DIR/contrib/examples
-@@ -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
+-#      CPPEXDIR=$top_srcdir/$CPP_DIR/contrib/examples
++      CPPEXDIR=$top_srcdir/$CPP_DIR/contrib/examples
+ #      # This isn't correct because it doesn't handle all of the fields in
+ #      # the C++ examples Makefile, particularly the TEMPLATE_REP field
+ #      # The intent here is to update the directories; but we also need
+ #      # to update a few additional fields
+-#      (cd $prefix/examples/$CPP_DIR ; $bindir/mpireconfig Makefile )
+-#      echo "(cd $prefix/examples/$CPP_DIR ; $MAKE clean)" >> $UNINSTALLFILE
+-#      echo "/bin/rm -f $prefix/examples/$CPP_DIR/Makefile" >> $UNINSTALLFILE
+-#      prefix=$Savevar
+-#      CopyFile $CPPEXDIR/hello_world.cc $prefix/examples/$CPP_DIR
+-#      CopyFile $CPPEXDIR/ring.cc $prefix/examples/$CPP_DIR
+-#      CopyFile $CPPEXDIR/topology.cc $prefix/examples/$CPP_DIR
+-#      CopyFile $CPPEXDIR/user_bcast.cc $prefix/examples/$CPP_DIR
+-#      CopyFile $CPPEXDIR/chapter_10_mpi2.cc $prefix/examples/$CPP_DIR
+-#      CopyFile $CPPEXDIR/pi.cc $prefix/examples/$CPP_DIR
+-#      CopyFile $CPPEXDIR/README $prefix/examples/$CPP_DIR
++	(cd $prefix/share/examples/mpi-ch/$CPP_DIR ; $bindir/mpireconfig Makefile )
++	echo "(cd $prefix/share/examples/mpi-ch/$CPP_DIR ; $MAKE clean)" >> $UNINSTALLFILE
++	echo "/bin/rm -f $prefix/share/examples/mpi-ch/$CPP_DIR/Makefile" >> $UNINSTALLFILE
++      prefix=$Savevar
 +    CopyFile $CPPEXDIR/hello_world.cc $prefix/share/examples/mpi-ch/$CPP_DIR
 +    CopyFile $CPPEXDIR/ring.cc $prefix/share/examples/mpi-ch/$CPP_DIR
 +    CopyFile $CPPEXDIR/topology.cc $prefix/share/examples/mpi-ch/$CPP_DIR
@@ -125,18 +89,30 @@ Adopt to pkg hierarchy.
 +    CopyFile $CPPEXDIR/chapter_10_mpi2.cc $prefix/share/examples/mpi-ch/$CPP_DIR
 +    CopyFile $CPPEXDIR/pi.cc $prefix/share/examples/mpi-ch/$CPP_DIR
 +    CopyFile $CPPEXDIR/README $prefix/share/examples/mpi-ch/$CPP_DIR
-     #
-     # Test build the C++ examples
--    $Show "(cd $prefix/examples/$CPP_DIR ; /bin/rm -f mpirun ; \
--	      ln -s ../../bin/mpirun mpirun )"
--    echo "/bin/rm -f $prefix/examples/$CPP_DIR/mpirun" >> $UNINSTALLFILE
++
+ #      #
+ #      # Test build the C++ examples
+-#      $Show "(cd $prefix/examples/$CPP_DIR ; /bin/rm -f mpirun ; \
+-#  	      ln -s ../../bin/mpirun mpirun )"
+-#      echo "/bin/rm -f $prefix/examples/$CPP_DIR/mpirun" >> $UNINSTALLFILE
+-#      #
+-#      echo "About to run C++ installation test..."
+-#      $Show "(cd $prefix/examples/$CPP_DIR; $MAKE ; $MAKE clean)"
 +    $Show "(cd $prefix/share/examples/mpi-ch/$CPP_DIR ; /bin/rm -f mpirun ; \
-+	ln -s $bindir/mpirun mpirun )"
++       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/examples/$CPP_DIR; $MAKE ; $MAKE clean)"
-+    $Show "(cd $prefix/share/examples/mpi-ch/$CPP_DIR; $MAKE ; $MAKE clean)"
++
++      echo "About to run C++ installation test..."
++      $Show "(cd $prefix/share/examples/mpi-ch/$CPP_DIR; $MAKE ; $MAKE clean)"
+ #      # A temporary fix because C++ clean doesn't remove any template 
+ #      # directories.  This will eventually need to be changed into a for loop
+ #      # (even better, the clean target in the Makefile should be fixed)
+-#      if [ -d $prefix/examples/$CPP_DIR/ii_files ] ; then
+-#          $Show rm -rf $prefix/examples/$CPP_DIR/ii_files
+-#      fi
++      if [ -d $prefix/share/examples/mpi-ch/$CPP_DIR/ii_files ] ; then
++          $Show rm -rf $prefix/share/examples/mpi-ch/$CPP_DIR/ii_files
++      fi
      #
  fi
  #
diff --git a/parallel/mpi-ch/patches/patch-an b/parallel/mpi-ch/patches/patch-an
deleted file mode 100644
index a1f54ea0157..00000000000
--- a/parallel/mpi-ch/patches/patch-an
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-an,v 1.1 2001/03/21 15:29:01 wennmach Exp $
-
-Add "NETBSD" where appropriate.
-
---- mpid/ch_p4/p4/usc/usc.c.orig	Mon Mar 19 20:26:34 2001
-+++ mpid/ch_p4/p4/usc/usc.c	Mon Mar 19 20:28:13 2001
-@@ -88,7 +88,7 @@
- 
- #if defined(SUN) || defined(HP) || defined(DEC5000) || \
-     defined(SUN_SOLARIS) || defined(FREEBSD) || defined(LINUX) || \
--    defined(I86_SOLARIS) || \
-+    defined(I86_SOLARIS) || defined(NETBSD) || \
-     defined(BALANCE) || \
-     defined(RS6000)  ||  defined(IBM3090) || \
-     defined(NEXT) || defined(TITAN) || defined(GP_1000) || \
-@@ -198,7 +198,7 @@
- 
- #if defined(SUN) || defined(HP) || \
-     defined(SUN_SOLARIS) || defined(FREEBSD) || defined(LINUX) || \
--    defined(I86_SOLARIS) || \
-+    defined(I86_SOLARIS) || defined(NETBSD) || \
-     defined(BALANCE) || \
-     defined(RS6000) || defined(IBM3090) || \
-     defined(NEXT) || defined(TITAN) || defined(TC1000) || \
diff --git a/parallel/mpi-ch/patches/patch-aq b/parallel/mpi-ch/patches/patch-aq
deleted file mode 100644
index 202a60813b6..00000000000
--- a/parallel/mpi-ch/patches/patch-aq
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2001/03/21 15:29:01 wennmach Exp $
-
-PVFS symbol confusion.
-
---- romio/adio/common/ad_fstype.c.orig	Mon Mar 19 22:55:26 2001
-+++ romio/adio/common/ad_fstype.c	Mon Mar 19 22:57:50 2001
-@@ -26,7 +26,9 @@
- #ifdef SX4
- #include <sys/stat.h>
- #endif
--#ifdef PVFS
-+/* NetBSD defines PVFS in sys/param.h, but that PVFS has nothing to do
-+   with the PVFS file system */
-+#if defined(PVFS) && !defined(__NetBSD__)
- #include "pvfs_config.h"
- #endif
- 
diff --git a/parallel/mpi-ch/patches/patch-ar b/parallel/mpi-ch/patches/patch-ar
index 1d08ceb8bc2..d4b5118ca82 100644
--- a/parallel/mpi-ch/patches/patch-ar
+++ b/parallel/mpi-ch/patches/patch-ar
@@ -1,15 +1,13 @@
-$NetBSD: patch-ar,v 1.1 2001/03/21 15:29:01 wennmach Exp $
+$NetBSD: patch-ar,v 1.2 2003/03/27 21:07:06 jschauma 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 @@
+--- 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 ; \
+                                     -uninstall=$UNINSTALLFILE \
+ 				    -mode=$MODE -xmode=$XMODE ; \
            fi )
-     fi
diff --git a/parallel/mpi-ch/patches/patch-au b/parallel/mpi-ch/patches/patch-au
new file mode 100644
index 00000000000..880a02128bc
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-au
@@ -0,0 +1,69 @@
+$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 @@
+ vectest_SOURCES = vectest.f
+ stress_SOURCES = stress.c daytime.c getopts.c
+ tcomm_SOURCES = tcomm.c mpe_seq.c getopts.c
+-copytest_SOURCES = copytest.c duff.c
++copytest_SOURCES = copytest.c
+ 
+ # Distribution modifications
+ EXTRA_DIST = config ${EXTRA_SCRIPTS}
+@@ -115,7 +115,7 @@
+ DEFS = @DEFS@ -I. -I$(srcdir) -I.
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lm
+ tunepkt_SOURCES = tunepkt.c
+ tunepkt_OBJECTS =  tunepkt.o
+ tunepkt_LDADD = $(LDADD)
+@@ -126,7 +126,7 @@
+ pktuse_LDADD = $(LDADD)
+ pktuse_DEPENDENCIES = 
+ pktuse_LDFLAGS = 
+-copytest_OBJECTS =  copytest.o duff.o
++copytest_OBJECTS =  copytest.o
+ copytest_LDADD = $(LDADD)
+ copytest_DEPENDENCIES = 
+ copytest_LDFLAGS = 
+@@ -260,12 +260,18 @@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
+-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	@list='$(bin_PROGRAMS) $(EXTRA_PROGRAMS)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+ 	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ 	  else :; fi; \
+ 	done
++	@list='$(EXTRA_SCRIPTS)'; for p in $$list; do \
++	  if test -f $$p; then \
++	    echo "  $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
++	     $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++	  else :; fi; \
++	done
+ 
+ uninstall-binPROGRAMS:
+ 	@$(NORMAL_UNINSTALL)
+@@ -326,7 +332,7 @@
+ 
+ mpptest: $(mpptest_OBJECTS) $(mpptest_DEPENDENCIES)
+ 	@rm -f mpptest
+-	$(LINK) $(mpptest_LDFLAGS) $(mpptest_OBJECTS) $(mpptest_LDADD) $(LIBS)
++	$(LINK) $(mpptest_LDFLAGS) $(mpptest_OBJECTS) $(mpptest_LDADD) $(LIBS) -lm
+ 
+ goptest: $(goptest_OBJECTS) $(goptest_DEPENDENCIES)
+ 	@rm -f goptest
+@@ -440,7 +446,7 @@
+ install: install-am
+ uninstall-am: uninstall-binPROGRAMS
+ uninstall: uninstall-am
+-all-am: Makefile $(PROGRAMS) $(HEADERS) mpptestconf.h
++all-am: Makefile $(PROGRAMS) $(EXTRA_PROGRAMS) $(HEADERS) mpptestconf.h
+ all-redirect: all-am
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
diff --git a/parallel/mpi-ch/patches/patch-av b/parallel/mpi-ch/patches/patch-av
new file mode 100644
index 00000000000..62d8bdf38e3
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-av
@@ -0,0 +1,17 @@
+$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 @@
+ # Install adds ALL of the examples to the installation area
+ # This is an initial version.
+ install-all: install
+-	(rm $(PREFIX)/examples/*)
+-	-$(CPRP) -r examples $(PREFIX)
++	-$(CPRP) -r examples/* $(PREFIX)/share/examples/mpi-ch
+ 	# Update the makefiles
+-	(cd $(PREFIX)/examples ; \
++	(cd $(PREFIX)/share/examples/mpi-ch ; \
+ 		$(bindir)/mpireconfig Makefile ; \
+ 		for dir in `find . -type d -print` ; do \
+ 			(cd $$dir ; \
diff --git a/parallel/mpi-ch/patches/patch-aw b/parallel/mpi-ch/patches/patch-aw
new file mode 100644
index 00000000000..746530e0da5
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-aw
@@ -0,0 +1,66 @@
+$NetBSD: patch-aw,v 1.1 2003/03/27 21:07:06 jschauma Exp $
+
+--- man/man1/MPI.1.orig	Mon Jan 13 17:20:16 2003
++++ man/man1/MPI.1	Thu Mar 27 13:33:25 2003
+@@ -27,12 +27,12 @@
+ 
+ Add MPI to your path
+ .nf
+-% set path = ( $path /usr/local/mpi/bin )
++% set path = ( $path @PREFIX@/bin )
+ .fi
+ 
+ Compute pi to a given resolution on 8 processors or threads
+ .nf
+-% mpirun -np 8 /usr/local/mpi/examples/basic/fpi
++% mpirun -np 8 @PREFIX@/share/examples/mpi-ch/basic/fpi
+ .fi
+ 
+ Try 10000 intervals at the prompt.  Fortran source is available
+@@ -40,7 +40,7 @@
+ 
+ A coarse timing program is also available here
+ .nf
+-% mpirun -np 8 /usr/local/mpi/examples/basic/systest
++% mpirun -np 8 @PREFIX@/share/examples/mpi-ch/basic/systest
+ .fi
+ 
+ More sophisticated timing programs may be found in the source for the MPICH
+@@ -61,8 +61,7 @@
+ .SH DOCUMENTATION
+ 
+ Postscript documentation can be found in directory
+-/usr/local/mpi/doc/.  These include an introductory guide
+-(guide.ps) and a user manual (manual.ps).
++@PREFIX@/share/doc/mpi-ch.
+ 
+ Man pages exist for every MPI subroutine and function.  The command
+ .I mpiman
+@@ -92,14 +91,12 @@
+ .SH FILES
+ 
+ .nf
+-/usr/local/mpi/                 MPI software directory
+-/usr/local/mpi/COPYRIGHT        Copyright notice
+-/usr/local/mpi/README           various notes and instructions
+-/usr/local/mpi/bin/             binaries, including mpirun
+-/usr/local/mpi/examples/basic   elementary MPI programs
+-/usr/local/mpi/doc/             documentation
+-/usr/local/mpi/include/         include files
+-/usr/local/mpi/lib/             library files
++@PREFIX@/bin/                          binaries, including mpirun
++@PREFIX@/share/examples/mpi-ch/basic   elementary MPI programs
++@PREFIX@/share/doc/mpi-ch              documentation
++@PREFIX@/share/doc/html/mpi-ch         documentation
++@PREFIX@/include/                      include files
++@PREFIX@/mpi/lib/                      library files
+ .fi
+ 
+ 
+@@ -111,6 +108,3 @@
+ 
+ .SH ACKNOWLEDGEMENT
+ Thanks to Richard Frost for suggesting this page and providing a sample.
+-
+-.SH LOCATION
+-/home/MPI/mansrc/manpage