- Update from 1.7.3 to 1.7.5

- Convert USE_BZIP2 to USES

3 files changed, 231 insertions, 179 deletions

diff --git a/net/openmpi-devel/Makefile b/net/openmpi-devel/Makefile
index 79e4b10af328..b8d57f9745b9 100644
--- a/net/openmpi-devel/Makefile
+++ b/net/openmpi-devel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openmpi
-DISTVERSION=	1.7.3
-PORTREVISION=	1
+DISTVERSION=	1.7.5
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.7/downloads/
 PKGNAMESUFFIX=	-devel
@@ -15,11 +14,10 @@ LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
 		libhwloc.so:${PORTSDIR}/devel/hwloc \
 		libltdl.so:${PORTSDIR}/devel/libltdl
 
-CONFLICTS=	openmpi-1.6.*
+CONFLICTS=	openmpi-1.8
 
-USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
-USES=		fortran gmake pkgconfig
+USES=		fortran gmake pkgconfig tar:bzip2
 
 MPIBASE?=	mpi
 MPIDIR?=	${MPIBASE}/${UNIQUENAME}${PKGNAMESUFFIX}
diff --git a/net/openmpi-devel/distinfo b/net/openmpi-devel/distinfo
index 657c8e79cbc9..0e8971e4dde7 100644
--- a/net/openmpi-devel/distinfo
+++ b/net/openmpi-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openmpi-1.7.3.tar.bz2) = 438d96c178dbf5a1bc92fa1d238a8225d87b64af26ce2a07789faaf312117e45
-SIZE (openmpi-1.7.3.tar.bz2) = 12479769
+SHA256 (openmpi-1.7.5.tar.bz2) = cb3eef6880537d341d5d098511d390ec853716a6ec94007c03a0d1491b2ac8f2
+SIZE (openmpi-1.7.5.tar.bz2) = 13286694
diff --git a/net/openmpi-devel/pkg-plist b/net/openmpi-devel/pkg-plist
index 742f3e7a9169..7f3cb5ff3436 100644
--- a/net/openmpi-devel/pkg-plist
+++ b/net/openmpi-devel/pkg-plist
@@ -18,9 +18,6 @@
 %%MPIDIR%%/bin/orte-ps
 %%MPIDIR%%/bin/orte-server
 %%MPIDIR%%/bin/orte-top
-%%MPIDIR%%/bin/orteCC
-%%MPIDIR%%/bin/orte_wrapper_script
-%%MPIDIR%%/bin/ortec++
 %%MPIDIR%%/bin/ortecc
 %%MPIDIR%%/bin/orted
 %%MPIDIR%%/bin/orterun
@@ -31,7 +28,6 @@
 %%VT%%%%MPIDIR%%/bin/mpif77-vt
 %%VT%%%%MPIDIR%%/bin/mpif90-vt
 %%VT%%%%MPIDIR%%/bin/mpifort-vt
-%%VT%%%%MPIDIR%%/bin/opari
 %%VT%%%%MPIDIR%%/bin/otfaux
 %%VT%%%%MPIDIR%%/bin/otfcompress
 %%VT%%%%MPIDIR%%/bin/otfconfig
@@ -62,7 +58,6 @@
 %%VT%%%%MPIDIR%%/bin/vtwrapper
 %%VT%%%%MPIDIR%%/etc/vtsetup-config.dtd
 %%VT%%%%MPIDIR%%/etc/vtsetup-config.xml
-%%VT%%%%MPIDIR%%/include/vampirtrace/opari_omp.h
 %%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTFAUX_MsgMatching.h
 %%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTFAUX_State.h
 %%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTFAUX_Thumbnail.h
@@ -88,7 +83,6 @@
 %%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_inttypes_unix.h
 %%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/otf.h
 %%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/otfaux.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/pomp_lib.h
 %%VT%%%%MPIDIR%%/include/vampirtrace/vt_inttypes.h
 %%VT%%%%MPIDIR%%/include/vampirtrace/vt_user.h
 %%VT%%%%MPIDIR%%/include/vampirtrace/vt_user.inc
@@ -103,6 +97,39 @@
 %%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_message.h
 %%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_message.inc
 %%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_region.h
