Update to MPICH 3.0.1

===============================================================================
                               Changes in 3.0
===============================================================================

 # MPI-3: All MPI-3 features are now implemented and the MPI_VERSION
   bumped up to 3.0.

 # OVERALL: Added support for ARM-v7 native atomics

 # MPE: MPE is now separated out of MPICH and can be downloaded/used
   as a separate package.

 # PM/PMI: Upgraded to hwloc-1.6

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

     svn log -r10344:HEAD https://svn.mcs.anl.gov/repos/mpi/mpich2/tags/release/mpich-3.0

     ... or at the following link:

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


===============================================================================
                               Changes in 1.5
===============================================================================

 # OVERALL: Nemesis now supports an "--enable-yield=..." configure
   option for better performance/behavior when oversubscribing
   processes to cores.  Some form of this option is enabled by default
   on Linux, Darwin, and systems that support sched_yield().

 # OVERALL: Added support for Intel Many Integrated Core (MIC)
   architecture: shared memory, TCP/IP, and SCIF based communication.

 # OVERALL: Added support for IBM BG/Q architecture.  Thanks to IBM
   for the contribution.

 # MPI-3: const support has been added to mpi.h, although it is
   disabled by default.  It can be enabled on a per-translation unit
   basis with "#define MPICH2_CONST const".

 # MPI-3: Added support for MPIX_Type_create_hindexed_block.

 # MPI-3: The new MPI-3 nonblocking collective functions are now
   available as "MPIX_" functions (e.g., "MPIX_Ibcast").

 # MPI-3: The new MPI-3 neighborhood collective routines are now available as
   "MPIX_" functions (e.g., "MPIX_Neighbor_allgather").

 # MPI-3: The new MPI-3 MPI_Comm_split_type function is now available
   as an "MPIX_" function.

 # MPI-3: The new MPI-3 tools interface is now available as "MPIX_T_"
   functions.  This is a beta implementation right now with several
   limitations, including no support for multithreading.  Several
   performance variables related to CH3's message matching are exposed
   through this interface.

 # MPI-3: The new MPI-3 matched probe functionality is supported via
   the new routines MPIX_Mprobe, MPIX_Improbe, MPIX_Mrecv, and
   MPIX_Imrecv.

 # MPI-3: The new MPI-3 nonblocking communicator duplication routine,
   MPIX_Comm_idup, is now supported.  It will only work for
   single-threaded programs at this time.

 # MPI-3: MPIX_Comm_reenable_anysource support

 # MPI-3: Native MPIX_Comm_create_group support (updated version of
   the prior MPIX_Group_comm_create routine).

 # MPI-3: MPI_Intercomm_create's internal communication no longer interferes
   with point-to-point communication, even if point-to-point operations on the
   parent communicator use the same tag or MPI_ANY_TAG.

 # MPI-3: Eliminated the possibility of interference between
   MPI_Intercomm_create and point-to-point messaging operations.

 # Build system: Completely revamped build system to rely fully on
   autotools.  Parallel builds ("make -j8" and similar) are now supported.

 # Build system: rename "./maint/updatefiles" --> "./autogen.sh" and
   "configure.in" --> "configure.ac"

 # JUMPSHOT: Improvements to Jumpshot to handle thousands of
   timelines, including performance improvements to slog2 in such
   cases.

 # JUMPSHOT: Added navigation support to locate chosen drawable's ends
   when viewport has been scrolled far from the drawable.

 # PM/PMI: Added support for memory binding policies.

 # PM/PMI: Various improvements to the process binding support in
   Hydra.  Several new pre-defined binding options are provided.

 # PM/PMI: Upgraded to hwloc-1.5

 # PM/PMI: Several improvements to PBS support to natively use the PBS
   launcher.

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

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

     ... or at the following link:

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

12 files changed, 216 insertions, 715 deletions

diff --git a/parallel/mpi-ch/DESCR b/parallel/mpi-ch/DESCR
index d7962ac433c..bf193952918 100644
--- a/parallel/mpi-ch/DESCR
+++ b/parallel/mpi-ch/DESCR
@@ -1,5 +1,5 @@
-MPICH is a freely available, portable implementation of MPI and MPI-2
-standard message-passing interface.
+MPICH is a freely available, portable implementation of MPI, MPI-2,
+and MPI-3 standard message-passing interface.
 
 Documentation on installing and using MPICH is available, as well as
 manual pages for the routines and commands.
diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index 42b153772bd..143410fd6fd 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,58 +1,49 @@
-# $NetBSD: Makefile,v 1.72 2013/02/28 07:18:15 asau Exp $
+# $NetBSD: Makefile,v 1.73 2013/03/17 17:08:51 asau Exp $
 
-DISTNAME=	mpich2-1.4.1p1
-PKGREVISION=	1
+DISTNAME=	mpich-3.0.1
 CATEGORIES=	parallel
-MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/1.4.1p1/
+MASTER_SITES=	http://www.mpich.org/static/tarballs/$(PKGVERSION_NOREV)/
 
 MAINTAINER=	asau@inbox.ru
-HOMEPAGE=	http://www.mcs.anl.gov/research/projects/mpich2/
-COMMENT=	Open source MPI and MPI-2 implementation from Univ. of Chicago
+HOMEPAGE=	http://www.mpich.org/
+COMMENT=	Open source MPI, MPI-2, and MPI-3 implementation from Univ. of Chicago
 
 MAKE_JOBS_SAFE=		no
 
 DEPENDS+=	bash-[0-9]*:../../shells/bash
 
+# MPI_SUBPREFIX=		mpich
+# MPI_PREFIX=		$(LOCALBASE)/$(MPI_SUBPREFIX)
+MPI_PREFIX=		$(LOCALBASE)
+INSTALLATION_PREFIX=	$(MPI_PREFIX)
+
 GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++ fortran77
 
 PKG_SYSCONFSUBDIR=	mpich
 
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/${PKGBASE}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/${PKGBASE}
-CONFIGURE_ARGS+=	--htmldir=${PREFIX}/share/doc/${PKGBASE}/html
+GNU_CONFIGURE_PREFIX=	$(MPI_PREFIX)
+CONFIGURE_ARGS+=	--datadir=$(MPI_PREFIX)/share/$(PKGBASE)
+CONFIGURE_ARGS+=	--sysconfdir=$(PKG_SYSCONFDIR)
+CONFIGURE_ARGS+=	--docdir=$(MPI_PREFIX)/share/doc/$(PKGBASE)
+CONFIGURE_ARGS+=	--htmldir=$(MPI_PREFIX)/share/doc/$(PKGBASE)/html
 
 CONFIGURE_ARGS+=	--with-pm=hydra:gforker
 CONFIGURE_ARGS+=	--disable-fc		# problems?
 CONFIGURE_ARGS+=	--with-openpa-prefix=$(BUILDLINK_PREFIX.openpa:Q) # reuse it
+CONFIGURE_ARGS+=	--with-hwloc-prefix=$(BUILDLINK_PREFIX.hwloc:Q) # reuse it
 
 USE_TOOLS+=		perl:run
 
-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_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_mpicheck.conf \
-			${PKG_SYSCONFDIR}/mpe_mpicheck.conf
-CONF_FILES+=		share/${PKGBASE}/examples/mpe_mpilog.conf \
-			${PKG_SYSCONFDIR}/mpe_mpilog.conf
-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
+BUILDLINK_PASSTHRU_RPATHDIRS+=	$(MPI_PREFIX)/lib
+
+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
 
 # FreeBSD 6 hack:
 .include "../../mk/bsd.prefs.mk"
@@ -60,13 +51,10 @@ CONF_FILES+=		share/${PKGBASE}/examples/mpif77.conf \
 BUILDLINK_TRANSFORM+=	rm:-lrt
 .endif
 
-.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
-MAKE_ENV+=	LIBEXECINFO=-lexecinfo
-.else
-MAKE_ENV+=	LIBEXECINFO=
-.endif
-
 .include "options.mk"
 
+TEST_TARGET=	check
+
+.include "../../parallel/hwloc/buildlink3.mk"
 .include "../../parallel/openpa/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/parallel/mpi-ch/PLIST b/parallel/mpi-ch/PLIST
