4 files changed, 219 insertions, 141 deletions

diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index 0477cb02ba25..03c33c83f7b5 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -9,9 +9,9 @@
 #  - etc/*.sample support
 
 PORTNAME=	openmpi
-DISTVERSION=	1.2.8
+DISTVERSION=	1.3
 CATEGORIES=	net parallel
-MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.2/downloads/
+MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.3/downloads/
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	A High Performance Message Passing Library
@@ -21,7 +21,6 @@ LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_FORTRAN=	yes
 
 MPIBASE?=	mpi
 MPIDIR?=	${MPIBASE}/${UNIQUENAME}
@@ -39,27 +38,51 @@ USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib \
 MANPREFIX=	${PREFIX}/${MPIDIR}
 .include "${.CURDIR}/Makefile.man"
 
+OPTIONS=	FORTRAN "Enable Fortran support" on \
+		TORQUE "Enable Torque support" off \
+		SGE "Enable SGE support" off
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif
 
-.if exists(${LOCALBASE}/lib/libtorque.so)
-WITH_TORQUE=	yes
+.if defined(WITH_FORTRAN)
+USE_FORTRAN=	yes
+PLIST_SUB+=	FORTRAN=""
+.else
+CONFIGURE_ARGS+=	--disable-mpi-f77 --disable-mpi-f90
+PLIST_SUB+=	FORTRAN="@comment "
+.endif
+
+.if defined(WITH_SGE)
+SGE_BASE?=      sge
+SGE_ROOT=       ${LOCALBASE}/${SGE_BASE}
+SGE_ARCH=	fbsd-${ARCH}
+RUN_DEPENDS+=	${SGE_ROOT}/fbsd-${ARCH}/qrsh:${PORTSDIR}/sysutils/sge62
+CONFIGURE_ARGS+=	--with-sge
+CONFIGURE_ENV+=	SGE_ROOT=${SGE_ROOT}
+PLIST_FILES+=	${MPIDIR}/lib/openmpi/mca_ras_gridengine.la \
+		${MPIDIR}/lib/openmpi/mca_ras_gridengine.so \
+		${MPIDIR}/share/openmpi/help-ras-gridengine.txt
+.else
+CONFIGURE_ARGS+=	--without-sge
 .endif
 
 .if defined(WITH_TORQUE)
 LIB_DEPENDS+=	torque.2:${PORTSDIR}/sysutils/torque
 CONFIGURE_ARGS+=	--with-tm=${LOCALBASE}
-PLIST_SUB+=	TORQUE=""
+PLIST_FILES+=	${MPIDIR}/lib/openmpi/mca_plm_tm.so \
+		${MPIDIR}/lib/openmpi/mca_plm_tm.la \
+		${MPIDIR}/lib/openmpi/mca_ras_tm.la \
+		${MPIDIR}/lib/openmpi/mca_ras_tm.so \
+		${MPIDIR}/share/openmpi/help-plm-tm.txt \
+		${MPIDIR}/share/openmpi/help-ras-tm.txt
 .else
-PLIST_SUB+=	TORQUE="@comment "
+CONFIGURE_ARGS+=	--without-tm
 .endif
 
-post-install:
-	cd ${WRKSRC}/ompi/mpi && make install-man
-
 #######################################################################
 # The following targets are for the port maintainer.  Use at your own #
 # risk, no user-serviceable parts inside.                             #
@@ -68,12 +91,16 @@ post-install:
 # some effort and there's only one entry at this time.                #
 #######################################################################
 build-plist: Makefile
-	${RM} ${PLIST}
+	${RM} -f ${PLIST}
 	${FIND} ${PREFIX}/${MPIDIR} -name man -prune -o -type f -print | \
-	    ${SED} -e 's|${PREFIX}/${MPIDIR}|%%MPIDIR%%|' | \
+	    ${SED} -e 's|${PREFIX}/${MPIDIR}|%%MPIDIR%%|' \
+		-e 's|^\(.*f77.*\)|%%FORTRAN%%\1|' \
+		-e 's|^\(.*f90.*\)|%%FORTRAN%%\1|' | \
 	    ${SORT} >> ${PLIST}
 	${FIND} ${PREFIX}/${MPIDIR} -name man -prune -o -type l -print | \
-	    ${SED} -e 's|${PREFIX}/${MPIDIR}|%%MPIDIR%%|' | \
+	    ${SED} -e 's|${PREFIX}/${MPIDIR}|%%MPIDIR%%|' \
+		-e 's|^\(.*f77.*\)|%%FORTRAN%%\1|' \
+		-e 's|^\(.*f90.*\)|%%FORTRAN%%\1|' | \
 	    ${SORT} >> ${PLIST}
 	${FIND} ${PREFIX}/${MPIDIR} -type d | \
 	    ${EGREP} -v "${PREFIX}/${MPIDIR}$$" | \
diff --git a/net/openmpi/Makefile.man b/net/openmpi/Makefile.man
index e627de87722e..728ceb947580 100644
--- a/net/openmpi/Makefile.man
+++ b/net/openmpi/Makefile.man
@@ -2,14 +2,31 @@
 # See build-plist target in Makefile.
 #
 MLINKS=mpic++.1 mpiCC.1
