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

10 files changed, 198 insertions, 189 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"
diff --git a/parallel/mpi-ch/PLIST b/parallel/mpi-ch/PLIST
index 2ac6c7ca16e..2f502e5efe4 100644
--- a/parallel/mpi-ch/PLIST
+++ b/parallel/mpi-ch/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:10:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2009/12/13 18:38:10 asau Exp $
 bin/check_callstack
 bin/clog2_join
 bin/clog2_print
@@ -34,17 +34,19 @@ bin/mpdsigjob
 bin/mpdsigjob.py
 bin/mpdtrace
 bin/mpdtrace.py
-bin/mpecc.in
-bin/mpefc.in
+bin/mpic++
 bin/mpicc
 bin/mpich2version
 bin/mpicxx
 bin/mpiexec
+bin/mpiexec.gforker
+bin/mpiexec.hydra
 bin/mpiexec.py
 bin/mpif77
 bin/mpirun
 bin/mpirun.py
 bin/parkill
+bin/pmi_proxy
 include/clog_commset.h
 include/clog_const.h
 include/clog_inttypes.h
@@ -52,18 +54,15 @@ include/clog_uuid.h
 include/mpe.h
 include/mpe_callstack.h
 include/mpe_graphics.h
-include/mpe_graphicsf.h
 include/mpe_log.h
 include/mpe_log_thread.h
 include/mpe_logf.h
 include/mpe_misc.h
-include/mpe_thread.h
 include/mpi.h
 include/mpicxx.h
 include/mpif.h
 include/mpio.h
 include/mpiof.h
-lib/libampe.a
 lib/libfmpich.a
 lib/liblmpe.a
 lib/libmpe.a
@@ -78,6 +77,23 @@ lib/libtmpe.a
 lib/mpe_prof.o
 lib/pkgconfig/mpich2-ch3.pc
 man/man1/MPI.1
+man/man1/Zeroconf.1
+man/man1/mpd.1
+man/man1/mpdallexit.1
+man/man1/mpdboot.1
+man/man1/mpdcheck.1
+man/man1/mpdchkpyver.1
+man/man1/mpdcleanup.1
+man/man1/mpdexit.1
+man/man1/mpdgdbdrv.1
+man/man1/mpdhelp.1
+man/man1/mpdkilljob.1
+man/man1/mpdlib.1
+man/man1/mpdlistjobs.1
+man/man1/mpdman.1
+man/man1/mpdringtest.1
+man/man1/mpdsigjob.1
+man/man1/mpdtrace.1
 man/man1/mpicc.1
 man/man1/mpicxx.1
 man/man1/mpiexec.1
@@ -145,6 +161,10 @@ man/man3/MPI_Comm_spawn_multiple.3
 man/man3/MPI_Comm_split.3
 man/man3/MPI_Comm_test_inter.3
 man/man3/MPI_Dims_create.3
+man/man3/MPI_Dist_graph_create.3
+man/man3/MPI_Dist_graph_create_adjacent.3
+man/man3/MPI_Dist_graph_neighbors.3
+man/man3/MPI_Dist_graph_neighbors_count.3
 man/man3/MPI_Errhandler_create.3
 man/man3/MPI_Errhandler_free.3
 man/man3/MPI_Errhandler_get.3
@@ -264,6 +284,7 @@ man/man3/MPI_Issend.3
 man/man3/MPI_Keyval_create.3
 man/man3/MPI_Keyval_free.3
 man/man3/MPI_Lookup_name.3
+man/man3/MPI_Op_commute.3
 man/man3/MPI_Op_create.3
 man/man3/MPI_Op_free.3
 man/man3/MPI_Open_port.3
@@ -279,7 +300,9 @@ man/man3/MPI_Query_thread.3
 man/man3/MPI_Recv.3
 man/man3/MPI_Recv_init.3
 man/man3/MPI_Reduce.3
+man/man3/MPI_Reduce_local.3
 man/man3/MPI_Reduce_scatter.3
+man/man3/MPI_Reduce_scatter_block.3
 man/man3/MPI_Register_datarep.3
 man/man3/MPI_Request_free.3
 man/man3/MPI_Request_get_status.3
