--- /usr/wip/science/fvcom/Makefile	2014-04-12 18:58:02.000000000 -0500
+++ /usr/wip/science/fvcom/Makefile	2014-04-28 19:50:24.000000000 -0500
@@ -18,11 +18,12 @@ 
 		libblas.so:${PORTSDIR}/math/lapack
 
 USES=		fortran
+USE_GCC=	yes
 WRKSRC=		${WRKDIR}/FVCOM2.7.1/FVCOM_source
 
-PLIST_FILES=	bin/${PORTNAME}${PKGNAMESUFFIX}
+PLIST_FILES=	${MPIPREFIX}bin/${PORTNAME}${PKGNAMESUFFIX}
 
-RESTRICTED=	may not be redistributed because of licensing reasons
+RESTRICTED=	Requires (free) registration
 
 .include <bsd.port.pre.mk>
 
@@ -33,14 +34,23 @@ 
 	and place it in ${DISTDIR}/${DIST_SUBDIR}/
 .endif
 
+MAKE_JOBS_UNSAFE=	yes
+
 post-extract:
 	${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
 
+post-patch:
+	${REINPLACE_CMD} -e 's|gcc|${CC}|g' \
+		${WRKDIR}/FVCOM2.7.1/METIS_source/makefile
+	${REINPLACE_CMD} -e 's|cpp|${CPP}|g' \
+		${WRKDIR}/FVCOM2.7.1/FVCOM_source/Makefile
+
 pre-build:
 	(cd ${WRKSRC}/../METIS_source && make)
 
 do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/${MPIPREFIX}bin
 	${INSTALL_PROGRAM} ${WRKSRC}/fvcom \
-		${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
+		${STAGEDIR}${PREFIX}/${MPIPREFIX}bin/${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.post.mk>
--- /usr/wip/science/fvcom/files/patch-mod_lag.F	2013-02-20 11:30:45.000000000 -0600
+++ /usr/wip/science/fvcom/files/patch-mod_lag.F	2014-04-28 18:20:22.000000000 -0500
@@ -1,5 +1,5 @@ 
 --- mod_lag.F.orig	2008-07-25 16:44:11.000000000 -0500
-+++ mod_lag.F	2012-03-31 21:57:17.000000000 -0500
++++ mod_lag.F	2014-04-28 12:23:34.000000000 -0500
 @@ -212,7 +212,12 @@
    !Lagrangian particle associated scalar
    character(len=80) :: lag_scal_choice
--- /usr/wip/science/fvcom/pkg-message	1969-12-31 18:00:00.000000000 -0600
+++ /usr/wip/science/fvcom/pkg-message	2014-04-27 08:53:13.000000000 -0500
@@ -0,0 +1,4 @@ 
+-----------------------------------------------------------------------
+FVCOM has many build options that can be used in combination.  To build
+other variants, use one of the slave ports science/fvcom-*.
+-----------------------------------------------------------------------