Update to MPICH 3.2

9 files changed, 26 insertions, 80 deletions

diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 075e715e6697..57f0c80ea955 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mpich
-PORTVERSION=	3.1.4
-PORTREVISION=	1
+PORTVERSION=	3.2
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.mpich.org/static/downloads/${DISTVERSION}/
 
diff --git a/net/mpich/distinfo b/net/mpich/distinfo
index cf50bf37887c..c016da4e6930 100644
--- a/net/mpich/distinfo
+++ b/net/mpich/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mpich-3.1.4.tar.gz) = f68b5330e94306c00ca5a1c0e8e275c7f53517d01d6c524d51ce9359d240466b
-SIZE (mpich-3.1.4.tar.gz) = 11325036
+SHA256 (mpich-3.2.tar.gz) = 0778679a6b693d7b7caff37ff9d2856dc2bfc51318bf8373859bfa74253da3dc
+SIZE (mpich-3.2.tar.gz) = 11862150
diff --git a/net/mpich/files/patch-Makefile.in b/net/mpich/files/patch-Makefile.in
new file mode 100644
index 000000000000..120519c667ab
--- /dev/null
+++ b/net/mpich/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2015-11-12 04:08:10 UTC
++++ Makefile.in
+@@ -10241,7 +10241,7 @@ common_pm_includes = \
+ # we may not want to add AM_CPPFLAGS for this program
+ @BUILD_PM_GFORKER_TRUE@@PRIMARY_PM_GFORKER_TRUE@src_pm_gforker_mpiexec_CPPFLAGS = $(common_pm_includes) $(AM_CPPFLAGS)
+ @BUILD_PM_GFORKER_TRUE@@PRIMARY_PM_GFORKER_FALSE@src_pm_gforker_mpiexec_gforker_SOURCES = src/pm/gforker/mpiexec.c 
+-@BUILD_PM_GFORKER_TRUE@@PRIMARY_PM_GFORKER_FALSE@src_pm_gforker_mpiexec_gforker_LDADD = src/pm/util/libmpiexec.a
++@BUILD_PM_GFORKER_TRUE@@PRIMARY_PM_GFORKER_FALSE@src_pm_gforker_mpiexec_gforker_LDADD = src/pm/util/libmpiexec.a $(mpllib)
+ # we may not want to add AM_CPPFLAGS for this program
+ @BUILD_PM_GFORKER_TRUE@@PRIMARY_PM_GFORKER_FALSE@src_pm_gforker_mpiexec_gforker_CPPFLAGS = $(common_pm_includes) $(AM_CPPFLAGS)
+ @BUILD_PM_REMSHELL_TRUE@@PRIMARY_PM_REMSHELL_TRUE@src_pm_remshell_mpiexec_SOURCES = src/pm/remshell/mpiexec.c 
diff --git a/net/mpich/files/patch-src-mpi-pt2pt-greq_start.c b/net/mpich/files/patch-src-mpi-pt2pt-greq_start.c
deleted file mode 100644
index 483da55126f6..000000000000
--- a/net/mpich/files/patch-src-mpi-pt2pt-greq_start.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/mpi/pt2pt/greq_start.c.orig	2015-02-20 20:48:13 UTC
-+++ src/mpi/pt2pt/greq_start.c
-@@ -236,7 +236,7 @@ int MPIX_Grequest_class_create(MPI_Grequ
-         MPI_Grequest_cancel_function *cancel_fn,
-         MPIX_Grequest_poll_function *poll_fn,
-         MPIX_Grequest_wait_function *wait_fn,
--        MPIX_Grequest_class *greq_class) __attribute__((weak,alias("MPIX_Grequest_class_create")));
-+        MPIX_Grequest_class *greq_class) __attribute__((weak,alias("PMPIX_Grequest_class_create")));
- #endif
- /* -- End Profiling Symbol Block */
- 
-@@ -328,7 +328,7 @@ fn_fail:
- #elif defined(HAVE_PRAGMA_CRI_DUP)
- #pragma _CRI duplicate MPIX_Grequest_class_allocate as PMPIX_Grequest_class_allocate
- #elif defined(HAVE_WEAK_ATTRIBUTE)
--int MPIX_Grequest_class_allocate(MPIX_Grequest_class greq_class, void *extra_state, MPI_Request *request) __attribute__((weak,alias("MPIX_Grequest_class_allocate")));
-+int MPIX_Grequest_class_allocate(MPIX_Grequest_class greq_class, void *extra_state, MPI_Request *request) __attribute__((weak,alias("PMPIX_Grequest_class_allocate")));
- #endif
- /* -- End Profiling Symbol Block */
- 
-@@ -379,7 +379,7 @@ int MPIX_Grequest_start( MPI_Grequest_qu
-         MPIX_Grequest_poll_function *poll_fn,
-         MPIX_Grequest_wait_function *wait_fn,
-         void *extra_state,
--        MPI_Request *request ) __attribute__((weak,alias("MPIX_Grequest_start")));
-+        MPI_Request *request ) __attribute__((weak,alias("PMPIX_Grequest_start")));
- #endif
- /* -- End Profiling Symbol Block */
- 
diff --git a/net/mpich/files/patch-src-mutex-mutex_create.c b/net/mpich/files/patch-src-mutex-mutex_create.c
deleted file mode 100644
index e1c7bf97d093..000000000000
--- a/net/mpich/files/patch-src-mutex-mutex_create.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mutex/mutex_create.c.orig	2015-02-20 20:48:13 UTC
-+++ src/mutex/mutex_create.c
-@@ -23,7 +23,7 @@
- #elif defined(HAVE_PRAGMA_CRI_DUP)
- #pragma _CRI duplicate MPIX_Mutex_create as PMPIX_Mutex_create
- #elif defined(HAVE_WEAK_ATTRIBUTE)
--int MPIX_Mutex_create(int my_count, MPI_Comm comm, MPIX_Mutex * hdl_out) __attribute__((weak,alias("MPIX_Mutex_create")));
-+int MPIX_Mutex_create(int my_count, MPI_Comm comm, MPIX_Mutex * hdl_out) __attribute__((weak,alias("PMPIX_Mutex_create")));
- #endif
- /* -- End Profiling Symbol Block */
- 
diff --git a/net/mpich/files/patch-src-mutex-mutex_free.c b/net/mpich/files/patch-src-mutex-mutex_free.c
deleted file mode 100644
index 801bed597631..000000000000
--- a/net/mpich/files/patch-src-mutex-mutex_free.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mutex/mutex_free.c.orig	2015-02-20 20:48:13 UTC
-+++ src/mutex/mutex_free.c
-@@ -20,7 +20,7 @@
- #elif defined(HAVE_PRAGMA_CRI_DUP)
- #pragma _CRI duplicate MPIX_Mutex_free as PMPIX_Mutex_free
- #elif defined(HAVE_WEAK_ATTRIBUTE)
--int MPIX_Mutex_free(MPIX_Mutex * hdl_ptr) __attribute__((weak,alias("MPIX_Mutex_free")));
-+int MPIX_Mutex_free(MPIX_Mutex * hdl_ptr) __attribute__((weak,alias("PMPIX_Mutex_free")));
- #endif
- /* -- End Profiling Symbol Block */
- 
diff --git a/net/mpich/files/patch-src-mutex-mutex_lock.c b/net/mpich/files/patch-src-mutex-mutex_lock.c
deleted file mode 100644
index d6377021ed2d..000000000000
--- a/net/mpich/files/patch-src-mutex-mutex_lock.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mutex/mutex_lock.c.orig	2015-02-20 20:48:13 UTC
-+++ src/mutex/mutex_lock.c
-@@ -21,7 +21,7 @@
- #elif defined(HAVE_PRAGMA_CRI_DUP)
- #pragma _CRI duplicate MPIX_Mutex_lock as PMPIX_Mutex_lock
- #elif defined(HAVE_WEAK_ATTRIBUTE)
--int MPIX_Mutex_lock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("MPIX_Mutex_lock")));
-+int MPIX_Mutex_lock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("PMPIX_Mutex_lock")));
- #endif
- /* -- End Profiling Symbol Block */
- 
diff --git a/net/mpich/files/patch-src-mutex-mutex_unlock.c b/net/mpich/files/patch-src-mutex-mutex_unlock.c
deleted file mode 100644
index 3eeb4d3bcdf4..000000000000
--- a/net/mpich/files/patch-src-mutex-mutex_unlock.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mutex/mutex_unlock.c.orig	2015-02-20 20:48:13 UTC
-+++ src/mutex/mutex_unlock.c
-@@ -21,7 +21,7 @@
- #elif defined(HAVE_PRAGMA_CRI_DUP)
- #pragma _CRI duplicate MPIX_Mutex_unlock as PMPIX_Mutex_unlock
- #elif defined(HAVE_WEAK_ATTRIBUTE)
--int MPIX_Mutex_unlock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("MPIX_Mutex_unlock")));
-+int MPIX_Mutex_unlock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("PMPIX_Mutex_unlock")));
- #endif
- /* -- End Profiling Symbol Block */
- 
diff --git a/net/mpich/pkg-plist b/net/mpich/pkg-plist
index e8ce4781ec41..6c21a8db6fdd 100644
--- a/net/mpich/pkg-plist
+++ b/net/mpich/pkg-plist
@@ -45,18 +45,18 @@ include/primitives/opa_unsafe.h
 lib/libmpi.a
 lib/libmpi.so
 lib/libmpi.so.12
