- Update to 1.1.2

PR:		ports/105453
Submitted by:	trasz
Approved by:	maintainer timeout

3 files changed, 64 insertions, 32 deletions

diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index f035b9583005..1c58f6a4c53d 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -10,9 +10,9 @@
 #  - etc/*.sample support
 
 PORTNAME=	openmpi
-DISTVERSION=	1.0.2
+DISTVERSION=	1.1.2
 CATEGORIES=	net parallel
-MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.0/downloads/
+MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.1/downloads/
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	A High Performance Message Passing Library
@@ -36,6 +36,11 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}/${MPIDIR} ${CONFIGURE_TARGET}
 
+USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib/openmpi
+
+MAN1=		mpiexec.1 mpirun.1 orterun.1
+MANPREFIX=	${TARGETDIR}/${MPIDIR}
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
@@ -50,6 +55,18 @@ IGNORE=		is not supported for FreeBSD < 5.3
 .endif
 .endif
 
+.if exists(${LOCALBASE}/lib/libtorque.so)
+WITH_TORQUE=	yes
+.endif
+
+.if defined(WITH_TORQUE)
+LIB_DEPENDS+=	torque.0:${PORTSDIR}/sysutils/torque
+CONFIGURE_ARGS+=	--with-tm=${LOCALBASE}
+PLIST_SUB+=	TORQUE=""
+.else
+PLIST_SUB+=	TORQUE="@comment "
+.endif
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/net/openmpi/distinfo b/net/openmpi/distinfo
index 86feb7be810f..2a1ecd868b80 100644
--- a/net/openmpi/distinfo
+++ b/net/openmpi/distinfo
@@ -1,3 +1,3 @@
-MD5 (openmpi-1.0.2.tar.bz2) = fd32861d643f9fe539a01d0d5b836f41
-SHA256 (openmpi-1.0.2.tar.bz2) = ccd1074d7dd9566b73812d9882c84e446a8f4c77b6f471d386d3e3b9467767b8
-SIZE (openmpi-1.0.2.tar.bz2) = 3195850
+MD5 (openmpi-1.1.2.tar.bz2) = 53877ec8bca5f6e505496b6b94b1d850
+SHA256 (openmpi-1.1.2.tar.bz2) = 3bd8d9fe40b356be7f9c3d336013d3865f8ca6a79b3c6e7ef28784f6c3a2b8e6
+SIZE (openmpi-1.1.2.tar.bz2) = 3222389
diff --git a/net/openmpi/pkg-plist b/net/openmpi/pkg-plist
index 75a908bfb26b..f603905932d0 100644
--- a/net/openmpi/pkg-plist
+++ b/net/openmpi/pkg-plist
@@ -1,15 +1,13 @@
-%%MPIDIR%%/bin/mpic++
-%%MPIDIR%%/bin/mpicc
-%%MPIDIR%%/bin/mpif77
-%%MPIDIR%%/bin/mpif90
 %%MPIDIR%%/bin/ompi_info
+%%MPIDIR%%/bin/opal_wrapper
 %%MPIDIR%%/bin/orted
-%%MPIDIR%%/bin/orteprobe
 %%MPIDIR%%/bin/orterun
 %%MPIDIR%%/etc/openmpi-default-hostfile
 %%MPIDIR%%/etc/openmpi-mca-params.conf
 %%MPIDIR%%/etc/openmpi-totalview.tcl
 %%MPIDIR%%/include/mpi.h
+%%MPIDIR%%/include/mpif-common.h
+%%MPIDIR%%/include/mpif-config.h
 %%MPIDIR%%/include/mpif.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/comm.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/comm_inln.h
@@ -66,10 +64,14 @@
 %%MPIDIR%%/lib/openmpi/mca_btl_tcp.so
 %%MPIDIR%%/lib/openmpi/mca_coll_basic.la
 %%MPIDIR%%/lib/openmpi/mca_coll_basic.so
