Upgrade to 1.6.1. [0]

Allow IPV6 support to be disabled. [1]
Fix SGE dependency check. [2]

Switch to OptionsNG.

PR:		ports/169549 [0], ports/159705 [1], ports/157746 [2]

4 files changed, 195 insertions, 38 deletions

diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index f0373c5ed0fa..73f009d2b99f 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -9,14 +9,16 @@
 #  - etc/*.sample support
 
 PORTNAME=	openmpi
-DISTVERSION=	1.4.3
+DISTVERSION=	1.6.1
 CATEGORIES=	net parallel
-MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.4/downloads/
+MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.6/downloads/
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	A High Performance Message Passing Library
 
-LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
+		hwloc:${PORTSDIR}/devel/hwloc \
+		ltdl:${PORTSDIR}/devel/libltdl
 
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
@@ -31,6 +33,9 @@ PLIST_SUB+=	MPIDIR=${MPIDIR}
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}/${MPIDIR} \
 			--mandir=${PREFIX}/${MPIDIR}/man \
+			--program-prefix= \
+			--with-hwloc=${LOCALBASE} \
+			--with-libltdl=${LOCALBASE} \
 		 	${CONFIGURE_TARGET}
 
 USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib \
@@ -39,22 +44,26 @@ USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib \
 MANPREFIX=	${PREFIX}/${MPIDIR}
 .include "${.CURDIR}/Makefile.man"
 
-OPTIONS=	TORQUE "Enable Torque support" off \
-		SGE "Enable SGE support" off
+OPTIONS_DEFINE=	IPV6 SGE TORQUE
 
-.include <bsd.port.pre.mk>
+SGE_DESC=	Enable SGE support
+TORQUE_DESC=	Enable Torque support
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
+OPTIONS_DEFAULT=	IPV6
 
-USE_FORTRAN=	yes
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSGE}
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
 
-.if defined(WITH_SGE)
+.if ${PORT_OPTIONS:MSGE}
 SGE_BASE?=	sge
 SGE_ROOT=	${LOCALBASE}/${SGE_BASE}
 SGE_ARCH=	fbsd-${ARCH}
-RUN_DEPENDS+=	${SGE_ROOT}/fbsd-${ARCH}/qrsh:${PORTSDIR}/sysutils/sge62
+RUN_DEPENDS+=	${SGE_ROOT}/bin/fbsd-${ARCH}/qrsh:${PORTSDIR}/sysutils/sge62
 CONFIGURE_ARGS+=	--with-sge
 CONFIGURE_ENV+=	SGE_ROOT=${SGE_ROOT}
 PLIST_FILES+=	${MPIDIR}/lib/openmpi/mca_ras_gridengine.la \
@@ -64,8 +73,8 @@ PLIST_FILES+=	${MPIDIR}/lib/openmpi/mca_ras_gridengine.la \
 CONFIGURE_ARGS+=	--without-sge
 .endif
 
-.if defined(WITH_TORQUE)
-LIB_DEPENDS+=	torque.2:${PORTSDIR}/sysutils/torque
+.if ${PORT_OPTIONS:MTORQUE}
+LIB_DEPENDS+=	torque:${PORTSDIR}/sysutils/torque
 CONFIGURE_ARGS+=	--with-tm=${LOCALBASE}
 PLIST_FILES+=	${MPIDIR}/lib/openmpi/mca_plm_tm.so \
 		${MPIDIR}/lib/openmpi/mca_plm_tm.la \
@@ -77,6 +86,14 @@ PLIST_FILES+=	${MPIDIR}/lib/openmpi/mca_plm_tm.so \
 CONFIGURE_ARGS+=	--without-tm
 .endif
 
+.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.                             #
@@ -105,7 +122,8 @@ build-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+=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
diff --git a/net/openmpi/Makefile.man b/net/openmpi/Makefile.man
index e567162f56c9..d38b24f194c5 100644
--- a/net/openmpi/Makefile.man
+++ b/net/openmpi/Makefile.man
@@ -1,7 +1,8 @@
 # Do not edit!  Auto-generated file.
 # See build-plist target in Makefile.
 #
-MLINKS=mpic++.1 mpiCC.1
+MLINKS+=mpic++.1 mpiCC.1
+MLINKS+=ortec++.1 orteCC.1
 MAN1+=mpic++.1
 MAN1+=mpicc.1
 MAN1+=mpicxx.1