-lib/libmpi.so.12.0.5
+lib/libmpi.so.12.1.0
 lib/libmpich.so
 lib/libmpichcxx.so
 %%FORTRAN%%lib/libmpichf90.so
 lib/libmpicxx.a
 lib/libmpicxx.so
 lib/libmpicxx.so.12
-lib/libmpicxx.so.12.0.5
+lib/libmpicxx.so.12.1.0
 %%FORTRAN%%lib/libmpifort.a
 %%FORTRAN%%lib/libmpifort.so
 %%FORTRAN%%lib/libmpifort.so.12
-%%FORTRAN%%lib/libmpifort.so.12.0.5
+%%FORTRAN%%lib/libmpifort.so.12.1.0
 lib/libmpl.so
 lib/libopa.so
 libdata/pkgconfig/mpich.pc
@@ -80,6 +80,8 @@ man/man3/MPI_Add_error_class.3.gz
 man/man3/MPI_Add_error_code.3.gz
 man/man3/MPI_Add_error_string.3.gz
 man/man3/MPI_Address.3.gz
+man/man3/MPI_Aint_add.3.gz
+man/man3/MPI_Aint_diff.3.gz
 man/man3/MPI_Allgather.3.gz
 man/man3/MPI_Allgatherv.3.gz
 man/man3/MPI_Alloc_mem.3.gz
