Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15117
Modified Files: fftw.info fftw.patch Log Message: fftw with gfortran suitable for 10.5, promoted from unstable with permission from M. Costabel Index: fftw.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/fftw.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- fftw.info 14 Oct 2007 00:00:07 -0000 1.4 +++ fftw.info 30 Dec 2007 04:17:57 -0000 1.5 @@ -1,14 +1,14 @@ Info2: << Package: fftw%type_pkg[-mpi] -Type: -mpi (.) +Type: -mpi (boolean) Version: 2.1.5 -Revision: 1009 -Distribution: 10.4 +Revision: 1012 +#Distribution: 10.4 Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]> Source: ftp://ftp.fftw.org/pub/%n/old/fftw-%v.tar.gz Source-MD5: 8d16a84f3ca02a785ef9eb36249ba433 -BuildDepends: g95 (>= 0.50-20060413), (%type_raw[-mpi] = -mpi) lammpi-dev (>= 7.0.6-1011) -Depends: %N-shlibs (= %v-%r), (%type_raw[-mpi] = -mpi) lammpi (>= 7.0.6-1011) +BuildDepends: gcc42 (>= 4.2.2-1000), (%type_raw[-mpi] = -mpi) lammpi-dev (>= 7.0.6-1011) +Depends: %N-shlibs (= %v-%r), gcc42-shlibs (>= 4.2.2-1000), (%type_raw[-mpi] = -mpi) lammpi (>= 7.0.6-1011) BuildDependsOnly: True Patch: fftw.patch Conflicts: fftw-absoft, fftw, fftw-mpi @@ -21,39 +21,43 @@ InstallScript: << #!/bin/bash -ev if [ "%type_raw[-mpi]" == "-mpi" ]; then - if [ %m = "i386" ]; then - FC=%p/bin/g95 FLIBS="-L%p/lib -lg95" ./configure %c --without-gcc-arch --enable-mpi + if [ %m = "i386" ]; then + F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./configure %c --without-gcc-arch --enable-mpi else - FC=%p/bin/g95 FLIBS="-L%p/lib -lg95" ./configure %c --enable-mpi + F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./configure %c --enable-mpi fi else if [ %m = "i386" ]; then - FC=%p/bin/g95 FLIBS="-L%p/lib -lg95" ./configure %c --without-gcc-arch + F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./configure %c --without-gcc-arch else - FC=%p/bin/g95 FLIBS="-L%p/lib -lg95" ./configure %c + F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./configure %c fi fi make install DESTDIR=%d make clean if [ "%type_raw[-mpi]" == "-mpi" ]; then if [ %m = "i386" ]; then - FC=%p/bin/g95 FLIBS="-L%p/lib -lg95" ./configure %c --without-gcc-arch --enable-mpi --enable-float + F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./configure %c --without-gcc-arch --enable-mpi --enable-float else - FC=%p/bin/g95 FLIBS="-L%p/lib -lg95" ./configure %c --enable-float --enable-altivec --enable-mpi + F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./configure %c --enable-float --enable-altivec --enable-mpi fi else if [ %m = "i386" ]; then - FC=%p/bin/g95 FLIBS="-L%p/lib -lg95" ./configure %c --without-gcc-arch --enable-float + F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./configure %c --without-gcc-arch --enable-float else - FC=%p/bin/g95 FLIBS="-L%p/lib -lg95" ./configure %c --enable-float --enable-altivec + F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./configure %c --enable-float --enable-altivec fi fi make + cd doc + rm -f fftw.info fftw.info-1 fftw.info-2 fftw.info-3 fftw.info-4 fftw.info-5 + make info + cd .. make install DESTDIR=%d - (cd %i/lib; ln -s %p/lib/libdfftw.2.0.7.dylib libfftw.dylib) - (cd %i/lib; ln -s %p/lib/libdrfftw.2.0.7.dylib librfftw.dylib) - (cd %i/include; ln -s %p/include/dfftw.h fftw.h) - (cd %i/include; ln -s %p/include/drfftw.h rfftw.h) + (cd %i/lib; ln -s %p/lib/libdfftw.2.0.7.dylib libfftw.dylib) || exit 1 + (cd %i/lib; ln -s %p/lib/libdrfftw.2.0.7.dylib librfftw.dylib) || exit 1 + (cd %i/include; ln -s %p/include/dfftw.h fftw.h) || exit 1 + (cd %i/include; ln -s %p/include/drfftw.h rfftw.h) || exit 1 << SplitOff: << Package: %N-shlibs @@ -79,6 +83,7 @@ << DocFiles: README COPYING INSTALL COPYRIGHT NEWS README.hacks AUTHORS Description: Discrete Fourier Transform Library +InfoDocs: fftw.info DescDetail: << Performs the DFT in one or more dimensions, of both real and complex data, for arbitrary input size. Index: fftw.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/fftw.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- fftw.patch 20 Jan 2006 20:12:58 -0000 1.1 +++ fftw.patch 30 Dec 2007 04:17:57 -0000 1.2 @@ -1,5 +1,6 @@ ---- fftw-2.1.13/configure.orig Mon Jan 27 16:24:14 2003 -+++ fftw-2.1.13/configure Mon Jan 27 16:24:25 2003 +diff -ruN --exclude '*~' fftw-2.1.5/configure fftw-2.1.5.patched/configure +--- fftw-2.1.5/configure 2003-03-24 02:09:56.000000000 -0500 ++++ fftw-2.1.5.patched/configure 2007-11-12 12:14:33.000000000 -0500 @@ -8771,7 +8771,7 @@ fi echo "$as_me:$LINENO: result: $ac_cv_flibs" >&5 @@ -9,3 +10,18 @@ ac_ext=c ac_cpp='$CPP $CPPFLAGS' +diff -ruN --exclude '*~' fftw-2.1.5/doc/fftw.texi fftw-2.1.5.patched/doc/fftw.texi +--- fftw-2.1.5/doc/fftw.texi 2003-03-16 18:43:18.000000000 -0500 ++++ fftw-2.1.5.patched/doc/fftw.texi 2007-11-12 12:13:48.000000000 -0500 +@@ -43,6 +43,11 @@ + approved by the Free Software Foundation. + @end ifinfo + [EMAIL PROTECTED] Texinfo documentation system [EMAIL PROTECTED] ++* fftw: (fftw). FFTW User's Manual. [EMAIL PROTECTED] direntry ++ + @titlepage + @sp 10 + @comment The title is printed in a large font. ------------------------------------------------------------------------- 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