@@ -496,6 +519,10 @@ share/doc/mpich2/html/www3/MPI_Comm_spawn_multiple.html
 share/doc/mpich2/html/www3/MPI_Comm_split.html
 share/doc/mpich2/html/www3/MPI_Comm_test_inter.html
 share/doc/mpich2/html/www3/MPI_Dims_create.html
+share/doc/mpich2/html/www3/MPI_Dist_graph_create.html
+share/doc/mpich2/html/www3/MPI_Dist_graph_create_adjacent.html
+share/doc/mpich2/html/www3/MPI_Dist_graph_neighbors.html
+share/doc/mpich2/html/www3/MPI_Dist_graph_neighbors_count.html
 share/doc/mpich2/html/www3/MPI_Errhandler_create.html
 share/doc/mpich2/html/www3/MPI_Errhandler_free.html
 share/doc/mpich2/html/www3/MPI_Errhandler_get.html
@@ -615,6 +642,7 @@ share/doc/mpich2/html/www3/MPI_Issend.html
 share/doc/mpich2/html/www3/MPI_Keyval_create.html
 share/doc/mpich2/html/www3/MPI_Keyval_free.html
 share/doc/mpich2/html/www3/MPI_Lookup_name.html
+share/doc/mpich2/html/www3/MPI_Op_commute.html
 share/doc/mpich2/html/www3/MPI_Op_create.html
 share/doc/mpich2/html/www3/MPI_Op_free.html
 share/doc/mpich2/html/www3/MPI_Open_port.html
@@ -630,7 +658,9 @@ share/doc/mpich2/html/www3/MPI_Query_thread.html
 share/doc/mpich2/html/www3/MPI_Recv.html
 share/doc/mpich2/html/www3/MPI_Recv_init.html
 share/doc/mpich2/html/www3/MPI_Reduce.html
+share/doc/mpich2/html/www3/MPI_Reduce_local.html
 share/doc/mpich2/html/www3/MPI_Reduce_scatter.html
+share/doc/mpich2/html/www3/MPI_Reduce_scatter_block.html
 share/doc/mpich2/html/www3/MPI_Register_datarep.html
 share/doc/mpich2/html/www3/MPI_Request_free.html
 share/doc/mpich2/html/www3/MPI_Request_get_status.html
@@ -780,13 +810,9 @@ share/doc/mpich2/smpd_pmi.pdf
 share/doc/mpich2/user.pdf
 share/mpich2/examples/mpe_callstack_ldflags.conf
 share/mpich2/examples/mpe_f77env.conf
-share/mpich2/examples/mpe_f77env.conf.in
-share/mpich2/examples/mpe_graphics.conf
 share/mpich2/examples/mpe_help.conf
-share/mpich2/examples/mpe_help.conf.in
 share/mpich2/examples/mpe_log.conf
 share/mpich2/examples/mpe_log_postlib.conf
-share/mpich2/examples/mpe_mpianim.conf
 share/mpich2/examples/mpe_mpicheck.conf
 share/mpich2/examples/mpe_mpilog.conf
 share/mpich2/examples/mpe_mpitrace.conf
@@ -796,7 +822,6 @@ share/mpich2/examples/mpicxx.conf
 share/mpich2/examples/mpif77.conf
 share/mpich2/examples/mpixxx_opts.conf
 share/mpich2/examples_collchk/Makefile
-share/mpich2/examples_collchk/Makefile.in
 share/mpich2/examples_collchk/composite.c
 share/mpich2/examples_collchk/scatterv.c
 share/mpich2/examples_collchk/time_allreduce.c
@@ -808,13 +833,7 @@ share/mpich2/examples_collchk/wrong_int_byte.c
 share/mpich2/examples_collchk/wrong_reals.f
 share/mpich2/examples_collchk/wrong_root.c
 share/mpich2/examples_collchk/wrong_scatterv.c
-share/mpich2/examples_graphics/Makefile
-share/mpich2/examples_graphics/Makefile.in
-share/mpich2/examples_graphics/cpi.c
-share/mpich2/examples_graphics/cxgraphics.c
-share/mpich2/examples_graphics/fxgraphics.f
 share/mpich2/examples_logging/Makefile
