Update to MPICH 3.1.1.

From the announcement:
This is a stable release that adds several capabilities including Blue
Gene/Q implementation supports for MPI-3, experimental Fortran 2008
bindings, significant rework of MPICH library management, and a large
number of bug fixes.

3 files changed, 22 insertions, 30 deletions

diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 85fdb76076a3..1efc23f42ade 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mpich
-DISTVERSION=	3.1
-PORTREVISION=	2
+PORTVERSION=	3.1.1
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.mpich.org/static/downloads/${DISTVERSION}/
 
@@ -29,7 +28,7 @@ OPTIONS_RADIO_DEFAULTPM=DGFORKER DHYDRA
 OPTIONS_DEFAULT=	FORTRAN HYDRA DHYDRA
 OPTIONS_SUB=		yes
 
-FORTRAN_CONFIGURE_ENABLE=	f77 fc
+FORTRAN_CONFIGURE_ENABLE=	fortran
 FORTRAN_USES=			fortran
 
 GFORKER_DESC=	Simple local process manager
@@ -37,7 +36,8 @@ HYDRA_DESC=	Parallel process manager
 DGFORKER_DESC=	Make gforker the default process manager
 DHYDRA_DESC=	Make hydra the default process manager
 
-CONFIGURE_ARGS=	--with-hwloc-prefix=${LOCALBASE} ac_cv_path_BASH_SHELL=""
+CONFIGURE_ARGS=	--with-hwloc-prefix=${LOCALBASE} ac_cv_path_BASH_SHELL="" \
+		pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 
 .include <bsd.port.options.mk>
 
@@ -66,9 +66,4 @@ PLIST_SUB+=	EXECGFORKER="@comment "
 .endif
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} \
-		-e '/pkgconfigdir=/s,=.*,=$$prefix/libdata/pkgconfig,' \
-		${WRKSRC}/configure ${WRKSRC}/src/openpa/configure
-
 .include <bsd.port.mk>
diff --git a/net/mpich/distinfo b/net/mpich/distinfo
index 24d840f47257..e0de33ceb7e1 100644
--- a/net/mpich/distinfo
+++ b/net/mpich/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mpich-3.1.tar.gz) = fcf96dbddb504a64d33833dc455be3dda1e71c7b3df411dfcf9df066d7c32c39
-SIZE (mpich-3.1.tar.gz) = 11088555
+SHA256 (mpich-3.1.1.tar.gz) = 455ccfaf4ec724d2cf5d8bff1f3d26a958ad196121e7ea26504fd3018757652d
+SIZE (mpich-3.1.1.tar.gz) = 10812560
diff --git a/net/mpich/pkg-plist b/net/mpich/pkg-plist
index 33d3b49cf972..5c0472793e6c 100644
--- a/net/mpich/pkg-plist
+++ b/net/mpich/pkg-plist
@@ -10,7 +10,10 @@ bin/mpicxx
 %%HYDRA%%bin/mpiexec.hydra
 %%FORTRAN%%bin/mpif77
 %%FORTRAN%%bin/mpif90
+%%FORTRAN%%bin/mpifort
+%%HYDRA%%bin/mpirun
 bin/mpivars
+bin/parkill
 include/mpi.h
 %%FORTRAN%%include/mpi.mod
 %%FORTRAN%%include/mpi_base.mod
@@ -38,30 +41,24 @@ include/primitives/opa_gcc_sicortex.h
 include/primitives/opa_nt_intrinsics.h
 include/primitives/opa_sun_atomic_ops.h
 include/primitives/opa_unsafe.h
-%%FORTRAN%%lib/libfmpich.a
 %%FORTRAN%%lib/libfmpich.so
-%%FORTRAN%%lib/libfmpich.so.12
-%%FORTRAN%%lib/libfmpich.so.12.0.0
-lib/libmpich.a
+lib/libmpi.a
+lib/libmpi.so
+lib/libmpi.so.12
+lib/libmpi.so.12.0.1
 lib/libmpich.so
-lib/libmpich.so.12
-lib/libmpich.so.12.0.0
-lib/libmpichcxx.a
 lib/libmpichcxx.so
-lib/libmpichcxx.so.12
-lib/libmpichcxx.so.12.0.0
-%%FORTRAN%%lib/libmpichf90.a
 %%FORTRAN%%lib/libmpichf90.so
-%%FORTRAN%%lib/libmpichf90.so.12
-%%FORTRAN%%lib/libmpichf90.so.12.0.0
-lib/libmpl.a
+lib/libmpicxx.a
+lib/libmpicxx.so
+lib/libmpicxx.so.12
+lib/libmpicxx.so.12.0.1
+%%FORTRAN%%lib/libmpifort.a
+%%FORTRAN%%lib/libmpifort.so
+%%FORTRAN%%lib/libmpifort.so.12
+%%FORTRAN%%lib/libmpifort.so.12.0.1
 lib/libmpl.so
-lib/libmpl.so.1
-lib/libmpl.so.1.0.0
-lib/libopa.a
 lib/libopa.so
-lib/libopa.so.1
-lib/libopa.so.1.0.0
 libdata/pkgconfig/mpich.pc
 libdata/pkgconfig/openpa.pc
 man/man1/hydra_nameserver.1.gz
@@ -71,7 +68,7 @@ man/man1/mpicc.1.gz
 man/man1/mpicxx.1.gz
 man/man1/mpiexec.1.gz
 man/man1/mpif77.1.gz
-man/man1/mpif90.1.gz
+man/man1/mpifort.1.gz
 man/man3/MPIX_Comm_group_failed.3.gz
 man/man3/MPIX_Comm_reenable_anysource.3.gz
 man/man3/MPIX_Comm_remote_group_failed.3.gz