+%%VT%%%%MPIDIR%%/%%DATADIR%%/mpic++-vt-wrapper-data.txt
+%%VT%%%%MPIDIR%%/%%DATADIR%%/mpicc-vt-wrapper-data.txt
+%%VT%%%%MPIDIR%%/%%DATADIR%%/mpicxx-vt-wrapper-data.txt
+%%VT%%%%MPIDIR%%/%%DATADIR%%/mpif77-vt-wrapper-data.txt
+%%VT%%%%MPIDIR%%/%%DATADIR%%/mpif90-vt-wrapper-data.txt
+%%VT%%%%MPIDIR%%/%%DATADIR%%/mpifort-vt-wrapper-data.txt
+%%VT%%%%MPIDIR%%/share/vampirtrace/FILTER.SPEC
+%%VT%%%%MPIDIR%%/share/vampirtrace/GROUPS.SPEC
+%%VT%%%%MPIDIR%%/share/vampirtrace/METRICS.SPEC
+%%VT%%%%MPIDIR%%/share/vampirtrace/config.log
+%%VT%%%%MPIDIR%%/share/vampirtrace/doc/ChangeLog
+%%VT%%%%MPIDIR%%/share/vampirtrace/doc/LICENSE
+%%VT%%%%MPIDIR%%/share/vampirtrace/doc/UserManual.html
+%%VT%%%%MPIDIR%%/share/vampirtrace/doc/UserManual.pdf
+%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/ChangeLog
+%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/LICENSE
+%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/otfprofile.pdf
+%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/otfprofile_clustering.pdf
+%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/otftools.pdf
+%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/specification.pdf
+%%VT%%%%MPIDIR%%/share/vampirtrace/doc/vtsetup/ChangeLog
+%%VT%%%%MPIDIR%%/share/vampirtrace/doc/vtsetup/LICENSE
+%%VT%%%%MPIDIR%%/share/vampirtrace/libtool
+%%VT%%%%MPIDIR%%/share/vampirtrace/omp.h
+%%VT%%%%MPIDIR%%/share/vampirtrace/vtCC-wrapper-data.txt
+%%VT%%%%MPIDIR%%/share/vampirtrace/vtc++-wrapper-data.txt
+%%VT%%%%MPIDIR%%/share/vampirtrace/vtcc-wrapper-data.txt
+%%VT%%%%MPIDIR%%/share/vampirtrace/vtcxx-wrapper-data.txt
+%%VT%%%%MPIDIR%%/share/vampirtrace/vtf77-wrapper-data.txt
+%%VT%%%%MPIDIR%%/share/vampirtrace/vtf90-wrapper-data.txt
+%%VT%%%%MPIDIR%%/share/vampirtrace/vtfort-wrapper-data.txt
+%%VT%%%%MPIDIR%%/share/vampirtrace/vtsetup-data.dtd
+%%VT%%%%MPIDIR%%/share/vampirtrace/vtsetup-data.xml
 %%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_region.inc
 %%VT%%%%MPIDIR%%/include/vampirtrace/vt_wrap_pthread.h
 %%VT%%%%MPIDIR%%/lib/libopen-trace-format.a
@@ -129,86 +156,14 @@
 %%VT%%%%MPIDIR%%/lib/libvt-mt.la
 %%VT%%%%MPIDIR%%/lib/libvt-mt.so
 %%VT%%%%MPIDIR%%/lib/libvt-mt.so.0
-%%VT%%%%MPIDIR%%/lib/libvt-pomp.a
-%%VT%%%%MPIDIR%%/lib/libvt-pomp.la
 %%VT%%%%MPIDIR%%/lib/libvt.a
 %%VT%%%%MPIDIR%%/lib/libvt.la
 %%VT%%%%MPIDIR%%/lib/libvt.so
 %%VT%%%%MPIDIR%%/lib/libvt.so.0
-%%VT%%%%MPIDIR%%/share/openmpi/mpiCC-vt-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/openmpi/mpic++-vt-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/openmpi/mpicc-vt-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/openmpi/mpicxx-vt-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/openmpi/mpif77-vt-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/openmpi/mpif90-vt-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/openmpi/mpifort-vt-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/vampirtrace/FILTER.SPEC
-%%VT%%%%MPIDIR%%/share/vampirtrace/GROUPS.SPEC
-%%VT%%%%MPIDIR%%/share/vampirtrace/METRICS.SPEC
-%%VT%%%%MPIDIR%%/share/vampirtrace/config.log
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/ChangeLog
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/LICENSE
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/UserManual.html
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/UserManual.pdf
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/opari/ChangeLog
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/opari/LICENSE
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/opari/Readme.html
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/opari/lacsi01.pdf
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/opari/opari-logo-100.gif
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/ChangeLog
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/LICENSE
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/otfprofile.pdf
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/otfprofile_clustering.pdf
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/otftools.pdf
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/specification.pdf
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/vtsetup/ChangeLog
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/vtsetup/LICENSE
-%%VT%%%%MPIDIR%%/share/vampirtrace/libtool
-%%VT%%%%MPIDIR%%/share/vampirtrace/omp.h
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtCC-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtc++-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtcc-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtcxx-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtf77-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtf90-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtfort-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtsetup-data.dtd
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtsetup-data.xml
-%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace/doc/vtsetup
-%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace/doc/otf
-%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace/doc/opari
-%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace/doc
-%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace
-%%VT%%@dirrmtry %%MPIDIR%%/include/vampirtrace/open-trace-format
-%%VT%%@dirrmtry %%MPIDIR%%/include/vampirtrace
-%%MPIDIR%%/etc/openmpi-default-hostfile
-%%MPIDIR%%/etc/openmpi-mca-params.conf
-%%MPIDIR%%/etc/openmpi-totalview.tcl
-%%MPIDIR%%/include/event2/buffer.h
-%%MPIDIR%%/include/event2/buffer_compat.h
-%%MPIDIR%%/include/event2/bufferevent.h
-%%MPIDIR%%/include/event2/bufferevent_compat.h
-%%MPIDIR%%/include/event2/bufferevent_ssl.h
-%%MPIDIR%%/include/event2/bufferevent_struct.h
-%%MPIDIR%%/include/event2/dns.h
-%%MPIDIR%%/include/event2/dns_compat.h
-%%MPIDIR%%/include/event2/dns_struct.h
-%%MPIDIR%%/include/event2/event-config.h
-%%MPIDIR%%/include/event2/event.h
-%%MPIDIR%%/include/event2/event_compat.h
-%%MPIDIR%%/include/event2/event_struct.h
-%%MPIDIR%%/include/event2/http.h
-%%MPIDIR%%/include/event2/http_compat.h
-%%MPIDIR%%/include/event2/http_struct.h
-%%MPIDIR%%/include/event2/keyvalq_struct.h
-%%MPIDIR%%/include/event2/listener.h
-%%MPIDIR%%/include/event2/rpc.h
-%%MPIDIR%%/include/event2/rpc_compat.h
-%%MPIDIR%%/include/event2/rpc_struct.h
-%%MPIDIR%%/include/event2/tag.h
-%%MPIDIR%%/include/event2/tag_compat.h
-%%MPIDIR%%/include/event2/thread.h
-%%MPIDIR%%/include/event2/util.h
+%%VT%%%%MPIDIR%%/%%DATADIR%%/mpiCC-vt-wrapper-data.txt
+%%MPIDIR%%/%%ETCDIR%%-default-hostfile
+%%MPIDIR%%/%%ETCDIR%%-mca-params.conf
+%%MPIDIR%%/%%ETCDIR%%-totalview.tcl
 %%MPIDIR%%/include/mpi-ext.h
 %%MPIDIR%%/include/mpi.h
 %%MPIDIR%%/include/mpi_portable_platform.h