-share/mpich2/examples_logging/Makefile.in
 share/mpich2/examples_logging/comm1_isr.c
 share/mpich2/examples_logging/comm1_isr_loop.c
 share/mpich2/examples_logging/comm2_connect_accept.c
diff --git a/parallel/mpi-ch/buildlink3.mk b/parallel/mpi-ch/buildlink3.mk
index fb07a2cccd0..21a2390c4ed 100644
--- a/parallel/mpi-ch/buildlink3.mk
+++ b/parallel/mpi-ch/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/12/13 18:38:11 asau Exp $
 
 BUILDLINK_TREE+=	mpich2
 
@@ -7,7 +7,8 @@ MPICH2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mpich2+=	mpich2>=1.0.7
 BUILDLINK_PKGSRCDIR.mpich2?=	../../parallel/mpi-ch
-BUILDLINK_DEPMETHOD.mpich2?=	build
-.endif # MPICH2_BUILDLINK3_MK
+
+.include "../../parallel/openpa/buildlink3.mk"
+.endif	# MPICH2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-mpich2
diff --git a/parallel/mpi-ch/distinfo b/parallel/mpi-ch/distinfo
index 88595894105..72870591f8d 100644
--- a/parallel/mpi-ch/distinfo
+++ b/parallel/mpi-ch/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.14 2008/12/21 11:41:01 obache Exp $
+$NetBSD: distinfo,v 1.15 2009/12/13 18:38:11 asau Exp $
 
-SHA1 (mpich2-1.0.8.tar.gz) = 41d6f6ce1034ecec5c14fb03592730ae2dd071e5
-RMD160 (mpich2-1.0.8.tar.gz) = 646cf50fbdc60a49809f4d0a6bcaf2835844db1f
-Size (mpich2-1.0.8.tar.gz) = 17237476 bytes
-SHA1 (patch-aa) = bf2ae82372de78e77891b9cf0d93618ba95ca0c8
-SHA1 (patch-ab) = 904c244fb3273dd1c38e0083c443f9a9c9d7e27e
-SHA1 (patch-ac) = 6e2d4e66824ea6806e86946feea4bc0ae29eca59
-SHA1 (patch-ad) = f3d63a31cbfd8f2e08254130b6579135f6ab8c67
-SHA1 (patch-ae) = e665c29ef2f19c7683eae790299eb4a21f960898
+SHA1 (mpich2-1.2.1.tar.gz) = 0f7e104143cb4449afcec542e44098423e1627cb
+RMD160 (mpich2-1.2.1.tar.gz) = 6ffbfbd11d9a51a79228713705df7be6d7f67be7
+Size (mpich2-1.2.1.tar.gz) = 18284454 bytes
+SHA1 (patch-aa) = a11348d3003c8dccc07d061019f1f754c48ddded
+SHA1 (patch-ac) = d31277411645b5c05c049a26d80f51b937fe5faf
+SHA1 (patch-ae) = c9b9d8144bbecec3b71ec0999d8f7036d6672bca
+SHA1 (patch-af) = 47ed56d04a7e196ee67d81cf27328a1f53539505
diff --git a/parallel/mpi-ch/patches/patch-aa b/parallel/mpi-ch/patches/patch-aa
index 86b0b85190f..16a13b3ec65 100644
--- a/parallel/mpi-ch/patches/patch-aa
+++ b/parallel/mpi-ch/patches/patch-aa
@@ -1,62 +1,45 @@
-$NetBSD: patch-aa,v 1.8 2008/12/21 11:41:01 obache Exp $
+$NetBSD: patch-aa,v 1.9 2009/12/13 18:38:11 asau Exp $
 
-Fix scripts installation.
 Install configuration files into example directory.
 
---- src/env/Makefile.in.orig	2008-10-24 21:31:50.000000000 +0400
-+++ src/env/Makefile.in	2008-12-20 17:34:39.000000000 +0300
-@@ -9,6 +9,7 @@
- VERBOSE         = 1
- INSTALL         = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT  = @INSTALL_SCRIPT@
- INSTALL_DATA    = @INSTALL_DATA@
- MKDIR_P         = @MKDIR_P@
- master_top_srcdir  = @master_top_srcdir@
-@@ -18,6 +19,7 @@
- prefix          = @prefix@
- exec_prefix     = @exec_prefix@
- bindir          = @bindir@
-+datadir		= @datadir@
+--- src/env/Makefile.in.orig	2009-11-18 19:40:34.000000000 +0300
++++ src/env/Makefile.in	2009-12-13 20:12:58.000000000 +0300
+@@ -19,6 +19,7 @@
+ srcdir          = @srcdir@
+ abs_srcdir      = @abs_srcdir@
  sysconfdir      = @sysconfdir@