index 70b5027c8b4..389b0055626 100644
--- a/parallel/mpi-ch/PLIST
+++ b/parallel/mpi-ch/PLIST
@@ -1,62 +1,35 @@
-@comment $NetBSD: PLIST,v 1.17 2012/01/11 09:43:25 asau Exp $
-bin/bt2line
-bin/check_callstack
-bin/clog2_join
-bin/clog2_print
-bin/clog2_repair
+@comment $NetBSD: PLIST,v 1.18 2013/03/17 17:08:51 asau Exp $
 bin/hydra_nameserver
 bin/hydra_persist
 bin/hydra_pmi_proxy
 bin/mpic++
 bin/mpicc
-bin/mpich2version
+bin/mpichversion
 bin/mpicxx
 bin/mpiexec
 bin/mpiexec.gforker
 bin/mpiexec.hydra
 bin/mpif77
 bin/mpirun
-include/clog_commset.h
-include/clog_const.h
-include/clog_inttypes.h
-include/clog_uuid.h
-include/mpe.h
-include/mpe_callstack.h
-include/mpe_graphics.h
-include/mpe_log.h
-include/mpe_log_thread.h
-include/mpe_logf.h
-include/mpe_misc.h
+bin/parkill
 include/mpi.h
 include/mpicxx.h
 include/mpif.h
 include/mpio.h
 include/mpiof.h
-include/mpix.h
-lib/libfmpich.a
-lib/liblmpe.a
-lib/libmpe.a
-lib/libmpe_collchk.a
-lib/libmpe_f2cmpi.a
-lib/libmpe_nompi.a
-lib/libmpe_nompi_null.a
-lib/libmpe_null.a
-lib/libmpich.a
-lib/libmpichcxx.a
+lib/libfmpich.la
+lib/libmpich.la
+lib/libmpichcxx.la
 lib/libmpl.la
-lib/libtmpe.a
-lib/mpe_prof.o
-lib/pkgconfig/mpich2-c.pc
-lib/pkgconfig/mpich2-cxx.pc
-lib/pkgconfig/mpich2-f77.pc
-lib/pkgconfig/mpich2-f90.pc
-man/man1/MPI.1
+lib/pkgconfig/mpich.pc
 man/man1/mpicc.1
 man/man1/mpicxx.1
 man/man1/mpiexec.1
 man/man1/mpif77.1
 man/man1/mpif90.1
-man/man3/MPIX_Group_comm_create.3
+man/man3/MPIX_Comm_group_failed.3
+man/man3/MPIX_Comm_reenable_anysource.3
+man/man3/MPIX_Comm_remote_group_failed.3
 man/man3/MPI_Abort.3
 man/man3/MPI_Accumulate.3
 man/man3/MPI_Add_error_class.3
@@ -95,29 +68,36 @@ man/man3/MPI_Comm_compare.3
 man/man3/MPI_Comm_connect.3
 man/man3/MPI_Comm_create.3
 man/man3/MPI_Comm_create_errhandler.3
+man/man3/MPI_Comm_create_group.3
 man/man3/MPI_Comm_create_keyval.3
 man/man3/MPI_Comm_delete_attr.3
 man/man3/MPI_Comm_disconnect.3
 man/man3/MPI_Comm_dup.3
+man/man3/MPI_Comm_dup_with_info.3
 man/man3/MPI_Comm_free.3
 man/man3/MPI_Comm_free_keyval.3
 man/man3/MPI_Comm_get_attr.3
 man/man3/MPI_Comm_get_errhandler.3
+man/man3/MPI_Comm_get_info.3
 man/man3/MPI_Comm_get_name.3
 man/man3/MPI_Comm_get_parent.3
 man/man3/MPI_Comm_group.3
+man/man3/MPI_Comm_idup.3
 man/man3/MPI_Comm_join.3
 man/man3/MPI_Comm_rank.3
 man/man3/MPI_Comm_remote_group.3
 man/man3/MPI_Comm_remote_size.3
 man/man3/MPI_Comm_set_attr.3
 man/man3/MPI_Comm_set_errhandler.3
+man/man3/MPI_Comm_set_info.3
 man/man3/MPI_Comm_set_name.3
 man/man3/MPI_Comm_size.3
 man/man3/MPI_Comm_spawn.3
 man/man3/MPI_Comm_spawn_multiple.3
 man/man3/MPI_Comm_split.3
+man/man3/MPI_Comm_split_type.3
 man/man3/MPI_Comm_test_inter.3
+man/man3/MPI_Compare_and_swap.3
 man/man3/MPI_Dims_create.3
 man/man3/MPI_Dist_graph_create.3
 man/man3/MPI_Dist_graph_create_adjacent.3
@@ -130,6 +110,7 @@ man/man3/MPI_Errhandler_set.3
 man/man3/MPI_Error_class.3
 man/man3/MPI_Error_string.3
 man/man3/MPI_Exscan.3
+man/man3/MPI_Fetch_and_op.3
 man/man3/MPI_File_c2f.3
 man/man3/MPI_File_call_errhandler.3
 man/man3/MPI_File_close.3
@@ -193,9 +174,12 @@ man/man3/MPI_Free_mem.3
 man/man3/MPI_Gather.3
 man/man3/MPI_Gatherv.3
 man/man3/MPI_Get.3
+man/man3/MPI_Get_accumulate.3
 man/man3/MPI_Get_address.3
 man/man3/MPI_Get_count.3
 man/man3/MPI_Get_elements.3
+man/man3/MPI_Get_elements_x.3
+man/man3/MPI_Get_library_version.3
 man/man3/MPI_Get_processor_name.3
 man/man3/MPI_Get_version.3
 man/man3/MPI_Graph_create.3
@@ -218,7 +202,25 @@ man/man3/MPI_Group_rank.3
 man/man3/MPI_Group_size.3
 man/man3/MPI_Group_translate_ranks.3
 man/man3/MPI_Group_union.3
+man/man3/MPI_Iallgather.3
+man/man3/MPI_Iallgatherv.3
+man/man3/MPI_Iallreduce.3
+man/man3/MPI_Ialltoall.3
+man/man3/MPI_Ialltoallv.3
+man/man3/MPI_Ialltoallw.3
+man/man3/MPI_Ibarrier.3
+man/man3/MPI_Ibcast.3
 man/man3/MPI_Ibsend.3
+man/man3/MPI_Iexscan.3
+man/man3/MPI_Igather.3
+man/man3/MPI_Igatherv.3
+man/man3/MPI_Improbe.3
+man/man3/MPI_Imrecv.3
+man/man3/MPI_Ineighbor_allgather.3
+man/man3/MPI_Ineighbor_allgatherv.3
+man/man3/MPI_Ineighbor_alltoall.3
+man/man3/MPI_Ineighbor_alltoallv.3
+man/man3/MPI_Ineighbor_alltoallw.3
 man/man3/MPI_Info_create.3
 man/man3/MPI_Info_delete.3
 man/man3/MPI_Info_dup.3
@@ -235,13 +237,26 @@ man/man3/MPI_Intercomm_create.3
 man/man3/MPI_Intercomm_merge.3
 man/man3/MPI_Iprobe.3
 man/man3/MPI_Irecv.3
+man/man3/MPI_Ireduce.3
+man/man3/MPI_Ireduce_scatter.3
+man/man3/MPI_Ireduce_scatter_block.3
 man/man3/MPI_Irsend.3
 man/man3/MPI_Is_thread_main.3
+man/man3/MPI_Iscan.3
+man/man3/MPI_Iscatter.3
+man/man3/MPI_Iscatterv.3
 man/man3/MPI_Isend.3
 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_Mprobe.3
+man/man3/MPI_Mrecv.3
+man/man3/MPI_Neighbor_allgather.3
+man/man3/MPI_Neighbor_allgatherv.3
+man/man3/MPI_Neighbor_alltoall.3
+man/man3/MPI_Neighbor_alltoallv.3
+man/man3/MPI_Neighbor_alltoallw.3
 man/man3/MPI_Op_commute.3
 man/man3/MPI_Op_create.3
 man/man3/MPI_Op_free.3
@@ -255,6 +270,7 @@ man/man3/MPI_Probe.3
 man/man3/MPI_Publish_name.3
 man/man3/MPI_Put.3
 man/man3/MPI_Query_thread.3
+man/man3/MPI_Raccumulate.3
 man/man3/MPI_Recv.3
 man/man3/MPI_Recv_init.3
 man/man3/MPI_Reduce.3
@@ -264,6 +280,9 @@ 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
+man/man3/MPI_Rget.3
+man/man3/MPI_Rget_accumulate.3
+man/man3/MPI_Rput.3
 man/man3/MPI_Rsend.3
 man/man3/MPI_Rsend_init.3
 man/man3/MPI_Scan.3
