Index: head/devel/ga/Makefile
===================================================================
--- head/devel/ga/Makefile	(revision 535074)
+++ head/devel/ga/Makefile	(revision 535075)
@@ -1,31 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	ga
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.7.2
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Partitioned Global Address Space (PGAS) library for distributed arrays
 
 LICENSE=	BMIL
 LICENSE_NAME=	Battelle Memorial Institute License
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack \
-		libmpich.so:net/mpich \
 		libscalapack.so:math/scalapack
 
 USES=		autoreconf fortran gmake libtool localbase
 USE_GITHUB=	yes
 GH_ACCOUNT=	GlobalArrays
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-peigs --enable-shared --disable-static --with-blas4 --with-scalapack
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 LDFLAGS+=	-lscalapack
+
+OPTIONS_RADIO=		MPI
+OPTIONS_RADIO_MPI=	MPICH OPENMPI
+OPTIONS_DEFAULT=	MPICH # the default should be the same as for the MPI option in math/scalapack
+
+MPICH_LIB_DEPENDS=	libmpich.so:net/mpich
+
+OPENMPI_BUILD_DEPENDS=		openmpi>0:net/openmpi
+OPENMPI_RUN_DEPENDS=		openmpi>0:net/openmpi
+OPENMPI_CONFIGURE_ENV=		CC=${LOCALBASE}/mpi/openmpi/bin/mpicc MPICC=${LOCALBASE}/mpi/openmpi/bin/mpicc \
+				CXX=${LOCALBASE}/mpi/openmpi/bin/mpic++ MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpic++ \
+				F77=${LOCALBASE}/mpi/openmpi/bin/mpif77 MPIF77=${LOCALBASE}/mpi/openmpi/bin/mpif77 \
+				FC=${LOCALBASE}/mpi/openmpi/bin/mpif90 MPIFC=${LOCALBASE}/mpi/openmpi/bin/mpif90 \
+				LDFLAGS="-L${LOCALBASE}/mpi/openmpi/lib -Wl,-rpath,${LOCALBASE}/mpi/openmpi/lib"
+OPENMPI_MAKE_ARGS=		FREEBSD_LINK_FLAGS="-L${LOCALBASE}/mpi/openmpi/lib -Wl,-rpath,${LOCALBASE}/mpi/openmpi/lib -lmpi"
 
 .include <bsd.port.mk>
Index: head/devel/ga/files/patch-Makefile.am
===================================================================
--- head/devel/ga/files/patch-Makefile.am	(nonexistent)
+++ head/devel/ga/files/patch-Makefile.am	(revision 535075)
@@ -0,0 +1,16 @@
+--- Makefile.am.orig	2020-02-28 19:39:16 UTC
++++ Makefile.am
+@@ -1649,11 +1649,11 @@ libga_la_LIBADD += $(MAYBE_FLIBS)
+ # if --disable-f77 is used, we must override linker choice
+ if ENABLE_F77
+ libga_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \
+-    $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \
++    $(LIBTOOLFLAGS) --mode=link $(F77LD) $(FREEBSD_LINK_FLAGS) $(AM_FFLAGS) $(FFLAGS) \
+     $(libga_la_LDFLAGS) $(LDFLAGS) -o $@
+ else
+ libga_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+-    $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++    $(LIBTOOLFLAGS) --mode=link $(CCLD) $(FREEBSD_LINK_FLAGS) (AM_CFLAGS) $(CFLAGS) \
+     $(libga_la_LDFLAGS) $(LDFLAGS) -o $@
+ endif
+ 

Property changes on: head/devel/ga/files/patch-Makefile.am
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property