@@ -11,13 +12,17 @@ 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
@@ -225,6 +230,7 @@ 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
diff --git a/net/openmpi/distinfo b/net/openmpi/distinfo
index e4b4c3eae62b..e14aeebae204 100644
--- a/net/openmpi/distinfo
+++ b/net/openmpi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openmpi-1.4.3.tar.bz2) = 220b72b1c7ee35469ff74b4cfdbec457158ac6894635143a33e9178aa3981015
-SIZE (openmpi-1.4.3.tar.bz2) = 6626909
+SHA256 (openmpi-1.6.1.tar.bz2) = 077240dd1ab10f0caf26931e585db73848e9815c7119b993f91d269da5901e3a
+SIZE (openmpi-1.6.1.tar.bz2) = 10194684
diff --git a/net/openmpi/pkg-plist b/net/openmpi/pkg-plist
index 27cea9fec5a0..646555b612f3 100644
--- a/net/openmpi/pkg-plist
+++ b/net/openmpi/pkg-plist
@@ -4,25 +4,36 @@
 %%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfdump
 %%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfinfo
 %%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfmerge
+%%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfmerge-mpi
+%%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfprofile
+%%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfprofile-mpi
+%%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfshrink
+%%MPIDIR%%/bin/ompi-probe
+%%MPIDIR%%/bin/ompi-profiler
 %%MPIDIR%%/bin/ompi-server
 %%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/orte_wrapper_script
 %%MPIDIR%%/bin/orted
 %%MPIDIR%%/bin/orterun
-%%MPIDIR%%/bin/vtcc
-%%MPIDIR%%/bin/vtcxx
-%%MPIDIR%%/bin/vtf77
-%%MPIDIR%%/bin/vtf90
 %%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
+%%MPIDIR%%/include/mpi-ext.h
 %%MPIDIR%%/include/mpi.h
+%%MPIDIR%%/include/mpi_portable_platform.h
 %%MPIDIR%%/include/mpif-common.h
 %%MPIDIR%%/include/mpif-config.h
 %%MPIDIR%%/include/mpif-mpi-io.h
@@ -58,16 +69,24 @@
 %%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/OTFAUX_MsgMatching.h
+%%MPIDIR%%/include/vampirtrace/OTFAUX_State.h
+%%MPIDIR%%/include/vampirtrace/OTFAUX_Thumbnail.h
 %%MPIDIR%%/include/vampirtrace/OTF_CopyHandler.h
+%%MPIDIR%%/include/vampirtrace/OTF_CopyHandler_stream.h
 %%MPIDIR%%/include/vampirtrace/OTF_Definitions.h
+%%MPIDIR%%/include/vampirtrace/OTF_Errno.h
 %%MPIDIR%%/include/vampirtrace/OTF_File.h
 %%MPIDIR%%/include/vampirtrace/OTF_FileManager.h
+%%MPIDIR%%/include/vampirtrace/OTF_File_iofsl.h
 %%MPIDIR%%/include/vampirtrace/OTF_Filenames.h
 %%MPIDIR%%/include/vampirtrace/OTF_HandlerArray.h
+%%MPIDIR%%/include/vampirtrace/OTF_KeyValue.h
 %%MPIDIR%%/include/vampirtrace/OTF_MasterControl.h
 %%MPIDIR%%/include/vampirtrace/OTF_RBuffer.h
 %%MPIDIR%%/include/vampirtrace/OTF_RStream.h
 %%MPIDIR%%/include/vampirtrace/OTF_Reader.h
+%%MPIDIR%%/include/vampirtrace/OTF_Version.h
 %%MPIDIR%%/include/vampirtrace/OTF_WBuffer.h
 %%MPIDIR%%/include/vampirtrace/OTF_WStream.h
 %%MPIDIR%%/include/vampirtrace/OTF_Writer.h
@@ -75,34 +94,63 @@
 %%MPIDIR%%/include/vampirtrace/OTF_inttypes_unix.h
 %%MPIDIR%%/include/vampirtrace/opari_omp.h
 %%MPIDIR%%/include/vampirtrace/otf.h
+%%MPIDIR%%/include/vampirtrace/otfaux.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.1
+%%MPIDIR%%/lib/libmca_common_sm.so.3
 %%MPIDIR%%/lib/libmpi.la