+MAN7+=opal_crs.7
+MAN7+=orte_filem.7
+MAN7+=orte_snapc.7
+MAN7+=orte_hosts.7
+MAN7+=ompi_crcp.7
+MAN1+=opal_wrapper.1
+MAN1+=orte-clean.1
+MAN1+=orte-iof.1
+MAN1+=orte-ps.1
+MAN1+=orted.1
+MAN1+=orterun.1
+MAN1+=ompi_info.1
 MAN1+=mpicc.1
+MAN1+=mpic++.1
 MAN1+=mpicxx.1
 MAN1+=mpif77.1
 MAN1+=mpif90.1
 MAN1+=mpirun.1
-MAN1+=orterun.1
-MAN1+=mpic++.1
 MAN1+=mpiexec.1
+MAN1+=ompi-ps.1
+MAN1+=ompi-clean.1
+MAN1+=ompi-server.1
+MAN3+=MPI.3
+MAN3+=MPI_Abort.3
+MAN3+=MPI_Accumulate.3
 MAN3+=MPI_Add_error_class.3
 MAN3+=MPI_Add_error_code.3
 MAN3+=MPI_Add_error_string.3
@@ -18,6 +35,7 @@ MAN3+=MPI_Allgather.3
 MAN3+=MPI_Allgatherv.3
 MAN3+=MPI_Alloc_mem.3
 MAN3+=MPI_Allreduce.3
+MAN3+=MPI_Alltoall.3
 MAN3+=MPI_Alltoallv.3
 MAN3+=MPI_Alltoallw.3
 MAN3+=MPI_Attr_delete.3
@@ -26,8 +44,10 @@ MAN3+=MPI_Attr_put.3
 MAN3+=MPI_Barrier.3
 MAN3+=MPI_Bcast.3
 MAN3+=MPI_Bsend.3
-MAN3+=MPI_Cancel.3
+MAN3+=MPI_Bsend_init.3
+MAN3+=MPI_Buffer_attach.3
 MAN3+=MPI_Buffer_detach.3
+MAN3+=MPI_Cancel.3
 MAN3+=MPI_Cart_coords.3
 MAN3+=MPI_Cart_create.3
 MAN3+=MPI_Cartdim_get.3
@@ -39,16 +59,18 @@ MAN3+=MPI_Cart_sub.3
 MAN3+=MPI_Close_port.3
 MAN3+=MPI_Comm_accept.3
 MAN3+=MPI_Comm_c2f.3
+MAN3+=MPI_Comm_call_errhandler.3
 MAN3+=MPI_Comm_compare.3
 MAN3+=MPI_Comm_connect.3
 MAN3+=MPI_Comm_create.3
 MAN3+=MPI_Comm_create_errhandler.3
-MAN3+=MPI.3
 MAN3+=MPI_Comm_create_keyval.3
 MAN3+=MPI_Comm_delete_attr.3
 MAN3+=MPI_Comm_disconnect.3
 MAN3+=MPI_Comm_dup.3
 MAN3+=MPI_Comm_f2c.3
+MAN3+=MPI_Comm_free.3
+MAN3+=MPI_Comm_free_keyval.3
 MAN3+=MPI_Comm_get_attr.3
 MAN3+=MPI_Comm_get_errhandler.3
 MAN3+=MPI_Comm_get_name.3
@@ -56,11 +78,12 @@ MAN3+=MPI_Comm_get_parent.3
 MAN3+=MPI_Comm_group.3
 MAN3+=MPI_Comm_join.3
 MAN3+=MPI_Comm_rank.3
+MAN3+=MPI_Comm_remote_group.3
 MAN3+=MPI_Comm_remote_size.3
 MAN3+=MPI_Comm_set_attr.3
-MAN3+=MPI_Comm_size.3
-MAN3+=MPI_Comm_free.3
+MAN3+=MPI_Comm_set_errhandler.3
 MAN3+=MPI_Comm_set_name.3
+MAN3+=MPI_Comm_size.3
 MAN3+=MPI_Comm_spawn.3
 MAN3+=MPI_Comm_spawn_multiple.3
 MAN3+=MPI_Comm_split.3
@@ -73,9 +96,9 @@ MAN3+=MPI_Errhandler_set.3
 MAN3+=MPI_Error_class.3
 MAN3+=MPI_Error_string.3
 MAN3+=MPI_Exscan.3
-MAN3+=MPI_File_call_errhandler.3
 MAN3+=MPI_File_c2f.3
-MAN3+=MPI_Gather.3
+MAN3+=MPI_File_call_errhandler.3
+MAN3+=MPI_File_close.3
 MAN3+=MPI_File_create_errhandler.3
 MAN3+=MPI_File_delete.3
 MAN3+=MPI_File_f2c.3
@@ -85,14 +108,17 @@ MAN3+=MPI_File_get_byte_offset.3
 MAN3+=MPI_File_get_errhandler.3
 MAN3+=MPI_File_get_group.3
 MAN3+=MPI_File_get_info.3
