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, 18 insertions, 15 deletions

diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index 51cc1811346..77c69614907 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2009/12/03 13:06:56 asau Exp $
+# $NetBSD: Makefile,v 1.60 2009/12/13 18:38:10 asau Exp $
 
-DISTNAME=	mpich2-1.0.8
-PKGREVISION=	2
+DISTNAME=	mpich2-1.2.1
 CATEGORIES=	parallel
-MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/1.0.8/
+MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/1.2.1/
 
 MAINTAINER=	asau@inbox.ru
 HOMEPAGE=	http://www.mcs.anl.gov/research/projects/mpich2/
@@ -27,7 +26,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/${PKGBASE}
 CONFIGURE_ARGS+=	--htmldir=${PREFIX}/share/doc/${PKGBASE}/html
 
-CONFIGURE_ARGS+=	--disable-f90
+CONFIGURE_ARGS+=	--disable-f90	# problems?
 
 USE_TOOLS+=		perl:run
 
@@ -37,16 +36,12 @@ CONF_FILES+=		share/${PKGBASE}/examples/mpe_callstack_ldflags.conf \
 			${PKG_SYSCONFDIR}/mpe_callstack_ldflags.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpe_f77env.conf \
 			${PKG_SYSCONFDIR}/mpe_f77env.conf
-CONF_FILES+=		share/${PKGBASE}/examples/mpe_graphics.conf \
-			${PKG_SYSCONFDIR}/mpe_graphics.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpe_help.conf \
 			${PKG_SYSCONFDIR}/mpe_help.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpe_log.conf \
 			${PKG_SYSCONFDIR}/mpe_log.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpe_log_postlib.conf \
 			${PKG_SYSCONFDIR}/mpe_log_postlib.conf
-CONF_FILES+=		share/${PKGBASE}/examples/mpe_mpianim.conf \
-			${PKG_SYSCONFDIR}/mpe_mpianim.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpe_mpicheck.conf \
 			${PKG_SYSCONFDIR}/mpe_mpicheck.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpe_mpilog.conf \
@@ -55,19 +50,27 @@ CONF_FILES+=		share/${PKGBASE}/examples/mpe_mpitrace.conf \
 			${PKG_SYSCONFDIR}/mpe_mpitrace.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpe_nolog.conf \
 			${PKG_SYSCONFDIR}/mpe_nolog.conf
+
 CONF_FILES+=		share/${PKGBASE}/examples/mpicc.conf \
 			${PKG_SYSCONFDIR}/mpicc.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpicxx.conf \
 			${PKG_SYSCONFDIR}/mpicxx.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpif77.conf \
 			${PKG_SYSCONFDIR}/mpif77.conf
+CONF_FILES+=		share/${PKGBASE}/examples/mpixxx_opts.conf \
+			${PKG_SYSCONFDIR}/mpixxx_opts.conf
 
-SPECIAL_PERMS+=		bin/mpdroot ${SETUID_ROOT_PERMS}
+# disable bundled OpenPA:
+post-extract:
+	mv $(WRKSRC)/src/openpa $(WRKSRC)/src/openpa.off
 
-.include "../../lang/python/application.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.if !defined(_X11_BUILDLINK3_MK)
-CONFIGURE_ARGS+=	--x-includes=${BUILDLINK_PREFIX.libX11}/include
-CONFIGURE_ARGS+=	--x-libraries=${BUILDLINK_PREFIX.libX11}/lib
+.include "../../mk/bsd.prefs.mk"
+
+# FreeBSD 6 hack:
+.if $(OPSYS) == "FreeBSD"
+BUILDLINK_TRANSFORM+=	rm:-lrt
 .endif
+
+.include "../../lang/python/application.mk"
+.include "../../parallel/openpa/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"