Upgrade to 1.2.2, the most recent release.

Handle manpages correct.
Remove defunct pkg-message.
LDCONFIG all the directories [0]

Submitted by:	CHAO Shin [0]
PR:		ports/112236 [0]

6 files changed, 389 insertions, 78 deletions

diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index f7b74a6b4c7c..5dce4851b88d 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -9,10 +9,10 @@
 #  - etc/*.sample support
 
 PORTNAME=	openmpi
-DISTVERSION=	1.1.4
+DISTVERSION=	1.2.2
 PORTREVISION=	1
 CATEGORIES=	net parallel
-MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.1/downloads/
+MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.2/downloads/
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	A High Performance Message Passing Library
@@ -29,17 +29,13 @@ MPIDIR?=	${MPIBASE}/${UNIQUENAME}
 PLIST_SUB+=	MPIBASE=${MPIBASE}
 PLIST_SUB+=	MPIDIR=${MPIDIR}
 
-SUB_FILES+=	pkg-message
-SUB_LIST+=	MPIDIR=${MPIDIR}
-
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
 CONFIGURE_ARGS+=	--prefix=${PREFIX}/${MPIDIR} ${CONFIGURE_TARGET}
 
-USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib/openmpi
+USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib \
+		${PREFIX}/${MPIDIR}/lib/openmpi
 
-MAN1=		mpiexec.1 mpirun.1 orterun.1
 MANPREFIX=	${TARGETDIR}/${MPIDIR}
+.include "${.CURDIR}/Makefile.man"
 
 .include <bsd.port.pre.mk>
 
@@ -64,27 +60,35 @@ PLIST_SUB+=	TORQUE=""
 PLIST_SUB+=	TORQUE="@comment "
 .endif
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 #######################################################################
 # The following targets are for the port maintainer.  Use at your own #
 # risk, no user-serviceable parts inside.                             #
+#                                                                     #
+# XXX: we should generate MLINKS programaticaly, but it would take    #
+# some effort and there's only one entry at this time.                #
 #######################################################################
 build-plist: Makefile