+MAN3+=MPI_File_get_position.3
 MAN3+=MPI_File_get_position_shared.3
 MAN3+=MPI_File_get_size.3
 MAN3+=MPI_File_get_view.3
-MAN3+=MPI_File_read_at_all_begin.3
 MAN3+=MPI_File_get_type_extent.3
 MAN3+=MPI_File_iread.3
 MAN3+=MPI_File_iread_at.3
+MAN3+=MPI_File_iread_shared.3
 MAN3+=MPI_File_iwrite.3
+MAN3+=MPI_File_iwrite_at.3
+MAN3+=MPI_File_iwrite_shared.3
 MAN3+=MPI_File_open.3
 MAN3+=MPI_File_preallocate.3
 MAN3+=MPI_File_read.3
@@ -101,9 +127,10 @@ MAN3+=MPI_File_read_all_begin.3
 MAN3+=MPI_File_read_all_end.3
 MAN3+=MPI_File_read_at.3
 MAN3+=MPI_File_read_at_all.3
+MAN3+=MPI_File_read_at_all_begin.3
 MAN3+=MPI_File_read_at_all_end.3
 MAN3+=MPI_File_read_ordered.3
-MAN3+=MPI_File_iread_shared.3
+MAN3+=MPI_File_read_ordered_begin.3
 MAN3+=MPI_File_read_ordered_end.3
 MAN3+=MPI_File_read_shared.3
 MAN3+=MPI_File_seek.3
@@ -117,10 +144,10 @@ MAN3+=MPI_File_sync.3
 MAN3+=MPI_File_write.3
 MAN3+=MPI_File_write_all.3
 MAN3+=MPI_File_write_all_begin.3
-MAN3+=MPI_File_write_at_all_begin.3
 MAN3+=MPI_File_write_all_end.3
 MAN3+=MPI_File_write_at.3
 MAN3+=MPI_File_write_at_all.3
+MAN3+=MPI_File_write_at_all_begin.3
 MAN3+=MPI_File_write_at_all_end.3
 MAN3+=MPI_File_write_ordered.3
 MAN3+=MPI_File_write_ordered_begin.3
@@ -129,12 +156,13 @@ MAN3+=MPI_File_write_shared.3
 MAN3+=MPI_Finalize.3
 MAN3+=MPI_Finalized.3
 MAN3+=MPI_Free_mem.3
+MAN3+=MPI_Gather.3
 MAN3+=MPI_Gatherv.3
 MAN3+=MPI_Get.3
 MAN3+=MPI_Get_address.3
 MAN3+=MPI_Get_count.3
-MAN3+=MPI_Info_get_valuelen.3
 MAN3+=MPI_Get_elements.3
+MAN3+=MPI_Get_processor_name.3
 MAN3+=MPI_Get_version.3
 MAN3+=MPI_Graph_create.3
 MAN3+=MPI_Graphdims_get.3
@@ -145,12 +173,14 @@ MAN3+=MPI_Graph_neighbors_count.3
 MAN3+=MPI_Grequest_complete.3
 MAN3+=MPI_Grequest_start.3
 MAN3+=MPI_Group_c2f.3
+MAN3+=MPI_Group_compare.3
 MAN3+=MPI_Group_difference.3
 MAN3+=MPI_Group_excl.3
 MAN3+=MPI_Group_f2c.3
 MAN3+=MPI_Group_free.3
 MAN3+=MPI_Init.3
 MAN3+=MPI_Group_incl.3
+MAN3+=MPI_Group_intersection.3
 MAN3+=MPI_Group_range_excl.3
 MAN3+=MPI_Group_range_incl.3
 MAN3+=MPI_Group_rank.3
@@ -164,9 +194,13 @@ MAN3+=MPI_Info_delete.3
 MAN3+=MPI_Info_dup.3
 MAN3+=MPI_Info_f2c.3
 MAN3+=MPI_Info_free.3
+MAN3+=MPI_Info_get.3
 MAN3+=MPI_Info_get_nkeys.3
 MAN3+=MPI_Info_get_nthkey.3
+MAN3+=MPI_Info_get_valuelen.3
 MAN3+=MPI_Info_set.3
+MAN3+=MPI_Initialized.3
+MAN3+=MPI_Init_thread.3
 MAN3+=MPI_Intercomm_create.3
 MAN3+=MPI_Intercomm_merge.3
 MAN3+=MPI_Iprobe.3
@@ -180,33 +214,36 @@ MAN3+=MPI_Keyval_free.3
 MAN3+=MPI_Lookup_name.3
 MAN3+=MPI_Op_c2f.3
 MAN3+=MPI_Op_create.3
+MAN3+=MPI_Open_port.3
 MAN3+=MPI_Op_f2c.3
-MAN3+=MPI_Pack_external_size.3
 MAN3+=MPI_Op_free.3
-MAN3+=MPI_Initialized.3
 MAN3+=MPI_Pack.3
+MAN3+=MPI_Pack_external.3
+MAN3+=MPI_Pack_external_size.3
 MAN3+=MPI_Pack_size.3
 MAN3+=MPI_Pcontrol.3
 MAN3+=MPI_Probe.3
 MAN3+=MPI_Publish_name.3
 MAN3+=MPI_Put.3