@@ -221,6 +176,8 @@
 %%MPIDIR%%/include/mpif-io-handles.h
 %%MPIDIR%%/include/mpif-sentinels.h
 %%MPIDIR%%/include/mpif.h
+%%MPIDIR%%/include/mpp/shmem.fh
+%%MPIDIR%%/include/mpp/shmem.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/comm.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/comm_inln.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/constants.h
@@ -252,30 +209,32 @@
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/topology_inln.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/win.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/win_inln.h
+%%MPIDIR%%/include/shmem.fh
+%%MPIDIR%%/include/shmem.h
 %%MPIDIR%%/lib/libmca_common_sm.la
 %%MPIDIR%%/lib/libmca_common_sm.so
 %%MPIDIR%%/lib/libmca_common_sm.so.4
 %%MPIDIR%%/lib/libmpi.la
 %%MPIDIR%%/lib/libmpi.so
-%%MPIDIR%%/lib/libmpi.so.3
+%%MPIDIR%%/lib/libmpi.so.5
 %%MPIDIR%%/lib/libmpi_cxx.la
 %%MPIDIR%%/lib/libmpi_cxx.so
 %%MPIDIR%%/lib/libmpi_cxx.so.2
 %%MPIDIR%%/lib/libmpi_mpifh.la
 %%MPIDIR%%/lib/libmpi_mpifh.so
-%%MPIDIR%%/lib/libmpi_mpifh.so.3
+%%MPIDIR%%/lib/libmpi_mpifh.so.4
 %%MPIDIR%%/lib/libmpi_usempi.la
 %%MPIDIR%%/lib/libmpi_usempi.so
-%%MPIDIR%%/lib/libmpi_usempi.so.2
+%%MPIDIR%%/lib/libmpi_usempi.so.3
 %%MPIDIR%%/lib/libompitrace.la
 %%MPIDIR%%/lib/libompitrace.so
 %%MPIDIR%%/lib/libompitrace.so.0
 %%MPIDIR%%/lib/libopen-pal.la
 %%MPIDIR%%/lib/libopen-pal.so
-%%MPIDIR%%/lib/libopen-pal.so.6
+%%MPIDIR%%/lib/libopen-pal.so.7
 %%MPIDIR%%/lib/libopen-rte.la
 %%MPIDIR%%/lib/libopen-rte.so
-%%MPIDIR%%/lib/libopen-rte.so.6
+%%MPIDIR%%/lib/libopen-rte.so.7
 %%MPIDIR%%/lib/mpi.mod
 %%MPIDIR%%/lib/openmpi/libompi_dbg_msgq.la
 %%MPIDIR%%/lib/openmpi/libompi_dbg_msgq.so
@@ -295,6 +254,8 @@
 %%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_btl_vader.la
+%%MPIDIR%%/lib/openmpi/mca_btl_vader.so
 %%MPIDIR%%/lib/openmpi/mca_coll_basic.la
 %%MPIDIR%%/lib/openmpi/mca_coll_basic.so
 %%MPIDIR%%/lib/openmpi/mca_coll_hierarch.la
@@ -321,6 +282,12 @@
 %%MPIDIR%%/lib/openmpi/mca_db_hash.so
 %%MPIDIR%%/lib/openmpi/mca_db_print.la
 %%MPIDIR%%/lib/openmpi/mca_db_print.so
+%%MPIDIR%%/lib/openmpi/mca_dfs_app.la
+%%MPIDIR%%/lib/openmpi/mca_dfs_app.so
+%%MPIDIR%%/lib/openmpi/mca_dfs_orted.la
+%%MPIDIR%%/lib/openmpi/mca_dfs_orted.so
+%%MPIDIR%%/lib/openmpi/mca_dfs_test.la
+%%MPIDIR%%/lib/openmpi/mca_dfs_test.so
 %%MPIDIR%%/lib/openmpi/mca_dpm_orte.la
 %%MPIDIR%%/lib/openmpi/mca_dpm_orte.so
 %%MPIDIR%%/lib/openmpi/mca_errmgr_default_app.la
@@ -329,6 +296,8 @@
 %%MPIDIR%%/lib/openmpi/mca_errmgr_default_hnp.so
 %%MPIDIR%%/lib/openmpi/mca_errmgr_default_orted.la
 %%MPIDIR%%/lib/openmpi/mca_errmgr_default_orted.so