@@ -279,6 +298,35 @@ man/man3/MPI_Start.3
 man/man3/MPI_Startall.3
 man/man3/MPI_Status_set_cancelled.3
 man/man3/MPI_Status_set_elements.3
+man/man3/MPI_Status_set_elements_x.3
+man/man3/MPI_T_category_changed.3
+man/man3/MPI_T_category_get_categories.3
+man/man3/MPI_T_category_get_cvars.3
+man/man3/MPI_T_category_get_info.3
+man/man3/MPI_T_category_get_num.3
+man/man3/MPI_T_category_get_pvars.3
+man/man3/MPI_T_cvar_get_info.3
+man/man3/MPI_T_cvar_get_num.3
+man/man3/MPI_T_cvar_handle_alloc.3
+man/man3/MPI_T_cvar_handle_free.3
+man/man3/MPI_T_cvar_read.3
+man/man3/MPI_T_cvar_write.3
+man/man3/MPI_T_enum_get_info.3
+man/man3/MPI_T_enum_get_item.3
+man/man3/MPI_T_finalize.3
+man/man3/MPI_T_init_thread.3
+man/man3/MPI_T_pvar_get_info.3
+man/man3/MPI_T_pvar_get_num.3
+man/man3/MPI_T_pvar_handle_alloc.3
+man/man3/MPI_T_pvar_handle_free.3
+man/man3/MPI_T_pvar_read.3
+man/man3/MPI_T_pvar_readreset.3
+man/man3/MPI_T_pvar_reset.3
+man/man3/MPI_T_pvar_session_create.3
+man/man3/MPI_T_pvar_session_free.3
+man/man3/MPI_T_pvar_start.3
+man/man3/MPI_T_pvar_stop.3
+man/man3/MPI_T_pvar_write.3
 man/man3/MPI_Test.3
 man/man3/MPI_Test_cancelled.3
 man/man3/MPI_Testall.3
@@ -289,6 +337,7 @@ man/man3/MPI_Type_commit.3
 man/man3/MPI_Type_contiguous.3
 man/man3/MPI_Type_create_darray.3
 man/man3/MPI_Type_create_hindexed.3
+man/man3/MPI_Type_create_hindexed_block.3
 man/man3/MPI_Type_create_hvector.3
 man/man3/MPI_Type_create_indexed_block.3
 man/man3/MPI_Type_create_keyval.3
@@ -304,8 +353,10 @@ man/man3/MPI_Type_get_attr.3
 man/man3/MPI_Type_get_contents.3
 man/man3/MPI_Type_get_envelope.3
 man/man3/MPI_Type_get_extent.3
+man/man3/MPI_Type_get_extent_x.3
 man/man3/MPI_Type_get_name.3
 man/man3/MPI_Type_get_true_extent.3
+man/man3/MPI_Type_get_true_extent_x.3
 man/man3/MPI_Type_hindexed.3
 man/man3/MPI_Type_hvector.3
 man/man3/MPI_Type_indexed.3
@@ -314,6 +365,7 @@ man/man3/MPI_Type_match_size.3
 man/man3/MPI_Type_set_attr.3
 man/man3/MPI_Type_set_name.3
 man/man3/MPI_Type_size.3
+man/man3/MPI_Type_size_x.3
 man/man3/MPI_Type_struct.3
 man/man3/MPI_Type_ub.3
 man/man3/MPI_Type_vector.3
@@ -324,492 +376,49 @@ man/man3/MPI_Wait.3
 man/man3/MPI_Waitall.3
 man/man3/MPI_Waitany.3
 man/man3/MPI_Waitsome.3
+man/man3/MPI_Win_allocate.3
+man/man3/MPI_Win_allocate_shared.3
+man/man3/MPI_Win_attach.3
 man/man3/MPI_Win_call_errhandler.3
 man/man3/MPI_Win_complete.3
 man/man3/MPI_Win_create.3
+man/man3/MPI_Win_create_dynamic.3
 man/man3/MPI_Win_create_errhandler.3
 man/man3/MPI_Win_create_keyval.3
 man/man3/MPI_Win_delete_attr.3
+man/man3/MPI_Win_detach.3
 man/man3/MPI_Win_fence.3
+man/man3/MPI_Win_flush.3
+man/man3/MPI_Win_flush_all.3
+man/man3/MPI_Win_flush_local.3
+man/man3/MPI_Win_flush_local_all.3
 man/man3/MPI_Win_free.3
 man/man3/MPI_Win_free_keyval.3
 man/man3/MPI_Win_get_attr.3
 man/man3/MPI_Win_get_errhandler.3
 man/man3/MPI_Win_get_group.3
+man/man3/MPI_Win_get_info.3
 man/man3/MPI_Win_get_name.3
 man/man3/MPI_Win_lock.3
+man/man3/MPI_Win_lock_all.3
 man/man3/MPI_Win_post.3
 man/man3/MPI_Win_set_attr.3
 man/man3/MPI_Win_set_errhandler.3
+man/man3/MPI_Win_set_info.3
 man/man3/MPI_Win_set_name.3
+man/man3/MPI_Win_shared_query.3
 man/man3/MPI_Win_start.3
+man/man3/MPI_Win_sync.3
 man/man3/MPI_Win_test.3
 man/man3/MPI_Win_unlock.3
+man/man3/MPI_Win_unlock_all.3
 man/man3/MPI_Win_wait.3
 man/man3/MPI_Wtick.3
 man/man3/MPI_Wtime.3