-%%MPIDIR%%/lib/libmpi.so.0
+%%MPIDIR%%/lib/libmpi.so.1
 %%MPIDIR%%/lib/libmpi_cxx.la
-%%MPIDIR%%/lib/libmpi_cxx.so.0
+%%MPIDIR%%/lib/libmpi_cxx.so.1
 %%MPIDIR%%/lib/libmpi_f77.la
-%%MPIDIR%%/lib/libmpi_f77.so.0
+%%MPIDIR%%/lib/libmpi_f77.so.1
 %%MPIDIR%%/lib/libmpi_f90.la
-%%MPIDIR%%/lib/libmpi_f90.so.0
+%%MPIDIR%%/lib/libmpi_f90.so.2
+%%MPIDIR%%/lib/libompitrace.la
+%%MPIDIR%%/lib/libompitrace.so.0
 %%MPIDIR%%/lib/libopen-pal.la
-%%MPIDIR%%/lib/libopen-pal.so.0
+%%MPIDIR%%/lib/libopen-pal.so.4
 %%MPIDIR%%/lib/libopen-rte.la
-%%MPIDIR%%/lib/libopen-rte.so.0
+%%MPIDIR%%/lib/libopen-rte.so.4
 %%MPIDIR%%/lib/libotf.a
 %%MPIDIR%%/lib/libotf.la
+%%MPIDIR%%/lib/libotf.so.6
+%%MPIDIR%%/lib/libotfaux.a
+%%MPIDIR%%/lib/libotfaux.la
+%%MPIDIR%%/lib/libotfaux.so.0
+%%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.fmpi.a
-%%MPIDIR%%/lib/libvt.mpi.a
-%%MPIDIR%%/lib/libvt.omp.a
-%%MPIDIR%%/lib/libvt.ompi.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
@@ -148,6 +196,8 @@
 %%MPIDIR%%/lib/openmpi/mca_ess_hnp.so
 %%MPIDIR%%/lib/openmpi/mca_ess_singleton.la
 %%MPIDIR%%/lib/openmpi/mca_ess_singleton.so
+%%MPIDIR%%/lib/openmpi/mca_ess_slave.la
+%%MPIDIR%%/lib/openmpi/mca_ess_slave.so
 %%MPIDIR%%/lib/openmpi/mca_ess_tool.la
 %%MPIDIR%%/lib/openmpi/mca_ess_tool.so
 %%MPIDIR%%/lib/openmpi/mca_filem_rsh.la
@@ -156,6 +206,8 @@
 %%MPIDIR%%/lib/openmpi/mca_grpcomm_bad.so
 %%MPIDIR%%/lib/openmpi/mca_grpcomm_basic.la
 %%MPIDIR%%/lib/openmpi/mca_grpcomm_basic.so
+%%MPIDIR%%/lib/openmpi/mca_grpcomm_hier.la
+%%MPIDIR%%/lib/openmpi/mca_grpcomm_hier.so
 %%MPIDIR%%/lib/openmpi/mca_io_romio.la
 %%MPIDIR%%/lib/openmpi/mca_io_romio.so
 %%MPIDIR%%/lib/openmpi/mca_iof_hnp.la
@@ -166,12 +218,16 @@
 %%MPIDIR%%/lib/openmpi/mca_iof_tool.so
 %%MPIDIR%%/lib/openmpi/mca_maffinity_first_use.la
 %%MPIDIR%%/lib/openmpi/mca_maffinity_first_use.so
+%%MPIDIR%%/lib/openmpi/mca_maffinity_hwloc.la
+%%MPIDIR%%/lib/openmpi/mca_maffinity_hwloc.so
 %%MPIDIR%%/lib/openmpi/mca_mpool_fake.la
 %%MPIDIR%%/lib/openmpi/mca_mpool_fake.so
 %%MPIDIR%%/lib/openmpi/mca_mpool_rdma.la
 %%MPIDIR%%/lib/openmpi/mca_mpool_rdma.so
 %%MPIDIR%%/lib/openmpi/mca_mpool_sm.la
 %%MPIDIR%%/lib/openmpi/mca_mpool_sm.so
+%%MPIDIR%%/lib/openmpi/mca_notifier_command.la
+%%MPIDIR%%/lib/openmpi/mca_notifier_command.so
 %%MPIDIR%%/lib/openmpi/mca_notifier_syslog.la
 %%MPIDIR%%/lib/openmpi/mca_notifier_syslog.so
 %%MPIDIR%%/lib/openmpi/mca_odls_default.la
@@ -182,10 +238,12 @@
 %%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_paffinity_posix.la
-%%MPIDIR%%/lib/openmpi/mca_paffinity_posix.so
+%%MPIDIR%%/lib/openmpi/mca_paffinity_hwloc.la
+%%MPIDIR%%/lib/openmpi/mca_paffinity_hwloc.so
 %%MPIDIR%%/lib/openmpi/mca_plm_rsh.la
 %%MPIDIR%%/lib/openmpi/mca_plm_rsh.so
+%%MPIDIR%%/lib/openmpi/mca_pml_bfo.la
+%%MPIDIR%%/lib/openmpi/mca_pml_bfo.so
 %%MPIDIR%%/lib/openmpi/mca_pml_cm.la
 %%MPIDIR%%/lib/openmpi/mca_pml_cm.so
 %%MPIDIR%%/lib/openmpi/mca_pml_csum.la
@@ -196,28 +254,52 @@
 %%MPIDIR%%/lib/openmpi/mca_pml_v.so
 %%MPIDIR%%/lib/openmpi/mca_pubsub_orte.la
 %%MPIDIR%%/lib/openmpi/mca_pubsub_orte.so
+%%MPIDIR%%/lib/openmpi/mca_ras_cm.la
+%%MPIDIR%%/lib/openmpi/mca_ras_cm.so
 %%MPIDIR%%/lib/openmpi/mca_rcache_vma.la
 %%MPIDIR%%/lib/openmpi/mca_rcache_vma.so
 %%MPIDIR%%/lib/openmpi/mca_rmaps_load_balance.la
 %%MPIDIR%%/lib/openmpi/mca_rmaps_load_balance.so
 %%MPIDIR%%/lib/openmpi/mca_rmaps_rank_file.la
 %%MPIDIR%%/lib/openmpi/mca_rmaps_rank_file.so
+%%MPIDIR%%/lib/openmpi/mca_rmaps_resilient.la
+%%MPIDIR%%/lib/openmpi/mca_rmaps_resilient.so
 %%MPIDIR%%/lib/openmpi/mca_rmaps_round_robin.la
 %%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_topo.la
+%%MPIDIR%%/lib/openmpi/mca_rmaps_topo.so
 %%MPIDIR%%/lib/openmpi/mca_rml_oob.la
 %%MPIDIR%%/lib/openmpi/mca_rml_oob.so
 %%MPIDIR%%/lib/openmpi/mca_routed_binomial.la
 %%MPIDIR%%/lib/openmpi/mca_routed_binomial.so
+%%MPIDIR%%/lib/openmpi/mca_routed_cm.la
+%%MPIDIR%%/lib/openmpi/mca_routed_cm.so
 %%MPIDIR%%/lib/openmpi/mca_routed_direct.la
 %%MPIDIR%%/lib/openmpi/mca_routed_direct.so
 %%MPIDIR%%/lib/openmpi/mca_routed_linear.la
 %%MPIDIR%%/lib/openmpi/mca_routed_linear.so
+%%MPIDIR%%/lib/openmpi/mca_routed_radix.la
+%%MPIDIR%%/lib/openmpi/mca_routed_radix.so
+%%MPIDIR%%/lib/openmpi/mca_routed_slave.la
+%%MPIDIR%%/lib/openmpi/mca_routed_slave.so
+%%MPIDIR%%/lib/openmpi/mca_shmem_mmap.la
+%%MPIDIR%%/lib/openmpi/mca_shmem_mmap.so
+%%MPIDIR%%/lib/openmpi/mca_shmem_posix.la
+%%MPIDIR%%/lib/openmpi/mca_shmem_posix.so
+%%MPIDIR%%/lib/openmpi/mca_shmem_sysv.la
+%%MPIDIR%%/lib/openmpi/mca_shmem_sysv.so
 %%MPIDIR%%/lib/openmpi/mca_topo_unity.la
 %%MPIDIR%%/lib/openmpi/mca_topo_unity.so
 %%MPIDIR%%/lib/openmpi/mca_vprotocol_pessimist.la
 %%MPIDIR%%/lib/openmpi/mca_vprotocol_pessimist.so
+%%MPIDIR%%/lib/pkgconfig/ompi-c.pc
+%%MPIDIR%%/lib/pkgconfig/ompi-cxx.pc
+%%MPIDIR%%/lib/pkgconfig/ompi-f77.pc
+%%MPIDIR%%/lib/pkgconfig/ompi-f90.pc
+%%MPIDIR%%/lib/pkgconfig/ompi.pc
+%%MPIDIR%%/lib/pkgconfig/orte.pc
 %%MPIDIR%%/share/openmpi/amca-param-sets/example.conf
 %%MPIDIR%%/share/openmpi/help-coll-sync.txt
 %%MPIDIR%%/share/openmpi/help-dash-host.txt
@@ -226,44 +308,62 @@
 %%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-param.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-csum.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-odls-default.txt
 %%MPIDIR%%/share/openmpi/help-ompi-crcp-base.txt
 %%MPIDIR%%/share/openmpi/help-ompi-dpm-base.txt
 %%MPIDIR%%/share/openmpi/help-ompi-dpm-orte.txt
+%%MPIDIR%%/share/openmpi/help-ompi-probe.txt
+%%MPIDIR%%/share/openmpi/help-ompi-profiler.txt
 %%MPIDIR%%/share/openmpi/help-ompi-pubsub-orte.txt
 %%MPIDIR%%/share/openmpi/help-ompi-server.txt
 %%MPIDIR%%/share/openmpi/help-ompi_info.txt
+%%MPIDIR%%/share/openmpi/help-oob-tcp.txt
 %%MPIDIR%%/share/openmpi/help-opal-carto-file.txt
 %%MPIDIR%%/share/openmpi/help-opal-crs-base.txt
 %%MPIDIR%%/share/openmpi/help-opal-crs-none.txt
+%%MPIDIR%%/share/openmpi/help-opal-maffinity-hwloc.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-orte-clean.txt
 %%MPIDIR%%/share/openmpi/help-orte-filem-base.txt
 %%MPIDIR%%/share/openmpi/help-orte-filem-rsh.txt
 %%MPIDIR%%/share/openmpi/help-orte-iof.txt
+%%MPIDIR%%/share/openmpi/help-orte-notifier-command.txt
 %%MPIDIR%%/share/openmpi/help-orte-odls-base.txt
 %%MPIDIR%%/share/openmpi/help-orte-ps.txt
 %%MPIDIR%%/share/openmpi/help-orte-rmaps-base.txt
 %%MPIDIR%%/share/openmpi/help-orte-rmaps-lb.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-rmaps-topo.txt
 %%MPIDIR%%/share/openmpi/help-orte-runtime.txt
 %%MPIDIR%%/share/openmpi/help-orte-snapc-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-regex.txt
 %%MPIDIR%%/share/openmpi/help-rmaps_rank_file.txt
 %%MPIDIR%%/share/openmpi/mpic++-vt-wrapper-data.txt
 %%MPIDIR%%/share/openmpi/mpic++-wrapper-data.txt
@@ -274,9 +374,12 @@
 %%MPIDIR%%/share/openmpi/mpif90-vt-wrapper-data.txt
 %%MPIDIR%%/share/openmpi/mpif90-wrapper-data.txt
 %%MPIDIR%%/share/openmpi/openmpi-valgrind.supp
+%%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
@@ -288,12 +391,15 @@
 %%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/vtcxx-wrapper-data.txt
-%%MPIDIR%%/share/vampirtrace/vtf77-wrapper-data.txt
-%%MPIDIR%%/share/vampirtrace/vtf90-wrapper-data.txt
+%%MPIDIR%%/share/vampirtrace/vtfort-wrapper-data.txt
 %%MPIDIR%%/bin/mpiCC
 %%MPIDIR%%/bin/mpiCC-vt
 %%MPIDIR%%/bin/mpic++
@@ -311,18 +417,44 @@
 %%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/libotf.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
@@ -334,6 +466,7 @@
 @dirrm %%MPIDIR%%/man/man3
 @dirrm %%MPIDIR%%/man/man1
 @dirrm %%MPIDIR%%/man
+@dirrm %%MPIDIR%%/lib/pkgconfig
 @dirrm %%MPIDIR%%/lib/openmpi
 @dirrm %%MPIDIR%%/lib
 @dirrm %%MPIDIR%%/include/vampirtrace