- Update to 2.1.1

- Force the wrapper to use rpath pointing to the correct GCC directory.
  This solves a problem (bug 217750) when a non-default GCC version is used.

PR:		217750

3 files changed, 21 insertions, 20 deletions

diff --git a/net/openmpi2/Makefile b/net/openmpi2/Makefile
index 12e14f3818ca..ea19293a057c 100644
--- a/net/openmpi2/Makefile
+++ b/net/openmpi2/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openmpi
-PORTVERSION=	2.0.2
-PORTREVISION=	4
+PORTVERSION=	2.1.1
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.open-mpi.org/software/ompi/v${PORTVERSION:R}/downloads/
 PKGNAMESUFFIX=	2
@@ -45,6 +44,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX}/${MPIDIR} \
 			--enable-heterogeneous \
 			--enable-mpi-thread-multiple \
 			--with-libevent=external \
+			--with-wrapper-ldflags=-Wl,-rpath=-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
 			ompi_cv_fortran_ignore_tkr_data=0
 
 USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib \
diff --git a/net/openmpi2/distinfo b/net/openmpi2/distinfo
index 78cdbd78d773..73be50cad846 100644
--- a/net/openmpi2/distinfo
+++ b/net/openmpi2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485945440
-SHA256 (openmpi-2.0.2.tar.bz2) = cae396e643f9f91f0a795f8d8694adf7bacfb16f967c22fb39e9e28d477730d3
-SIZE (openmpi-2.0.2.tar.bz2) = 8311215
+TIMESTAMP = 1498328950
+SHA256 (openmpi-2.1.1.tar.bz2) = bd7badd4ff3afa448c0d7f3ca0ee6ce003b957e9954aa87d8e4435759b5e4d16
+SIZE (openmpi-2.1.1.tar.bz2) = 8242859
diff --git a/net/openmpi2/pkg-plist b/net/openmpi2/pkg-plist
index 39350503b63e..20248386dc05 100644
--- a/net/openmpi2/pkg-plist
+++ b/net/openmpi2/pkg-plist
@@ -79,35 +79,35 @@
 %%MPIDIR%%/lib/libmca_common_sm.la
 %%MPIDIR%%/lib/libmca_common_sm.so
 %%MPIDIR%%/lib/libmca_common_sm.so.20
-%%MPIDIR%%/lib/libmca_common_sm.so.20.0.0
+%%MPIDIR%%/lib/libmca_common_sm.so.20.10.1
 %%MPIDIR%%/lib/libmpi.la
 %%MPIDIR%%/lib/libmpi.so
 %%MPIDIR%%/lib/libmpi.so.20
-%%MPIDIR%%/lib/libmpi.so.20.0.2
+%%MPIDIR%%/lib/libmpi.so.20.10.1
 %%MPIDIR%%/lib/libmpi_cxx.la
 %%MPIDIR%%/lib/libmpi_cxx.so
 %%MPIDIR%%/lib/libmpi_cxx.so.20
-%%MPIDIR%%/lib/libmpi_cxx.so.20.0.1
+%%MPIDIR%%/lib/libmpi_cxx.so.20.10.0
 %%MPIDIR%%/lib/libmpi_mpifh.la
 %%MPIDIR%%/lib/libmpi_mpifh.so
 %%MPIDIR%%/lib/libmpi_mpifh.so.20
-%%MPIDIR%%/lib/libmpi_mpifh.so.20.1.0
+%%MPIDIR%%/lib/libmpi_mpifh.so.20.11.0
 %%MPIDIR%%/lib/libmpi_usempi.la
 %%MPIDIR%%/lib/libmpi_usempi.so
 %%MPIDIR%%/lib/libmpi_usempi.so.20
-%%MPIDIR%%/lib/libmpi_usempi.so.20.1.0
+%%MPIDIR%%/lib/libmpi_usempi.so.20.10.0
 %%MPIDIR%%/lib/libompitrace.la
 %%MPIDIR%%/lib/libompitrace.so
 %%MPIDIR%%/lib/libompitrace.so.20
-%%MPIDIR%%/lib/libompitrace.so.20.0.0
+%%MPIDIR%%/lib/libompitrace.so.20.10.0
 %%MPIDIR%%/lib/libopen-pal.la
 %%MPIDIR%%/lib/libopen-pal.so
 %%MPIDIR%%/lib/libopen-pal.so.20