+MAN3+=MPI_Query_thread.3
 MAN3+=MPI_Recv.3
+MAN3+=MPI_Recv_init.3
 MAN3+=MPI_Reduce.3
+MAN3+=MPI_Reduce_scatter.3
 MAN3+=MPI_Register_datarep.3
 MAN3+=MPI_Request_c2f.3
 MAN3+=MPI_Request_f2c.3
 MAN3+=MPI_Request_free.3
 MAN3+=MPI_Request_get_status.3
-MAN3+=MPI_Status_set_cancelled.3
 MAN3+=MPI_Rsend.3
-MAN3+=MPI_Query_thread.3
-MAN3+=MPI_Recv_init.3
+MAN3+=MPI_Rsend_init.3
 MAN3+=MPI_Scan.3
 MAN3+=MPI_Scatter.3
 MAN3+=MPI_Scatterv.3
 MAN3+=MPI_Send.3
 MAN3+=MPI_Send_init.3
 MAN3+=MPI_Sendrecv.3
+MAN3+=MPI_Sendrecv_replace.3
 MAN3+=MPI_Sizeof.3
 MAN3+=MPI_Ssend.3
 MAN3+=MPI_Ssend_init.3
@@ -214,18 +251,20 @@ MAN3+=MPI_Start.3
 MAN3+=MPI_Startall.3
 MAN3+=MPI_Status_c2f.3
 MAN3+=MPI_Status_f2c.3
+MAN3+=MPI_Status_set_cancelled.3
 MAN3+=MPI_Status_set_elements.3
 MAN3+=MPI_Test.3
 MAN3+=MPI_Testall.3
-MAN3+=MPI_Win_start.3
-MAN3+=MPI_Wtick.3
-MAN3+=MPI_Wait.3
+MAN3+=MPI_Testany.3
+MAN3+=MPI_Test_cancelled.3
 MAN3+=MPI_Testsome.3
 MAN3+=MPI_Topo_test.3
 MAN3+=MPI_Type_c2f.3
 MAN3+=MPI_Type_commit.3
 MAN3+=MPI_Type_contiguous.3
 MAN3+=MPI_Type_create_darray.3
+MAN3+=MPI_Type_create_f90_complex.3
+MAN3+=MPI_Type_create_f90_integer.3
 MAN3+=MPI_Type_create_f90_real.3
 MAN3+=MPI_Type_create_hindexed.3
 MAN3+=MPI_Type_create_hvector.3
@@ -233,8 +272,8 @@ MAN3+=MPI_Type_create_indexed_block.3
 MAN3+=MPI_Type_create_keyval.3
 MAN3+=MPI_Type_dup.3
 MAN3+=MPI_Type_create_resized.3
-MAN3+=MPI_Type_create_subarray.3
 MAN3+=MPI_Type_create_struct.3
+MAN3+=MPI_Type_create_subarray.3
 MAN3+=MPI_Type_delete_attr.3
 MAN3+=MPI_Type_extent.3
 MAN3+=MPI_Type_f2c.3
@@ -245,11 +284,13 @@ MAN3+=MPI_Type_get_contents.3
 MAN3+=MPI_Type_get_envelope.3
 MAN3+=MPI_Type_get_extent.3
 MAN3+=MPI_Type_get_name.3
+MAN3+=MPI_Type_get_true_extent.3
 MAN3+=MPI_Type_hindexed.3
 MAN3+=MPI_Type_hvector.3
+MAN3+=MPI_Wait.3
 MAN3+=MPI_Type_indexed.3
-MAN3+=MPI_Type_match_size.3
 MAN3+=MPI_Type_lb.3
+MAN3+=MPI_Type_match_size.3
 MAN3+=MPI_Type_set_attr.3
 MAN3+=MPI_Type_set_name.3
 MAN3+=MPI_Type_size.3
@@ -257,6 +298,7 @@ MAN3+=MPI_Type_struct.3
 MAN3+=MPI_Type_ub.3
 MAN3+=MPI_Type_vector.3
 MAN3+=MPI_Unpack.3
+MAN3+=MPI_Unpack_external.3
 MAN3+=MPI_Unpublish_name.3
 MAN3+=MPI_Waitall.3
 MAN3+=MPI_Waitany.3
@@ -264,8 +306,9 @@ MAN3+=MPI_Waitsome.3
 MAN3+=MPI_Win_c2f.3
 MAN3+=MPI_Win_call_errhandler.3
 MAN3+=MPI_Win_complete.3
-MAN3+=MPI_Wtime.3
+MAN3+=MPI_Wtick.3
 MAN3+=MPI_Win_create.3
+MAN3+=MPI_Win_create_errhandler.3
 MAN3+=MPI_Win_create_keyval.3
 MAN3+=MPI_Win_delete_attr.3
 MAN3+=MPI_Win_f2c.3
@@ -277,42 +320,13 @@ MAN3+=MPI_Win_get_errhandler.3
 MAN3+=MPI_Win_get_group.3
 MAN3+=MPI_Win_get_name.3
 MAN3+=MPI_Win_lock.3
