Update to MPICH2 1.2.1.

===============================================================================
                               Changes in 1.2.1
===============================================================================

 # OVERALL: Improved support for fine-grained multithreading.

 # OVERALL: Improved integration with Valgrind for debugging builds of MPICH2.

 # PM/PMI: Initial support for hwloc process-core binding library in
   Hydra.

 # PM/PMI: Updates to the PMI-2 code to match the PMI-2 API and
   wire-protocol draft.

 # Several other minor bug fixes, memory leak fixes, and code cleanup.
   A full list of changes is available using:

     svn log -r5425:HEAD https://svn.mcs.anl.gov/repos/mpi/mpich2/tags/release/mpich2-1.2.1

     ... or at the following link:

     https://trac.mcs.anl.gov/projects/mpich2/log/mpich2/tags/release/mpich2-1.2.1?action=follow_copy&rev=HEAD&stop_rev=5425&mode=follow_copy


===============================================================================
                               Changes in 1.2
===============================================================================

 # OVERALL: Support for MPI-2.2

 # OVERALL: Several fixes to Nemesis/MX.

 # WINDOWS: Performance improvements to Nemesis/windows.

 # PM/PMI: Scalability and performance improvements to Hydra using
   PMI-1.1 process-mapping features.

 # PM/PMI: Support for process-binding for hyperthreading enabled
   systems in Hydra.

 # PM/PMI: Initial support for PBS as a resource management kernel in
   Hydra.

 # PM/PMI: PMI2 client code is now officially included in the release.

 # TEST SUITE: Support to run the MPICH2 test suite through valgrind.

 # Several other minor bug fixes, memory leak fixes, and code cleanup.
   A full list of changes is available using:

     svn log -r5025:HEAD https://svn.mcs.anl.gov/repos/mpi/mpich2/tags/release/mpich2-1.2

     ... or at the following link:

     https://trac.mcs.anl.gov/projects/mpich2/log/mpich2/tags/release/mpich2-1.2?action=follow_copy&rev=HEAD&stop_rev=5025&mode=follow_copy


===============================================================================
                               Changes in 1.1.1p1
===============================================================================

 - OVERALL: Fixed an invalid read in the dataloop code for zero count types.

 - OVERALL: Fixed several bugs in ch3:nemesis:mx (tickets #744,#760;
   also change r5126).

 - BUILD SYSTEM: Several fixes for functionality broken in 1.1.1 release,
   including MPICH2LIB_xFLAGS and extra libraries living in $LIBS instead of
   $LDFLAGS.  Also, '-lpthread' should no longer be duplicated in link lines.

 - BUILD SYSTEM: MPICH2 shared libraries are now compatible with glibc versioned
   symbols on Linux, such as those present in the MX shared libraries.

 - BUILD SYSTEM: Minor tweaks to improve compilation under the nvcc CUDA
   compiler.

 - PM/PMI: Fix mpd incompatibility with python2.3 introduced in mpich2-1.1.1.

 - PM/PMI: Several fixes to hydra, including memory leak fixes and process
   binding issues.

 - TEST SUITE: Correct invalid arguments in the coll2 and coll3 tests.

 - Several other minor bug fixes, memory leak fixes, and code cleanup.  A full
   list of changes is available using:

     svn log -r5032:HEAD https://svn.mcs.anl.gov/repos/mpi/mpich2/tags/release/mpich2-1.1.1p1

     ... or at the following link:

     https://trac.mcs.anl.gov/projects/mpich2/log/mpich2/tags/release/mpich2-1.1.1p1?action=follow_copy&rev=HEAD&stop_rev=5032&mode=follow_copy


===============================================================================
                               Changes in 1.1.1
===============================================================================

 # OVERALL: Improved support for Boost MPI.

 # PM/PMI: Significantly improved time taken by MPI_Init with Nemesis and MPD on
   large numbers of processes.

 # PM/PMI: Improved support for hybrid MPI-UPC program launching with
   Hydra.

 # PM/PMI: Improved support for process-core binding with Hydra.

 # PM/PMI: Preliminary support for PMI-2. Currently supported only
   with Hydra.

 # Many other bug fixes, memory leak fixes and code cleanup. A full
   list of changes is available using:

  svn log -r4655:HEAD https://svn.mcs.anl.gov/repos/mpi/mpich2/tags/release/mpich2-1.1.1

  ... or at the following link:

  https://trac.mcs.anl.gov/projects/mpich2/log/mpich2/tags/release/mpich2-1.1.1?action=follow_copy&rev=HEAD&stop_rev=4655&mode=follow_copy


===============================================================================
                               Changes in 1.1
===============================================================================

- OVERALL: Added MPI 2.1 support.

- OVERALL: Nemesis is now the default configuration channel with a
  completely new TCP communication module.

- OVERALL: Windows support for nemesis.

- OVERALL: Added a new Myrinet MX network module for nemesis.

- OVERALL: Initial support for shared-memory aware collective
  communication operations.  Currently MPI_Bcast, MPI_Reduce, MPI_Allreduce,
  and MPI_Scan.