+%%MPIDIR%%/lib/openmpi/mca_errmgr_default_tool.la
+%%MPIDIR%%/lib/openmpi/mca_errmgr_default_tool.so
 %%MPIDIR%%/lib/openmpi/mca_ess_env.la
 %%MPIDIR%%/lib/openmpi/mca_ess_env.so
 %%MPIDIR%%/lib/openmpi/mca_ess_hnp.la
@@ -349,6 +318,8 @@
 %%MPIDIR%%/lib/openmpi/mca_fcoll_two_phase.so
 %%MPIDIR%%/lib/openmpi/mca_fcoll_ylib.la
 %%MPIDIR%%/lib/openmpi/mca_fcoll_ylib.so
+%%MPIDIR%%/lib/openmpi/mca_filem_raw.la
+%%MPIDIR%%/lib/openmpi/mca_filem_raw.so
 %%MPIDIR%%/lib/openmpi/mca_fs_ufs.la
 %%MPIDIR%%/lib/openmpi/mca_fs_ufs.so
 %%MPIDIR%%/lib/openmpi/mca_grpcomm_bad.la
@@ -359,6 +330,10 @@
 %%MPIDIR%%/lib/openmpi/mca_io_romio.so
 %%MPIDIR%%/lib/openmpi/mca_iof_hnp.la
 %%MPIDIR%%/lib/openmpi/mca_iof_hnp.so
+%%MPIDIR%%/lib/openmpi/mca_iof_mr_hnp.la
+%%MPIDIR%%/lib/openmpi/mca_iof_mr_hnp.so
+%%MPIDIR%%/lib/openmpi/mca_iof_mr_orted.la
+%%MPIDIR%%/lib/openmpi/mca_iof_mr_orted.so
 %%MPIDIR%%/lib/openmpi/mca_iof_orted.la
 %%MPIDIR%%/lib/openmpi/mca_iof_orted.so
 %%MPIDIR%%/lib/openmpi/mca_iof_tool.la
@@ -371,10 +346,12 @@
 %%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_osc_rdma.la
 %%MPIDIR%%/lib/openmpi/mca_osc_rdma.so
+%%MPIDIR%%/lib/openmpi/mca_osc_sm.la
+%%MPIDIR%%/lib/openmpi/mca_osc_sm.so
+%%MPIDIR%%/lib/openmpi/mca_plm_isolated.la
+%%MPIDIR%%/lib/openmpi/mca_plm_isolated.so
 %%MPIDIR%%/lib/openmpi/mca_plm_rsh.la
 %%MPIDIR%%/lib/openmpi/mca_plm_rsh.so
 %%MPIDIR%%/lib/openmpi/mca_pml_bfo.la
@@ -405,6 +382,8 @@
 %%MPIDIR%%/lib/openmpi/mca_rmaps_round_robin.so
 %%MPIDIR%%/lib/openmpi/mca_rmaps_seq.la
 %%MPIDIR%%/lib/openmpi/mca_rmaps_seq.so
+%%MPIDIR%%/lib/openmpi/mca_rmaps_staged.la
+%%MPIDIR%%/lib/openmpi/mca_rmaps_staged.so
 %%MPIDIR%%/lib/openmpi/mca_rml_oob.la
 %%MPIDIR%%/lib/openmpi/mca_rml_oob.so
 %%MPIDIR%%/lib/openmpi/mca_routed_binomial.la
@@ -421,8 +400,14 @@
 %%MPIDIR%%/lib/openmpi/mca_sbgp_basesmuma.so
 %%MPIDIR%%/lib/openmpi/mca_sbgp_p2p.la
 %%MPIDIR%%/lib/openmpi/mca_sbgp_p2p.so
-%%MPIDIR%%/lib/openmpi/mca_sharedfp_dummy.la
-%%MPIDIR%%/lib/openmpi/mca_sharedfp_dummy.so
+%%MPIDIR%%/lib/openmpi/mca_sec_basic.la
+%%MPIDIR%%/lib/openmpi/mca_sec_basic.so
+%%MPIDIR%%/lib/openmpi/mca_sharedfp_individual.la
+%%MPIDIR%%/lib/openmpi/mca_sharedfp_individual.so
+%%MPIDIR%%/lib/openmpi/mca_sharedfp_lockedfile.la
+%%MPIDIR%%/lib/openmpi/mca_sharedfp_lockedfile.so
+%%MPIDIR%%/lib/openmpi/mca_sharedfp_sm.la
+%%MPIDIR%%/lib/openmpi/mca_sharedfp_sm.so
 %%MPIDIR%%/lib/openmpi/mca_shmem_mmap.la
 %%MPIDIR%%/lib/openmpi/mca_shmem_mmap.so
 %%MPIDIR%%/lib/openmpi/mca_shmem_posix.la
@@ -437,6 +422,12 @@
 %%MPIDIR%%/lib/openmpi/mca_state_novm.so
 %%MPIDIR%%/lib/openmpi/mca_state_orted.la
 %%MPIDIR%%/lib/openmpi/mca_state_orted.so
+%%MPIDIR%%/lib/openmpi/mca_state_staged_hnp.la
+%%MPIDIR%%/lib/openmpi/mca_state_staged_hnp.so
+%%MPIDIR%%/lib/openmpi/mca_state_staged_orted.la
+%%MPIDIR%%/lib/openmpi/mca_state_staged_orted.so
+%%MPIDIR%%/lib/openmpi/mca_state_tool.la
+%%MPIDIR%%/lib/openmpi/mca_state_tool.so
 %%MPIDIR%%/lib/openmpi/mca_topo_basic.la
 %%MPIDIR%%/lib/openmpi/mca_topo_basic.so
 %%MPIDIR%%/lib/openmpi/mca_vprotocol_pessimist.la
