3 files changed, 23 insertions, 20 deletions

diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index 8caf697e1582..a66609e457a4 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -4,9 +4,9 @@
 #  - etc/*.sample support
 
 PORTNAME=	openmpi
-DISTVERSION=	1.8.8
+PORTVERSION=	1.10.0
 CATEGORIES=	net parallel
-MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.8/downloads/
+MASTER_SITES=	http://www.open-mpi.org/software/ompi/v${PORTVERSION:R}/downloads/
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	High Performance Message Passing Library
@@ -15,8 +15,6 @@ LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
 		libhwloc.so:${PORTSDIR}/devel/hwloc \
 		libltdl.so:${PORTSDIR}/devel/libltdl
 
-CONFLICTS=	openmpi-devel-1.7.*
-
 HAS_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 # :keepla because port uses lt_dlopen
@@ -44,7 +42,7 @@ OPTIONS_DEFINE=	IPV6 SLURM TORQUE VT
 TORQUE_DESC=	Enable Torque support
 SLURM_DESC=	Enable SLURM support
 VT_DESC=		Enable VampirTrace support
-OPTIONS_DEFAULT=	IPV6
+OPTIONS_DEFAULT=	IPV6 SLURM
 OPTIONS_SUB=	yes
 
 IPV6_CONFIGURE_ENABLE=	ipv6
diff --git a/net/openmpi/distinfo b/net/openmpi/distinfo
index 432e561ccffc..3953f0c27d51 100644
--- a/net/openmpi/distinfo
+++ b/net/openmpi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openmpi-1.8.8.tar.bz2) = a28382d1e6a36f4073412dc00836ff2524e42b674da9caf6ca7377baad790b94
-SIZE (openmpi-1.8.8.tar.bz2) = 13231433
+SHA256 (openmpi-1.10.0.tar.bz2) = 26b432ce8dcbad250a9787402f2c999ecb6c25695b00c9c6ee05a306c78b6490
+SIZE (openmpi-1.10.0.tar.bz2) = 13207009
diff --git a/net/openmpi/pkg-plist b/net/openmpi/pkg-plist
index 6f97867d4c3f..9fb30bcf650f 100644
--- a/net/openmpi/pkg-plist
+++ b/net/openmpi/pkg-plist
@@ -14,9 +14,11 @@
 %%MPIDIR%%/bin/ompi_info
 %%MPIDIR%%/bin/opal_wrapper
 %%MPIDIR%%/bin/orte-clean
+%%MPIDIR%%/bin/orte-dvm
 %%MPIDIR%%/bin/orte-info
 %%MPIDIR%%/bin/orte-ps
 %%MPIDIR%%/bin/orte-server
+%%MPIDIR%%/bin/orte-submit
 %%MPIDIR%%/bin/orte-top
 %%MPIDIR%%/bin/ortecc
 %%MPIDIR%%/bin/orterun
@@ -227,16 +229,16 @@
 %%MPIDIR%%/lib/libmca_common_sm.so.4.0.4
 %%MPIDIR%%/lib/libmpi.la
 %%MPIDIR%%/lib/libmpi.so
-%%MPIDIR%%/lib/libmpi.so.1
-%%MPIDIR%%/lib/libmpi.so.1.6.3
+%%MPIDIR%%/lib/libmpi.so.12
+%%MPIDIR%%/lib/libmpi.so.12.0.0
 %%MPIDIR%%/lib/libmpi_cxx.la
 %%MPIDIR%%/lib/libmpi_cxx.so
 %%MPIDIR%%/lib/libmpi_cxx.so.1
 %%MPIDIR%%/lib/libmpi_cxx.so.1.1.3
 %%MPIDIR%%/lib/libmpi_mpifh.la
 %%MPIDIR%%/lib/libmpi_mpifh.so
-%%MPIDIR%%/lib/libmpi_mpifh.so.2
-%%MPIDIR%%/lib/libmpi_mpifh.so.2.5.2
+%%MPIDIR%%/lib/libmpi_mpifh.so.12
+%%MPIDIR%%/lib/libmpi_mpifh.so.12.0.0
 %%MPIDIR%%/lib/libmpi_usempi.la
 %%MPIDIR%%/lib/libmpi_usempi.so
 %%MPIDIR%%/lib/libmpi_usempi.so.1
@@ -247,12 +249,12 @@
 %%MPIDIR%%/lib/libompitrace.so.0.0.0
 %%MPIDIR%%/lib/libopen-pal.la
 %%MPIDIR%%/lib/libopen-pal.so
