- Change maintainer's email to @FreeBSD.org

- Add stage support
- Add SLURM options to support sysutils/slurm-hpc (submitted via email by Jason Bacon <jwbacon@tds.net>)
- Use options helpers
- Add VT (VampirTrace) as option

3 files changed, 571 insertions, 585 deletions

diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index 541e1ac56a97..2b1c47a676fd 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -1,16 +1,15 @@
 # $FreeBSD$
 
-NO_STAGE=	yes
 # TODO:
 #  - etc/*.sample support
 
 PORTNAME=	openmpi
 DISTVERSION=	1.6.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.6/downloads/
 
-MAINTAINER=	danilogondolfo@gmail.com
+MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	High Performance Message Passing Library
 
 LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
@@ -20,6 +19,7 @@ LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 USES=		gmake pkgconfig
+USE_FORTRAN=	yes
 
 MPIBASE?=	mpi
 MPIDIR?=	${MPIBASE}/${UNIQUENAME}
@@ -37,68 +37,48 @@ USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib \
 		${PREFIX}/${MPIDIR}/lib/openmpi
 
 MANPREFIX=	${PREFIX}/${MPIDIR}
-.include "${.CURDIR}/Makefile.man"
 
-OPTIONS_DEFINE=	IPV6 TORQUE
+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_SUB=	yes
 
 IPV6_CONFIGURE_ENABLE=	ipv6
+
 TORQUE_CONFIGURE_ON=	--with-tm=${LOCALBASE}
 TORQUE_CONFIGURE_OFF=	--without-tm
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTORQUE}
-LIB_DEPENDS+=	libtorque.so:${PORTSDIR}/sysutils/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}/lib/openmpi/mca_ess_tm.so \
-		${MPIDIR}/lib/openmpi/mca_ess_tm.la \
-		${MPIDIR}/share/openmpi/help-plm-tm.txt \
-		${MPIDIR}/share/openmpi/help-ras-tm.txt
-.endif
+TORQUE_LIB_DEPENDS=	libtorque.so:${PORTSDIR}/sysutils/torque
+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}/lib/openmpi/mca_ess_tm.so \
+			${MPIDIR}/lib/openmpi/mca_ess_tm.la \
+			${MPIDIR}/share/openmpi/help-plm-tm.txt \
+			${MPIDIR}/share/openmpi/help-ras-tm.txt
+
+SLURM_CONFIGURE_WITH=	slurm
+SLURM_LIB_DEPENDS=	libslurm.so:${PORTSDIR}/sysutils/slurm-hpc
+SLURM_PLIST_FILES=	${MPIDIR}/lib/openmpi/mca_ess_slurm.la \
+			${MPIDIR}/lib/openmpi/mca_ess_slurm.so \
+			${MPIDIR}/lib/openmpi/mca_ess_slurmd.la \
+			${MPIDIR}/lib/openmpi/mca_ess_slurmd.so \
+			${MPIDIR}/lib/openmpi/mca_plm_slurm.la \
+			${MPIDIR}/lib/openmpi/mca_plm_slurm.so \
+			${MPIDIR}/lib/openmpi/mca_ras_slurm.la \
+			${MPIDIR}/lib/openmpi/mca_ras_slurm.so \
+			${MPIDIR}/share/openmpi/help-plm-slurm.txt \
+			${MPIDIR}/share/openmpi/help-ras-slurm.txt
+
+VT_CONFIGURE_OFF=	--enable-contrib-no-build=vt --disable-vt
+VT_USE=			JAVA=yes
+
+.include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif
 