@@ -468,7 +459,6 @@
 %%MPIDIR%%/man/man1/orte-ps.1.gz
 %%MPIDIR%%/man/man1/orte-server.1.gz
 %%MPIDIR%%/man/man1/orte-top.1.gz
-%%MPIDIR%%/man/man1/orteCC.1.gz
 %%MPIDIR%%/man/man1/orted.1.gz
 %%MPIDIR%%/man/man1/orterun.1.gz
 %%MPIDIR%%/man/man3/MPI.3.gz
@@ -511,10 +501,12 @@
 %%MPIDIR%%/man/man3/MPI_Comm_connect.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_create.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_create_errhandler.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_create_group.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_create_keyval.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_delete_attr.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_disconnect.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_dup.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_dup_with_info.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_f2c.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_free.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_free_keyval.3.gz
@@ -523,6 +515,7 @@
 %%MPIDIR%%/man/man3/MPI_Comm_get_name.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_get_parent.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_group.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_idup.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_join.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_rank.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_remote_group.3.gz
@@ -534,8 +527,14 @@
 %%MPIDIR%%/man/man3/MPI_Comm_spawn.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_spawn_multiple.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_split.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_split_type.3.gz
 %%MPIDIR%%/man/man3/MPI_Comm_test_inter.3.gz
+%%MPIDIR%%/man/man3/MPI_Compare_and_swap.3.gz
 %%MPIDIR%%/man/man3/MPI_Dims_create.3.gz
+%%MPIDIR%%/man/man3/MPI_Dist_graph_create.3.gz
+%%MPIDIR%%/man/man3/MPI_Dist_graph_create_adjacent.3.gz
+%%MPIDIR%%/man/man3/MPI_Dist_graph_neighbors.3.gz
+%%MPIDIR%%/man/man3/MPI_Dist_graph_neighbors_count.3.gz
 %%MPIDIR%%/man/man3/MPI_Errhandler_create.3.gz
 %%MPIDIR%%/man/man3/MPI_Errhandler_free.3.gz
 %%MPIDIR%%/man/man3/MPI_Errhandler_get.3.gz
@@ -543,6 +542,7 @@
 %%MPIDIR%%/man/man3/MPI_Error_class.3.gz
 %%MPIDIR%%/man/man3/MPI_Error_string.3.gz
 %%MPIDIR%%/man/man3/MPI_Exscan.3.gz
+%%MPIDIR%%/man/man3/MPI_Fetch_and_op.3.gz
 %%MPIDIR%%/man/man3/MPI_File_c2f.3.gz
 %%MPIDIR%%/man/man3/MPI_File_call_errhandler.3.gz
 %%MPIDIR%%/man/man3/MPI_File_close.3.gz
@@ -606,6 +606,7 @@
 %%MPIDIR%%/man/man3/MPI_Gather.3.gz
 %%MPIDIR%%/man/man3/MPI_Gatherv.3.gz
 %%MPIDIR%%/man/man3/MPI_Get.3.gz
+%%MPIDIR%%/man/man3/MPI_Get_accumulate.3.gz
 %%MPIDIR%%/man/man3/MPI_Get_address.3.gz
 %%MPIDIR%%/man/man3/MPI_Get_count.3.gz
 %%MPIDIR%%/man/man3/MPI_Get_elements.3.gz
@@ -635,9 +636,24 @@
 %%MPIDIR%%/man/man3/MPI_Group_size.3.gz
 %%MPIDIR%%/man/man3/MPI_Group_translate_ranks.3.gz
 %%MPIDIR%%/man/man3/MPI_Group_union.3.gz
+%%MPIDIR%%/man/man3/MPI_Iallgather.3.gz
+%%MPIDIR%%/man/man3/MPI_Iallgatherv.3.gz
+%%MPIDIR%%/man/man3/MPI_Iallreduce.3.gz
+%%MPIDIR%%/man/man3/MPI_Ialltoall.3.gz
+%%MPIDIR%%/man/man3/MPI_Ialltoallv.3.gz
+%%MPIDIR%%/man/man3/MPI_Ialltoallw.3.gz
+%%MPIDIR%%/man/man3/MPI_Ibcast.3.gz
 %%MPIDIR%%/man/man3/MPI_Ibsend.3.gz
+%%MPIDIR%%/man/man3/MPI_Iexscan.3.gz
+%%MPIDIR%%/man/man3/MPI_Igather.3.gz
+%%MPIDIR%%/man/man3/MPI_Igatherv.3.gz
 %%MPIDIR%%/man/man3/MPI_Improbe.3.gz
 %%MPIDIR%%/man/man3/MPI_Imrecv.3.gz
+%%MPIDIR%%/man/man3/MPI_Ineighbor_allgather.3.gz
+%%MPIDIR%%/man/man3/MPI_Ineighbor_allgatherv.3.gz
+%%MPIDIR%%/man/man3/MPI_Ineighbor_alltoall.3.gz
+%%MPIDIR%%/man/man3/MPI_Ineighbor_alltoallv.3.gz
+%%MPIDIR%%/man/man3/MPI_Ineighbor_alltoallw.3.gz
 %%MPIDIR%%/man/man3/MPI_Info_c2f.3.gz
 %%MPIDIR%%/man/man3/MPI_Info_create.3.gz
 %%MPIDIR%%/man/man3/MPI_Info_delete.3.gz