-man/man4/MPE_Add_RGB_color.4
-man/man4/MPE_CaptureFile.4
-man/man4/MPE_Close_graphics.4
-man/man4/MPE_Comm_global_rank.4
-man/man4/MPE_Decomp1d.4
-man/man4/MPE_Describe_comm_event.4
-man/man4/MPE_Describe_comm_state.4
-man/man4/MPE_Describe_event.4
-man/man4/MPE_Describe_info_event.4
-man/man4/MPE_Describe_info_state.4
-man/man4/MPE_Describe_state.4
-man/man4/MPE_Draw_circle.4
-man/man4/MPE_Draw_line.4
-man/man4/MPE_Draw_logic.4
-man/man4/MPE_Draw_point.4
-man/man4/MPE_Draw_points.4
-man/man4/MPE_Draw_string.4
-man/man4/MPE_Errors_call_debugger.4
-man/man4/MPE_Fill_circle.4
-man/man4/MPE_Fill_rectangle.4
-man/man4/MPE_Finish_log.4
-man/man4/MPE_GetHostName.4
-man/man4/MPE_GetTags.4
-man/man4/MPE_Get_mouse_press.4
-man/man4/MPE_IO_Stdout_to_file.4
-man/man4/MPE_Iget_mouse_press.4
-man/man4/MPE_Init_log.4
-man/man4/MPE_Initialized_logging.4
-man/man4/MPE_Line_thickness.4
-man/man4/MPE_Log_bare_event.4
-man/man4/MPE_Log_comm_event.4
-man/man4/MPE_Log_comm_receive.4
-man/man4/MPE_Log_comm_send.4
-man/man4/MPE_Log_event.4
-man/man4/MPE_Log_get_event_number.4
-man/man4/MPE_Log_get_solo_eventID.4
-man/man4/MPE_Log_get_state_eventIDs.4
-man/man4/MPE_Log_info_event.4
-man/man4/MPE_Log_merged_logfilename.4
-man/man4/MPE_Log_pack.4
-man/man4/MPE_Log_receive.4
-man/man4/MPE_Log_send.4
-man/man4/MPE_Log_sync_clocks.4
-man/man4/MPE_Make_color_array.4
-man/man4/MPE_Num_colors.4
-man/man4/MPE_Open_graphics.4
-man/man4/MPE_ReturnTags.4
-man/man4/MPE_Seq_begin.4
-man/man4/MPE_Seq_end.4
-man/man4/MPE_Signals_call_debugger.4
-man/man4/MPE_Start_log.4
-man/man4/MPE_Stop_log.4
-man/man4/MPE_TagsEnd.4
-man/man4/MPE_Update.4
-sbin/mpecheckinstall
-sbin/mpetestexec
-sbin/mpetestexeclog
-sbin/mpetestlink
-sbin/mpeuninstall
-share/doc/mpich2/html/index.htm
-share/doc/mpich2/html/www1/MPI.html
-share/doc/mpich2/html/www1/index.htm
-share/doc/mpich2/html/www1/mpicc.html
-share/doc/mpich2/html/www1/mpicxx.html
-share/doc/mpich2/html/www1/mpiexec.html
-share/doc/mpich2/html/www1/mpif77.html
-share/doc/mpich2/html/www1/mpif90.html
-share/doc/mpich2/html/www3/MPIX_Group_comm_create.html
-share/doc/mpich2/html/www3/MPI_Abort.html
-share/doc/mpich2/html/www3/MPI_Accumulate.html
-share/doc/mpich2/html/www3/MPI_Add_error_class.html
-share/doc/mpich2/html/www3/MPI_Add_error_code.html
-share/doc/mpich2/html/www3/MPI_Add_error_string.html
-share/doc/mpich2/html/www3/MPI_Address.html
-share/doc/mpich2/html/www3/MPI_Allgather.html
-share/doc/mpich2/html/www3/MPI_Allgatherv.html
-share/doc/mpich2/html/www3/MPI_Alloc_mem.html
-share/doc/mpich2/html/www3/MPI_Allreduce.html
-share/doc/mpich2/html/www3/MPI_Alltoall.html
-share/doc/mpich2/html/www3/MPI_Alltoallv.html
-share/doc/mpich2/html/www3/MPI_Alltoallw.html
-share/doc/mpich2/html/www3/MPI_Attr_delete.html
-share/doc/mpich2/html/www3/MPI_Attr_get.html
-share/doc/mpich2/html/www3/MPI_Attr_put.html
-share/doc/mpich2/html/www3/MPI_Barrier.html
-share/doc/mpich2/html/www3/MPI_Bcast.html
-share/doc/mpich2/html/www3/MPI_Bsend.html
-share/doc/mpich2/html/www3/MPI_Bsend_init.html
-share/doc/mpich2/html/www3/MPI_Buffer_attach.html
-share/doc/mpich2/html/www3/MPI_Buffer_detach.html
-share/doc/mpich2/html/www3/MPI_Cancel.html
-share/doc/mpich2/html/www3/MPI_Cart_coords.html
-share/doc/mpich2/html/www3/MPI_Cart_create.html
-share/doc/mpich2/html/www3/MPI_Cart_get.html
-share/doc/mpich2/html/www3/MPI_Cart_map.html
-share/doc/mpich2/html/www3/MPI_Cart_rank.html
-share/doc/mpich2/html/www3/MPI_Cart_shift.html
-share/doc/mpich2/html/www3/MPI_Cart_sub.html
-share/doc/mpich2/html/www3/MPI_Cartdim_get.html
-share/doc/mpich2/html/www3/MPI_Close_port.html
-share/doc/mpich2/html/www3/MPI_Comm_accept.html
-share/doc/mpich2/html/www3/MPI_Comm_call_errhandler.html
-share/doc/mpich2/html/www3/MPI_Comm_compare.html
-share/doc/mpich2/html/www3/MPI_Comm_connect.html
-share/doc/mpich2/html/www3/MPI_Comm_create.html
-share/doc/mpich2/html/www3/MPI_Comm_create_errhandler.html
-share/doc/mpich2/html/www3/MPI_Comm_create_keyval.html
-share/doc/mpich2/html/www3/MPI_Comm_delete_attr.html
-share/doc/mpich2/html/www3/MPI_Comm_disconnect.html
-share/doc/mpich2/html/www3/MPI_Comm_dup.html
-share/doc/mpich2/html/www3/MPI_Comm_free.html
-share/doc/mpich2/html/www3/MPI_Comm_free_keyval.html
-share/doc/mpich2/html/www3/MPI_Comm_get_attr.html
-share/doc/mpich2/html/www3/MPI_Comm_get_errhandler.html
-share/doc/mpich2/html/www3/MPI_Comm_get_name.html
-share/doc/mpich2/html/www3/MPI_Comm_get_parent.html
-share/doc/mpich2/html/www3/MPI_Comm_group.html
-share/doc/mpich2/html/www3/MPI_Comm_join.html
-share/doc/mpich2/html/www3/MPI_Comm_rank.html
-share/doc/mpich2/html/www3/MPI_Comm_remote_group.html
-share/doc/mpich2/html/www3/MPI_Comm_remote_size.html
-share/doc/mpich2/html/www3/MPI_Comm_set_attr.html
-share/doc/mpich2/html/www3/MPI_Comm_set_errhandler.html
-share/doc/mpich2/html/www3/MPI_Comm_set_name.html
-share/doc/mpich2/html/www3/MPI_Comm_size.html
-share/doc/mpich2/html/www3/MPI_Comm_spawn.html
-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
-share/doc/mpich2/html/www3/MPI_Errhandler_set.html
-share/doc/mpich2/html/www3/MPI_Error_class.html
-share/doc/mpich2/html/www3/MPI_Error_string.html
-share/doc/mpich2/html/www3/MPI_Exscan.html
-share/doc/mpich2/html/www3/MPI_File_c2f.html
-share/doc/mpich2/html/www3/MPI_File_call_errhandler.html
-share/doc/mpich2/html/www3/MPI_File_close.html
-share/doc/mpich2/html/www3/MPI_File_create_errhandler.html
-share/doc/mpich2/html/www3/MPI_File_delete.html
-share/doc/mpich2/html/www3/MPI_File_f2c.html
-share/doc/mpich2/html/www3/MPI_File_get_amode.html
-share/doc/mpich2/html/www3/MPI_File_get_atomicity.html
-share/doc/mpich2/html/www3/MPI_File_get_byte_offset.html
-share/doc/mpich2/html/www3/MPI_File_get_errhandler.html
-share/doc/mpich2/html/www3/MPI_File_get_group.html
-share/doc/mpich2/html/www3/MPI_File_get_info.html
-share/doc/mpich2/html/www3/MPI_File_get_position.html
-share/doc/mpich2/html/www3/MPI_File_get_position_shared.html
-share/doc/mpich2/html/www3/MPI_File_get_size.html
-share/doc/mpich2/html/www3/MPI_File_get_type_extent.html
-share/doc/mpich2/html/www3/MPI_File_get_view.html
-share/doc/mpich2/html/www3/MPI_File_iread.html
-share/doc/mpich2/html/www3/MPI_File_iread_at.html
-share/doc/mpich2/html/www3/MPI_File_iread_shared.html
-share/doc/mpich2/html/www3/MPI_File_iwrite.html
-share/doc/mpich2/html/www3/MPI_File_iwrite_at.html
-share/doc/mpich2/html/www3/MPI_File_iwrite_shared.html
-share/doc/mpich2/html/www3/MPI_File_open.html
-share/doc/mpich2/html/www3/MPI_File_preallocate.html
-share/doc/mpich2/html/www3/MPI_File_read.html
-share/doc/mpich2/html/www3/MPI_File_read_all.html
-share/doc/mpich2/html/www3/MPI_File_read_all_begin.html
-share/doc/mpich2/html/www3/MPI_File_read_all_end.html
-share/doc/mpich2/html/www3/MPI_File_read_at.html
-share/doc/mpich2/html/www3/MPI_File_read_at_all.html
-share/doc/mpich2/html/www3/MPI_File_read_at_all_begin.html
-share/doc/mpich2/html/www3/MPI_File_read_at_all_end.html
-share/doc/mpich2/html/www3/MPI_File_read_ordered.html
-share/doc/mpich2/html/www3/MPI_File_read_ordered_begin.html
-share/doc/mpich2/html/www3/MPI_File_read_ordered_end.html
-share/doc/mpich2/html/www3/MPI_File_read_shared.html
-share/doc/mpich2/html/www3/MPI_File_seek.html
-share/doc/mpich2/html/www3/MPI_File_seek_shared.html
-share/doc/mpich2/html/www3/MPI_File_set_atomicity.html
-share/doc/mpich2/html/www3/MPI_File_set_errhandler.html
-share/doc/mpich2/html/www3/MPI_File_set_info.html
-share/doc/mpich2/html/www3/MPI_File_set_size.html
-share/doc/mpich2/html/www3/MPI_File_set_view.html
-share/doc/mpich2/html/www3/MPI_File_sync.html
-share/doc/mpich2/html/www3/MPI_File_write.html
-share/doc/mpich2/html/www3/MPI_File_write_all.html
-share/doc/mpich2/html/www3/MPI_File_write_all_begin.html
-share/doc/mpich2/html/www3/MPI_File_write_all_end.html
-share/doc/mpich2/html/www3/MPI_File_write_at.html
-share/doc/mpich2/html/www3/MPI_File_write_at_all.html
-share/doc/mpich2/html/www3/MPI_File_write_at_all_begin.html
-share/doc/mpich2/html/www3/MPI_File_write_at_all_end.html
-share/doc/mpich2/html/www3/MPI_File_write_ordered.html
-share/doc/mpich2/html/www3/MPI_File_write_ordered_begin.html
-share/doc/mpich2/html/www3/MPI_File_write_ordered_end.html
-share/doc/mpich2/html/www3/MPI_File_write_shared.html
-share/doc/mpich2/html/www3/MPI_Finalize.html
-share/doc/mpich2/html/www3/MPI_Finalized.html
-share/doc/mpich2/html/www3/MPI_Free_mem.html
-share/doc/mpich2/html/www3/MPI_Gather.html
-share/doc/mpich2/html/www3/MPI_Gatherv.html
-share/doc/mpich2/html/www3/MPI_Get.html
-share/doc/mpich2/html/www3/MPI_Get_address.html
-share/doc/mpich2/html/www3/MPI_Get_count.html
-share/doc/mpich2/html/www3/MPI_Get_elements.html
-share/doc/mpich2/html/www3/MPI_Get_processor_name.html
-share/doc/mpich2/html/www3/MPI_Get_version.html
-share/doc/mpich2/html/www3/MPI_Graph_create.html
-share/doc/mpich2/html/www3/MPI_Graph_get.html
-share/doc/mpich2/html/www3/MPI_Graph_map.html
-share/doc/mpich2/html/www3/MPI_Graph_neighbors.html
-share/doc/mpich2/html/www3/MPI_Graph_neighbors_count.html
-share/doc/mpich2/html/www3/MPI_Graphdims_get.html
-share/doc/mpich2/html/www3/MPI_Grequest_complete.html
-share/doc/mpich2/html/www3/MPI_Grequest_start.html
-share/doc/mpich2/html/www3/MPI_Group_compare.html
-share/doc/mpich2/html/www3/MPI_Group_difference.html
-share/doc/mpich2/html/www3/MPI_Group_excl.html
-share/doc/mpich2/html/www3/MPI_Group_free.html
-share/doc/mpich2/html/www3/MPI_Group_incl.html
-share/doc/mpich2/html/www3/MPI_Group_intersection.html
-share/doc/mpich2/html/www3/MPI_Group_range_excl.html
-share/doc/mpich2/html/www3/MPI_Group_range_incl.html
-share/doc/mpich2/html/www3/MPI_Group_rank.html
-share/doc/mpich2/html/www3/MPI_Group_size.html
-share/doc/mpich2/html/www3/MPI_Group_translate_ranks.html
-share/doc/mpich2/html/www3/MPI_Group_union.html
-share/doc/mpich2/html/www3/MPI_Ibsend.html
-share/doc/mpich2/html/www3/MPI_Info_create.html
-share/doc/mpich2/html/www3/MPI_Info_delete.html
-share/doc/mpich2/html/www3/MPI_Info_dup.html
-share/doc/mpich2/html/www3/MPI_Info_free.html
-share/doc/mpich2/html/www3/MPI_Info_get.html
-share/doc/mpich2/html/www3/MPI_Info_get_nkeys.html
-share/doc/mpich2/html/www3/MPI_Info_get_nthkey.html
-share/doc/mpich2/html/www3/MPI_Info_get_valuelen.html
-share/doc/mpich2/html/www3/MPI_Info_set.html
-share/doc/mpich2/html/www3/MPI_Init.html
-share/doc/mpich2/html/www3/MPI_Init_thread.html
-share/doc/mpich2/html/www3/MPI_Initialized.html
-share/doc/mpich2/html/www3/MPI_Intercomm_create.html
-share/doc/mpich2/html/www3/MPI_Intercomm_merge.html
-share/doc/mpich2/html/www3/MPI_Iprobe.html
-share/doc/mpich2/html/www3/MPI_Irecv.html
-share/doc/mpich2/html/www3/MPI_Irsend.html
-share/doc/mpich2/html/www3/MPI_Is_thread_main.html
-share/doc/mpich2/html/www3/MPI_Isend.html
-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
-share/doc/mpich2/html/www3/MPI_Pack.html
-share/doc/mpich2/html/www3/MPI_Pack_external.html
-share/doc/mpich2/html/www3/MPI_Pack_external_size.html
-share/doc/mpich2/html/www3/MPI_Pack_size.html
-share/doc/mpich2/html/www3/MPI_Pcontrol.html
-share/doc/mpich2/html/www3/MPI_Probe.html
-share/doc/mpich2/html/www3/MPI_Publish_name.html
-share/doc/mpich2/html/www3/MPI_Put.html
-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
-share/doc/mpich2/html/www3/MPI_Rsend.html
-share/doc/mpich2/html/www3/MPI_Rsend_init.html
-share/doc/mpich2/html/www3/MPI_Scan.html
-share/doc/mpich2/html/www3/MPI_Scatter.html
-share/doc/mpich2/html/www3/MPI_Scatterv.html
-share/doc/mpich2/html/www3/MPI_Send.html
-share/doc/mpich2/html/www3/MPI_Send_init.html
-share/doc/mpich2/html/www3/MPI_Sendrecv.html
-share/doc/mpich2/html/www3/MPI_Sendrecv_replace.html
-share/doc/mpich2/html/www3/MPI_Ssend.html
-share/doc/mpich2/html/www3/MPI_Ssend_init.html
-share/doc/mpich2/html/www3/MPI_Start.html
-share/doc/mpich2/html/www3/MPI_Startall.html
-share/doc/mpich2/html/www3/MPI_Status_set_cancelled.html
-share/doc/mpich2/html/www3/MPI_Status_set_elements.html
-share/doc/mpich2/html/www3/MPI_Test.html
-share/doc/mpich2/html/www3/MPI_Test_cancelled.html
-share/doc/mpich2/html/www3/MPI_Testall.html
-share/doc/mpich2/html/www3/MPI_Testany.html
-share/doc/mpich2/html/www3/MPI_Testsome.html
-share/doc/mpich2/html/www3/MPI_Topo_test.html
-share/doc/mpich2/html/www3/MPI_Type_commit.html
-share/doc/mpich2/html/www3/MPI_Type_contiguous.html
-share/doc/mpich2/html/www3/MPI_Type_create_darray.html
-share/doc/mpich2/html/www3/MPI_Type_create_hindexed.html
-share/doc/mpich2/html/www3/MPI_Type_create_hvector.html
-share/doc/mpich2/html/www3/MPI_Type_create_indexed_block.html
-share/doc/mpich2/html/www3/MPI_Type_create_keyval.html
-share/doc/mpich2/html/www3/MPI_Type_create_resized.html
-share/doc/mpich2/html/www3/MPI_Type_create_struct.html
-share/doc/mpich2/html/www3/MPI_Type_create_subarray.html
-share/doc/mpich2/html/www3/MPI_Type_delete_attr.html
-share/doc/mpich2/html/www3/MPI_Type_dup.html
-share/doc/mpich2/html/www3/MPI_Type_extent.html
-share/doc/mpich2/html/www3/MPI_Type_free.html
-share/doc/mpich2/html/www3/MPI_Type_free_keyval.html
-share/doc/mpich2/html/www3/MPI_Type_get_attr.html
-share/doc/mpich2/html/www3/MPI_Type_get_contents.html
-share/doc/mpich2/html/www3/MPI_Type_get_envelope.html
-share/doc/mpich2/html/www3/MPI_Type_get_extent.html
-share/doc/mpich2/html/www3/MPI_Type_get_name.html
-share/doc/mpich2/html/www3/MPI_Type_get_true_extent.html
-share/doc/mpich2/html/www3/MPI_Type_hindexed.html
-share/doc/mpich2/html/www3/MPI_Type_hvector.html
-share/doc/mpich2/html/www3/MPI_Type_indexed.html
-share/doc/mpich2/html/www3/MPI_Type_lb.html
-share/doc/mpich2/html/www3/MPI_Type_match_size.html
-share/doc/mpich2/html/www3/MPI_Type_set_attr.html
-share/doc/mpich2/html/www3/MPI_Type_set_name.html
-share/doc/mpich2/html/www3/MPI_Type_size.html
-share/doc/mpich2/html/www3/MPI_Type_struct.html
-share/doc/mpich2/html/www3/MPI_Type_ub.html
-share/doc/mpich2/html/www3/MPI_Type_vector.html
-share/doc/mpich2/html/www3/MPI_Unpack.html
-share/doc/mpich2/html/www3/MPI_Unpack_external.html
-share/doc/mpich2/html/www3/MPI_Unpublish_name.html
-share/doc/mpich2/html/www3/MPI_Wait.html
-share/doc/mpich2/html/www3/MPI_Waitall.html
-share/doc/mpich2/html/www3/MPI_Waitany.html
-share/doc/mpich2/html/www3/MPI_Waitsome.html
-share/doc/mpich2/html/www3/MPI_Win_call_errhandler.html
-share/doc/mpich2/html/www3/MPI_Win_complete.html
-share/doc/mpich2/html/www3/MPI_Win_create.html
-share/doc/mpich2/html/www3/MPI_Win_create_errhandler.html
-share/doc/mpich2/html/www3/MPI_Win_create_keyval.html
-share/doc/mpich2/html/www3/MPI_Win_delete_attr.html
-share/doc/mpich2/html/www3/MPI_Win_fence.html
-share/doc/mpich2/html/www3/MPI_Win_free.html
-share/doc/mpich2/html/www3/MPI_Win_free_keyval.html
-share/doc/mpich2/html/www3/MPI_Win_get_attr.html
-share/doc/mpich2/html/www3/MPI_Win_get_errhandler.html
-share/doc/mpich2/html/www3/MPI_Win_get_group.html
-share/doc/mpich2/html/www3/MPI_Win_get_name.html
-share/doc/mpich2/html/www3/MPI_Win_lock.html
-share/doc/mpich2/html/www3/MPI_Win_post.html
-share/doc/mpich2/html/www3/MPI_Win_set_attr.html
-share/doc/mpich2/html/www3/MPI_Win_set_errhandler.html
-share/doc/mpich2/html/www3/MPI_Win_set_name.html
-share/doc/mpich2/html/www3/MPI_Win_start.html
-share/doc/mpich2/html/www3/MPI_Win_test.html
-share/doc/mpich2/html/www3/MPI_Win_unlock.html
-share/doc/mpich2/html/www3/MPI_Win_wait.html
-share/doc/mpich2/html/www3/MPI_Wtick.html
-share/doc/mpich2/html/www3/MPI_Wtime.html
-share/doc/mpich2/html/www3/index.htm
-share/doc/mpich2/install.pdf
-share/doc/mpich2/logging.pdf
-share/doc/mpich2/smpd_pmi.pdf
-share/doc/mpich2/user.pdf
-share/mpich2/doc/www4/MPE_Add_RGB_color.html
-share/mpich2/doc/www4/MPE_CaptureFile.html
-share/mpich2/doc/www4/MPE_Close_graphics.html
-share/mpich2/doc/www4/MPE_Comm_global_rank.html
-share/mpich2/doc/www4/MPE_Decomp1d.html
-share/mpich2/doc/www4/MPE_Describe_comm_event.html
-share/mpich2/doc/www4/MPE_Describe_comm_state.html
-share/mpich2/doc/www4/MPE_Describe_event.html
-share/mpich2/doc/www4/MPE_Describe_info_event.html
-share/mpich2/doc/www4/MPE_Describe_info_state.html
-share/mpich2/doc/www4/MPE_Describe_state.html
-share/mpich2/doc/www4/MPE_Draw_circle.html
-share/mpich2/doc/www4/MPE_Draw_line.html
-share/mpich2/doc/www4/MPE_Draw_logic.html
-share/mpich2/doc/www4/MPE_Draw_point.html
-share/mpich2/doc/www4/MPE_Draw_points.html
-share/mpich2/doc/www4/MPE_Draw_string.html
-share/mpich2/doc/www4/MPE_Errors_call_debugger.html
-share/mpich2/doc/www4/MPE_Fill_circle.html
-share/mpich2/doc/www4/MPE_Fill_rectangle.html
-share/mpich2/doc/www4/MPE_Finish_log.html
-share/mpich2/doc/www4/MPE_GetHostName.html
-share/mpich2/doc/www4/MPE_GetTags.html
-share/mpich2/doc/www4/MPE_Get_mouse_press.html
-share/mpich2/doc/www4/MPE_IO_Stdout_to_file.html
-share/mpich2/doc/www4/MPE_Iget_mouse_press.html
-share/mpich2/doc/www4/MPE_Init_log.html
-share/mpich2/doc/www4/MPE_Initialized_logging.html
-share/mpich2/doc/www4/MPE_Line_thickness.html
-share/mpich2/doc/www4/MPE_Log_bare_event.html
-share/mpich2/doc/www4/MPE_Log_comm_event.html
-share/mpich2/doc/www4/MPE_Log_comm_receive.html
-share/mpich2/doc/www4/MPE_Log_comm_send.html
-share/mpich2/doc/www4/MPE_Log_event.html
-share/mpich2/doc/www4/MPE_Log_get_event_number.html
-share/mpich2/doc/www4/MPE_Log_get_solo_eventID.html
-share/mpich2/doc/www4/MPE_Log_get_state_eventIDs.html
-share/mpich2/doc/www4/MPE_Log_info_event.html
-share/mpich2/doc/www4/MPE_Log_merged_logfilename.html
-share/mpich2/doc/www4/MPE_Log_pack.html
-share/mpich2/doc/www4/MPE_Log_receive.html
-share/mpich2/doc/www4/MPE_Log_send.html
-share/mpich2/doc/www4/MPE_Log_sync_clocks.html
-share/mpich2/doc/www4/MPE_Make_color_array.html
-share/mpich2/doc/www4/MPE_Num_colors.html
-share/mpich2/doc/www4/MPE_Open_graphics.html
-share/mpich2/doc/www4/MPE_ReturnTags.html
-share/mpich2/doc/www4/MPE_Seq_begin.html
-share/mpich2/doc/www4/MPE_Seq_end.html
-share/mpich2/doc/www4/MPE_Signals_call_debugger.html
-share/mpich2/doc/www4/MPE_Start_log.html
-share/mpich2/doc/www4/MPE_Stop_log.html
-share/mpich2/doc/www4/MPE_TagsEnd.html
-share/mpich2/doc/www4/MPE_Update.html
-share/mpich2/doc/www4/libmpe.cit
-share/mpich2/examples/mpe_callstack_ldflags.conf
-share/mpich2/examples/mpe_f77env.conf
-share/mpich2/examples/mpe_help.conf
-share/mpich2/examples/mpe_log.conf
-share/mpich2/examples/mpe_log_postlib.conf
-share/mpich2/examples/mpe_mpicheck.conf
-share/mpich2/examples/mpe_mpilog.conf
-share/mpich2/examples/mpe_mpitrace.conf
-share/mpich2/examples/mpe_nolog.conf
-share/mpich2/examples/mpicc.conf
-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/composite.c
-share/mpich2/examples_collchk/scatterv.c
-share/mpich2/examples_collchk/time_allreduce.c
-share/mpich2/examples_collchk/time_alltoallv.c
-share/mpich2/examples_collchk/time_alltoallv0.c
-share/mpich2/examples_collchk/time_bcast.c
-share/mpich2/examples_collchk/wrong_composite.c
-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_logging/Makefile
-share/mpich2/examples_logging/comm1_isr.c
-share/mpich2/examples_logging/comm1_isr_loop.c
-share/mpich2/examples_logging/comm2_connect_accept.c
-share/mpich2/examples_logging/comm2_spawn_child.c
-share/mpich2/examples_logging/comm2_spawn_parent.c
-share/mpich2/examples_logging/cpi.c
-share/mpich2/examples_logging/cpilog.c
-share/mpich2/examples_logging/cpilog_pack.c
-share/mpich2/examples_logging/fcomm1_isr.f
-share/mpich2/examples_logging/fpilog.f
-share/mpich2/examples_logging/fpilog_pack.F
-share/mpich2/examples_logging/iotest.c
-share/mpich2/examples_logging/log_cost.c
-share/mpich2/examples_logging/openmp_mpilog.F
-share/mpich2/examples_logging/openmp_sendrecv.c
-share/mpich2/examples_logging/pthread_allreduce.c
-share/mpich2/examples_logging/pthread_sendrecv.c
-share/mpich2/examples_logging/pthread_sendrecv_user.c
-share/mpich2/examples_logging/srtest.c
-@pkgdir etc/mpich
+share/doc/mpich/install.pdf
+share/doc/mpich/logging.pdf
+share/doc/mpich/smpd_pmi.pdf
+share/doc/mpich/user.pdf
+share/mpich/examples/mpicc.conf
+share/mpich/examples/mpicxx.conf
+share/mpich/examples/mpif77.conf
diff --git a/parallel/mpi-ch/buildlink3.mk b/parallel/mpi-ch/buildlink3.mk
index ad72206a648..d1a6100933b 100644
--- a/parallel/mpi-ch/buildlink3.mk
+++ b/parallel/mpi-ch/buildlink3.mk
@@ -1,14 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.15 2010/12/17 02:47:18 asau Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2013/03/17 17:08:51 asau Exp $
 