+MAN3+=MPI_Win_post.3
 MAN3+=MPI_Win_set_attr.3
 MAN3+=MPI_Win_set_errhandler.3
 MAN3+=MPI_Win_set_name.3
-MAN3+=OpenMPI.3
+MAN3+=MPI_Wtime.3
+MAN3+=MPI_Win_start.3
 MAN3+=MPI_Win_test.3
-MAN3+=MPI_Win_wait.3
-MAN3+=MPI_Abort.3
-MAN3+=MPI_Accumulate.3
-MAN3+=MPI_Alltoall.3
-MAN3+=MPI_Bsend_init.3
-MAN3+=MPI_Buffer_attach.3
-MAN3+=MPI_Comm_call_errhandler.3
-MAN3+=MPI_Comm_free_keyval.3
-MAN3+=MPI_Comm_remote_group.3
-MAN3+=MPI_Comm_set_errhandler.3
-MAN3+=MPI_File_close.3
-MAN3+=MPI_File_get_position.3
-MAN3+=MPI_File_iwrite_at.3
-MAN3+=MPI_File_iwrite_shared.3
 MAN3+=MPI_Win_unlock.3
-MAN3+=MPI_File_read_ordered_begin.3
-MAN3+=MPI_Get_processor_name.3
-MAN3+=MPI_Group_compare.3
-MAN3+=MPI_Group_intersection.3
-MAN3+=MPI_Info_get.3
-MAN3+=MPI_Init_thread.3
-MAN3+=MPI_Open_port.3
-MAN3+=MPI_Pack_external.3
-MAN3+=MPI_Reduce_scatter.3
-MAN3+=MPI_Rsend_init.3
-MAN3+=MPI_Sendrecv_replace.3
-MAN3+=MPI_Testany.3
-MAN3+=MPI_Test_cancelled.3
-MAN3+=MPI_Type_create_f90_complex.3
-MAN3+=MPI_Type_create_f90_integer.3
-MAN3+=MPI_Type_get_true_extent.3
-MAN3+=MPI_Unpack_external.3
-MAN3+=MPI_Win_create_errhandler.3
-MAN3+=MPI_Win_post.3
+MAN3+=MPI_Win_wait.3
+MAN3+=OpenMPI.3
diff --git a/net/openmpi/distinfo b/net/openmpi/distinfo
index 4c264433c78b..3db933de9ef3 100644
--- a/net/openmpi/distinfo
+++ b/net/openmpi/distinfo
@@ -1,3 +1,3 @@
-MD5 (openmpi-1.2.8.tar.bz2) = 7f2d5af02101c5f01173f4f6de296549
-SHA256 (openmpi-1.2.8.tar.bz2) = 75b286cb3b1bf6528a7e64ee019369e0601b8acb5c3c167a987f755d1e41c95c
-SIZE (openmpi-1.2.8.tar.bz2) = 3556787
+MD5 (openmpi-1.3.tar.bz2) = efbba7d652d1e430d456f65d7a2e339b
+SHA256 (openmpi-1.3.tar.bz2) = 864706d88d28b586a045461a828962c108f5912671071bc3ef0ca187f115e47b
+SIZE (openmpi-1.3.tar.bz2) = 6430688
diff --git a/net/openmpi/pkg-plist b/net/openmpi/pkg-plist
index 20630905d71f..5ffcd619320a 100644
--- a/net/openmpi/pkg-plist
+++ b/net/openmpi/pkg-plist
@@ -1,5 +1,15 @@
+%%FORTRAN%%%%MPIDIR%%/lib/libmpi_f77.la
+%%FORTRAN%%%%MPIDIR%%/lib/libmpi_f77.so.0
+%%FORTRAN%%%%MPIDIR%%/lib/libmpi_f90.la
+%%FORTRAN%%%%MPIDIR%%/lib/libmpi_f90.so.0
+%%FORTRAN%%%%MPIDIR%%/share/openmpi/mpif77-wrapper-data.txt
+%%FORTRAN%%%%MPIDIR%%/share/openmpi/mpif90-wrapper-data.txt
+%%MPIDIR%%/bin/ompi-server
 %%MPIDIR%%/bin/ompi_info
 %%MPIDIR%%/bin/opal_wrapper
+%%MPIDIR%%/bin/orte-clean
+%%MPIDIR%%/bin/orte-iof
+%%MPIDIR%%/bin/orte-ps
 %%MPIDIR%%/bin/orted
 %%MPIDIR%%/bin/orterun
 %%MPIDIR%%/etc/openmpi-default-hostfile
@@ -8,6 +18,7 @@
 %%MPIDIR%%/include/mpi.h
 %%MPIDIR%%/include/mpif-common.h
 %%MPIDIR%%/include/mpif-config.h
+%%MPIDIR%%/include/mpif-mpi-io.h
 %%MPIDIR%%/include/mpif.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/comm.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/comm_inln.h
@@ -46,17 +57,13 @@
 %%MPIDIR%%/lib/libmpi.so.0
 %%MPIDIR%%/lib/libmpi_cxx.la
 %%MPIDIR%%/lib/libmpi_cxx.so.0