+%%MPIDIR%%/lib/openmpi/mca_coll_hierarch.la
+%%MPIDIR%%/lib/openmpi/mca_coll_hierarch.so
 %%MPIDIR%%/lib/openmpi/mca_coll_self.la
 %%MPIDIR%%/lib/openmpi/mca_coll_self.so
 %%MPIDIR%%/lib/openmpi/mca_coll_sm.la
 %%MPIDIR%%/lib/openmpi/mca_coll_sm.so
+%%MPIDIR%%/lib/openmpi/mca_coll_tuned.la
+%%MPIDIR%%/lib/openmpi/mca_coll_tuned.so
 %%MPIDIR%%/lib/openmpi/mca_gpr_null.la
 %%MPIDIR%%/lib/openmpi/mca_gpr_null.so
 %%MPIDIR%%/lib/openmpi/mca_gpr_proxy.la
@@ -92,34 +94,24 @@
 %%MPIDIR%%/lib/openmpi/mca_ns_replica.so
 %%MPIDIR%%/lib/openmpi/mca_oob_tcp.la
 %%MPIDIR%%/lib/openmpi/mca_oob_tcp.so
-%%MPIDIR%%/lib/openmpi/mca_pls_daemon.la
-%%MPIDIR%%/lib/openmpi/mca_pls_daemon.so
+%%MPIDIR%%/lib/openmpi/mca_osc_pt2pt.la
+%%MPIDIR%%/lib/openmpi/mca_osc_pt2pt.so
 %%MPIDIR%%/lib/openmpi/mca_pls_fork.la
 %%MPIDIR%%/lib/openmpi/mca_pls_fork.so
-%%MPIDIR%%/lib/openmpi/mca_pls_proxy.la
-%%MPIDIR%%/lib/openmpi/mca_pls_proxy.so
 %%MPIDIR%%/lib/openmpi/mca_pls_rsh.la
 %%MPIDIR%%/lib/openmpi/mca_pls_rsh.so
-%%MPIDIR%%/lib/openmpi/mca_pls_slurm.la
-%%MPIDIR%%/lib/openmpi/mca_pls_slurm.so
+%%TORQUE%%%%MPIDIR%%/lib/openmpi/mca_pls_tm.la
+%%TORQUE%%%%MPIDIR%%/lib/openmpi/mca_pls_tm.so
 %%MPIDIR%%/lib/openmpi/mca_pml_ob1.la
 %%MPIDIR%%/lib/openmpi/mca_pml_ob1.so
-%%MPIDIR%%/lib/openmpi/mca_pml_teg.la
-%%MPIDIR%%/lib/openmpi/mca_pml_teg.so
-%%MPIDIR%%/lib/openmpi/mca_ptl_self.la
-%%MPIDIR%%/lib/openmpi/mca_ptl_self.so
-%%MPIDIR%%/lib/openmpi/mca_ptl_sm.la
-%%MPIDIR%%/lib/openmpi/mca_ptl_sm.so
-%%MPIDIR%%/lib/openmpi/mca_ptl_tcp.la
-%%MPIDIR%%/lib/openmpi/mca_ptl_tcp.so
 %%MPIDIR%%/lib/openmpi/mca_ras_dash_host.la
 %%MPIDIR%%/lib/openmpi/mca_ras_dash_host.so
 %%MPIDIR%%/lib/openmpi/mca_ras_hostfile.la
 %%MPIDIR%%/lib/openmpi/mca_ras_hostfile.so
 %%MPIDIR%%/lib/openmpi/mca_ras_localhost.la
 %%MPIDIR%%/lib/openmpi/mca_ras_localhost.so
-%%MPIDIR%%/lib/openmpi/mca_ras_slurm.la
-%%MPIDIR%%/lib/openmpi/mca_ras_slurm.so
+%%TORQUE%%%%MPIDIR%%/lib/openmpi/mca_ras_tm.la
+%%TORQUE%%%%MPIDIR%%/lib/openmpi/mca_ras_tm.so
 %%MPIDIR%%/lib/openmpi/mca_rcache_rb.la
 %%MPIDIR%%/lib/openmpi/mca_rcache_rb.so
 %%MPIDIR%%/lib/openmpi/mca_rds_hostfile.la