-%%MPIDIR%%/lib/libopen-pal.so.20.2.0
+%%MPIDIR%%/lib/libopen-pal.so.20.10.1
 %%MPIDIR%%/lib/libopen-rte.la
 %%MPIDIR%%/lib/libopen-rte.so
 %%MPIDIR%%/lib/libopen-rte.so.20
-%%MPIDIR%%/lib/libopen-rte.so.20.1.0
+%%MPIDIR%%/lib/libopen-rte.so.20.10.1
 %%MPIDIR%%/lib/mpi.mod
 %%MPIDIR%%/lib/openmpi/libompi_dbg_msgq.la
 %%MPIDIR%%/lib/openmpi/libompi_dbg_msgq.so
@@ -167,6 +167,8 @@
 %%MPIDIR%%/lib/openmpi/mca_fbtl_posix.so
 %%MPIDIR%%/lib/openmpi/mca_fcoll_dynamic.la
 %%MPIDIR%%/lib/openmpi/mca_fcoll_dynamic.so
+%%MPIDIR%%/lib/openmpi/mca_fcoll_dynamic_gen2.la
+%%MPIDIR%%/lib/openmpi/mca_fcoll_dynamic_gen2.so
 %%MPIDIR%%/lib/openmpi/mca_fcoll_individual.la
 %%MPIDIR%%/lib/openmpi/mca_fcoll_individual.so
 %%MPIDIR%%/lib/openmpi/mca_fcoll_static.la
@@ -193,10 +195,8 @@
 %%MPIDIR%%/lib/openmpi/mca_iof_orted.so
 %%MPIDIR%%/lib/openmpi/mca_iof_tool.la
 %%MPIDIR%%/lib/openmpi/mca_iof_tool.so
-%%MPIDIR%%/lib/openmpi/mca_mpool_grdma.la
-%%MPIDIR%%/lib/openmpi/mca_mpool_grdma.so
-%%MPIDIR%%/lib/openmpi/mca_mpool_sm.la
-%%MPIDIR%%/lib/openmpi/mca_mpool_sm.so
+%%MPIDIR%%/lib/openmpi/mca_mpool_hugepage.la
+%%MPIDIR%%/lib/openmpi/mca_mpool_hugepage.so
 %%MPIDIR%%/lib/openmpi/mca_notifier_syslog.la
 %%MPIDIR%%/lib/openmpi/mca_notifier_syslog.so
 %%MPIDIR%%/lib/openmpi/mca_odls_default.la
@@ -227,8 +227,8 @@
 %%MPIDIR%%/lib/openmpi/mca_pstat_test.so
 %%MPIDIR%%/lib/openmpi/mca_ras_simulator.la
 %%MPIDIR%%/lib/openmpi/mca_ras_simulator.so
-%%MPIDIR%%/lib/openmpi/mca_rcache_vma.la
-%%MPIDIR%%/lib/openmpi/mca_rcache_vma.so
+%%MPIDIR%%/lib/openmpi/mca_rcache_grdma.la
+%%MPIDIR%%/lib/openmpi/mca_rcache_grdma.so
 %%MPIDIR%%/lib/openmpi/mca_rmaps_mindist.la
 %%MPIDIR%%/lib/openmpi/mca_rmaps_mindist.so
 %%MPIDIR%%/lib/openmpi/mca_rmaps_ppr.la
@@ -757,6 +757,7 @@
 %%MPIDIR%%/%%DATADIR%%/help-mca-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-mca-bml-r2.txt
 %%MPIDIR%%/%%DATADIR%%/help-mca-coll-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-mca-osc-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-mca-var.txt
 %%MPIDIR%%/%%DATADIR%%/help-mpi-api.txt
 %%MPIDIR%%/%%DATADIR%%/help-mpi-btl-base.txt
@@ -796,12 +797,12 @@
 %%MPIDIR%%/%%DATADIR%%/help-orte-top.txt
 %%MPIDIR%%/%%DATADIR%%/help-orted.txt
 %%MPIDIR%%/%%DATADIR%%/help-orterun.txt
-%%MPIDIR%%/%%DATADIR%%/help-osc-pt2pt.txt
 %%MPIDIR%%/%%DATADIR%%/help-plm-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-plm-rsh.txt
 %%MPIDIR%%/%%DATADIR%%/help-pmix-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-ras-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-ras-simulator.txt
+%%MPIDIR%%/%%DATADIR%%/help-rcache-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-regex.txt
 %%MPIDIR%%/%%DATADIR%%/help-rmaps_rank_file.txt
 %%MPIDIR%%/%%DATADIR%%/help-state-staged-hnp.txt