svn commit: r351162 - in head/science: fvcom fvcom-mpi

[Danilo Egea Gondolfo]

Author: danilo
Date: Sat Apr 12 23:58:02 2014
New Revision: 351162
URL: http://svnweb.freebsd.org/changeset/ports/351162
QAT: https://qat.redports.org/buildarchive/r351162/

Log:
  - Support staging
  - Convert LIB_DEPENDS to new syntax
  
  Approved by:	portmgr (blanket)

Modified:
  head/science/fvcom-mpi/Makefile
  head/science/fvcom/Makefile

Modified: head/science/fvcom-mpi/Makefile
==============================================================================
--- head/science/fvcom-mpi/Makefile	Sat Apr 12 23:44:17 2014	(r351161)
+++ head/science/fvcom-mpi/Makefile	Sat Apr 12 23:58:02 2014	(r351162)
@@ -5,12 +5,11 @@ PKGNAMESUFFIX=	-mpi
 
 MAINTAINER=	jwbacon at tds.net
 
-LIB_DEPENDS+=	mpi:${PORTSDIR}/net/openmpi
+LIB_DEPENDS+=	libmpi.so:${PORTSDIR}/net/openmpi
 
 MASTERDIR=	${.CURDIR}/../fvcom
 
 MAKE_ARGS+=	FC=${LOCALBASE}/mpi/openmpi/bin/mpif90 \
 		PORT_CPP_FLAGS+=-DMULTIPROCESSOR
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"

Modified: head/science/fvcom/Makefile
==============================================================================
--- head/science/fvcom/Makefile	Sat Apr 12 23:44:17 2014	(r351161)
+++ head/science/fvcom/Makefile	Sat Apr 12 23:58:02 2014	(r351162)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fvcom
 PORTVERSION=	2.7.1
-PORTREVISION=	2
+PORTREVISION?=	2
 CATEGORIES=	science
 MASTER_SITES=	http://fvcom.smast.umassd.edu/FVCOM/index.html/
 DISTNAME=	sourcecode1
@@ -13,9 +13,9 @@ MAINTAINER=	jwbacon at tds.net
 COMMENT=	Unstructured Grid Finite Volume Coastal Ocean Model
 
 # Check netcdf lib for Fortran support!
-LIB_DEPENDS+=	netcdff:${PORTSDIR}/science/netcdf-ftn \
-		lapack:${PORTSDIR}/math/lapack \
-		blas:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	libnetcdff.so:${PORTSDIR}/science/netcdf-ftn \
+		liblapack.so:${PORTSDIR}/math/lapack \
+		libblas.so:${PORTSDIR}/math/lapack
 
 USES=		fortran
 WRKSRC=		${WRKDIR}/FVCOM2.7.1/FVCOM_source
@@ -24,7 +24,6 @@ PLIST_FILES=	bin/${PORTNAME}${PKGNAMESUF
 
 RESTRICTED=	may not be redistributed because of licensing reasons
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTFILES})
@@ -42,6 +41,6 @@ pre-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fvcom \
-		${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.post.mk>