-BUILDLINK_TREE+=	mpich2
+BUILDLINK_TREE+=	mpich
 
-.if !defined(MPICH2_BUILDLINK3_MK)
-MPICH2_BUILDLINK3_MK:=
+.if !defined(MPICH_BUILDLINK3_MK)
+MPICH_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mpich2+=	mpich2>=1.0.7
-BUILDLINK_PKGSRCDIR.mpich2?=	../../parallel/mpi-ch
+BUILDLINK_API_DEPENDS.mpich+=	mpich>=3
+BUILDLINK_PKGSRCDIR.mpich?=	../../parallel/mpi-ch
+
+FIND_PREFIX:=	BUILDLINK_PREFIX.mpich=mpich
+.include "../../mk/find-prefix.mk"
 
 .include "../../parallel/openpa/buildlink3.mk"
-.endif	# MPICH2_BUILDLINK3_MK
+.endif	# MPICH_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-mpich2
+BUILDLINK_TREE+=	-mpich
diff --git a/parallel/mpi-ch/distinfo b/parallel/mpi-ch/distinfo
index 73b3aa20628..d277d6b32b8 100644
--- a/parallel/mpi-ch/distinfo
+++ b/parallel/mpi-ch/distinfo
@@ -1,12 +1,7 @@
-$NetBSD: distinfo,v 1.20 2013/02/26 23:36:17 joerg Exp $
+$NetBSD: distinfo,v 1.21 2013/03/17 17:08:51 asau Exp $
 
