Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22851/unstable/main/finkinfo/sci
Modified Files:
xfoil.info xfoil.patch
Log Message:
Move extant xfoil to stable (builds on clean system).
New %r in unstable that uses gcc42
Index: xfoil.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/xfoil.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xfoil.info 12 Oct 2006 02:19:05 -0000 1.4
+++ xfoil.info 6 Feb 2007 16:54:59 -0000 1.5
@@ -1,11 +1,11 @@
Package: xfoil
Version: 696
-Revision: 2
+Revision: 1000
License: GPL
Architecture: powerpc
Maintainer: Kevin Horton <[EMAIL PROTECTED]>
-Depends: x11-shlibs, x11
-BuildDepends: g77, x11-dev
+Depends: gcc42-shlibs, x11-shlibs, x11
+BuildDepends: gcc42, x11-dev
Source: http://web.mit.edu/drela/Public/web/xfoil/xfoil6.96.tar.gz
Source-MD5: 6ea00f7a3a0d338e97ab48ef5dd3d011
SourceDirectory: Xfoil
@@ -13,12 +13,17 @@
CompileScript: <<
#!/bin/sh -ev
cd orrs/bin
+ mv Makefile Makefile.orig
+ mv Makefile_DP Makefile
make osgen
- make osmap.o FLG="-O -ffixed-line-length-none"
+ make osmap.o FLG="-O -ffixed-line-length-none -r8"
+ make osmap.o
cd ..
echo 'bin/osgen osmaps_ns.lst'
bin/osgen osmaps_ns.lst
cd ../plotlib
+ mv config.make config.make.orig
+ mv config.make.DP config.make
make
cd ../bin
make all
@@ -72,8 +77,20 @@
Set environment variable OSMAP to "%p/share/xfoil/osmap.dat" if it is
desired to use the option to see individual-frequency plotting on the
A/Ao plot.c
+
+ This package compiles xfoil with double precision arithmetic.
<<
DescPort: <<
Need to allow arbitrary line length in osmap.f (uses %b in a string).
+
+ g95 compiler with double precision does not work - compiles, but xfoil
+ will not find solution when doing ASEQ runs
+
+ Switched to double precision using gfortran from gcc42 as of
+ xfoil-696-1000 for more stability. There are multiple compile warnings
+ about obsolete arithmetic IF statements, but the compiled code appears to
+ produce correct results.
<<
Homepage: http://web.mit.edu/drela/Public/web/xfoil/
+
+
Index: xfoil.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/xfoil.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xfoil.patch 20 Jan 2006 20:30:41 -0000 1.1
+++ xfoil.patch 6 Feb 2007 16:54:59 -0000 1.2
@@ -1,16 +1,14 @@
diff -urN Xfoil_orig/bin/Makefile Xfoil/bin/Makefile
--- Xfoil_orig/bin/Makefile 2005-11-23 08:55:45.000000000 -0500
+++ Xfoil/bin/Makefile 2005-12-22 09:42:53.000000000 -0500
-@@ -91,26 +91,26 @@
+@@ -91,25 +91,25 @@
#FFLOPT = -O2 -fomit-frame-pointer
##--------------------------
### GNU g77
-#FC = g77
--#FFLAGS = -O3 -fomit-frame-pointer
--#FFLOPT = -O3 -fomit-frame-pointer
-+FC = g77
-+FFLAGS = -O
-+FFLOPT = -O
++FC = gfortran
+ #FFLAGS = -O3 -fomit-frame-pointer
+ #FFLOPT = -O3 -fomit-frame-pointer
# Debug flags (symbols, array bounds)
#FC = g77
#FFLAGS = -g -O0 -C
@@ -31,45 +29,42 @@
### Double precision option
-FFLAGS = -O -r8
-FFLOPT = -O -r8
--PLTOBJ = ../plotlib/libPltDP.a
-+#FFLAGS = -O -r8
-+#FFLOPT = -O -r8
-+#PLTOBJ = ../plotlib/libPltDP.a
++FFLAGS = -O -fdefault-real-8
++FFLOPT = -O -fdefault-real-8
+ PLTOBJ = ../plotlib/libPltDP.a
- all: $(PROGS)
-diff -urN Xfoil_orig/orrs/bin/Makefile Xfoil/orrs/bin/Makefile
---- Xfoil_orig/orrs/bin/Makefile 2005-03-04 20:16:18.000000000 -0500
-+++ Xfoil/orrs/bin/Makefile 2005-12-22 11:19:50.000000000 -0500
+diff -urN Xfoil_orig/orrs/bin/Makefile_DP Xfoil/orrs/bin/Makefile_DP
+--- Xfoil_orig/orrs/bin/Makefile_DP 2005-03-04 20:16:18.000000000 -0500
++++ Xfoil/orrs/bin/Makefile_DP 2005-12-22 11:19:50.000000000 -0500
@@ -1,20 +1,20 @@
SRC = ../src
--PLTOBJ = /var/local/codes/Xplot/libPlt.a
-+PLTOBJ = ../../plotlib/libPlt.a
+-PLTOBJ = /var/local/codes/Xplot/libPltDP.a
++PLTOBJ = ../../plotlib/libPltDP.a
#========================================
# Default compiler flags
-FC = f77
--FLG = -O
--PLTLIB = -lX11
-+FC = g77
-+FLG = -O
-+PLTLIB = -L/usr/X11R6/lib -lX11
++FC = gfortran
+-FLG = -O -r8
++FLG = -O -fdefault-real-8
+ PLTLIB = -lX11
FTNLIB =
#========================================
# Uncomment for Intel Fortran Compiler
--FC = ifort
--FLG = -O
+-FC = ifc
+-FLG = -O -r8
-PLTLIB = -L/usr/X11R6/lib -lX11
-FTNLIB = -Vaxlib
-+#FC = ifort
-+#FLG = -O
++#FC = ifc
++#FLG = -O -r8
+#PLTLIB = -L/usr/X11R6/lib -lX11
+#FTNLIB = -Vaxlib
- # Additional IFC stuff needed on MIT's Athena system
- #FC = ifc
+ #========================================
+
diff -urN Xfoil_orig/orrs/src/osmap.f Xfoil/orrs/src/osmap.f
--- Xfoil_orig/orrs/src/osmap.f 2004-11-01 23:10:45.000000000 -0500
+++ Xfoil/orrs/src/osmap.f 2005-12-22 11:51:05.000000000 -0500
@@ -86,39 +81,64 @@
diff -urN Xfoil_orig/plotlib/Makefile Xfoil/plotlib/Makefile
--- Xfoil_orig/plotlib/Makefile 2004-06-02 12:23:43.000000000 -0400
+++ Xfoil/plotlib/Makefile 2005-12-22 09:45:36.000000000 -0500
+@@ -35,7 +35,7 @@
+ #INSTALLDIR= .
+
+ # Use these to set default library name (overridden in config.make file)
+-PLTLIB = libPlt.a
+-#PLTLIB = libPltDP.a
++#PLTLIB = libPlt.a
++PLTLIB = libPltDP.a
+
+
+ ###========================================================
+--- Xfoil_orig/plotlib/Makefile 2004-06-02 12:23:43.000000000 -0400
++++ Xfoil/plotlib/Makefile 2005-12-22 09:45:36.000000000 -0500
@@ -69,14 +69,14 @@
###================================================
### Default compilers and flags, install commands
-FC = f77
++FC = gfortran
-CC = cc
-+FC = g77
+CC = gcc
# Some fortrans need trailing underscores in C interface symbols (see Xwin.c)
DEFINE = -DUNDERSCORE
# Uncomment DP to make double-precision version
- #DP = -r8
--FFLAGS = -O $(DP)
+-#DP = -r8
++DP = -fdefault-real-8
+ FFLAGS = -O $(DP)
-CFLAGS = -O $(DEFINE)
-+FFLAGS = -O
+CFLAGS = -O2 -I/usr/X11R6/include/ $(DEFINE)
AR = ar r
RANLIB = ranlib
LINKLIB = -lX11
-diff -urN Xfoil_orig/plotlib/config.make Xfoil/plotlib/config.make
---- Xfoil_orig/plotlib/config.make 2005-10-21 23:04:44.000000000 -0400
-+++ Xfoil/plotlib/config.make 2005-12-22 09:49:18.000000000 -0500
-@@ -8,8 +8,8 @@
-
- ### Use these to set library name
- ### (you might add DP to name to keep double precision version separate)
--#PLTLIB = libPlt.a
--PLTLIB = libPltDP.a
-+PLTLIB = libPlt.a
-+#PLTLIB = libPltDP.a
-
-
- # Some fortrans need trailing underscores in C interface symbols (see Xwin.c)
+diff -urN Xfoil_orig/plotlib/config.make.DP Xfoil/plotlib/config.make.DP
+--- Xfoil_orig/plotlib/config.make.DP 2005-10-21 23:04:44.000000000 -0400
++++ Xfoil/plotlib/config.make.DP 2005-12-22 09:49:18.000000000 -0500
+@@ -25,13 +25,13 @@
+ ### g77 the GNU Fortran compiler
+ #
+-#FC = g77-3
++FC = gfortran
+ #FC = fort77
+-#CC = gcc
++CC = gcc
+ # Uncomment DP to make double-precision version
+ # (note -r8 does not work in g77, use f2c instead)
+-#DP = -r8
++DP = -fdefault-real-8
+-#FFLAGS = -O2 $(DP)
++FFLAGS = -O $(DP)
+-#CFLAGS = -O2 $(DEFINE)
++CFLAGS = -O2 $(DEFINE)
+ #AR = ar r
+ #RANLIB = ranlib
+ #LINKLIB = -L/usr/X11R6/lib -lX11
+
+diff -urN Xfoil_orig/plotlib/config.make.DP Xfoil/plotlib/config.make.DP
+--- Xfoil_orig/plotlib/config.make.DP 2005-10-21 23:04:44.000000000 -0400
++++ Xfoil/plotlib/config.make.DP 2005-12-22 09:49:18.000000000 -0500
@@ -55,13 +55,13 @@
CC = gcc
@@ -146,10 +166,12 @@
+###-------------------------------------------------------------------------
+### OS X via Fink packaging system
+#
-+FC = g77
-+FFLAGS = -O
++FC = gfortran
++FFLAGS = -O -fdefault-real-8
+CFLAGS = -O2 -I/usr/X11R6/include/ $(DEFINE)
+AR = ar r
+RANLIB = ranlib
+
+LINKLIB = -L/usr/X11R6/lib -lX11
+
+
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