-USE_FORTRAN=	yes
-
-#######################################################################
-# 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:
-	${RM} -f ${PLIST}
-	${FIND} ${PREFIX}/${MPIDIR} -name man -prune -o -type f -print | \
-	    ${SED} -e 's|${PREFIX}/${MPIDIR}|%%MPIDIR%%|' \
-	        -e 's|${CONFIGURE_TARGET}|%%CONFIGURE_TARGET%%|' | \
-	    ${SORT} >> ${PLIST}
-	${FIND} ${PREFIX}/${MPIDIR} -name man -prune -o -type l -print | \
-	    ${SED} -e 's|${PREFIX}/${MPIDIR}|%%MPIDIR%%|' \
-	        -e 's|${CONFIGURE_TARGET}|%%CONFIGURE_TARGET%%|' | \
-	    ${SORT} >> ${PLIST}
-	${FIND} ${PREFIX}/${MPIDIR} -type d | \
-	    ${EGREP} -v "${PREFIX}/${MPIDIR}$$" | \
-	    ${SED} -e 's|${PREFIX}/${MPIDIR}|@dirrm %%MPIDIR%%|' | \
-	    ${SORT} -r >> ${PLIST}
-	${ECHO} "@dirrmtry %%MPIDIR%%" \
-	    >> ${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
-	@echo "MLINKS+=ortec++.1 orteCC.1" >> ${.CURDIR}/Makefile.man
-	${FIND} ${PREFIX}/${MPIDIR}/man -type f | \
-	    ${SED} -e 's|.*man\([0-9LN]\)/\(.*\)|MAN\1+=\2|' -e 's/\.gz$$//' | \
-	    ${SORT} >> ${.CURDIR}/Makefile.man
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/openmpi/Makefile.man b/net/openmpi/Makefile.man
deleted file mode 100644
index d38b24f194c5..000000000000
--- a/net/openmpi/Makefile.man
+++ /dev/null
@@ -1,339 +0,0 @@
-# Do not edit!  Auto-generated file.
-# See build-plist target in Makefile.
-#
-MLINKS+=mpic++.1 mpiCC.1
-MLINKS+=ortec++.1 orteCC.1
-MAN1+=mpic++.1
-MAN1+=mpicc.1
-MAN1+=mpicxx.1
-MAN1+=mpiexec.1
-MAN1+=mpif77.1
-MAN1+=mpif90.1
-MAN1+=mpirun.1
-MAN1+=ompi-clean.1
-MAN1+=ompi-iof.1
-MAN1+=ompi-probe.1
-MAN1+=ompi-profiler.1
-MAN1+=ompi-ps.1
-MAN1+=ompi-server.1
-MAN1+=ompi-top.1
-MAN1+=ompi_info.1
-MAN1+=opal_wrapper.1
-MAN1+=orte-clean.1
-MAN1+=orte-iof.1
-MAN1+=orte-ps.1
-MAN1+=orte-top.1
-MAN1+=orted.1
-MAN1+=orterun.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
-MAN3+=MPI_Address.3
-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
-MAN3+=MPI_Attr_get.3
-MAN3+=MPI_Attr_put.3
-MAN3+=MPI_Barrier.3
-MAN3+=MPI_Bcast.3
-MAN3+=MPI_Bsend.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_Cart_get.3
-MAN3+=MPI_Cart_map.3
-MAN3+=MPI_Cart_rank.3
-MAN3+=MPI_Cart_shift.3
-MAN3+=MPI_Cart_sub.3
-MAN3+=MPI_Cartdim_get.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_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
-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_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
-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_call_errhandler.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_position_shared.3
-MAN3+=MPI_File_get_size.3
-MAN3+=MPI_File_get_type_extent.3
-MAN3+=MPI_File_get_view.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
-MAN3+=MPI_File_read_all.3
-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_read_ordered_begin.3
-MAN3+=MPI_File_read_ordered_end.3
-MAN3+=MPI_File_read_shared.3
-MAN3+=MPI_File_seek.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_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
-MAN3+=MPI_File_write_ordered_end.3
-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_Get_elements.3
-MAN3+=MPI_Get_processor_name.3
-MAN3+=MPI_Get_version.3
-MAN3+=MPI_Graph_create.3
-MAN3+=MPI_Graph_get.3
-MAN3+=MPI_Graph_map.3
-MAN3+=MPI_Graph_neighbors.3
-MAN3+=MPI_Graph_neighbors_count.3
-MAN3+=MPI_Graphdims_get.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_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
-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.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_Init.3
-MAN3+=MPI_Init_thread.3
-MAN3+=MPI_Initialized.3
-MAN3+=MPI_Intercomm_create.3
-MAN3+=MPI_Intercomm_merge.3
-MAN3+=MPI_Iprobe.3
-MAN3+=MPI_Irecv.3
-MAN3+=MPI_Irsend.3
-MAN3+=MPI_Is_thread_main.3
-MAN3+=MPI_Isend.3
-MAN3+=MPI_Issend.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_Op_f2c.3
-MAN3+=MPI_Op_free.3
-MAN3+=MPI_Open_port.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_local.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_Rsend.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
-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_Test_cancelled.3
-MAN3+=MPI_Testall.3
-MAN3+=MPI_Testany.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
-MAN3+=MPI_Type_create_indexed_block.3
-MAN3+=MPI_Type_create_keyval.3
-MAN3+=MPI_Type_create_resized.3
-MAN3+=MPI_Type_create_struct.3
-MAN3+=MPI_Type_create_subarray.3
-MAN3+=MPI_Type_delete_attr.3
-MAN3+=MPI_Type_dup.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_Type_indexed.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
-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_Wait.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_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
-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_post.3
-MAN3+=MPI_Win_set_attr.3
-MAN3+=MPI_Win_set_errhandler.3
-MAN3+=MPI_Win_set_name.3
-MAN3+=MPI_Win_start.3
-MAN3+=MPI_Win_test.3
-MAN3+=MPI_Win_unlock.3
-MAN3+=MPI_Win_wait.3
-MAN3+=MPI_Wtick.3
-MAN3+=MPI_Wtime.3
-MAN3+=OpenMPI.3
-MAN7+=ompi_crcp.7
-MAN7+=opal_crs.7
-MAN7+=orte_filem.7
-MAN7+=orte_hosts.7
-MAN7+=orte_snapc.7
diff --git a/net/openmpi/pkg-plist b/net/openmpi/pkg-plist
index d4983c1bbf29..84eb9095ccdc 100644
--- a/net/openmpi/pkg-plist
+++ b/net/openmpi/pkg-plist
@@ -1,33 +1,31 @@
+%%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-iof
 %%MPIDIR%%/bin/ompi-probe
 %%MPIDIR%%/bin/ompi-profiler
+%%MPIDIR%%/bin/ompi-ps
 %%MPIDIR%%/bin/ompi-server
+%%MPIDIR%%/bin/ompi-top
 %%MPIDIR%%/bin/ompi_info
 %%MPIDIR%%/bin/opal_wrapper
-%%MPIDIR%%/bin/opari
 %%MPIDIR%%/bin/orte-bootproxy.sh
 %%MPIDIR%%/bin/orte-clean
 %%MPIDIR%%/bin/orte-iof
 %%MPIDIR%%/bin/orte-ps
 %%MPIDIR%%/bin/orte-top
+%%MPIDIR%%/bin/orteCC
 %%MPIDIR%%/bin/orte_wrapper_script
+%%MPIDIR%%/bin/ortec++
+%%MPIDIR%%/bin/ortecc
 %%MPIDIR%%/bin/orted
 %%MPIDIR%%/bin/orterun
-%%MPIDIR%%/bin/otfaux
-%%MPIDIR%%/bin/otfconfig
-%%MPIDIR%%/bin/otfprint
-%%MPIDIR%%/bin/otfinfo
-%%MPIDIR%%/bin/otfmerge
-%%MPIDIR%%/bin/otfmerge-mpi
-%%MPIDIR%%/bin/otfprofile
-%%MPIDIR%%/bin/otfprofile-mpi
-%%MPIDIR%%/bin/otfshrink
-%%MPIDIR%%/bin/otfcompress
-%%MPIDIR%%/bin/vtfilter
-%%MPIDIR%%/bin/vtfilter-mpi
-%%MPIDIR%%/bin/vtrun
-%%MPIDIR%%/bin/vtunify
-%%MPIDIR%%/bin/vtunify-mpi
-%%MPIDIR%%/bin/vtwrapper
 %%MPIDIR%%/etc/openmpi-default-hostfile
 %%MPIDIR%%/etc/openmpi-mca-params.conf
 %%MPIDIR%%/etc/openmpi-totalview.tcl
@@ -69,89 +67,30 @@
 %%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/vampirtrace/open-trace-format/otf.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_CopyHandler.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_CopyHandler_stream.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Definitions.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Errno.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_File.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_File_iofsl.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_FileManager.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Filenames.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_HandlerArray.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_inttypes.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_KeyValue.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_MasterControl.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_RBuffer.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_RStream.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Reader.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Version.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_WBuffer.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_WStream.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Writer.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_inttypes_unix.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/otfaux.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTFAUX_State.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTFAUX_MsgMatching.h
-%%MPIDIR%%/include/vampirtrace/open-trace-format/OTFAUX_Thumbnail.h
-%%MPIDIR%%/include/vampirtrace/opari_omp.h
-%%MPIDIR%%/include/vampirtrace/pomp_lib.h
-%%MPIDIR%%/include/vampirtrace/vt_inttypes.h
-%%MPIDIR%%/include/vampirtrace/vt_user.h
-%%MPIDIR%%/include/vampirtrace/vt_user.inc
-%%MPIDIR%%/include/vampirtrace/vt_user_comment.h
-%%MPIDIR%%/include/vampirtrace/vt_user_comment.inc
-%%MPIDIR%%/include/vampirtrace/vt_user_control.h
-%%MPIDIR%%/include/vampirtrace/vt_user_control.inc
-%%MPIDIR%%/include/vampirtrace/vt_user_count.h
-%%MPIDIR%%/include/vampirtrace/vt_user_count.inc
-%%MPIDIR%%/include/vampirtrace/vt_user_marker.h
-%%MPIDIR%%/include/vampirtrace/vt_user_marker.inc
-%%MPIDIR%%/include/vampirtrace/vt_user_message.h
-%%MPIDIR%%/include/vampirtrace/vt_user_message.inc
-%%MPIDIR%%/include/vampirtrace/vt_user_region.h
-%%MPIDIR%%/include/vampirtrace/vt_user_region.inc
-%%MPIDIR%%/include/vampirtrace/vt_wrap_pthread.h
 %%MPIDIR%%/lib/libmca_common_sm.la
+%%MPIDIR%%/lib/libmca_common_sm.so
 %%MPIDIR%%/lib/libmca_common_sm.so.3
 %%MPIDIR%%/lib/libmpi.la
+%%MPIDIR%%/lib/libmpi.so
 %%MPIDIR%%/lib/libmpi.so.1
 %%MPIDIR%%/lib/libmpi_cxx.la
+%%MPIDIR%%/lib/libmpi_cxx.so
 %%MPIDIR%%/lib/libmpi_cxx.so.1
 %%MPIDIR%%/lib/libmpi_f77.la
+%%MPIDIR%%/lib/libmpi_f77.so
 %%MPIDIR%%/lib/libmpi_f77.so.1
 %%MPIDIR%%/lib/libmpi_f90.la
+%%MPIDIR%%/lib/libmpi_f90.so
 %%MPIDIR%%/lib/libmpi_f90.so.4
 %%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.4
 %%MPIDIR%%/lib/libopen-rte.la
+%%MPIDIR%%/lib/libopen-rte.so
 %%MPIDIR%%/lib/libopen-rte.so.4
-%%MPIDIR%%/lib/libopen-trace-format.so
-%%MPIDIR%%/lib/libotfaux.a
-%%MPIDIR%%/lib/libotfaux.la
-%%MPIDIR%%/lib/libotfaux.so.0
-%%MPIDIR%%/lib/libopen-trace-format.so.1
-%%MPIDIR%%/lib/libopen-trace-format.la
-%%MPIDIR%%/lib/libopen-trace-format.a
-%%MPIDIR%%/lib/libvt-hyb.a
-%%MPIDIR%%/lib/libvt-hyb.la
-%%MPIDIR%%/lib/libvt-hyb.so.0
-%%MPIDIR%%/lib/libvt-mpi-unify.a
-%%MPIDIR%%/lib/libvt-mpi-unify.la
-%%MPIDIR%%/lib/libvt-mpi-unify.so.0
-%%MPIDIR%%/lib/libvt-mpi.a
-%%MPIDIR%%/lib/libvt-mpi.la
-%%MPIDIR%%/lib/libvt-mpi.so.0
-%%MPIDIR%%/lib/libvt-mt.a
-%%MPIDIR%%/lib/libvt-mt.la
-%%MPIDIR%%/lib/libvt-mt.so.0
-%%MPIDIR%%/lib/libvt-pomp.a
-%%MPIDIR%%/lib/libvt-pomp.la
-%%MPIDIR%%/lib/libvt.a
-%%MPIDIR%%/lib/libvt.la
-%%MPIDIR%%/lib/libvt.so.0
 %%MPIDIR%%/lib/mpi.mod
 %%MPIDIR%%/lib/openmpi/libompi_dbg_msgq.la
 %%MPIDIR%%/lib/openmpi/libompi_dbg_msgq.so
@@ -301,6 +240,342 @@
 %%MPIDIR%%/lib/pkgconfig/ompi-f90.pc
 %%MPIDIR%%/lib/pkgconfig/ompi.pc
 %%MPIDIR%%/lib/pkgconfig/orte.pc
+%%MPIDIR%%/man/man1/mpiCC.1.gz
+%%MPIDIR%%/man/man1/mpic++.1.gz
+%%MPIDIR%%/man/man1/mpicc.1.gz
+%%MPIDIR%%/man/man1/mpicxx.1.gz
+%%MPIDIR%%/man/man1/mpiexec.1.gz
+%%MPIDIR%%/man/man1/mpif77.1.gz
+%%MPIDIR%%/man/man1/mpif90.1.gz
+%%MPIDIR%%/man/man1/mpirun.1.gz
+%%MPIDIR%%/man/man1/ompi-clean.1.gz
+%%MPIDIR%%/man/man1/ompi-iof.1.gz
+%%MPIDIR%%/man/man1/ompi-probe.1.gz
+%%MPIDIR%%/man/man1/ompi-profiler.1.gz
+%%MPIDIR%%/man/man1/ompi-ps.1.gz
+%%MPIDIR%%/man/man1/ompi-server.1.gz
+%%MPIDIR%%/man/man1/ompi-top.1.gz
+%%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-iof.1.gz
+%%MPIDIR%%/man/man1/orte-ps.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
+%%MPIDIR%%/man/man3/MPI_Abort.3.gz
+%%MPIDIR%%/man/man3/MPI_Accumulate.3.gz
+%%MPIDIR%%/man/man3/MPI_Add_error_class.3.gz
+%%MPIDIR%%/man/man3/MPI_Add_error_code.3.gz
+%%MPIDIR%%/man/man3/MPI_Add_error_string.3.gz
+%%MPIDIR%%/man/man3/MPI_Address.3.gz
+%%MPIDIR%%/man/man3/MPI_Allgather.3.gz
+%%MPIDIR%%/man/man3/MPI_Allgatherv.3.gz
+%%MPIDIR%%/man/man3/MPI_Alloc_mem.3.gz
+%%MPIDIR%%/man/man3/MPI_Allreduce.3.gz
+%%MPIDIR%%/man/man3/MPI_Alltoall.3.gz
+%%MPIDIR%%/man/man3/MPI_Alltoallv.3.gz
+%%MPIDIR%%/man/man3/MPI_Alltoallw.3.gz
+%%MPIDIR%%/man/man3/MPI_Attr_delete.3.gz
+%%MPIDIR%%/man/man3/MPI_Attr_get.3.gz
+%%MPIDIR%%/man/man3/MPI_Attr_put.3.gz
+%%MPIDIR%%/man/man3/MPI_Barrier.3.gz
+%%MPIDIR%%/man/man3/MPI_Bcast.3.gz
+%%MPIDIR%%/man/man3/MPI_Bsend.3.gz
+%%MPIDIR%%/man/man3/MPI_Bsend_init.3.gz
+%%MPIDIR%%/man/man3/MPI_Buffer_attach.3.gz
+%%MPIDIR%%/man/man3/MPI_Buffer_detach.3.gz
+%%MPIDIR%%/man/man3/MPI_Cancel.3.gz
+%%MPIDIR%%/man/man3/MPI_Cart_coords.3.gz
+%%MPIDIR%%/man/man3/MPI_Cart_create.3.gz
+%%MPIDIR%%/man/man3/MPI_Cart_get.3.gz
+%%MPIDIR%%/man/man3/MPI_Cart_map.3.gz
+%%MPIDIR%%/man/man3/MPI_Cart_rank.3.gz
+%%MPIDIR%%/man/man3/MPI_Cart_shift.3.gz
+%%MPIDIR%%/man/man3/MPI_Cart_sub.3.gz
+%%MPIDIR%%/man/man3/MPI_Cartdim_get.3.gz
+%%MPIDIR%%/man/man3/MPI_Close_port.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_accept.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_c2f.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_call_errhandler.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_compare.3.gz
+%%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_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_f2c.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_free.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_free_keyval.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_get_attr.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_get_errhandler.3.gz
+%%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_join.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_rank.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_remote_group.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_remote_size.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_set_attr.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_set_errhandler.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_set_name.3.gz
+%%MPIDIR%%/man/man3/MPI_Comm_size.3.gz
+%%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_test_inter.3.gz
+%%MPIDIR%%/man/man3/MPI_Dims_create.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
+%%MPIDIR%%/man/man3/MPI_Errhandler_set.3.gz
+%%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_File_c2f.3.gz
+%%MPIDIR%%/man/man3/MPI_File_call_errhandler.3.gz
+%%MPIDIR%%/man/man3/MPI_File_close.3.gz
+%%MPIDIR%%/man/man3/MPI_File_create_errhandler.3.gz
+%%MPIDIR%%/man/man3/MPI_File_delete.3.gz
+%%MPIDIR%%/man/man3/MPI_File_f2c.3.gz
+%%MPIDIR%%/man/man3/MPI_File_get_amode.3.gz
+%%MPIDIR%%/man/man3/MPI_File_get_atomicity.3.gz
+%%MPIDIR%%/man/man3/MPI_File_get_byte_offset.3.gz
+%%MPIDIR%%/man/man3/MPI_File_get_errhandler.3.gz
+%%MPIDIR%%/man/man3/MPI_File_get_group.3.gz
+%%MPIDIR%%/man/man3/MPI_File_get_info.3.gz
+%%MPIDIR%%/man/man3/MPI_File_get_position.3.gz
+%%MPIDIR%%/man/man3/MPI_File_get_position_shared.3.gz
+%%MPIDIR%%/man/man3/MPI_File_get_size.3.gz
+%%MPIDIR%%/man/man3/MPI_File_get_type_extent.3.gz
+%%MPIDIR%%/man/man3/MPI_File_get_view.3.gz
+%%MPIDIR%%/man/man3/MPI_File_iread.3.gz
+%%MPIDIR%%/man/man3/MPI_File_iread_at.3.gz
+%%MPIDIR%%/man/man3/MPI_File_iread_shared.3.gz
+%%MPIDIR%%/man/man3/MPI_File_iwrite.3.gz
+%%MPIDIR%%/man/man3/MPI_File_iwrite_at.3.gz
+%%MPIDIR%%/man/man3/MPI_File_iwrite_shared.3.gz
+%%MPIDIR%%/man/man3/MPI_File_open.3.gz
+%%MPIDIR%%/man/man3/MPI_File_preallocate.3.gz
+%%MPIDIR%%/man/man3/MPI_File_read.3.gz
+%%MPIDIR%%/man/man3/MPI_File_read_all.3.gz
+%%MPIDIR%%/man/man3/MPI_File_read_all_begin.3.gz
+%%MPIDIR%%/man/man3/MPI_File_read_all_end.3.gz
+%%MPIDIR%%/man/man3/MPI_File_read_at.3.gz
+%%MPIDIR%%/man/man3/MPI_File_read_at_all.3.gz
+%%MPIDIR%%/man/man3/MPI_File_read_at_all_begin.3.gz
+%%MPIDIR%%/man/man3/MPI_File_read_at_all_end.3.gz
+%%MPIDIR%%/man/man3/MPI_File_read_ordered.3.gz
+%%MPIDIR%%/man/man3/MPI_File_read_ordered_begin.3.gz
+%%MPIDIR%%/man/man3/MPI_File_read_ordered_end.3.gz
+%%MPIDIR%%/man/man3/MPI_File_read_shared.3.gz
+%%MPIDIR%%/man/man3/MPI_File_seek.3.gz
+%%MPIDIR%%/man/man3/MPI_File_seek_shared.3.gz
+%%MPIDIR%%/man/man3/MPI_File_set_atomicity.3.gz
+%%MPIDIR%%/man/man3/MPI_File_set_errhandler.3.gz
+%%MPIDIR%%/man/man3/MPI_File_set_info.3.gz
+%%MPIDIR%%/man/man3/MPI_File_set_size.3.gz
+%%MPIDIR%%/man/man3/MPI_File_set_view.3.gz
+%%MPIDIR%%/man/man3/MPI_File_sync.3.gz
+%%MPIDIR%%/man/man3/MPI_File_write.3.gz
+%%MPIDIR%%/man/man3/MPI_File_write_all.3.gz
+%%MPIDIR%%/man/man3/MPI_File_write_all_begin.3.gz
+%%MPIDIR%%/man/man3/MPI_File_write_all_end.3.gz
+%%MPIDIR%%/man/man3/MPI_File_write_at.3.gz
+%%MPIDIR%%/man/man3/MPI_File_write_at_all.3.gz
+%%MPIDIR%%/man/man3/MPI_File_write_at_all_begin.3.gz
+%%MPIDIR%%/man/man3/MPI_File_write_at_all_end.3.gz
+%%MPIDIR%%/man/man3/MPI_File_write_ordered.3.gz
+%%MPIDIR%%/man/man3/MPI_File_write_ordered_begin.3.gz
+%%MPIDIR%%/man/man3/MPI_File_write_ordered_end.3.gz
+%%MPIDIR%%/man/man3/MPI_File_write_shared.3.gz
+%%MPIDIR%%/man/man3/MPI_Finalize.3.gz
+%%MPIDIR%%/man/man3/MPI_Finalized.3.gz
+%%MPIDIR%%/man/man3/MPI_Free_mem.3.gz
+%%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_address.3.gz
+%%MPIDIR%%/man/man3/MPI_Get_count.3.gz
+%%MPIDIR%%/man/man3/MPI_Get_elements.3.gz
+%%MPIDIR%%/man/man3/MPI_Get_processor_name.3.gz
+%%MPIDIR%%/man/man3/MPI_Get_version.3.gz
+%%MPIDIR%%/man/man3/MPI_Graph_create.3.gz
+%%MPIDIR%%/man/man3/MPI_Graph_get.3.gz
+%%MPIDIR%%/man/man3/MPI_Graph_map.3.gz
+%%MPIDIR%%/man/man3/MPI_Graph_neighbors.3.gz
+%%MPIDIR%%/man/man3/MPI_Graph_neighbors_count.3.gz
+%%MPIDIR%%/man/man3/MPI_Graphdims_get.3.gz
+%%MPIDIR%%/man/man3/MPI_Grequest_complete.3.gz
+%%MPIDIR%%/man/man3/MPI_Grequest_start.3.gz
+%%MPIDIR%%/man/man3/MPI_Group_c2f.3.gz
+%%MPIDIR%%/man/man3/MPI_Group_compare.3.gz
+%%MPIDIR%%/man/man3/MPI_Group_difference.3.gz
+%%MPIDIR%%/man/man3/MPI_Group_excl.3.gz
+%%MPIDIR%%/man/man3/MPI_Group_f2c.3.gz
+%%MPIDIR%%/man/man3/MPI_Group_free.3.gz
+%%MPIDIR%%/man/man3/MPI_Group_incl.3.gz
+%%MPIDIR%%/man/man3/MPI_Group_intersection.3.gz
+%%MPIDIR%%/man/man3/MPI_Group_range_excl.3.gz
+%%MPIDIR%%/man/man3/MPI_Group_range_incl.3.gz
+%%MPIDIR%%/man/man3/MPI_Group_rank.3.gz
+%%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_Ibsend.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
+%%MPIDIR%%/man/man3/MPI_Info_dup.3.gz
+%%MPIDIR%%/man/man3/MPI_Info_f2c.3.gz
+%%MPIDIR%%/man/man3/MPI_Info_free.3.gz
+%%MPIDIR%%/man/man3/MPI_Info_get.3.gz
+%%MPIDIR%%/man/man3/MPI_Info_get_nkeys.3.gz
+%%MPIDIR%%/man/man3/MPI_Info_get_nthkey.3.gz
+%%MPIDIR%%/man/man3/MPI_Info_get_valuelen.3.gz
+%%MPIDIR%%/man/man3/MPI_Info_set.3.gz
+%%MPIDIR%%/man/man3/MPI_Init.3.gz
+%%MPIDIR%%/man/man3/MPI_Init_thread.3.gz
+%%MPIDIR%%/man/man3/MPI_Initialized.3.gz
+%%MPIDIR%%/man/man3/MPI_Intercomm_create.3.gz
+%%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_Irsend.3.gz
+%%MPIDIR%%/man/man3/MPI_Is_thread_main.3.gz
+%%MPIDIR%%/man/man3/MPI_Isend.3.gz
+%%MPIDIR%%/man/man3/MPI_Issend.3.gz
+%%MPIDIR%%/man/man3/MPI_Keyval_create.3.gz
+%%MPIDIR%%/man/man3/MPI_Keyval_free.3.gz
+%%MPIDIR%%/man/man3/MPI_Lookup_name.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
+%%MPIDIR%%/man/man3/MPI_Op_free.3.gz
+%%MPIDIR%%/man/man3/MPI_Open_port.3.gz
+%%MPIDIR%%/man/man3/MPI_Pack.3.gz
+%%MPIDIR%%/man/man3/MPI_Pack_external.3.gz
+%%MPIDIR%%/man/man3/MPI_Pack_external_size.3.gz
+%%MPIDIR%%/man/man3/MPI_Pack_size.3.gz
+%%MPIDIR%%/man/man3/MPI_Pcontrol.3.gz
+%%MPIDIR%%/man/man3/MPI_Probe.3.gz
+%%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_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_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_Rsend.3.gz
+%%MPIDIR%%/man/man3/MPI_Rsend_init.3.gz
+%%MPIDIR%%/man/man3/MPI_Scan.3.gz
+%%MPIDIR%%/man/man3/MPI_Scatter.3.gz
+%%MPIDIR%%/man/man3/MPI_Scatterv.3.gz
+%%MPIDIR%%/man/man3/MPI_Send.3.gz
+%%MPIDIR%%/man/man3/MPI_Send_init.3.gz
+%%MPIDIR%%/man/man3/MPI_Sendrecv.3.gz
+%%MPIDIR%%/man/man3/MPI_Sendrecv_replace.3.gz
+%%MPIDIR%%/man/man3/MPI_Sizeof.3.gz
+%%MPIDIR%%/man/man3/MPI_Ssend.3.gz
+%%MPIDIR%%/man/man3/MPI_Ssend_init.3.gz
+%%MPIDIR%%/man/man3/MPI_Start.3.gz
+%%MPIDIR%%/man/man3/MPI_Startall.3.gz
+%%MPIDIR%%/man/man3/MPI_Status_c2f.3.gz
+%%MPIDIR%%/man/man3/MPI_Status_f2c.3.gz
+%%MPIDIR%%/man/man3/MPI_Status_set_cancelled.3.gz
+%%MPIDIR%%/man/man3/MPI_Status_set_elements.3.gz
+%%MPIDIR%%/man/man3/MPI_Test.3.gz
+%%MPIDIR%%/man/man3/MPI_Test_cancelled.3.gz
+%%MPIDIR%%/man/man3/MPI_Testall.3.gz
+%%MPIDIR%%/man/man3/MPI_Testany.3.gz
+%%MPIDIR%%/man/man3/MPI_Testsome.3.gz
+%%MPIDIR%%/man/man3/MPI_Topo_test.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_c2f.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_commit.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_contiguous.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_create_darray.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_create_f90_complex.3.gz
+%%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_hvector.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_create_indexed_block.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_create_keyval.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_create_resized.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_create_struct.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_create_subarray.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_delete_attr.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_dup.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_extent.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_f2c.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_free.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_free_keyval.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_get_attr.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_get_contents.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_get_envelope.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_get_extent.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_get_name.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_get_true_extent.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_hindexed.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_hvector.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_indexed.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_lb.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_match_size.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_set_attr.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_set_name.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_size.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_struct.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_ub.3.gz
+%%MPIDIR%%/man/man3/MPI_Type_vector.3.gz
+%%MPIDIR%%/man/man3/MPI_Unpack.3.gz
+%%MPIDIR%%/man/man3/MPI_Unpack_external.3.gz
+%%MPIDIR%%/man/man3/MPI_Unpublish_name.3.gz
+%%MPIDIR%%/man/man3/MPI_Wait.3.gz
+%%MPIDIR%%/man/man3/MPI_Waitall.3.gz
+%%MPIDIR%%/man/man3/MPI_Waitany.3.gz
+%%MPIDIR%%/man/man3/MPI_Waitsome.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_c2f.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_call_errhandler.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_complete.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_create.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_create_errhandler.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_create_keyval.3.gz
+%%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_free.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_free_keyval.3.gz
+%%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_name.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_lock.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_test.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_unlock.3.gz
+%%MPIDIR%%/man/man3/MPI_Win_wait.3.gz
+%%MPIDIR%%/man/man3/MPI_Wtick.3.gz
+%%MPIDIR%%/man/man3/MPI_Wtime.3.gz
+%%MPIDIR%%/man/man3/OpenMPI.3.gz
+%%MPIDIR%%/man/man7/ompi_crcp.7.gz
+%%MPIDIR%%/man/man7/opal_crs.7.gz
+%%MPIDIR%%/man/man7/orte_filem.7.gz
+%%MPIDIR%%/man/man7/orte_hosts.7.gz
+%%MPIDIR%%/man/man7/orte_snapc.7.gz
 %%MPIDIR%%/share/openmpi/amca-param-sets/example.conf
 %%MPIDIR%%/share/openmpi/help-coll-sync.txt
 %%MPIDIR%%/share/openmpi/help-dash-host.txt
@@ -366,117 +641,187 @@
 %%MPIDIR%%/share/openmpi/help-ras-base.txt
 %%MPIDIR%%/share/openmpi/help-regex.txt
 %%MPIDIR%%/share/openmpi/help-rmaps_rank_file.txt
-%%MPIDIR%%/share/openmpi/mpic++-vt-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/mpiCC-wrapper-data.txt
 %%MPIDIR%%/share/openmpi/mpic++-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/mpicc-vt-wrapper-data.txt
 %%MPIDIR%%/share/openmpi/mpicc-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/mpif77-vt-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/mpicxx-wrapper-data.txt
 %%MPIDIR%%/share/openmpi/mpif77-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/mpif90-vt-wrapper-data.txt
 %%MPIDIR%%/share/openmpi/mpif90-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/openmpi-valgrind.supp
+%%MPIDIR%%/share/open%%MPIDIR%%-valgrind.supp
+%%MPIDIR%%/share/openmpi/orteCC-wrapper-data.txt
 %%MPIDIR%%/share/openmpi/ortec++-wrapper-data.txt
 %%MPIDIR%%/share/openmpi/ortecc-wrapper-data.txt
-%%MPIDIR%%/share/vampirtrace/FILTER.SPEC
-%%MPIDIR%%/share/vampirtrace/GROUPS.SPEC
-%%MPIDIR%%/share/vampirtrace/METRICS.SPEC
-%%MPIDIR%%/share/vampirtrace/config.log
-%%MPIDIR%%/share/vampirtrace/doc/ChangeLog
-%%MPIDIR%%/share/vampirtrace/doc/LICENSE
-%%MPIDIR%%/share/vampirtrace/doc/UserManual.html
-%%MPIDIR%%/share/vampirtrace/doc/UserManual.pdf
-%%MPIDIR%%/share/vampirtrace/doc/opari/ChangeLog
-%%MPIDIR%%/share/vampirtrace/doc/opari/LICENSE
-%%MPIDIR%%/share/vampirtrace/doc/opari/Readme.html
-%%MPIDIR%%/share/vampirtrace/doc/opari/lacsi01.pdf
-%%MPIDIR%%/share/vampirtrace/doc/opari/opari-logo-100.gif
-%%MPIDIR%%/share/vampirtrace/doc/otf/ChangeLog
-%%MPIDIR%%/share/vampirtrace/doc/otf/LICENSE
-%%MPIDIR%%/share/vampirtrace/doc/otf/otfprofile.pdf
-%%MPIDIR%%/share/vampirtrace/doc/otf/otfprofile_clustering.pdf
-%%MPIDIR%%/share/vampirtrace/doc/otf/otftools.pdf
-%%MPIDIR%%/share/vampirtrace/doc/otf/specification.pdf
-%%MPIDIR%%/share/vampirtrace/libtool
-%%MPIDIR%%/share/vampirtrace/omp.h
-%%MPIDIR%%/share/vampirtrace/vtc++-wrapper-data.txt
-%%MPIDIR%%/share/vampirtrace/vtcc-wrapper-data.txt
-%%MPIDIR%%/share/vampirtrace/vtfort-wrapper-data.txt
-%%MPIDIR%%/bin/mpiCC
-%%MPIDIR%%/bin/mpiCC-vt
-%%MPIDIR%%/bin/mpic++
-%%MPIDIR%%/bin/mpic++-vt
-%%MPIDIR%%/bin/mpicc
-%%MPIDIR%%/bin/mpicc-vt
-%%MPIDIR%%/bin/mpicxx
-%%MPIDIR%%/bin/mpicxx-vt
-%%MPIDIR%%/bin/mpiexec
-%%MPIDIR%%/bin/mpif77
-%%MPIDIR%%/bin/mpif77-vt
-%%MPIDIR%%/bin/mpif90
-%%MPIDIR%%/bin/mpif90-vt
-%%MPIDIR%%/bin/mpirun
-%%MPIDIR%%/bin/ompi-clean
-%%MPIDIR%%/bin/ompi-iof
-%%MPIDIR%%/bin/ompi-ps
-%%MPIDIR%%/bin/ompi-top
-%%MPIDIR%%/bin/orteCC
-%%MPIDIR%%/bin/ortec++
-%%MPIDIR%%/bin/ortecc
-%%MPIDIR%%/bin/otfdecompress
-%%MPIDIR%%/bin/vtCC
-%%MPIDIR%%/bin/vtc++
-%%MPIDIR%%/bin/vtcc
-%%MPIDIR%%/bin/vtcxx
-%%MPIDIR%%/bin/vtf77
-%%MPIDIR%%/bin/vtf90
-%%MPIDIR%%/bin/vtfiltergen
-%%MPIDIR%%/bin/vtfiltergen-mpi
-%%MPIDIR%%/bin/vtfort
-%%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/libompitrace.so
-%%MPIDIR%%/lib/libopen-pal.so
-%%MPIDIR%%/lib/libopen-rte.so
-%%MPIDIR%%/lib/libotfaux.so
-%%MPIDIR%%/lib/libvt-hyb.so
-%%MPIDIR%%/lib/libvt-mpi-unify.so
-%%MPIDIR%%/lib/libvt-mpi.so
-%%MPIDIR%%/lib/libvt-mt.so
-%%MPIDIR%%/lib/libvt.so
-%%MPIDIR%%/share/openmpi/mpiCC-vt-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/mpiCC-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/mpicxx-vt-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/mpicxx-wrapper-data.txt
-%%MPIDIR%%/share/openmpi/orteCC-wrapper-data.txt
-%%MPIDIR%%/share/vampirtrace/vtCC-wrapper-data.txt
-%%MPIDIR%%/share/vampirtrace/vtcxx-wrapper-data.txt
-%%MPIDIR%%/share/vampirtrace/vtf77-wrapper-data.txt
-%%MPIDIR%%/share/vampirtrace/vtf90-wrapper-data.txt
-@dirrm %%MPIDIR%%/share/vampirtrace/doc/otf
-@dirrm %%MPIDIR%%/share/vampirtrace/doc/opari
-@dirrm %%MPIDIR%%/share/vampirtrace/doc
-@dirrm %%MPIDIR%%/share/vampirtrace
-@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
-@dirrm %%MPIDIR%%/lib/openmpi
-@dirrm %%MPIDIR%%/lib/pkgconfig
-@dirrm %%MPIDIR%%/lib
-@dirrm %%MPIDIR%%/include/vampirtrace/open-trace-format
-@dirrm %%MPIDIR%%/include/vampirtrace
-@dirrm %%MPIDIR%%/include/openmpi/ompi/mpi/cxx
-@dirrm %%MPIDIR%%/include/openmpi/ompi/mpi
-@dirrm %%MPIDIR%%/include/openmpi/ompi
-@dirrm %%MPIDIR%%/include/openmpi
-@dirrm %%MPIDIR%%/include
-@dirrm %%MPIDIR%%/etc
-@dirrm %%MPIDIR%%/bin
+%%VT%%%%MPIDIR%%/bin/mpiCC-vt
+%%VT%%%%MPIDIR%%/bin/mpic++-vt
+%%VT%%%%MPIDIR%%/bin/mpicc-vt
+%%VT%%%%MPIDIR%%/bin/mpicxx-vt
+%%VT%%%%MPIDIR%%/bin/mpif77-vt
+%%VT%%%%MPIDIR%%/bin/mpif90-vt
+%%VT%%%%MPIDIR%%/bin/opari
+%%VT%%%%MPIDIR%%/bin/otfaux
+%%VT%%%%MPIDIR%%/bin/otfcompress
+%%VT%%%%MPIDIR%%/bin/otfconfig
+%%VT%%%%MPIDIR%%/bin/otfdecompress
+%%VT%%%%MPIDIR%%/bin/otfinfo
+%%VT%%%%MPIDIR%%/bin/otfmerge
+%%VT%%%%MPIDIR%%/bin/otfmerge-mpi
+%%VT%%%%MPIDIR%%/bin/otfprint
+%%VT%%%%MPIDIR%%/bin/otfprofile
+%%VT%%%%MPIDIR%%/bin/otfprofile-mpi
+%%VT%%%%MPIDIR%%/bin/otfshrink
+%%VT%%%%MPIDIR%%/bin/vtCC
+%%VT%%%%MPIDIR%%/bin/vtc++
+%%VT%%%%MPIDIR%%/bin/vtcc
+%%VT%%%%MPIDIR%%/bin/vtcxx
+%%VT%%%%MPIDIR%%/bin/vtf77
+%%VT%%%%MPIDIR%%/bin/vtf90
+%%VT%%%%MPIDIR%%/bin/vtfilter
+%%VT%%%%MPIDIR%%/bin/vtfilter-mpi
+%%VT%%%%MPIDIR%%/bin/vtfiltergen
+%%VT%%%%MPIDIR%%/bin/vtfiltergen-mpi
+%%VT%%%%MPIDIR%%/bin/vtfort
+%%VT%%%%MPIDIR%%/bin/vtrun
+%%VT%%%%MPIDIR%%/bin/vtsetup
+%%VT%%%%MPIDIR%%/bin/vtsetup.jar
+%%VT%%%%MPIDIR%%/bin/vtunify
+%%VT%%%%MPIDIR%%/bin/vtunify-mpi
+%%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
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_CopyHandler.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_CopyHandler_stream.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Definitions.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Errno.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_File.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_FileManager.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_File_iofsl.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Filenames.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_HandlerArray.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_KeyValue.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_MasterControl.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_RBuffer.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_RStream.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Reader.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Version.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_WBuffer.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_WStream.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Writer.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_inttypes.h
+%%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
+%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_comment.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_comment.inc
+%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_control.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_control.inc
+%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_count.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_count.inc
+%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_marker.h
+%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_marker.inc
+%%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%%/include/vampirtrace/vt_user_region.inc
+%%VT%%%%MPIDIR%%/include/vampirtrace/vt_wrap_pthread.h
+%%VT%%%%MPIDIR%%/lib/libopen-trace-format.a
+%%VT%%%%MPIDIR%%/lib/libopen-trace-format.la
+%%VT%%%%MPIDIR%%/lib/libopen-trace-format.so
+%%VT%%%%MPIDIR%%/lib/libopen-trace-format.so.1
+%%VT%%%%MPIDIR%%/lib/libotfaux.a
+%%VT%%%%MPIDIR%%/lib/libotfaux.la
+%%VT%%%%MPIDIR%%/lib/libotfaux.so
+%%VT%%%%MPIDIR%%/lib/libotfaux.so.0
+%%VT%%%%MPIDIR%%/lib/libvt-hyb.a
+%%VT%%%%MPIDIR%%/lib/libvt-hyb.la
+%%VT%%%%MPIDIR%%/lib/libvt-hyb.so
+%%VT%%%%MPIDIR%%/lib/libvt-hyb.so.0
+%%VT%%%%MPIDIR%%/lib/libvt-mpi-unify.a
+%%VT%%%%MPIDIR%%/lib/libvt-mpi-unify.la
+%%VT%%%%MPIDIR%%/lib/libvt-mpi-unify.so
+%%VT%%%%MPIDIR%%/lib/libvt-mpi-unify.so.0
+%%VT%%%%MPIDIR%%/lib/libvt-mpi.a
+%%VT%%%%MPIDIR%%/lib/libvt-mpi.la
+%%VT%%%%MPIDIR%%/lib/libvt-mpi.so
+%%VT%%%%MPIDIR%%/lib/libvt-mpi.so.0
+%%VT%%%%MPIDIR%%/lib/libvt-mt.a
+%%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/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
+@dirrmtry %%MPIDIR%%/share/openmpi/amca-param-sets
+@dirrmtry %%MPIDIR%%/share/openmpi
+@dirrmtry %%MPIDIR%%/share
+@dirrmtry %%MPIDIR%%/man/man7
+@dirrmtry %%MPIDIR%%/man/man3
+@dirrmtry %%MPIDIR%%/man/man1
+@dirrmtry %%MPIDIR%%/man
+@dirrmtry %%MPIDIR%%/lib/pkgconfig
+@dirrmtry %%MPIDIR%%/lib/openmpi
+@dirrmtry %%MPIDIR%%/lib
+@dirrmtry %%MPIDIR%%/include/openmpi/ompi/mpi/cxx
+@dirrmtry %%MPIDIR%%/include/openmpi/ompi/mpi
+@dirrmtry %%MPIDIR%%/include/openmpi/ompi
+@dirrmtry %%MPIDIR%%/include/openmpi
+@dirrmtry %%MPIDIR%%/include
+@dirrmtry %%MPIDIR%%/etc
+@dirrmtry %%MPIDIR%%/bin
 @dirrmtry %%MPIDIR%%
 @dirrmtry %%MPIBASE%%