@@ -142,39 +134,62 @@
 %%MPIDIR%%/lib/openmpi/mca_sds_seed.so
 %%MPIDIR%%/lib/openmpi/mca_sds_singleton.la
 %%MPIDIR%%/lib/openmpi/mca_sds_singleton.so
-%%MPIDIR%%/lib/openmpi/mca_sds_slurm.la
-%%MPIDIR%%/lib/openmpi/mca_sds_slurm.so
 %%MPIDIR%%/lib/openmpi/mca_topo_unity.la
 %%MPIDIR%%/lib/openmpi/mca_topo_unity.so
 %%MPIDIR%%/share/openmpi/help-mca-base.txt
 %%MPIDIR%%/share/openmpi/help-mca-coll-base.txt
 %%MPIDIR%%/share/openmpi/help-mca-param.txt
+%%MPIDIR%%/share/openmpi/help-mpi-api.txt
 %%MPIDIR%%/share/openmpi/help-mpi-btl-base.txt
 %%MPIDIR%%/share/openmpi/help-mpi-runtime.txt
 %%MPIDIR%%/share/openmpi/help-ompi_info.txt
 %%MPIDIR%%/share/openmpi/help-opal-runtime.txt
+%%MPIDIR%%/share/openmpi/help-opal-wrapper.txt
 %%MPIDIR%%/share/openmpi/help-orte-pls-fork.txt
+%%MPIDIR%%/share/openmpi/help-orte-rmaps-base.txt
 %%MPIDIR%%/share/openmpi/help-orte-rmaps-rr.txt
 %%MPIDIR%%/share/openmpi/help-orte-runtime.txt
 %%MPIDIR%%/share/openmpi/help-orted.txt
-%%MPIDIR%%/share/openmpi/help-orteprobe.txt
 %%MPIDIR%%/share/openmpi/help-orterun.txt
 %%MPIDIR%%/share/openmpi/help-pls-base.txt
 %%MPIDIR%%/share/openmpi/help-pls-rsh.txt
-%%MPIDIR%%/share/openmpi/help-pls-slurm.txt
-%%MPIDIR%%/share/openmpi/help-ras-slurm.txt
-%%MPIDIR%%/share/openmpi/help-wrapper.txt
+%%TORQUE%%%%MPIDIR%%/share/openmpi/help-pls-tm.txt
+%%MPIDIR%%/share/openmpi/help-rds-hostfile.txt
+%%MPIDIR%%/share/openmpi/mpic++-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/mpicc-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/mpif77-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/mpif90-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/opalc++-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/opalcc-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/ortec++-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/ortecc-wrapper-data.txt
 %%MPIDIR%%/bin/mpiCC
+%%MPIDIR%%/bin/mpic++
+%%MPIDIR%%/bin/mpicc
 %%MPIDIR%%/bin/mpicxx
 %%MPIDIR%%/bin/mpiexec
+%%MPIDIR%%/bin/mpif77
+%%MPIDIR%%/bin/mpif90
 %%MPIDIR%%/bin/mpirun
+%%MPIDIR%%/bin/opalCC
+%%MPIDIR%%/bin/opalc++
+%%MPIDIR%%/bin/opalcc
+%%MPIDIR%%/bin/orteCC
+%%MPIDIR%%/bin/ortec++
+%%MPIDIR%%/bin/ortecc
 %%MPIDIR%%/lib/libmca_common_sm.so
 %%MPIDIR%%/lib/libmpi.so
 %%MPIDIR%%/lib/libmpi_cxx.so
 %%MPIDIR%%/lib/libopal.so
 %%MPIDIR%%/lib/liborte.so
+%%MPIDIR%%/share/openmpi/mpiCC-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/mpicxx-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/opalCC-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/orteCC-wrapper-data.txt
 @dirrm %%MPIDIR%%/share/openmpi
 @dirrm %%MPIDIR%%/share
+@dirrm %%MPIDIR%%/man/man1
+@dirrm %%MPIDIR%%/man
 @dirrm %%MPIDIR%%/lib/openmpi
 @dirrm %%MPIDIR%%/lib
 @dirrm %%MPIDIR%%/include/openmpi/ompi/mpi/cxx