@@ -173,10 +175,14 @@ man/man3/MPI_File_get_size.3.gz
 man/man3/MPI_File_get_type_extent.3.gz
 man/man3/MPI_File_get_view.3.gz
 man/man3/MPI_File_iread.3.gz
+man/man3/MPI_File_iread_all.3.gz
 man/man3/MPI_File_iread_at.3.gz
+man/man3/MPI_File_iread_at_all.3.gz
 man/man3/MPI_File_iread_shared.3.gz
 man/man3/MPI_File_iwrite.3.gz
+man/man3/MPI_File_iwrite_all.3.gz
 man/man3/MPI_File_iwrite_at.3.gz
+man/man3/MPI_File_iwrite_at_all.3.gz
 man/man3/MPI_File_iwrite_shared.3.gz
 man/man3/MPI_File_open.3.gz
 man/man3/MPI_File_preallocate.3.gz
@@ -346,9 +352,11 @@ man/man3/MPI_Status_set_elements_x.3.gz
 man/man3/MPI_T_category_changed.3.gz
 man/man3/MPI_T_category_get_categories.3.gz
 man/man3/MPI_T_category_get_cvars.3.gz
+man/man3/MPI_T_category_get_index.3.gz
 man/man3/MPI_T_category_get_info.3.gz
 man/man3/MPI_T_category_get_num.3.gz
 man/man3/MPI_T_category_get_pvars.3.gz
+man/man3/MPI_T_cvar_get_index.3.gz
 man/man3/MPI_T_cvar_get_info.3.gz
 man/man3/MPI_T_cvar_get_num.3.gz
 man/man3/MPI_T_cvar_handle_alloc.3.gz
@@ -359,6 +367,7 @@ man/man3/MPI_T_enum_get_info.3.gz
 man/man3/MPI_T_enum_get_item.3.gz
 man/man3/MPI_T_finalize.3.gz
 man/man3/MPI_T_init_thread.3.gz
+man/man3/MPI_T_pvar_get_index.3.gz
 man/man3/MPI_T_pvar_get_info.3.gz
 man/man3/MPI_T_pvar_get_num.3.gz
 man/man3/MPI_T_pvar_handle_alloc.3.gz