-%%MPIDIR%%/lib/libmpi_f77.la
-%%MPIDIR%%/lib/libmpi_f77.so.0
-%%MPIDIR%%/lib/libmpi_f90.la
-%%MPIDIR%%/lib/libmpi_f90.so.0
 %%MPIDIR%%/lib/libopen-pal.la
 %%MPIDIR%%/lib/libopen-pal.so.0
 %%MPIDIR%%/lib/libopen-rte.la
 %%MPIDIR%%/lib/libopen-rte.so.0
 %%MPIDIR%%/lib/mpi.mod
-%%MPIDIR%%/lib/openmpi/libompitv.la
-%%MPIDIR%%/lib/openmpi/libompitv.so
+%%MPIDIR%%/lib/openmpi/libompi_dbg_msgq.la
+%%MPIDIR%%/lib/openmpi/libompi_dbg_msgq.so
 %%MPIDIR%%/lib/openmpi/mca_allocator_basic.la
 %%MPIDIR%%/lib/openmpi/mca_allocator_basic.so
 %%MPIDIR%%/lib/openmpi/mca_allocator_bucket.la
@@ -69,135 +76,165 @@
 %%MPIDIR%%/lib/openmpi/mca_btl_sm.so
 %%MPIDIR%%/lib/openmpi/mca_btl_tcp.la
 %%MPIDIR%%/lib/openmpi/mca_btl_tcp.so
+%%MPIDIR%%/lib/openmpi/mca_carto_auto_detect.la
+%%MPIDIR%%/lib/openmpi/mca_carto_auto_detect.so
+%%MPIDIR%%/lib/openmpi/mca_carto_file.la
+%%MPIDIR%%/lib/openmpi/mca_carto_file.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_inter.la
+%%MPIDIR%%/lib/openmpi/mca_coll_inter.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_errmgr_hnp.la
-%%MPIDIR%%/lib/openmpi/mca_errmgr_hnp.so
-%%MPIDIR%%/lib/openmpi/mca_errmgr_orted.la
-%%MPIDIR%%/lib/openmpi/mca_errmgr_orted.so
-%%MPIDIR%%/lib/openmpi/mca_errmgr_proxy.la
-%%MPIDIR%%/lib/openmpi/mca_errmgr_proxy.so
-%%MPIDIR%%/lib/openmpi/mca_gpr_null.la
-%%MPIDIR%%/lib/openmpi/mca_gpr_null.so
-%%MPIDIR%%/lib/openmpi/mca_gpr_proxy.la
-%%MPIDIR%%/lib/openmpi/mca_gpr_proxy.so
-%%MPIDIR%%/lib/openmpi/mca_gpr_replica.la
-%%MPIDIR%%/lib/openmpi/mca_gpr_replica.so
+%%MPIDIR%%/lib/openmpi/mca_crs_none.la
+%%MPIDIR%%/lib/openmpi/mca_crs_none.so
+%%MPIDIR%%/lib/openmpi/mca_dpm_orte.la
+%%MPIDIR%%/lib/openmpi/mca_dpm_orte.so
+%%MPIDIR%%/lib/openmpi/mca_errmgr_default.la
+%%MPIDIR%%/lib/openmpi/mca_errmgr_default.so
+%%MPIDIR%%/lib/openmpi/mca_ess_env.la
+%%MPIDIR%%/lib/openmpi/mca_ess_env.so
+%%MPIDIR%%/lib/openmpi/mca_ess_hnp.la
+%%MPIDIR%%/lib/openmpi/mca_ess_hnp.so
+%%MPIDIR%%/lib/openmpi/mca_ess_singleton.la
+%%MPIDIR%%/lib/openmpi/mca_ess_singleton.so
+%%MPIDIR%%/lib/openmpi/mca_ess_tool.la
+%%MPIDIR%%/lib/openmpi/mca_ess_tool.so
+%%MPIDIR%%/lib/openmpi/mca_filem_rsh.la
+%%MPIDIR%%/lib/openmpi/mca_filem_rsh.so
+%%MPIDIR%%/lib/openmpi/mca_grpcomm_bad.la
+%%MPIDIR%%/lib/openmpi/mca_grpcomm_bad.so
+%%MPIDIR%%/lib/openmpi/mca_grpcomm_basic.la
+%%MPIDIR%%/lib/openmpi/mca_grpcomm_basic.so
 %%MPIDIR%%/lib/openmpi/mca_io_romio.la
 %%MPIDIR%%/lib/openmpi/mca_io_romio.so
-%%MPIDIR%%/lib/openmpi/mca_iof_proxy.la
-%%MPIDIR%%/lib/openmpi/mca_iof_proxy.so
-%%MPIDIR%%/lib/openmpi/mca_iof_svc.la
-%%MPIDIR%%/lib/openmpi/mca_iof_svc.so
+%%MPIDIR%%/lib/openmpi/mca_iof_hnp.la
+%%MPIDIR%%/lib/openmpi/mca_iof_hnp.so
+%%MPIDIR%%/lib/openmpi/mca_iof_orted.la
+%%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_maffinity_first_use.la
 %%MPIDIR%%/lib/openmpi/mca_maffinity_first_use.so