-	${RM} -f pkg-plist
-	${FIND} ${PREFIX}/${MPIDIR}/* -type f | \
+	${RM} ${PLIST}
+	${FIND} ${PREFIX}/${MPIDIR} -name man -prune -o -type f -print | \
 	    ${SED} -e 's|${PREFIX}/${MPIDIR}|%%MPIDIR%%|' | \
-	    ${SORT} >> pkg-plist
-	${FIND} ${PREFIX}/${MPIDIR}/* -type l | \
+	    ${SORT} >> ${PLIST}
+	${FIND} ${PREFIX}/${MPIDIR} -name man -prune -o -type l -print | \
 	    ${SED} -e 's|${PREFIX}/${MPIDIR}|%%MPIDIR%%|' | \
-	    ${SORT} >> pkg-plist
-	${FIND} ${PREFIX}/${MPIDIR}/* -type d | \
+	    ${SORT} >> ${PLIST}
+	${FIND} ${PREFIX}/${MPIDIR} -type d | \
+	    egrep -v "${PREFIX}/${MPIDIR}$$" | \
 	    ${SED} -e 's|${PREFIX}/${MPIDIR}|@dirrm %%MPIDIR%%|' | \
-	    ${SORT} -r >> pkg-plist
+	    ${SORT} -r >> ${PLIST}
 	${ECHO} "@dirrmtry %%MPIDIR%%" \
-	    >> pkg-plist
-	${ECHO} "@dirrmtry %D/%%MPIBASE%%" \
-	    >> pkg-plist
+	    >> ${PLIST}
+	${ECHO} "@dirrmtry %%MPIBASE%%" \
+	    >> ${PLIST}
+	@echo "# Do not edit!  Auto-generated file." > ${.CURDIR}/Makefile.man
+	@echo "# See build-plist target in Makefile." >> ${.CURDIR}/Makefile.man
+	@echo "#" >> ${.CURDIR}/Makefile.man
+	@echo "MLINKS=mpic++.1 mpiCC.1" >> ${.CURDIR}/Makefile.man
+	${FIND} ${PREFIX}/${MPIDIR}/man -type f | \
+	    ${SED} -e 's|.*man\([0-9LN]\)/\(.*\)|MAN\1+=\2|' -e 's/\.gz$$//' \
+	    >> ${.CURDIR}/Makefile.man
 
 .include <bsd.port.post.mk>
diff --git a/net/openmpi/Makefile.man b/net/openmpi/Makefile.man
new file mode 100644
index 000000000000..39905ddac355
--- /dev/null
+++ b/net/openmpi/Makefile.man
@@ -0,0 +1,318 @@
+# Do not edit!  Auto-generated file.
+# See build-plist target in Makefile.
+#
+MLINKS=mpic++.1 mpiCC.1
+MAN1+=mpicc.1
+MAN1+=mpicxx.1
+MAN1+=mpif77.1
+MAN1+=mpif90.1
+MAN1+=mpirun.1
+MAN1+=orterun.1
+MAN1+=mpic++.1
+MAN1+=mpiexec.1
+MAN3+=MPI_Add_error_class.3
+MAN3+=MPI_Add_error_code.3
+MAN3+=MPI_Add_error_string.3
+MAN3+=MPI_Address.3
+MAN3+=MPI_Allgather.3
+MAN3+=MPI_Allgatherv.3
+MAN3+=MPI_Alloc_mem.3
+MAN3+=MPI_Allreduce.3
+MAN3+=MPI_Alltoallw.3
+MAN3+=MPI_Attr_delete.3
+MAN3+=MPI_Attr_get.3
+MAN3+=MPI_Attr_put.3
+MAN3+=MPI_Barrier.3
+MAN3+=MPI_Bcast.3
+MAN3+=MPI_Bsend.3
+MAN3+=MPI_Abort.3
+MAN3+=MPI_Alltoall.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
+MAN3+=MPI_Cart_get.3
+MAN3+=MPI_Cart_shift.3
+MAN3+=MPI_Cart_sub.3
+MAN3+=MPI_Close_port.3
+MAN3+=MPI_Comm_accept.3
+MAN3+=MPI_Comm_c2f.3
+MAN3+=MPI_Comm_compare.3
+MAN3+=MPI_Comm_connect.3
+MAN3+=MPI_Comm_create.3
+MAN3+=MPI_Comm_dup.3
+MAN3+=MPI_Cart_map.3
+MAN3+=MPI_Comm_create_keyval.3
+MAN3+=MPI_Comm_delete_attr.3
+MAN3+=MPI_Comm_disconnect.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
+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_set_name.3
+MAN3+=MPI_Comm_size.3
+MAN3+=MPI_Comm_spawn.3
+MAN3+=MPI_Comm_spawn_multiple.3
+MAN3+=MPI_Comm_split.3
+MAN3+=MPI_Comm_test_inter.3
+MAN3+=MPI_Dims_create.3
+MAN3+=MPI_Errhandler_create.3
+MAN3+=MPI_Errhandler_free.3
+MAN3+=MPI_Errhandler_get.3
+MAN3+=MPI_Errhandler_set.3
+MAN3+=MPI_Error_class.3
+MAN3+=MPI_Error_string.3
+MAN3+=MPI_Exscan.3
+MAN3+=MPI_File_c2f.3
+MAN3+=MPI_File_close.3
+MAN3+=MPI_File_create_errhandler.3
+MAN3+=MPI_File_delete.3
+MAN3+=MPI_File_f2c.3
+MAN3+=MPI_File_get_amode.3
+MAN3+=MPI_File_get_atomicity.3
+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_view.3
+MAN3+=MPI_File_get_type_extent.3
+MAN3+=MPI_File_read_all.3
+MAN3+=MPI_File_read_at.3
+MAN3+=MPI_File_iread.3
+MAN3+=MPI_File_iread_at.3
+MAN3+=MPI_File_iwrite.3
+MAN3+=MPI_File_open.3
+MAN3+=MPI_File_read.3
+MAN3+=MPI_File_read_all_begin.3
+MAN3+=MPI_File_read_all_end.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_seek.3
+MAN3+=MPI_File_iread_shared.3
+MAN3+=MPI_File_iwrite_at.3
+MAN3+=MPI_File_iwrite_shared.3
+MAN3+=MPI_File_preallocate.3
+MAN3+=MPI_File_read_ordered.3
+MAN3+=MPI_File_read_ordered_end.3
+MAN3+=MPI_File_read_shared.3
+MAN3+=MPI_File_seek_shared.3
+MAN3+=MPI_File_set_atomicity.3
+MAN3+=MPI_File_set_errhandler.3
+MAN3+=MPI_File_set_info.3
+MAN3+=MPI_File_set_size.3
+MAN3+=MPI_File_set_view.3
+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_all_end.3
+MAN3+=MPI_Finalize.3
+MAN3+=MPI_File_write_at.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
+MAN3+=MPI_File_write_ordered_end.3
+MAN3+=MPI_File_write_shared.3
+MAN3+=MPI_Finalized.3
+MAN3+=MPI_Free_mem.3
+MAN3+=MPI_Gatherv.3
+MAN3+=MPI_Get.3
+MAN3+=MPI_Get_address.3
+MAN3+=MPI_Get_count.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
+MAN3+=MPI_Graph_get.3
+MAN3+=MPI_Graph_map.3
+MAN3+=MPI_Graph_neighbors.3
+MAN3+=MPI_Graph_neighbors_count.3
+MAN3+=MPI_Grequest_complete.3
+MAN3+=MPI_Grequest_start.3
+MAN3+=MPI_Group_c2f.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_range_excl.3
+MAN3+=MPI_Group_range_incl.3
+MAN3+=MPI_Group_rank.3
+MAN3+=MPI_Group_size.3
+MAN3+=MPI_Group_translate_ranks.3
+MAN3+=MPI_Group_union.3
+MAN3+=MPI_Ibsend.3
+MAN3+=MPI_Info_c2f.3
+MAN3+=MPI_Info_create.3
+MAN3+=MPI_Info_delete.3
+MAN3+=MPI_Info_dup.3
+MAN3+=MPI_Info_f2c.3
+MAN3+=MPI_Info_free.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_Intercomm_merge.3
+MAN3+=MPI_Iprobe.3
+MAN3+=MPI_Irecv.3
+MAN3+=MPI_Irsend.3
+MAN3+=MPI_Isend.3
+MAN3+=MPI_Issend.3
+MAN3+=MPI_Is_thread_main.3
+MAN3+=MPI_Keyval_create.3
+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_Op_free.3
+MAN3+=MPI_Initialized.3
+MAN3+=MPI_Init_thread.3
+MAN3+=MPI_Pack.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_Recv.3
+MAN3+=MPI_Reduce.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_Rsend.3
+MAN3+=MPI_Query_thread.3
+MAN3+=MPI_Recv_init.3
+MAN3+=MPI_Scan.3
+MAN3+=MPI_Scatterv.3
+MAN3+=MPI_Send.3
+MAN3+=MPI_Send_init.3
+MAN3+=MPI_Sendrecv.3
+MAN3+=MPI_Sizeof.3
+MAN3+=MPI_Ssend.3
+MAN3+=MPI_Ssend_init.3
+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_Testany.3
+MAN3+=MPI_Rsend_init.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_integer.3
+MAN3+=MPI_Type_create_f90_real.3
+MAN3+=MPI_Type_create_hindexed.3
+MAN3+=MPI_Type_create_hvector.3
+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_struct.3
+MAN3+=MPI_Type_extent.3
+MAN3+=MPI_Type_f2c.3
+MAN3+=MPI_Type_free.3
+MAN3+=MPI_Type_free_keyval.3
+MAN3+=MPI_Type_get_attr.3
+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_lb.3
+MAN3+=MPI_Type_set_attr.3
+MAN3+=MPI_Type_set_name.3
+MAN3+=MPI_Type_size.3
+MAN3+=MPI_Type_struct.3
+MAN3+=MPI_Type_ub.3
+MAN3+=MPI_Type_vector.3
+MAN3+=MPI_Unpack.3
+MAN3+=MPI_Unpublish_name.3
+MAN3+=MPI_Waitall.3
+MAN3+=MPI_Waitany.3
+MAN3+=MPI_Waitsome.3
+MAN3+=MPI_Win_c2f.3
+MAN3+=MPI_Win_call_errhandler.3
+MAN3+=MPI_Win_complete.3
+MAN3+=MPI_Wtick.3
+MAN3+=MPI_Win_create.3
+MAN3+=MPI_Win_create_keyval.3
+MAN3+=MPI_Win_delete_attr.3
+MAN3+=MPI_Win_f2c.3
+MAN3+=MPI_Win_fence.3
+MAN3+=MPI_Win_free.3
+MAN3+=MPI_Win_free_keyval.3
+MAN3+=MPI_Win_get_attr.3
+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_set_attr.3
+MAN3+=MPI_Win_set_errhandler.3
+MAN3+=MPI_Win_set_name.3
+MAN3+=MPI_Wtime.3
+MAN3+=MPI_Win_start.3
+MAN3+=MPI_Win_unlock.3
+MAN3+=MPI_Win_wait.3
+MAN3+=OpenMPI.3
+MAN3+=MPI.3
+MAN3+=MPI_Accumulate.3
+MAN3+=MPI_Alltoallv.3
+MAN3+=MPI_Bsend_init.3
+MAN3+=MPI_Cart_rank.3
+MAN3+=MPI_Comm_call_errhandler.3
+MAN3+=MPI_Comm_create_errhandler.3
+MAN3+=MPI_Comm_set_errhandler.3
+MAN3+=MPI_File_call_errhandler.3
+MAN3+=MPI_File_get_position_shared.3
+MAN3+=MPI_File_get_size.3
+MAN3+=MPI_Gather.3
+MAN3+=MPI_File_read_ordered_begin.3
+MAN3+=MPI_File_write_at_all.3
+MAN3+=MPI_Group_compare.3
+MAN3+=MPI_Group_intersection.3
+MAN3+=MPI_Info_get.3
+MAN3+=MPI_Intercomm_create.3
+MAN3+=MPI_Pack_external.3
+MAN3+=MPI_Reduce_scatter.3
+MAN3+=MPI_Scatter.3
+MAN3+=MPI_Sendrecv_replace.3
+MAN3+=MPI_Test_cancelled.3
+MAN3+=MPI_Type_create_f90_complex.3
+MAN3+=MPI_Type_create_subarray.3
+MAN3+=MPI_Type_delete_attr.3
+MAN3+=MPI_Type_match_size.3
+MAN3+=MPI_Unpack_external.3
+MAN3+=MPI_Win_create_errhandler.3
+MAN3+=MPI_Win_post.3
+MAN3+=MPI_Win_test.3
diff --git a/net/openmpi/distinfo b/net/openmpi/distinfo
index a3945918315e..49bc24c81873 100644
--- a/net/openmpi/distinfo
+++ b/net/openmpi/distinfo
@@ -1,3 +1,3 @@
-MD5 (openmpi-1.1.4.tar.bz2) = 28940b182156478fa442397b0c9660e1
-SHA256 (openmpi-1.1.4.tar.bz2) = 21c37f85df7e959f17cc7cb5571d8db2a94ed2763e3e96e5d052aff2725c1d18
-SIZE (openmpi-1.1.4.tar.bz2) = 3221833
+MD5 (openmpi-1.2.2.tar.bz2) = 7f553317e388c4efe479e908b66f910d
+SHA256 (openmpi-1.2.2.tar.bz2) = aa763e0e6a6f5fdff8f9d3fc988a4ba0ed902132d292c85aef392cc65bb524e6
+SIZE (openmpi-1.2.2.tar.bz2) = 3654886
diff --git a/net/openmpi/files/patch-opal_event_Makefile.in b/net/openmpi/files/patch-opal_event_Makefile.in
deleted file mode 100644
index 5bc5c4c6e2a0..000000000000
--- a/net/openmpi/files/patch-opal_event_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- opal/event/Makefile.in.orig
-+++ opal/event/Makefile.in
-@@ -828,8 +828,7 @@
- # Also specify where we can find this package's config.h because some
- # of the header files in this directory get included elsewhere in OMPI.
- # #@%@#$...
--AM_CPPFLAGS = \
--        -I$(top_srcdir)/opal/event/compat
-+AM_CPPFLAGS = 
- 
- 
- # OMPI: No need to build the sample or test
diff --git a/net/openmpi/files/pkg-message.in b/net/openmpi/files/pkg-message.in
deleted file mode 100644
index cf82021caaed..000000000000
--- a/net/openmpi/files/pkg-message.in
+++ /dev/null
@@ -1,7 +0,0 @@
-In order to use Open MPI, you make the following additions to your
-PATH and LD_LIBRARY_PATH variables:
-
-    PATH		%%PREFIX%%/%%MPIDIR%%/bin
-    LD_LIBRARY_PATH	%%PREFIX%%/%%MPIDIR%%/lib
-
-Failure to do so will result in bizarre command failures.
diff --git a/net/openmpi/pkg-plist b/net/openmpi/pkg-plist
index 4c6bbb5f128b..20630905d71f 100644
--- a/net/openmpi/pkg-plist
+++ b/net/openmpi/pkg-plist
@@ -46,12 +46,17 @@
 %%MPIDIR%%/lib/libmpi.so.0
 %%MPIDIR%%/lib/libmpi_cxx.la
 %%MPIDIR%%/lib/libmpi_cxx.so.0
-%%MPIDIR%%/lib/libmpi_f90.a
-%%MPIDIR%%/lib/libopal.la
-%%MPIDIR%%/lib/libopal.so.0
-%%MPIDIR%%/lib/liborte.la
-%%MPIDIR%%/lib/liborte.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/mca_allocator_basic.la
 %%MPIDIR%%/lib/openmpi/mca_allocator_basic.so
 %%MPIDIR%%/lib/openmpi/mca_allocator_bucket.la
@@ -72,6 +77,12 @@
 %%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
@@ -86,36 +97,42 @@
 %%MPIDIR%%/lib/openmpi/mca_iof_svc.so
 %%MPIDIR%%/lib/openmpi/mca_maffinity_first_use.la
 %%MPIDIR%%/lib/openmpi/mca_maffinity_first_use.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_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_fork.la
-%%MPIDIR%%/lib/openmpi/mca_pls_fork.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
-%%TORQUE%%%%MPIDIR%%/lib/openmpi/mca_pls_tm.la
-%%TORQUE%%%%MPIDIR%%/lib/openmpi/mca_pls_tm.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_hostfile.la
-%%MPIDIR%%/lib/openmpi/mca_ras_hostfile.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
-%%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_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_round_robin.la
@@ -137,32 +154,31 @@
 %%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-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-runtime.txt
+%%MPIDIR%%/share/openmpi/help-odls-default.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-orterun.txt
 %%MPIDIR%%/share/openmpi/help-pls-base.txt
+%%MPIDIR%%/share/openmpi/help-pls-gridengine.txt
 %%MPIDIR%%/share/openmpi/help-pls-rsh.txt
-%%TORQUE%%%%MPIDIR%%/share/openmpi/help-pls-tm.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/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
@@ -171,23 +187,18 @@
 %%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%%/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
-%%MPIDIR%%/share/openmpi/opalCC-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/orteCC-wrapper-data.txt
 @dirrm %%MPIDIR%%/share/openmpi
 @dirrm %%MPIDIR%%/share
+@dirrm %%MPIDIR%%/man/man3
 @dirrm %%MPIDIR%%/man/man1
 @dirrm %%MPIDIR%%/man
 @dirrm %%MPIDIR%%/lib/openmpi