- Define FFLAGS according to WITH_OPTIMIZED_FLAGS;

- Better description;

- Quiete some warnings;

- Pet portlint.

Submitted by:	Pedro F. Giffuni <giffunip (at) yahoo.com>

4 files changed, 26 insertions, 13 deletions

diff --git a/science/isaac-cfd/Makefile b/science/isaac-cfd/Makefile
index 25ef3c87ac0e..dfe197c261d4 100644
--- a/science/isaac-cfd/Makefile
+++ b/science/isaac-cfd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	isaac
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	isaac-cfd
@@ -24,12 +25,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Integrated Solution Algorithm for Arbitrary Configuration
 
 NO_WRKSUBDIR=	yes
-USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKEFILE=	makefile
-MAKE_FLAGS=	CPPFLAGS=-I.
-
-FFLAGS?=	-O2
+MAKE_FLAGS+=	CPPFLAGS=-I.
 
 .if !defined(WITH_EXAMPLES)
 PLIST_SUB=	WITH_EXAMPLES="@comment "
@@ -37,6 +35,10 @@ PLIST_SUB=	WITH_EXAMPLES="@comment "
 PLIST_SUB=	WITH_EXAMPLES=""
 .endif
 
+.if defined(WITH_OPTIMIZED_FLAGS)
+FFLAGS+=	-O2 -ffast-math -funroll-loops -fexpensive-optimizations
+.endif
+
 pre-configure:
 	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%FFLAGS%%+${FFLAGS}+;' \
 	${WRKSRC}/makefile
diff --git a/science/isaac-cfd/files/patch-main_main.F b/science/isaac-cfd/files/patch-main_main.F
new file mode 100644
index 000000000000..263a6de77f27
--- /dev/null
+++ b/science/isaac-cfd/files/patch-main_main.F
@@ -0,0 +1,11 @@
+--- ./main/main.F.orig	Mon Oct 29 04:25:28 2001
++++ ./main/main.F	Tue Apr  4 22:26:34 2006
+@@ -138,7 +138,7 @@
+ C           =  2 for iterative, implicit unsteady
+ C           =  3 for tau-ts iterative unsteady with 2nd order pseudo sub-iter 
+ C
+-      PARAMETER (MAXQ   =    7)
++      PARAMETER (MAXQ   =   12)
+ c--   PARAMETER (MXPTS  = 50000)
+ c++   PARAMETER (MXPTS  = 34000)
+ c32^3 PARAMETER (MXPTS  = 46700)
diff --git a/science/isaac-cfd/files/patch-makefile b/science/isaac-cfd/files/patch-makefile
index 9c0f92a15ec9..efe30acba5a5 100644
--- a/science/isaac-cfd/files/patch-makefile
+++ b/science/isaac-cfd/files/patch-makefile
@@ -6,7 +6,7 @@
 -FC = f77
 +MAKE?=gmake
  
-+F77 =	%%FC%%
++FC =	%%FC%%
  #SRC=  $(HOME)/CFD/ISAAC/src
  SRC=  $(CURDIR)
  SRCTARFILE= isaacsrc.tar
diff --git a/science/isaac-cfd/pkg-descr b/science/isaac-cfd/pkg-descr
index fa8eb6494b47..4458db040650 100644
--- a/science/isaac-cfd/pkg-descr
+++ b/science/isaac-cfd/pkg-descr
@@ -1,13 +1,13 @@
-ISAAC (Integrated Solution Algorithm for Arbitrary Configurations) is a 
-compressible Euler/Navier-Stokes computational fluid dynamics code. ISAAC 
-includes the capability of calculating the Euler equations for inviscid 
-flow or the Navier-Stokes equations for viscous flows. ISAAC uses a domain 
-decomposition structure to accomodate complex physical configurations. 
+ISAAC (Integrated Solution Algorithm for Arbitrary Configurations) is a
+compressible Euler/Navier-Stokes computational fluid dynamics code. ISAAC
+includes the capability of calculating the Euler equations for inviscid
+flow or the Navier-Stokes equations for viscous flows. ISAAC uses a domain
+decomposition structure to accomodate complex physical configurations.
 ISAAC can calculate either steady-state or time dependent flow.
 
-ISAAC was designed to test turbulence models. Various two equation 
-turbulence models, explicit algebraic Reynolds stress models, and full 
-differential Reynolds stress models are implemented in ISAAC. Several test 
+ISAAC was designed to test turbulence models. Various two equation
+turbulence models, explicit algebraic Reynolds stress models, and full
+differential Reynolds stress models are implemented in ISAAC. Several test
 cases are documented in the User's Guide.
 
 WWW:	http://isaac-cfd.sourceforge.net/