@@ -657,8 +673,14 @@
 %%MPIDIR%%/man/man3/MPI_Intercomm_merge.3.gz
 %%MPIDIR%%/man/man3/MPI_Iprobe.3.gz
 %%MPIDIR%%/man/man3/MPI_Irecv.3.gz
+%%MPIDIR%%/man/man3/MPI_Ireduce.3.gz
+%%MPIDIR%%/man/man3/MPI_Ireduce_scatter.3.gz
+%%MPIDIR%%/man/man3/MPI_Ireduce_scatter_block.3.gz
 %%MPIDIR%%/man/man3/MPI_Irsend.3.gz
 %%MPIDIR%%/man/man3/MPI_Is_thread_main.3.gz
+%%MPIDIR%%/man/man3/MPI_Iscan.3.gz
+%%MPIDIR%%/man/man3/MPI_Iscatter.3.gz
+%%MPIDIR%%/man/man3/MPI_Iscatterv.3.gz
 %%MPIDIR%%/man/man3/MPI_Isend.3.gz
 %%MPIDIR%%/man/man3/MPI_Issend.3.gz
 %%MPIDIR%%/man/man3/MPI_Keyval_create.3.gz
@@ -666,6 +688,11 @@
 %%MPIDIR%%/man/man3/MPI_Lookup_name.3.gz
 %%MPIDIR%%/man/man3/MPI_Mprobe.3.gz
 %%MPIDIR%%/man/man3/MPI_Mrecv.3.gz
+%%MPIDIR%%/man/man3/MPI_Neighbor_allgather.3.gz
+%%MPIDIR%%/man/man3/MPI_Neighbor_allgatherv.3.gz
+%%MPIDIR%%/man/man3/MPI_Neighbor_alltoall.3.gz
+%%MPIDIR%%/man/man3/MPI_Neighbor_alltoallv.3.gz
+%%MPIDIR%%/man/man3/MPI_Neighbor_alltoallw.3.gz
 %%MPIDIR%%/man/man3/MPI_Op_c2f.3.gz
 %%MPIDIR%%/man/man3/MPI_Op_create.3.gz
 %%MPIDIR%%/man/man3/MPI_Op_f2c.3.gz
@@ -680,16 +707,21 @@
 %%MPIDIR%%/man/man3/MPI_Publish_name.3.gz
 %%MPIDIR%%/man/man3/MPI_Put.3.gz
 %%MPIDIR%%/man/man3/MPI_Query_thread.3.gz
+%%MPIDIR%%/man/man3/MPI_Raccumulate.3.gz
 %%MPIDIR%%/man/man3/MPI_Recv.3.gz
 %%MPIDIR%%/man/man3/MPI_Recv_init.3.gz
 %%MPIDIR%%/man/man3/MPI_Reduce.3.gz
 %%MPIDIR%%/man/man3/MPI_Reduce_local.3.gz
 %%MPIDIR%%/man/man3/MPI_Reduce_scatter.3.gz
+%%MPIDIR%%/man/man3/MPI_Reduce_scatter_block.3.gz
 %%MPIDIR%%/man/man3/MPI_Register_datarep.3.gz
 %%MPIDIR%%/man/man3/MPI_Request_c2f.3.gz
 %%MPIDIR%%/man/man3/MPI_Request_f2c.3.gz
 %%MPIDIR%%/man/man3/MPI_Request_free.3.gz
 %%MPIDIR%%/man/man3/MPI_Request_get_status.3.gz
+%%MPIDIR%%/man/man3/MPI_Rget.3.gz
+%%MPIDIR%%/man/man3/MPI_Rget_accumulate.3.gz
+%%MPIDIR%%/man/man3/MPI_Rput.3.gz
 %%MPIDIR%%/man/man3/MPI_Rsend.3.gz
 %%MPIDIR%%/man/man3/MPI_Rsend_init.3.gz
 %%MPIDIR%%/man/man3/MPI_Scan.3.gz
@@ -723,6 +755,7 @@
 %%MPIDIR%%/man/man3/MPI_Type_create_f90_integer.3.gz
 %%MPIDIR%%/man/man3/MPI_Type_create_f90_real.3.gz
 %%MPIDIR%%/man/man3/MPI_Type_create_hindexed.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_create_hindexed_block.3.gz
 %%MPIDIR%%/man/man3/MPI_Type_create_hvector.3.gz
 %%MPIDIR%%/man/man3/MPI_Type_create_indexed_block.3.gz
 %%MPIDIR%%/man/man3/MPI_Type_create_keyval.3.gz
@@ -771,6 +804,10 @@
 %%MPIDIR%%/man/man3/MPI_Win_delete_attr.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_f2c.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_fence.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_flush.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_flush_all.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_flush_local.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_flush_local_all.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_free.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_free_keyval.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_get_attr.3.gz
@@ -778,13 +815,16 @@
 %%MPIDIR%%/man/man3/MPI_Win_get_group.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_name.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_start.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_sync.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_test.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_unlock.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_unlock_all.3.gz
 %%MPIDIR%%/man/man3/MPI_Win_wait.3.gz
 %%MPIDIR%%/man/man3/MPI_Wtick.3.gz
 %%MPIDIR%%/man/man3/MPI_Wtime.3.gz
@@ -795,85 +835,99 @@
 %%MPIDIR%%/man/man7/orte_hosts.7.gz
 %%MPIDIR%%/man/man7/orte_snapc.7.gz
 %%MPIDIR%%/man/man7/orte_sstore.7.gz
