svn commit: r363093 - in head/science/fvcom: . files

[William Grzybowski]

Author: wg
Date: Sun Jul 27 19:14:43 2014
New Revision: 363093
URL: http://svnweb.freebsd.org/changeset/ports/363093
QAT: https://qat.redports.org/buildarchive/r363093/

Log:
  science/fvcom: fix for LEGAL and correct install for mpi version
  
  - Pass back maintaienrship (user had an open PR)
  
  PR:		189091
  Submitted by:	maintainer

Added:
  head/science/fvcom/pkg-message   (contents, props changed)
Modified:
  head/science/fvcom/Makefile
  head/science/fvcom/files/patch-mod_lag.F

Modified: head/science/fvcom/Makefile
==============================================================================
--- head/science/fvcom/Makefile	Sun Jul 27 19:07:07 2014	(r363092)
+++ head/science/fvcom/Makefile	Sun Jul 27 19:14:43 2014	(r363093)
@@ -9,7 +9,7 @@ MASTER_SITES=	http://fvcom.smast.umassd.
 DISTNAME=	sourcecode1
 DIST_SUBDIR=	fvcom
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	jwbacon at tds.net
 COMMENT=	Unstructured Grid Finite Volume Coastal Ocean Model
 
 # Check netcdf lib for Fortran support!
@@ -18,11 +18,12 @@ LIB_DEPENDS+=	libnetcdff.so:${PORTSDIR}/
 		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 @@ IGNORE=	may not be redistributed because
 	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>

Modified: head/science/fvcom/files/patch-mod_lag.F
==============================================================================
--- head/science/fvcom/files/patch-mod_lag.F	Sun Jul 27 19:07:07 2014	(r363092)
+++ head/science/fvcom/files/patch-mod_lag.F	Sun Jul 27 19:14:43 2014	(r363093)
@@ -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

Added: head/science/fvcom/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/fvcom/pkg-message	Sun Jul 27 19:14:43 2014	(r363093)
@@ -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-*.
+-----------------------------------------------------------------------