-SHA1 (mpich2-1.4.1p1.tar.gz) = 8dcc8888fb27232eb8f76c11cc890f1c3c483804
-RMD160 (mpich2-1.4.1p1.tar.gz) = 1d355cc07b8675af77b1c255fd10696844447298
-Size (mpich2-1.4.1p1.tar.gz) = 19502854 bytes
-SHA1 (patch-Makefile.in) = c7e8398952d3b60d1325661ef0055c72930c70f9
-SHA1 (patch-aa) = f7d5fc3be6b2679ef0937615cc9c5b4229acb22a
-SHA1 (patch-ac) = b956a355ef381d759077288916c40e32b022f178
-SHA1 (patch-src_mpe2_Makefile_in) = a72b4edea6e59b0b4e59454e4d5910e01e689548
-SHA1 (patch-src_mpe2_src_callstack_src_Makefile.in) = 4f46ffad18f7d18ffeed7b703a57056a202e745a
-SHA1 (patch-src_mpe2_src_logging_src_Makefile.in) = e266eea99bc88ec93f892cbcb64e1560236b1b2d
-SHA1 (patch-src_pm_hydra_configure) = 9d42c909464fa24af7a079c03a75ae03aa3f8ee5
+SHA1 (mpich-3.0.1.tar.gz) = 61ed0b9fac26e1d102d93503bd8e1ac73f246b5a
+RMD160 (mpich-3.0.1.tar.gz) = a30aa14f9360b9cf2e88f9cd4f06b24b8800c55d
+Size (mpich-3.0.1.tar.gz) = 10934260 bytes
+SHA1 (patch-Makefile.in) = 32a78a384ecb94a30631a8a756e746edbe6e0060
+SHA1 (patch-src_pm_hydra_configure) = c8d25676499386e4a2616db5ab2d86443f29b1f7
diff --git a/parallel/mpi-ch/patches/patch-Makefile.in b/parallel/mpi-ch/patches/patch-Makefile.in
index 7764b93de73..d977e34b051 100644
--- a/parallel/mpi-ch/patches/patch-Makefile.in
+++ b/parallel/mpi-ch/patches/patch-Makefile.in
@@ -1,26 +1,57 @@
-$NetBSD: patch-Makefile.in,v 1.1 2012/01/11 09:43:26 asau Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2013/03/17 17:08:51 asau Exp $
 
