Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Dec 2013 20:26:22 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r337799 - head/science/isaac-cfd
Message-ID:  <201312272026.rBRKQMo2005715@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Fri Dec 27 20:26:21 2013
New Revision: 337799
URL: http://svnweb.freebsd.org/changeset/ports/337799

Log:
  - USES=fortran gmake.
  - Set MAKE_ARGS instead of MAKE_FLAGS.
  - Replace some += with =.
  - Staging.

Modified:
  head/science/isaac-cfd/Makefile   (contents, props changed)

Modified: head/science/isaac-cfd/Makefile
==============================================================================
--- head/science/isaac-cfd/Makefile	Fri Dec 27 20:21:58 2013	(r337798)
+++ head/science/isaac-cfd/Makefile	Fri Dec 27 20:26:21 2013	(r337799)
@@ -14,22 +14,26 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Integrated Solution Algorithm for Arbitrary Configuration
 
 NO_WRKSUBDIR=	yes
-USE_GMAKE=	yes
 MAKEFILE=	makefile
-MAKE_FLAGS+=	CPPFLAGS=-I.
-USE_FORTRAN=	yes
+MAKE_ARGS=	CPPFLAGS=-I.
+USES=		fortran gmake
 
-PLIST_FILES+=	bin/isaac
+PLIST_FILES=	bin/isaac
 PORTDOCS=	man.4_2.ps.gz
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES OPTIMIZED_FFLAGS
 OPTIMIZED_FFLAGS_DESC=	Use extra compiler (fortran) optimizations
 
-DOCS_DISTFILES+=	man.4_2.ps.gz
-EXAMPLES_DISTFILES+=	example_cases${EXTRACT_SUFX}
+DOCS_DISTFILES=	man.4_2.ps.gz
+EXAMPLES_DISTFILES=	example_cases${EXTRACT_SUFX}
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPTIMIZED_FFLAGS}
+FFLAGS+=	-O2 -ffast-math
+.endif
 
-NO_STAGE=	yes
 pre-configure:
 	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%FFLAGS%%+${FFLAGS}+;' \
 	${WRKSRC}/makefile
@@ -37,22 +41,16 @@ pre-configure:
 		${REINPLACE_CMD} -e 's|SRC= $$(HOME)/ISAAC/src|SRC= ${WRKSRC}|; \
 			s|$$(FFLAGS)|${FFLAGS} -I.|' {} \;
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MOPTIMIZED_FFLAGS}
-FFLAGS+=	-O2 -ffast-math
-.endif
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/isaac ${PREFIX}/bin/isaac
+	${INSTALL_PROGRAM} ${WRKSRC}/isaac ${STAGEDIR}${PREFIX}/bin/isaac
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/${PORTDOCS} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/example_cases${EXTRACT_SUFX} \
-		-C ${EXAMPLESDIR}/
+		-C ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312272026.rBRKQMo2005715>