++datadir		= @datadir@
  DEFS            = @DEFS@ -I. -I${srcdir}
  CPPFLAGS        = @CPPFLAGS@
-@@ -39,6 +41,8 @@
+ LIBS            = @LIBS@
+@@ -39,6 +40,8 @@
  INCLUDES = -I../include
  doc_sources = mpicc.txt mpif77.txt mpicxx.txt mpif90.txt mpiexec.txt
  
-+exampledir	= ${datadir}/examples
++exampledir =	$(datadir)/examples
 +
  .SUFFIXES:
  .SUFFIXES: .o .lo .c .man .html .latex .txt 
  .c.o:
-@@ -132,18 +136,18 @@
- 	if [ ! -d ${DESTDIR}${exec_prefix} ] ; then $(MKDIR_P) ${DESTDIR}${exec_prefix} ; fi
- 	if [ ! -d ${DESTDIR}${prefix} ] ; then $(MKDIR_P) ${DESTDIR}${prefix} ; fi
- 	if [ ! -d ${DESTDIR}${bindir} ] ; then $(MKDIR_P) ${DESTDIR}${bindir} ; fi
--	$(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpicc ${DESTDIR}${bindir}/mpicc
-+	$(INSTALL_SCRIPT) mpicc ${DESTDIR}${bindir}/mpicc
+@@ -135,15 +138,15 @@
  	$(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpich2version ${DESTDIR}${bindir}/mpich2version
--	$(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) parkill ${DESTDIR}${bindir}/parkill
+ 	$(INSTALL_SCRIPT) mpicc ${DESTDIR}${bindir}/mpicc
+ 	$(INSTALL_SCRIPT) parkill ${DESTDIR}${bindir}/parkill
 -	if [ ! -d ${DESTDIR}${sysconfdir} ] ; then $(MKDIR_P) ${DESTDIR}${sysconfdir} ; fi
 -	$(INSTALL_DATA) mpixxx_opts.conf ${DESTDIR}${sysconfdir}/mpixxx_opts.conf
 -	$(INSTALL_DATA) mpicc.conf ${DESTDIR}${sysconfdir}/mpicc.conf
--	if [ -s mpicxx ] ; then $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpicxx ${DESTDIR}${bindir}/mpicxx ; fi
--	if [ -s mpif77 ] ; then $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpif77 ${DESTDIR}${bindir}/mpif77 ; fi
--	if [ -s mpif90 ] ; then $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpif90 ${DESTDIR}${bindir}/mpif90 ; fi
--	if [ -s mpicxx.conf ] ; then $(INSTALL_DATA) mpicxx.conf ${DESTDIR}${sysconfdir}/mpicxx.conf ; fi
--	if [ -s mpif77.conf ] ; then $(INSTALL_DATA) mpif77.conf ${DESTDIR}${sysconfdir}/mpif77.conf ; fi
--	if [ -s mpif90.conf ] ; then $(INSTALL_DATA) mpif90.conf ${DESTDIR}${sysconfdir}/mpif90.conf ; fi
-+	$(INSTALL_SCRIPT) parkill ${DESTDIR}${bindir}/parkill
 +	if [ ! -d ${DESTDIR}${exampledir} ] ; then $(MKDIR_P) ${DESTDIR}${exampledir} ; fi
 +	$(INSTALL_DATA) mpixxx_opts.conf ${DESTDIR}${exampledir}/mpixxx_opts.conf
 +	$(INSTALL_DATA) mpicc.conf ${DESTDIR}${exampledir}/mpicc.conf
-+	if [ -s mpicxx ] ; then $(INSTALL_SCRIPT) mpicxx ${DESTDIR}${bindir}/mpicxx ; fi
-+	if [ -s mpif77 ] ; then $(INSTALL_SCRIPT) mpif77 ${DESTDIR}${bindir}/mpif77 ; fi
-+	if [ -s mpif90 ] ; then $(INSTALL_SCRIPT) mpif90 ${DESTDIR}${bindir}/mpif90 ; fi
+ 	if [ -s mpicxx ] ; then $(INSTALL_SCRIPT) mpicxx ${DESTDIR}${bindir}/mpicxx ; fi
+ 	if [ -s mpif77 ] ; then $(INSTALL_SCRIPT) mpif77 ${DESTDIR}${bindir}/mpif77 ; fi
+ 	if [ -s mpif90 ] ; then $(INSTALL_SCRIPT) mpif90 ${DESTDIR}${bindir}/mpif90 ; fi
+-	if [ -s mpicxx.conf ] ; then $(INSTALL_DATA) mpicxx.conf ${DESTDIR}${sysconfdir}/mpicxx.conf ; fi
+-	if [ -s mpif77.conf ] ; then $(INSTALL_DATA) mpif77.conf ${DESTDIR}${sysconfdir}/mpif77.conf ; fi
+-	if [ -s mpif90.conf ] ; then $(INSTALL_DATA) mpif90.conf ${DESTDIR}${sysconfdir}/mpif90.conf ; fi
 +	if [ -s mpicxx.conf ] ; then $(INSTALL_DATA) mpicxx.conf ${DESTDIR}${exampledir}/mpicxx.conf ; fi
 +	if [ -s mpif77.conf ] ; then $(INSTALL_DATA) mpif77.conf ${DESTDIR}${exampledir}/mpif77.conf ; fi
 +	if [ -s mpif90.conf ] ; then $(INSTALL_DATA) mpif90.conf ${DESTDIR}${exampledir}/mpif90.conf ; fi
+ 	${MAKE} install-postamble
  
  install-strip:
- 	$(MAKE) INSTALL_STRIP_FLAG=-s install
diff --git a/parallel/mpi-ch/patches/patch-ab b/parallel/mpi-ch/patches/patch-ab
deleted file mode 100644
index 176efb60ac7..00000000000
--- a/parallel/mpi-ch/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2008/05/29 20:25:54 tnn Exp $
-
-Fix installation of script.
-
---- src/pkgconfig/Makefile.in.orig	2008-02-15 21:35:01.000000000 +0300
-+++ src/pkgconfig/Makefile.in	2008-03-19 22:23:34.000000000 +0300
-@@ -74,7 +74,7 @@
- # Install target
- install:  FORCE_TARGET 
- 	if [ ! -d ${DESTDIR}${pkgconfigdir} ] ; then $(MKDIR_P) ${DESTDIR}${pkgconfigdir} ; fi
--	if [ -s mpich2-@DEVICE_NAME@.pc ] ; then $(INSTALL_PROGRAM) mpich2-@DEVICE_NAME@.pc ${DESTDIR}${pkgconfigdir}/mpich2-@DEVICE_NAME@.pc ; fi
-+	if [ -s mpich2-@DEVICE_NAME@.pc ] ; then $(INSTALL_DATA) mpich2-@DEVICE_NAME@.pc ${DESTDIR}${pkgconfigdir}/mpich2-@DEVICE_NAME@.pc ; fi
- 
- install-strip:
- 	$(MAKE) INSTALL_STRIP_FLAG=-s install
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
diff --git a/parallel/mpi-ch/patches/patch-ad b/parallel/mpi-ch/patches/patch-ad
deleted file mode 100644
index d285062009a..00000000000
--- a/parallel/mpi-ch/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2008/12/21 11:41:01 obache Exp $
-
-"test ==" portability fix.
-
---- configure.orig	2008-12-20 17:29:37.000000000 +0300
-+++ configure	2008-12-20 17:45:09.000000000 +0300
-@@ -32974,7 +32974,7 @@
- 	    ;;
-     esac
- 
--    if test "$cpu_gcc_x86_cycle" == "no" ; then
-+    if test "$cpu_gcc_x86_cycle" = "no" ; then
-         { { $as_echo "$as_me:$LINENO: error: Linux86 cycle counter is not available on this system and or with the $CC compiler" >&5
- $as_echo "$as_me: error: Linux86 cycle counter is not available on this system and or with the $CC compiler" >&2;}
-    { (exit 1); exit 1; }; }
diff --git a/parallel/mpi-ch/patches/patch-ae b/parallel/mpi-ch/patches/patch-ae
index d8569c18f19..595b4b7765a 100644
--- a/parallel/mpi-ch/patches/patch-ae
+++ b/parallel/mpi-ch/patches/patch-ae
@@ -1,60 +1,15 @@
-$NetBSD: patch-ae,v 1.5 2008/12/21 11:41:01 obache Exp $
+$NetBSD: patch-ae,v 1.6 2009/12/13 18:38:11 asau Exp $
 
 "test ==" portability fixes.
 
---- src/mpid/ch3/channels/nemesis/configure.orig	2008-12-20 17:29:37.000000000 +0300
-+++ src/mpid/ch3/channels/nemesis/configure	2008-12-20 17:41:34.000000000 +0300
-@@ -3790,7 +3790,7 @@
- fi
+--- src/mpid/ch3/channels/nemesis/configure.orig	2009-11-18 19:41:17.000000000 +0300
++++ src/mpid/ch3/channels/nemesis/configure	2009-12-11 06:15:44.000000000 +0300
+@@ -5947,7 +5947,7 @@
  
+     fi;
  
--if test "${nemesis_network}" == "gm" ; then
-+if test "${nemesis_network}" = "gm" ; then
-     ac_safe=`echo "gm.h" | sed 'y%./+-%__p_%'`
- { $as_echo "$as_me:$LINENO: checking for gm.h" >&5
- $as_echo_n "checking for gm.h... " >&6; }
-@@ -3989,7 +3989,7 @@
- fi
- 
- 
--if test "${nemesis_network}" == "ib" ; then
-+if test "${nemesis_network}" = "ib" ; then
-     ac_safe=`echo "verbs.h" | sed 'y%./+-%__p_%'`
- { $as_echo "$as_me:$LINENO: checking for verbs.h" >&5
- $as_echo_n "checking for verbs.h... " >&6; }
-@@ -4188,7 +4188,7 @@
- fi
- 
- 
--if test "${nemesis_network}" == "mx" ; then
-+if test "${nemesis_network}" = "mx" ; then
-     ac_safe=`echo "myriexpress.h" | sed 'y%./+-%__p_%'`
- { $as_echo "$as_me:$LINENO: checking for myriexpress.h" >&5
- $as_echo_n "checking for myriexpress.h... " >&6; }
-@@ -4397,7 +4397,7 @@
- fi
- 
- 
--if test "${nemesis_network}" == "elan" ; then
-+if test "${nemesis_network}" = "elan" ; then
- echo "=== You're about to use the experimental Nemesis/Elan network module."
- echo "=== This module has not been thoroughly tested and some performance issues remain."
- 
-@@ -4599,7 +4599,7 @@
- fi
- 
- 
--if test "${nemesis_network}" == "sctp" ; then
-+if test "${nemesis_network}" = "sctp" ; then
-     ac_safe=`echo "netinet/sctp.h" | sed 'y%./+-%__p_%'`
- { $as_echo "$as_me:$LINENO: checking for netinet/sctp.h" >&5
- $as_echo_n "checking for netinet/sctp.h... " >&6; }
-@@ -4798,7 +4798,7 @@
- fi
- 
- 
--if test "${nemesis_network}" == "psm" ; then
-+if test "${nemesis_network}" = "psm" ; then
-     ac_safe=`echo "psm.h" | sed 'y%./+-%__p_%'`
- { $as_echo "$as_me:$LINENO: checking for psm.h" >&5
- $as_echo_n "checking for psm.h... " >&6; }
+-    if test "${net}" == "newmad" ; then
++    if test "${net}" = "newmad" ; then
+        if test "${ac_cv_header_nm_public_h+set}" = set; then
+   { $as_echo "$as_me:$LINENO: checking for nm_public.h" >&5
+ $as_echo_n "checking for nm_public.h... " >&6; }
diff --git a/parallel/mpi-ch/patches/patch-af b/parallel/mpi-ch/patches/patch-af
new file mode 100644
index 00000000000..3124f19a4bb
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-af
@@ -0,0 +1,77 @@
+$NetBSD: patch-af,v 1.3 2009/12/13 18:38:11 asau Exp $
+
+Disable bundled OpenPA.
+
+--- examples/Makefile.in.orig	2009-11-18 19:40:35.000000000 +0300
++++ examples/Makefile.in	2009-12-11 15:41:31.000000000 +0300
+@@ -33,6 +33,8 @@
+ INCLUDES = -I../src/include -I${top_srcdir}/src/include
+ LIBS   =
+ 
++LIBOPA =
++
+ EXTRA_PROGRAMS = pmandel pmandel_spawn pmandel_service pmandel_spaserv 	         pmandel_fence hellow icpi parent child srtest srvec sr 		 spawn_merge_parent spawn_merge_child1 spawn_merge_child2
+ 
+ .SUFFIXES:
+@@ -105,47 +107,47 @@
+ all-redirect: cpi
+ 
+ coverage: 
+-parent: parent.o   ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
++parent: parent.o   ../lib/lib${MPILIBNAME}.a $(LIBOPA)
+ 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o parent parent.o  ${LIBS}
+-hellow: hellow.o   ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
++hellow: hellow.o   ../lib/lib${MPILIBNAME}.a $(LIBOPA)
+ 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o hellow hellow.o  ${LIBS}
+ pmandel_spawn: pmandel_spawn.o  \
+-	 ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
++	 ../lib/lib${MPILIBNAME}.a $(LIBOPA)
+ 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o pmandel_spawn pmandel_spawn.o  -lm \
+ 	${LIBS} 
+-pmandel: pmandel.o   ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
++pmandel: pmandel.o   ../lib/lib${MPILIBNAME}.a $(LIBOPA)
+ 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o pmandel pmandel.o  -lm ${LIBS}
+-icpi: icpi.o   ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
++icpi: icpi.o   ../lib/lib${MPILIBNAME}.a $(LIBOPA)
+ 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o icpi icpi.o  -lm ${LIBS}
+-child: child.o   ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
++child: child.o   ../lib/lib${MPILIBNAME}.a $(LIBOPA)
+ 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o child child.o  ${LIBS}
+ spawn_merge_child2: spawn_merge_child2.o  \
+-	 ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
++	 ../lib/lib${MPILIBNAME}.a $(LIBOPA)
+ 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o spawn_merge_child2 \
+ 	spawn_merge_child2.o  ${LIBS} 
+-cpi: cpi.o   ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
++cpi: cpi.o   ../lib/lib${MPILIBNAME}.a $(LIBOPA)
+ 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o cpi cpi.o  -lm ${LIBS}
+ pmandel_fence: pmandel_fence.o  \
+-	 ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
++	 ../lib/lib${MPILIBNAME}.a $(LIBOPA)
+ 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o pmandel_fence pmandel_fence.o  -lm \
+ 	${LIBS} 
+ spawn_merge_parent: spawn_merge_parent.o  \
+-	 ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
++	 ../lib/lib${MPILIBNAME}.a $(LIBOPA)
+ 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o spawn_merge_parent \
+ 	spawn_merge_parent.o  ${LIBS} 
+ spawn_merge_child1: spawn_merge_child1.o  \
+-	 ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
++	 ../lib/lib${MPILIBNAME}.a $(LIBOPA)
+ 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o spawn_merge_child1 \
+ 	spawn_merge_child1.o  ${LIBS} 
+ pmandel_spaserv: pmandel_spaserv.o  \
+-	 ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
++	 ../lib/lib${MPILIBNAME}.a $(LIBOPA)
+ 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o pmandel_spaserv pmandel_spaserv.o  \
+ 	-lm ${LIBS} 
+ pmandel_service: pmandel_service.o  \
+-	 ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
++	 ../lib/lib${MPILIBNAME}.a $(LIBOPA)
+ 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o pmandel_service pmandel_service.o  \
+ 	-lm ${LIBS} 
+-srtest: srtest.o   ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
++srtest: srtest.o   ../lib/lib${MPILIBNAME}.a $(LIBOPA)
+ 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o srtest srtest.o  ${LIBS}
+ # --------------------------------------------------------------------------
+ htmldoc: