- Use the libevent from ports. This solves a segfault reported by an user [1]

- Enable c++ bindings and "mpi thread multiple" support [1]
- Add DEBUG option

Reported by:	Otacilio Neto <otaciliodearaujo@gmail.com> [1]

2 files changed, 46 insertions, 1 deletions

diff --git a/net/openmpi2/Makefile b/net/openmpi2/Makefile
index adaa8e1c60a7..db860bbb83d2 100644
--- a/net/openmpi2/Makefile
+++ b/net/openmpi2/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	openmpi
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.open-mpi.org/software/ompi/v${PORTVERSION:R}/downloads/
 PKGNAMESUFFIX=	2
@@ -11,6 +12,7 @@ COMMENT=	High Performance Message Passing Library
 
 LIB_DEPENDS=	libhwloc.so:devel/hwloc \
 		libltdl.so:devel/libltdl \
+		libevent.so:devel/libevent2 \
 		libmunge.so:security/munge
 
 HAS_CONFIGURE=	yes
@@ -31,6 +33,12 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX}/${MPIDIR} \
 			--with-hwloc=${LOCALBASE} \
 			--with-libltdl=${LOCALBASE} \
 			--enable-mpi-fortran=usempi \
+			--enable-mpi-cxx \
+			--enable-cxx-exceptions \
+			--enable-heterogeneous \
+			--enable-mpi-thread-multiple \
+			--with-libevent=${LOCALBASE}/include \
+			--with-libevent-libdir=${LOCALBASE}/lib \
 			ompi_cv_fortran_ignore_tkr_data=0
 
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -39,12 +47,14 @@ USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib \
 
 MANPREFIX=	${PREFIX}/${MPIDIR}
 
-OPTIONS_DEFINE=	IPV6 SLURM TORQUE
+OPTIONS_DEFINE=	DEBUG IPV6 SLURM TORQUE
 TORQUE_DESC=	Enable Torque support
 SLURM_DESC=	Enable SLURM support
 OPTIONS_DEFAULT=	SLURM
 OPTIONS_SUB=	yes
 
+DEBUG_CONFIGURE_ENABLE=	debug
+
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 TORQUE_CONFIGURE_ON=	--with-tm=${LOCALBASE}
diff --git a/net/openmpi2/pkg-plist b/net/openmpi2/pkg-plist
index 6406b26ae7f2..248866812115 100644
--- a/net/openmpi2/pkg-plist
+++ b/net/openmpi2/pkg-plist
@@ -42,6 +42,37 @@
 %%MPIDIR%%/include/mpif-sentinels.h
 %%MPIDIR%%/include/mpif-sizeof.h
 %%MPIDIR%%/include/mpif.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
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/datatype.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/datatype_inln.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/errhandler.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/errhandler_inln.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/exception.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/file.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/file_inln.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/functions.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/functions_inln.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/group.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/group_inln.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/info.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/info_inln.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/intercomm.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/intercomm_inln.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/intracomm.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/intracomm_inln.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/mpicxx.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/op.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/op_inln.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/request.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/request_inln.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/status.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/status_inln.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/topology.h
+%%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/openmpi/ompi/mpiext/affinity/c/mpiext_affinity_c.h
 %%MPIDIR%%/include/openmpi/ompi/mpiext/cuda/c/mpiext_cuda_c.h
 %%MPIDIR%%/lib/libmca_common_sm.la
@@ -52,6 +83,10 @@
 %%MPIDIR%%/lib/libmpi.so
 %%MPIDIR%%/lib/libmpi.so.20
 %%MPIDIR%%/lib/libmpi.so.20.0.1
+%%MPIDIR%%/lib/libmpi_cxx.la
+%%MPIDIR%%/lib/libmpi_cxx.so
+%%MPIDIR%%/lib/libmpi_cxx.so.20
+%%MPIDIR%%/lib/libmpi_cxx.so.20.0.0
 %%MPIDIR%%/lib/libmpi_mpifh.la
 %%MPIDIR%%/lib/libmpi_mpifh.so
 %%MPIDIR%%/lib/libmpi_mpifh.so.20