--- /usr/wip/science/fvcom-openmpi/Makefile	2014-04-12 19:17:45.000000000 -0500
+++ /usr/wip/science/fvcom-openmpi/Makefile	2014-04-28 20:13:02.000000000 -0500
@@ -1,8 +1,11 @@ 
 # Created by: Jason Bacon <jwbacon@tds.net>
 # $FreeBSD: head/science/fvcom-mpi/Makefile 351165 2014-04-13 00:17:45Z danilo $
 
-PORTREVISION=	2
-PKGNAMESUFFIX=	-mpi
+PKGNAMESUFFIX=	-openmpi
+
+# Would be nice to get this from Mk
+# Include trailing / so that it can be used as ${MPIPREFIX}bin, etc.
+MPIPREFIX=	mpi/openmpi/
 
 MAINTAINER=	jwbacon@tds.net
 
@@ -10,7 +13,7 @@ 
 
 MASTERDIR=	${.CURDIR}/../fvcom
 
-MAKE_ARGS+=	FC=${LOCALBASE}/mpi/openmpi/bin/mpif90 \
+MAKE_ARGS+=	FC=${LOCALBASE}/${MPIPREFIX}bin/mpif90 \
 		PORT_CPP_FLAGS+=-DMULTIPROCESSOR
 
 .include "${MASTERDIR}/Makefile"