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

1 files changed, 28 insertions, 40 deletions

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"