---- Makefile.in.orig	2011-09-01 18:55:44.000000000 +0000
-+++ Makefile.in
-@@ -202,16 +202,16 @@ install:  install-preamble FORCE_TARGET 
- 	if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi
- 	if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi
- 	if [ -s $(srcdir)/doc/logging/logging.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/logging/logging.pdf ${DESTDIR}${docdir}/logging.pdf ; fi
--	(cd src/env && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${DESTDIR}${prefix} exec_prefix=${DESTDIR}${exec_prefix} bindir=${DESTDIR}${bindir} libdir=${DESTDIR}${libdir} includedir=${DESTDIR}${includedir} install)
--	(cd src/packaging/pkgconfig && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${DESTDIR}${prefix} exec_prefix=${DESTDIR}${exec_prefix} bindir=${DESTDIR}${bindir} libdir=${DESTDIR}${libdir} includedir=${DESTDIR}${includedir} install)
--	(cd src/packaging/envmods && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${DESTDIR}${prefix} exec_prefix=${DESTDIR}${exec_prefix} bindir=${DESTDIR}${bindir} libdir=${DESTDIR}${libdir} includedir=${DESTDIR}${includedir} install)
-+	(cd src/env && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${prefix} exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} includedir=${includedir} install)
-+	(cd src/packaging/pkgconfig && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${prefix} exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} includedir=${includedir} install)
-+	(cd src/packaging/envmods && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${prefix} exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} includedir=${includedir} install)
- 	for dir in @bindings_dirs@ - ; do \
- 		if [ "$$dir" = "-" ] ; then break ; fi ;\
--		(cd $$dir && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${DESTDIR}${prefix} exec_prefix=${DESTDIR}${exec_prefix} bindir=${DESTDIR}${bindir} libdir=${DESTDIR}${libdir} includedir=${DESTDIR}${includedir} install) ;\
-+		(cd $$dir && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${prefix} exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} includedir=${includedir} install) ;\
- 	done
- 	for dir in @other_install_dirs@ - ; do \
- 		if [ "$$dir" = "-" ] ; then break ; fi ;\
--		(cd $$dir && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${DESTDIR}${prefix} exec_prefix=${DESTDIR}${exec_prefix} bindir=${DESTDIR}${bindir} libdir=${DESTDIR}${libdir} includedir=${DESTDIR}${includedir} install) ;\
-+		(cd $$dir && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${prefix} exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} includedir=${includedir} install) ;\
+--- Makefile.in.orig	2012-12-20 21:29:15.000000000 +0100
++++ Makefile.in	2013-01-24 16:33:41.164187741 +0100
+@@ -5985,6 +5985,7 @@
+ srcdir = @srcdir@
+ subdirs = @subdirs@
+ sysconfdir = @sysconfdir@
++sysconfexampledir = ${datadir}/examples
+ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+@@ -6163,9 +6164,9 @@
+ 	src/mpid/ch3/errnames.txt $(am__append_52) \
+ 	src/mpid/common/sock/errnames.txt $(am__append_87) \
+ 	src/pmi/errnames.txt
+-external_subdirs = src/mpl src/openpa
++external_subdirs = src/mpl # src/openpa
+ # FIXME how/where does external_libs/ldflags get used?
+-external_ldflags = -L$(top_builddir)/src/mpl -L$(top_builddir)/src/openpa/src
++external_ldflags = -L$(top_builddir)/src/mpl # -L$(top_builddir)/src/openpa/src
+ external_libs = -lmpl -lopa $(am__append_12) $(am__append_13)
+ 
+ # NOTE on our semi-unconventional usage of DIST_SUBDIRS:
+@@ -23542,25 +23543,25 @@
+ 	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
+ install-sysconfDATA: $(sysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+-	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
++	@list='$(sysconf_DATA)'; test -n "$(sysconfexampledir)" || list=; \
+ 	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfexampledir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(sysconfexampledir)" || exit 1; \
+ 	fi; \
+ 	for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  echo "$$d$$p"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
++	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfexampledir)'"; \
++	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfexampledir)" || exit $$?; \
  	done
  