+%%MPIDIR%%/lib/openmpi/mca_mpool_fake.la
+%%MPIDIR%%/lib/openmpi/mca_mpool_fake.so
 %%MPIDIR%%/lib/openmpi/mca_mpool_rdma.la
 %%MPIDIR%%/lib/openmpi/mca_mpool_rdma.so
 %%MPIDIR%%/lib/openmpi/mca_mpool_sm.la
 %%MPIDIR%%/lib/openmpi/mca_mpool_sm.so
-%%MPIDIR%%/lib/openmpi/mca_ns_proxy.la
-%%MPIDIR%%/lib/openmpi/mca_ns_proxy.so
-%%MPIDIR%%/lib/openmpi/mca_ns_replica.la
-%%MPIDIR%%/lib/openmpi/mca_ns_replica.so
+%%MPIDIR%%/lib/openmpi/mca_notifier_syslog.la
+%%MPIDIR%%/lib/openmpi/mca_notifier_syslog.so
 %%MPIDIR%%/lib/openmpi/mca_odls_default.la
 %%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_pt2pt.la
 %%MPIDIR%%/lib/openmpi/mca_osc_pt2pt.so
-%%MPIDIR%%/lib/openmpi/mca_pls_gridengine.la
-%%MPIDIR%%/lib/openmpi/mca_pls_gridengine.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_osc_rdma.la
+%%MPIDIR%%/lib/openmpi/mca_osc_rdma.so
+%%MPIDIR%%/lib/openmpi/mca_plm_rsh.la
+%%MPIDIR%%/lib/openmpi/mca_plm_rsh.so
 %%MPIDIR%%/lib/openmpi/mca_pml_cm.la
 %%MPIDIR%%/lib/openmpi/mca_pml_cm.so
 %%MPIDIR%%/lib/openmpi/mca_pml_ob1.la
 %%MPIDIR%%/lib/openmpi/mca_pml_ob1.so
-%%MPIDIR%%/lib/openmpi/mca_ras_dash_host.la
-%%MPIDIR%%/lib/openmpi/mca_ras_dash_host.so
-%%MPIDIR%%/lib/openmpi/mca_ras_gridengine.la
-%%MPIDIR%%/lib/openmpi/mca_ras_gridengine.so
-%%MPIDIR%%/lib/openmpi/mca_ras_localhost.la
-%%MPIDIR%%/lib/openmpi/mca_ras_localhost.so
+%%MPIDIR%%/lib/openmpi/mca_pml_v.la
+%%MPIDIR%%/lib/openmpi/mca_pml_v.so
+%%MPIDIR%%/lib/openmpi/mca_pubsub_orte.la
+%%MPIDIR%%/lib/openmpi/mca_pubsub_orte.so
 %%MPIDIR%%/lib/openmpi/mca_rcache_vma.la
 %%MPIDIR%%/lib/openmpi/mca_rcache_vma.so
-%%MPIDIR%%/lib/openmpi/mca_rds_hostfile.la
-%%MPIDIR%%/lib/openmpi/mca_rds_hostfile.so
-%%MPIDIR%%/lib/openmpi/mca_rds_proxy.la
-%%MPIDIR%%/lib/openmpi/mca_rds_proxy.so
-%%MPIDIR%%/lib/openmpi/mca_rds_resfile.la
-%%MPIDIR%%/lib/openmpi/mca_rds_resfile.so
+%%MPIDIR%%/lib/openmpi/mca_rmaps_rank_file.la
+%%MPIDIR%%/lib/openmpi/mca_rmaps_rank_file.so
 %%MPIDIR%%/lib/openmpi/mca_rmaps_round_robin.la
 %%MPIDIR%%/lib/openmpi/mca_rmaps_round_robin.so
-%%MPIDIR%%/lib/openmpi/mca_rmgr_proxy.la
-%%MPIDIR%%/lib/openmpi/mca_rmgr_proxy.so
-%%MPIDIR%%/lib/openmpi/mca_rmgr_urm.la
-%%MPIDIR%%/lib/openmpi/mca_rmgr_urm.so
+%%MPIDIR%%/lib/openmpi/mca_rmaps_seq.la
+%%MPIDIR%%/lib/openmpi/mca_rmaps_seq.so
 %%MPIDIR%%/lib/openmpi/mca_rml_oob.la
 %%MPIDIR%%/lib/openmpi/mca_rml_oob.so
-%%MPIDIR%%/lib/openmpi/mca_sds_env.la
-%%MPIDIR%%/lib/openmpi/mca_sds_env.so
-%%MPIDIR%%/lib/openmpi/mca_sds_pipe.la
-%%MPIDIR%%/lib/openmpi/mca_sds_pipe.so
-%%MPIDIR%%/lib/openmpi/mca_sds_seed.la
-%%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_routed_binomial.la
+%%MPIDIR%%/lib/openmpi/mca_routed_binomial.so
+%%MPIDIR%%/lib/openmpi/mca_routed_direct.la
+%%MPIDIR%%/lib/openmpi/mca_routed_direct.so
+%%MPIDIR%%/lib/openmpi/mca_routed_linear.la
+%%MPIDIR%%/lib/openmpi/mca_routed_linear.so
 %%MPIDIR%%/lib/openmpi/mca_topo_unity.la
 %%MPIDIR%%/lib/openmpi/mca_topo_unity.so