- OVERALL: Improved handling of MPI Attributes.

- OVERALL: Support for BlueGene/P through the DCMF library (thanks to
  IBM for the patch).

- OVERALL: Experimental support for fine-grained multithreading

- OVERALL: Added dynamic processes support for Nemesis.

- OVERALL: Added automatic as well as statically runtime configurable
  receive timeout variation for MPD (thanks to OSU for the patch).

- OVERALL: Improved performance for MPI_Allgatherv, MPI_Gatherv, and MPI_Alltoall.

- PM/PMI: Initial support for the new Hydra process management
  framework (current support is for ssh, rsh, fork and a preliminary
  version of slurm).

- ROMIO: Added support for MPI_Type_create_resized and
  MPI_Type_create_indexed_block datatypes in ROMIO.

- ROMIO: Optimized Lustre ADIO driver (thanks to Weikuan Yu for
  initial work and Sun for further improvements).

- Many other bug fixes, memory leak fixes and code cleanup. A full
  list of changes is available using:

  svn log -r813:HEAD https://svn.mcs.anl.gov/repos/mpi/mpich2/tags/release/mpich2-1.1

  ... or at the following link:

  https://trac.mcs.anl.gov/projects/mpich2/log/mpich2/tags/release/mpich2-1.1?action=follow_copy&rev=HEAD&stop_rev=813&mode=follow_copy

1 files changed, 25 insertions, 23 deletions

diff --git a/parallel/mpi-ch/patches/patch-ac b/parallel/mpi-ch/patches/patch-ac
index 21fd4e659b5..ada6322ad1b 100644
--- a/parallel/mpi-ch/patches/patch-ac
+++ b/parallel/mpi-ch/patches/patch-ac
@@ -1,39 +1,41 @@
-$NetBSD: patch-ac,v 1.6 2008/12/21 11:41:01 obache Exp $
+$NetBSD: patch-ac,v 1.7 2009/12/13 18:38:11 asau Exp $
 
 Install sample configuration files in example directory.
 
---- src/mpe2/sbin/mpeinstall.in.orig	2008-10-24 20:56:05.000000000 +0400
-+++ src/mpe2/sbin/mpeinstall.in	2008-12-20 18:17:51.000000000 +0300
-@@ -40,13 +40,15 @@
+--- src/mpe2/sbin/mpeinstall.in.orig	2009-10-16 03:50:22.000000000 +0400
++++ src/mpe2/sbin/mpeinstall.in	2009-12-11 12:55:38.000000000 +0300
+@@ -40,12 +40,8 @@
  mandir=@mandir@
- # Since autoconf < 2.60 does not set docdir and htmldir,
- # check if they are set.  If not, set them accordingly.
+ # Since autoconf < 2.60 does not set @docdir@ and @htmldir@,
+ # If not set, docdir=@docdir@ remains, set them accordingly.
 -if [ "$docdir" = "@docdir@" ] ; then
 -    docdir=${datadir}/doc/${PACKAGE}
-+if [ "$docdir" = "@docdir@" ] ; then # don't override what we set.
-+#    docdir=${datadir}/doc/${PACKAGE}
- fi
+-fi
 -if [ "$htmldir" = "@htmldir@" ] ; then
 -    htmldir=${docdir}
-+if [ "$htmldir" = "@htmldir@" ] ; then # don't override what we set.
-+#    htmldir=${docdir}
+-fi
++case "$docdir" in @docdir) docdir=${datadir}/doc/${PACKAGE} ;; esac
++case "$htmldir" in @htmldir) htmldir=${docdir} ;; esac
+ 
+ # Assume PROF_LIBNAME=MPE_LIBNAME.
+ PROF_LIBNAME=@MPE_LIBNAME@
+@@ -494,14 +490,16 @@
+     fi
  fi
  
 +exampledir=${datadir}/examples
 +
- # Assume PROF_LIBNAME=MPE_LIBNAME.
- PROF_LIBNAME=@MPE_LIBNAME@
- MPI_IMPL=@MPI_IMPL@
-@@ -493,10 +495,10 @@
+ # Install compiler configuration files
  if [ -n "$etcbuild_dir" ] ; then
      if [ -d $etcbuild_dir ] ; then
-          echo "Installing $pkgname configuration files to $DESTDIR$sysconfdir"
--         InstallDirRecur $etcbuild_dir $sysconfdir $MODE
-+         InstallDirRecur $etcbuild_dir $exampledir $MODE
-          cd $etcbuild_dir && \
-          for file in *.conf ; do \
--             FixInstallFile $file $sysconfdir/$file ; \
-+             FixInstallFile $file $exampledir/$file ; \
-          done
+-        echo "Installing $pkgname configuration files to $DESTDIR$sysconfdir"
+-        MkDir $sysconfdir
++        echo "Installing $pkgname configuration files to $DESTDIR$exampledir"
++        MkDir $exampledir
+         cd $etcbuild_dir && \
+         for file in *.conf ; do \
+-            FixInstallFile $file $sysconfdir/$file ; \
++            FixInstallFile $file $exampledir/$file ; \
+         done
      fi
  fi