-%%MPIDIR%%/share/openmpi/amca-param-sets/example.conf
-%%MPIDIR%%/share/openmpi/help-dash-host.txt
-%%MPIDIR%%/share/openmpi/help-db-base.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-op-base.txt
-%%MPIDIR%%/share/openmpi/help-mca-var.txt
-%%MPIDIR%%/share/openmpi/help-mpi-api.txt
-%%MPIDIR%%/share/openmpi/help-mpi-btl-base.txt
-%%MPIDIR%%/share/openmpi/help-mpi-btl-sm.txt
-%%MPIDIR%%/share/openmpi/help-mpi-btl-tcp.txt
-%%MPIDIR%%/share/openmpi/help-mpi-coll-sm.txt
-%%MPIDIR%%/share/openmpi/help-mpi-common-sm.txt
-%%MPIDIR%%/share/openmpi/help-mpi-errors.txt
-%%MPIDIR%%/share/openmpi/help-mpi-pml-bfo.txt
-%%MPIDIR%%/share/openmpi/help-mpi-pml-ob1.txt
-%%MPIDIR%%/share/openmpi/help-mpi-runtime.txt
-%%MPIDIR%%/share/openmpi/help-mpool-base.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-oob-tcp.txt
-%%MPIDIR%%/share/openmpi/help-opal-compress-base.txt
-%%MPIDIR%%/share/openmpi/help-opal-compress-bzip.txt
-%%MPIDIR%%/share/openmpi/help-opal-compress-gzip.txt
-%%MPIDIR%%/share/openmpi/help-opal-crs-base.txt
-%%MPIDIR%%/share/openmpi/help-opal-crs-none.txt
-%%MPIDIR%%/share/openmpi/help-opal-hwloc-base.txt
-%%MPIDIR%%/share/openmpi/help-opal-runtime.txt
-%%MPIDIR%%/share/openmpi/help-opal-shmem-mmap.txt
-%%MPIDIR%%/share/openmpi/help-opal-shmem-posix.txt
-%%MPIDIR%%/share/openmpi/help-opal-shmem-sysv.txt
-%%MPIDIR%%/share/openmpi/help-opal-util.txt
-%%MPIDIR%%/share/openmpi/help-opal-wrapper.txt
-%%MPIDIR%%/share/openmpi/help-opal_info.txt
-%%MPIDIR%%/share/openmpi/help-orte-clean.txt
-%%MPIDIR%%/share/openmpi/help-orte-filem-base.txt
-%%MPIDIR%%/share/openmpi/help-orte-info.txt
-%%MPIDIR%%/share/openmpi/help-orte-odls-base.txt
-%%MPIDIR%%/share/openmpi/help-orte-odls-default.txt
-%%MPIDIR%%/share/openmpi/help-orte-ps.txt
-%%MPIDIR%%/share/openmpi/help-orte-rmaps-base.txt
-%%MPIDIR%%/share/openmpi/help-orte-rmaps-lama.txt
-%%MPIDIR%%/share/openmpi/help-orte-rmaps-md.txt
-%%MPIDIR%%/share/openmpi/help-orte-rmaps-ppr.txt
-%%MPIDIR%%/share/openmpi/help-orte-rmaps-resilient.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-server.txt
-%%MPIDIR%%/share/openmpi/help-orte-snapc-base.txt
-%%MPIDIR%%/share/openmpi/help-orte-sstore-base.txt
-%%MPIDIR%%/share/openmpi/help-orte-top.txt
-%%MPIDIR%%/share/openmpi/help-orted.txt
-%%MPIDIR%%/share/openmpi/help-orterun.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-ras-simulator.txt
-%%MPIDIR%%/share/openmpi/help-regex.txt
-%%MPIDIR%%/share/openmpi/help-rmaps_rank_file.txt
-%%MPIDIR%%/share/openmpi/mca-coll-ml.config
-%%MPIDIR%%/share/openmpi/mpiCC-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/mpic++-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/mpicc-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/mpicxx-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/mpif77-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/mpif90-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/mpifort-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/openmpi-valgrind.supp
-%%MPIDIR%%/share/openmpi/orteCC-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/ortec++-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/ortecc-wrapper-data.txt
-@dirrmtry %%MPIDIR%%/share/openmpi/amca-param-sets
-@dirrmtry %%MPIDIR%%/share/openmpi
+%%MPIDIR%%/%%DATADIR%%/amca-param-sets/example.conf
+%%MPIDIR%%/%%DATADIR%%/help-dash-host.txt
+%%MPIDIR%%/%%DATADIR%%/help-db-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-errmgr-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-ess-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-hostfile.txt
+%%MPIDIR%%/%%DATADIR%%/help-mca-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-mca-bml-r2.txt
+%%MPIDIR%%/%%DATADIR%%/help-mca-coll-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-mca-op-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-mca-var.txt
+%%MPIDIR%%/%%DATADIR%%/help-mpi-api.txt
+%%MPIDIR%%/%%DATADIR%%/help-mpi-btl-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-mpi-btl-sm.txt
+%%MPIDIR%%/%%DATADIR%%/help-mpi-btl-tcp.txt
+%%MPIDIR%%/%%DATADIR%%/help-mpi-btl-vader.txt
+%%MPIDIR%%/%%DATADIR%%/help-mpi-coll-sm.txt
+%%MPIDIR%%/%%DATADIR%%/help-mpi-common-sm.txt
+%%MPIDIR%%/%%DATADIR%%/help-mpi-errors.txt
+%%MPIDIR%%/%%DATADIR%%/help-mpi-pml-bfo.txt
+%%MPIDIR%%/%%DATADIR%%/help-mpi-pml-ob1.txt
+%%MPIDIR%%/%%DATADIR%%/help-mpi-runtime.txt
+%%MPIDIR%%/%%DATADIR%%/help-mpool-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-ompi-crcp-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-ompi-dpm-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-ompi-dpm-orte.txt
+%%MPIDIR%%/%%DATADIR%%/help-ompi-pubsub-orte.txt
+%%MPIDIR%%/%%DATADIR%%/help-oob-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-oob-tcp.txt
+%%MPIDIR%%/%%DATADIR%%/help-opal-compress-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-opal-compress-bzip.txt
+%%MPIDIR%%/%%DATADIR%%/help-opal-compress-gzip.txt
+%%MPIDIR%%/%%DATADIR%%/help-opal-crs-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-opal-crs-none.txt
+%%MPIDIR%%/%%DATADIR%%/help-opal-hwloc-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-opal-runtime.txt
+%%MPIDIR%%/%%DATADIR%%/help-opal-shmem-mmap.txt
+%%MPIDIR%%/%%DATADIR%%/help-opal-shmem-posix.txt
+%%MPIDIR%%/%%DATADIR%%/help-opal-shmem-sysv.txt
+%%MPIDIR%%/%%DATADIR%%/help-opal-util.txt
+%%MPIDIR%%/%%DATADIR%%/help-opal-wrapper.txt
+%%MPIDIR%%/%%DATADIR%%/help-opal_info.txt
+%%MPIDIR%%/%%DATADIR%%/help-orte-clean.txt
+%%MPIDIR%%/%%DATADIR%%/help-orte-filem-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-orte-filem-raw.txt
+%%MPIDIR%%/%%DATADIR%%/help-orte-info.txt
+%%MPIDIR%%/%%DATADIR%%/help-orte-odls-base.txt
+%%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
+%%MPIDIR%%/%%DATADIR%%/help-orte-rmaps-rr.txt
+%%MPIDIR%%/%%DATADIR%%/help-orte-rmaps-seq.txt
+%%MPIDIR%%/%%DATADIR%%/help-orte-runtime.txt
+%%MPIDIR%%/%%DATADIR%%/help-orte-server.txt
+%%MPIDIR%%/%%DATADIR%%/help-orte-snapc-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-orte-sstore-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-orte-top.txt
+%%MPIDIR%%/%%DATADIR%%/help-orted.txt
+%%MPIDIR%%/%%DATADIR%%/help-orterun.txt
+%%MPIDIR%%/%%DATADIR%%/help-plm-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-plm-rsh.txt
+%%MPIDIR%%/%%DATADIR%%/help-ras-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-ras-simulator.txt
+%%MPIDIR%%/%%DATADIR%%/help-regex.txt
+%%MPIDIR%%/%%DATADIR%%/help-rmaps_rank_file.txt
+%%MPIDIR%%/%%DATADIR%%/help-sec-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-shmem-api.txt
+%%MPIDIR%%/%%DATADIR%%/help-shmem-runtime.txt
+%%MPIDIR%%/%%DATADIR%%/help-state-staged-hnp.txt
+%%MPIDIR%%/%%DATADIR%%/mca-coll-ml.config
+%%MPIDIR%%/%%DATADIR%%/mpiCC-wrapper-data.txt
+%%MPIDIR%%/%%DATADIR%%/mpic++-wrapper-data.txt
+%%MPIDIR%%/%%DATADIR%%/mpicc-wrapper-data.txt
+%%MPIDIR%%/%%DATADIR%%/mpicxx-wrapper-data.txt
+%%MPIDIR%%/%%DATADIR%%/mpif77-wrapper-data.txt
+%%MPIDIR%%/%%DATADIR%%/mpif90-wrapper-data.txt
+%%MPIDIR%%/%%DATADIR%%/mpifort-wrapper-data.txt
+%%MPIDIR%%/%%DATADIR%%/openmpi-valgrind.supp
+%%MPIDIR%%/%%DATADIR%%/ortecc-wrapper-data.txt
+%%MPIDIR%%/%%DATADIR%%/shmemcc-wrapper-data.txt
+%%MPIDIR%%/%%DATADIR%%/shmemfort-wrapper-data.txt
+%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace/doc/vtsetup
+%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace/doc/otf
+%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace/doc
+%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace
+%%VT%%@dirrmtry %%MPIDIR%%/include/vampirtrace/open-trace-format
+%%VT%%@dirrmtry %%MPIDIR%%/include/vampirtrace
+@dirrmtry %%MPIDIR%%/%%DATADIR%%/amca-param-sets
+@dirrmtry %%MPIDIR%%/%%DATADIR%%
 @dirrmtry %%MPIDIR%%/share
 @dirrmtry %%MPIDIR%%/man/man7
 @dirrmtry %%MPIDIR%%/man/man3
@@ -886,7 +940,7 @@
 @dirrmtry %%MPIDIR%%/include/openmpi/ompi/mpi
 @dirrmtry %%MPIDIR%%/include/openmpi/ompi
 @dirrmtry %%MPIDIR%%/include/openmpi
-@dirrmtry %%MPIDIR%%/include/event2
+@dirrmtry %%MPIDIR%%/include/mpp
 @dirrmtry %%MPIDIR%%/include
 @dirrmtry %%MPIDIR%%/etc
 @dirrmtry %%MPIDIR%%/bin