+%%MPIDIR%%/lib/openmpi/mca_vprotocol_pessimist.la
+%%MPIDIR%%/lib/openmpi/mca_vprotocol_pessimist.so
+%%MPIDIR%%/share/openmpi/amca-param-sets/example.conf
+%%MPIDIR%%/share/openmpi/help-dash-host.txt
+%%MPIDIR%%/share/openmpi/help-ess-base.txt
+%%MPIDIR%%/share/openmpi/help-hostfile.txt
 %%MPIDIR%%/share/openmpi/help-mca-base.txt
 %%MPIDIR%%/share/openmpi/help-mca-bml-r2.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-errors.txt
 %%MPIDIR%%/share/openmpi/help-mpi-runtime.txt
+%%MPIDIR%%/share/openmpi/help-mpool-base.txt
 %%MPIDIR%%/share/openmpi/help-odls-default.txt
+%%MPIDIR%%/share/openmpi/help-ompi-crcp-base.txt
+%%MPIDIR%%/share/openmpi/help-ompi-dpm-base.txt
+%%MPIDIR%%/share/openmpi/help-ompi-dpm-orte.txt
+%%MPIDIR%%/share/openmpi/help-ompi-pubsub-orte.txt
+%%MPIDIR%%/share/openmpi/help-ompi-server.txt
 %%MPIDIR%%/share/openmpi/help-ompi_info.txt
+%%MPIDIR%%/share/openmpi/help-opal-carto-file.txt
+%%MPIDIR%%/share/openmpi/help-opal-crs-base.txt
+%%MPIDIR%%/share/openmpi/help-opal-crs-none.txt
 %%MPIDIR%%/share/openmpi/help-opal-runtime.txt
 %%MPIDIR%%/share/openmpi/help-opal-wrapper.txt
+%%MPIDIR%%/share/openmpi/help-orte-clean.txt
+%%MPIDIR%%/share/openmpi/help-orte-filem-base.txt
+%%MPIDIR%%/share/openmpi/help-orte-filem-rsh.txt
+%%MPIDIR%%/share/openmpi/help-orte-iof.txt
+%%MPIDIR%%/share/openmpi/help-orte-odls-base.txt
+%%MPIDIR%%/share/openmpi/help-orte-ps.txt
 %%MPIDIR%%/share/openmpi/help-orte-rmaps-base.txt
 %%MPIDIR%%/share/openmpi/help-orte-rmaps-rr.txt
+%%MPIDIR%%/share/openmpi/help-orte-rmaps-seq.txt
 %%MPIDIR%%/share/openmpi/help-orte-runtime.txt
+%%MPIDIR%%/share/openmpi/help-orte-snapc-base.txt
 %%MPIDIR%%/share/openmpi/help-orted.txt
 %%MPIDIR%%/share/openmpi/help-orterun.txt
-%%MPIDIR%%/share/openmpi/help-pls-base.txt
-%%MPIDIR%%/share/openmpi/help-pls-gridengine.txt
-%%MPIDIR%%/share/openmpi/help-pls-rsh.txt
-%%MPIDIR%%/share/openmpi/help-ras-gridengine.txt
-%%MPIDIR%%/share/openmpi/help-rds-hostfile.txt
-%%MPIDIR%%/share/openmpi/help-rmgr-base.txt
+%%MPIDIR%%/share/openmpi/help-plm-base.txt
+%%MPIDIR%%/share/openmpi/help-plm-rsh.txt
+%%MPIDIR%%/share/openmpi/help-ras-base.txt
+%%MPIDIR%%/share/openmpi/help-rmaps_rank_file.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
+%%FORTRAN%%%%MPIDIR%%/bin/mpif77
+%%FORTRAN%%%%MPIDIR%%/bin/mpif90
+%%FORTRAN%%%%MPIDIR%%/lib/libmpi_f77.so
+%%FORTRAN%%%%MPIDIR%%/lib/libmpi_f90.so
 %%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/ompi-clean
+%%MPIDIR%%/bin/ompi-ps
 %%MPIDIR%%/lib/libmca_common_sm.so
 %%MPIDIR%%/lib/libmpi.so
 %%MPIDIR%%/lib/libmpi_cxx.so
-%%MPIDIR%%/lib/libmpi_f77.so
-%%MPIDIR%%/lib/libmpi_f90.so
 %%MPIDIR%%/lib/libopen-pal.so
 %%MPIDIR%%/lib/libopen-rte.so
 %%MPIDIR%%/share/openmpi/mpiCC-wrapper-data.txt
 %%MPIDIR%%/share/openmpi/mpicxx-wrapper-data.txt
+@dirrm %%MPIDIR%%/share/openmpi/amca-param-sets
 @dirrm %%MPIDIR%%/share/openmpi
 @dirrm %%MPIDIR%%/share
+@dirrm %%MPIDIR%%/man/man7
 @dirrm %%MPIDIR%%/man/man3
 @dirrm %%MPIDIR%%/man/man1
 @dirrm %%MPIDIR%%/man