From owner-svn-ports-all@FreeBSD.ORG Fri Dec 27 20:26:22 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E3B888D; Fri, 27 Dec 2013 20:26:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 507B81DB3; Fri, 27 Dec 2013 20:26:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRKQMRm005716; Fri, 27 Dec 2013 20:26:22 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRKQMo2005715; Fri, 27 Dec 2013 20:26:22 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201312272026.rBRKQMo2005715@svn.freebsd.org> From: Tijl Coosemans Date: Fri, 27 Dec 2013 20:26:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337799 - head/science/isaac-cfd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Dec 2013 20:26:22 -0000 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 + +.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 - -.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