- install-strip:
+ uninstall-sysconfDATA:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
++	@list='$(sysconf_DATA)'; test -n "$(sysconfexampledir)" || list=; \
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir)
++	dir='$(DESTDIR)$(sysconfexampledir)'; $(am__uninstall_files_from_dir)
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+ 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
diff --git a/parallel/mpi-ch/patches/patch-aa b/parallel/mpi-ch/patches/patch-aa
deleted file mode 100644
index e3a9aa986c4..00000000000
--- a/parallel/mpi-ch/patches/patch-aa
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2012/01/11 09:43:26 asau Exp $
-
-Install configuration files into example directory.
-
---- src/env/Makefile.in.orig	2011-09-01 22:55:45.000000000 +0400
-+++ src/env/Makefile.in	2011-11-09 21:08:59.000000000 +0400
-@@ -21,6 +21,8 @@
- srcdir          = @srcdir@
- abs_srcdir      = @abs_srcdir@
- sysconfdir      = @sysconfdir@
-+datadir		= @datadir@
-+exampledir	= ${datadir}/examples
- DEFS            = @DEFS@ -I. -I${srcdir}
- CPPFLAGS        = @CPPFLAGS@
- LIBS            = @LIBS@
-@@ -97,15 +99,15 @@
- 	if [ ! -d ${DESTDIR}${bindir} ] ; then $(MKDIR_P) ${DESTDIR}${bindir} ; fi
- 	$(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG)  mpich2version ${DESTDIR}${bindir}/mpich2version
- 	$(INSTALL_SCRIPT)  mpicc ${DESTDIR}${bindir}/mpicc
--	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 [ ! -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.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} DESTDIR=${DESTDIR} prefix=${prefix} exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} includedir=${includedir} install-postamble
- 
- install-strip:
-@@ -113,14 +115,14 @@
- uninstall: 
- 	-rm -f ${DESTDIR}${bindir}/mpich2version
- 	-rm -f ${DESTDIR}${bindir}/mpicc
--	-rm -f ${DESTDIR}${sysconfdir}/mpixxx_opts.conf
--	-rm -f ${DESTDIR}${sysconfdir}/mpicc.conf
-+	-rm -f ${DESTDIR}${exampledir}/mpixxx_opts.conf
-+	-rm -f ${DESTDIR}${exampledir}/mpicc.conf
- 	-rm -f ${DESTDIR}${bindir}/mpicxx
- 	-rm -f ${DESTDIR}${bindir}/mpif77
- 	-rm -f ${DESTDIR}${bindir}/mpif90
--	-rm -f ${DESTDIR}${sysconfdir}/mpicxx.conf
--	-rm -f ${DESTDIR}${sysconfdir}/mpif77.conf
--	-rm -f ${DESTDIR}${sysconfdir}/mpif90.conf
-+	-rm -f ${DESTDIR}${exampledir}/mpicxx.conf
-+	-rm -f ${DESTDIR}${exampledir}/mpif77.conf
-+	-rm -f ${DESTDIR}${exampledir}/mpif90.conf
- 	${MAKE} uninstall-postamble
- installcheck: 
- # --------------------------------------------------------------------------
diff --git a/parallel/mpi-ch/patches/patch-ac b/parallel/mpi-ch/patches/patch-ac
deleted file mode 100644
index 159b71275b3..00000000000
--- a/parallel/mpi-ch/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2010/12/17 02:47:18 asau Exp $
-
-Install sample configuration files in example directory.
-
---- src/mpe2/sbin/mpeinstall.in.orig	2009-01-31 02:56:35.000000000 +0300
-+++ src/mpe2/sbin/mpeinstall.in	2009-03-22 21:29:26.000000000 +0300
-@@ -487,14 +487,16 @@
-     fi
- fi
- 
-+exampledir=${datadir}/examples
-+
- # Install compiler configuration files
- if [ -n "$etcbuild_dir" ] ; then
-     if [ -d $etcbuild_dir ] ; then
--        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-src_mpe2_Makefile_in b/parallel/mpi-ch/patches/patch-src_mpe2_Makefile_in
deleted file mode 100644
index 32c903da264..00000000000
--- a/parallel/mpi-ch/patches/patch-src_mpe2_Makefile_in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_mpe2_Makefile_in,v 1.1 2012/09/15 21:25:27 dholland Exp $
-
-Make build stop on error.
-
---- src/mpe2/Makefile.in~	2011-02-28 22:38:13.000000000 +0000
-+++ src/mpe2/Makefile.in
-@@ -53,8 +53,7 @@ build_lib_bin:
- 	@for pkg in $(PKGS) ; do \
- 	     if [ -n "$$pkg" -a -s $$pkg/Makefile ] ; then \
- 	         echo ; echo "**** Making $$pkg ...." ; \
--	         ( cd $$pkg && $(MAKE) $(MAKEOPTS) ) ; \
--                 sleep 1 ; \
-+	         ( cd $$pkg && $(MAKE) $(MAKEOPTS) ) || exit 1; \
- 	     fi ; \
- 	 done
- 
diff --git a/parallel/mpi-ch/patches/patch-src_mpe2_src_callstack_src_Makefile.in b/parallel/mpi-ch/patches/patch-src_mpe2_src_callstack_src_Makefile.in
deleted file mode 100644
index 17dccc994dd..00000000000
--- a/parallel/mpi-ch/patches/patch-src_mpe2_src_callstack_src_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_mpe2_src_callstack_src_Makefile.in,v 1.1 2013/02/26 23:36:17 joerg Exp $
-
---- src/mpe2/src/callstack/src/Makefile.in.orig	2013-02-26 21:04:07.000000000 +0000
-+++ src/mpe2/src/callstack/src/Makefile.in
-@@ -25,7 +25,7 @@ CFLAGS               = @CFLAGS@
- MPE_LIBDIR           = @libbuild_dir@
- LIB_PATH             = $(MPI_LIBS)
- PROF_LIBS            = -L$(MPE_LIBDIR) @PROF_LIBS@ $(MPI_LIBS)
--LDFLAGS              = @LDFLAGS@
-+LDFLAGS              = @LDFLAGS@ ${LIBEXECINFO}
- MPE_BUILD_FORTRAN2C  = @MPE_BUILD_FORTRAN2C@
- CC_DOES_C_O          = @CC_DOES_C_O@
- 
diff --git a/parallel/mpi-ch/patches/patch-src_mpe2_src_logging_src_Makefile.in b/parallel/mpi-ch/patches/patch-src_mpe2_src_logging_src_Makefile.in
deleted file mode 100644
index 8313e85b4ad..00000000000
--- a/parallel/mpi-ch/patches/patch-src_mpe2_src_logging_src_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_mpe2_src_logging_src_Makefile.in,v 1.1 2013/02/26 23:36:17 joerg Exp $
-
---- src/mpe2/src/logging/src/Makefile.in.orig	2013-02-26 21:04:35.000000000 +0000
-+++ src/mpe2/src/logging/src/Makefile.in
-@@ -25,7 +25,7 @@ CFLAGS               = @CFLAGS@
- MPE_LIBDIR           = @libbuild_dir@
- LIB_PATH             = $(MPI_LIBS)
- PROF_LIBS            = -L$(MPE_LIBDIR) @PROF_LIBS@ $(MPI_LIBS)
--LDFLAGS              = @LDFLAGS@
-+LDFLAGS              = @LDFLAGS@ ${LIBEXECINFO}
- MPE_BUILD_FORTRAN2C  = @MPE_BUILD_FORTRAN2C@
- CC_DOES_C_O          = @CC_DOES_C_O@
- 
diff --git a/parallel/mpi-ch/patches/patch-src_pm_hydra_configure b/parallel/mpi-ch/patches/patch-src_pm_hydra_configure
index 03cfac33c63..ba834d965e6 100644
--- a/parallel/mpi-ch/patches/patch-src_pm_hydra_configure
+++ b/parallel/mpi-ch/patches/patch-src_pm_hydra_configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_pm_hydra_configure,v 1.1 2012/01/11 09:43:26 asau Exp $
+$NetBSD: patch-src_pm_hydra_configure,v 1.2 2013/03/17 17:08:52 asau Exp $
 
---- src/pm/hydra/configure.orig	2011-09-01 18:54:46.000000000 +0000
-+++ src/pm/hydra/configure
-@@ -13854,7 +13854,7 @@ fi
+--- src/pm/hydra/configure.orig	2012-12-20 21:28:12.000000000 +0100
++++ src/pm/hydra/configure	2013-01-24 15:36:08.260189221 +0100
+@@ -14373,7 +14373,7 @@
  
  
  cat >>confdefs.h <<_ACEOF