Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv10185

Modified Files:
        freefem++.info 
Added Files:
        freefem++.patch 
Log Message:

New version 2.20 (not yet 2.21: it crashes).
Now builds using gfortran; thanks Jack Howarth, tracker #1834074



--- NEW FILE: freefem++.patch ---
--- freefem++-2.20-1/arpack/ARPACK/UTIL/second.f.org    2007-11-17 
21:38:11.000000000 -0500
+++ freefem++-2.20-1/arpack/ARPACK/UTIL/second.f        2007-11-17 
21:38:21.000000000 -0500
@@ -21,7 +21,6 @@
 *     ..
 *     .. External Functions ..
       REAL               ETIME
-      EXTERNAL           ETIME
 *     ..
 *     .. Executable Statements ..
 *

Index: freefem++.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/freefem++.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- freefem++.info      14 Oct 2007 00:01:09 -0000      1.7
+++ freefem++.info      18 Nov 2007 21:33:50 -0000      1.8
@@ -1,9 +1,9 @@
 Package: freefem++
-Version: 2.18
+Version: 2.20
 Revision: 1
-Distribution: 10.4
 Source: http://www.freefem.org/ff++/ftp/%n-%v.tar.gz
-Source-MD5: 40a2170a0223980e547df6cac1491468
+#Source-MD5: 37ccc0e4d405f920c13bf3d3f29e8669
+Source-MD5: 849db2109bbd45f1e5c040ee039acc4d
 Source2: http://www.caam.rice.edu/software/ARPACK/SRC/arpack96.tar.gz
 source2-MD5: fffaa970198b285676f4156cebc8626e
 Source2ExtractDir: %n-%v/arpack
@@ -15,13 +15,15 @@
 Source4-MD5: f6e87606bfb198d5c21c0a8c4936bc5c
 Source4Rename: UMFPACK-06-Sep-2006.tar.gz
 Source4ExtractDir: %n-%v/download/umfpack
-Depends: x11, x11-shlibs
-BuildDepends: g95, x11-dev, tetex3-base
+Depends: x11, x11-shlibs, gcc42-shlibs
+BuildDepends: gcc42, x11-dev, tetex3-base
+Patch: %n.patch
 PatchScript: <<
   /usr/bin/sed -i -e 's|INSTALL\-MacOSX||g; /Install-MacOS/d' Makefile.in
+  perl -pi.bak -e 's|am__EXEEXT_1 *=.*|am__EXEEXT_1 = FreeFem++|g' 
src/std/Makefile.in
 <<
 ConfigureParams: <<
- --without-fltk --enable-optim 'F77=g95' --with-flib="-lg95" \
+ --without-fltk --enable-optim 'F77=gfortran' --with-flib="-L%p/lib/gcc4.2/lib 
-lgfortran" \
  --with-arpack='%b/arpack/ARPACK/libarpack_Darwin.a' \
  --with-umfpack='%b/download/umfpack/UMFPACKv4.4/UMFPACK/Lib/libumfpack.a' \
  --with-amd='%b/download/umfpack/UMFPACKv4.4/AMD/Lib/libamd.a' \
@@ -30,8 +32,8 @@
 CompileScript: <<
 #!/bin/sh -ex
  pushd arpack/ARPACK
-   pushd LAPACK ; g95 -c dlamch.f ; popd
-   make all home=`pwd` PLAT=Darwin FC=g95 FFLAGS=-O3 MAKE=/usr/bin/make
+   pushd LAPACK ; gfortran -O3 -c dlamch.f ; popd
+   make all home=`pwd` PLAT=Darwin FC=gfortran FFLAGS=-O3 MAKE=/usr/bin/make
  popd
  pushd download/umfpack/UMFPACKv4.4
    (cd AMD/Source     ; make CONFIG="" CC=gcc CFLAGS="-O3") || exit 1
@@ -39,9 +41,9 @@
  popd
  export CPPFLAGS="-I%b/download/umfpack/UMFPACKv4.4/UMFPACK/Include/"
  ./configure %c 
- touch DOC/freefem++doc.pdf
+# touch DOC/freefem++doc.pdf
  make nativeX
- rm DOC/freefem++doc.pdf
+# rm DOC/freefem++doc.pdf
  ln -sf ../../src/femlib/gmres.hpp examples++-load/include/gmres.hpp
 <<   
 InstallScript: <<


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to