-%%MPIDIR%%/lib/libopen-pal.so.6
-%%MPIDIR%%/lib/libopen-pal.so.6.2.2
+%%MPIDIR%%/lib/libopen-pal.so.13
+%%MPIDIR%%/lib/libopen-pal.so.13.0.0
 %%MPIDIR%%/lib/libopen-rte.la
 %%MPIDIR%%/lib/libopen-rte.so
-%%MPIDIR%%/lib/libopen-rte.so.7
-%%MPIDIR%%/lib/libopen-rte.so.7.0.6
+%%MPIDIR%%/lib/libopen-rte.so.12
+%%MPIDIR%%/lib/libopen-rte.so.12.0.0
 %%MPIDIR%%/lib/mpi.mod
 %%MPIDIR%%/lib/openmpi/libompi_dbg_msgq.la
 %%MPIDIR%%/lib/openmpi/libompi_dbg_msgq.so
@@ -364,8 +366,8 @@
 %%MPIDIR%%/lib/openmpi/mca_odls_default.so
 %%MPIDIR%%/lib/openmpi/mca_oob_tcp.la
 %%MPIDIR%%/lib/openmpi/mca_oob_tcp.so
-%%MPIDIR%%/lib/openmpi/mca_osc_rdma.la
-%%MPIDIR%%/lib/openmpi/mca_osc_rdma.so
+%%MPIDIR%%/lib/openmpi/mca_osc_pt2pt.la
+%%MPIDIR%%/lib/openmpi/mca_osc_pt2pt.so
 %%MPIDIR%%/lib/openmpi/mca_osc_sm.la
 %%MPIDIR%%/lib/openmpi/mca_osc_sm.so
 %%MPIDIR%%/lib/openmpi/mca_plm_isolated.la
@@ -386,8 +388,6 @@
 %%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_rmaps_lama.la
-%%MPIDIR%%/lib/openmpi/mca_rmaps_lama.so
 %%MPIDIR%%/lib/openmpi/mca_rmaps_mindist.la
 %%MPIDIR%%/lib/openmpi/mca_rmaps_mindist.so
 %%MPIDIR%%/lib/openmpi/mca_rmaps_ppr.la
@@ -434,6 +434,8 @@
 %%MPIDIR%%/lib/openmpi/mca_shmem_sysv.so
 %%MPIDIR%%/lib/openmpi/mca_state_app.la
 %%MPIDIR%%/lib/openmpi/mca_state_app.so
+%%MPIDIR%%/lib/openmpi/mca_state_dvm.la
+%%MPIDIR%%/lib/openmpi/mca_state_dvm.so
 %%MPIDIR%%/lib/openmpi/mca_state_hnp.la
 %%MPIDIR%%/lib/openmpi/mca_state_hnp.so
 %%MPIDIR%%/lib/openmpi/mca_state_novm.la
@@ -473,9 +475,11 @@
 %%MPIDIR%%/man/man1/ompi_info.1.gz
 %%MPIDIR%%/man/man1/opal_wrapper.1.gz
 %%MPIDIR%%/man/man1/orte-clean.1.gz
+%%MPIDIR%%/man/man1/orte-dvm.1.gz
 %%MPIDIR%%/man/man1/orte-info.1.gz
 %%MPIDIR%%/man/man1/orte-ps.1.gz
 %%MPIDIR%%/man/man1/orte-server.1.gz
+%%MPIDIR%%/man/man1/orte-submit.1.gz
 %%MPIDIR%%/man/man1/orte-top.1.gz
 %%MPIDIR%%/man/man1/orted.1.gz
 %%MPIDIR%%/man/man1/orterun.1.gz
@@ -834,12 +838,14 @@
 %%MPIDIR%%/man/man3/MPI_Win_get_attr.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_get_errhandler.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_get_group.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_get_info.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_get_name.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_lock.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_lock_all.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_post.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_set_attr.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_set_errhandler.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_set_info.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_set_name.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_start.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_sync.3.gz
@@ -907,7 +913,6 @@
 %%MPIDIR%%/%%DATADIR%%/help-orte-odls-default.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-ps.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-rmaps-base.txt
-%%MPIDIR%%/%%DATADIR%%/help-orte-rmaps-lama.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-rmaps-md.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-rmaps-ppr.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-rmaps-resilient.txt