Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv17056
Modified Files:
fftw.patch fftw.info
Log Message:
Fix the info pages. Also build the fortran interface, which was not
built in the previous revision.
Index: fftw.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/fftw.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fftw.info 12 Nov 2007 00:13:14 -0000 1.8
+++ fftw.info 12 Nov 2007 17:46:03 -0000 1.9
@@ -2,7 +2,7 @@
Package: fftw%type_pkg[-mpi]
Type: -mpi (boolean)
Version: 2.1.5
-Revision: 1011
+Revision: 1012
#Distribution: 10.4
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Source: ftp://ftp.fftw.org/pub/%n/old/fftw-%v.tar.gz
@@ -22,33 +22,37 @@
#!/bin/bash -ev
if [ "%type_raw[-mpi]" == "-mpi" ]; then
if [ %m = "i386" ]; then
- FC=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./configure %c
--without-gcc-arch --enable-mpi
+ F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./configure %c
--without-gcc-arch --enable-mpi
else
- FC=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./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/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./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/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./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/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./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/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./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/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./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/gfortran FLIBS="-L%p/lib/gcc4.2/lib -lgfortran" ./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) || exit 1
(cd %i/lib; ln -s %p/lib/libdrfftw.2.0.7.dylib librfftw.dylib) || exit 1
@@ -79,7 +83,7 @@
<<
DocFiles: README COPYING INSTALL COPYRIGHT NEWS README.hacks AUTHORS
Description: Discrete Fourier Transform Library
-#InfoDocs: fftw.info fftw.info-1 fftw.info-2 fftw.info-3 fftw.info-4
fftw.info-5
+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/unstable/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:30:40 -0000 1.1
+++ fftw.patch 12 Nov 2007 17:46:03 -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: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
