Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6974/10.4/stable/main/finkinfo/sci
Modified Files:
fftw.info fftw.patch
Log Message:
Fix doc generation in 10.4/ Switch to gcc48.
Index: fftw.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/fftw.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- fftw.info 12 Apr 2012 17:06:20 -0000 1.18
+++ fftw.info 2 Apr 2013 21:37:36 -0000 1.19
@@ -2,16 +2,16 @@
Package: fftw%type_pkg[-mpi]
Type: -mpi (boolean)
Version: 2.1.5
-Revision: 1016
+Revision: 1118
Maintainer: None <fink-de...@lists.sourceforge.net>
Source: ftp://ftp.fftw.org/pub/%n/old/fftw-%v.tar.gz
Source-MD5: 8d16a84f3ca02a785ef9eb36249ba433
-BuildDepends: gcc46, (%type_raw[-mpi] = -mpi) openmpi-dev, fink (>= 0.27.2)
+BuildDepends: gcc48, (%type_raw[-mpi] = -mpi) openmpi-dev, fink (>= 0.27.2)
BuildConflicts: (%type_raw[-mpi] = .) openmpi-dev, lammpi-dev
-Depends: %N-shlibs (= %v-%r), gcc46-shlibs, (%type_raw[-mpi] = -mpi) openmpi,
(%type_raw[-mpi] = -mpi) openmpi-shlibs
+Depends: %N-shlibs (= %v-%r), gcc48-shlibs, (%type_raw[-mpi] = -mpi) openmpi,
(%type_raw[-mpi] = -mpi) openmpi-shlibs
BuildDependsOnly: True
PatchFile: fftw.patch
-PatchFile-MD5: 4e60cf62cfd5f5702f963e8fdac2f680
+PatchFile-MD5: 90b5513b0f993fea52c57affacd0f6ba
Conflicts: fftw-absoft, fftw, fftw-mpi
Replaces: fftw-absoft, fftw, ftw-mpi
Provides: (%type_raw[-mpi] = -mpi)fftw
@@ -25,30 +25,30 @@
#!/bin/bash -ev
if [ "%type_raw[-mpi]" == "-mpi" ]; then
if [ %m != "powerpc" ]; then
- F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.6/lib -lgfortran" ./configure %c
--without-gcc-arch --enable-mpi
+ F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.8/lib -lgfortran" ./configure %c
--without-gcc-arch --enable-mpi
else
- F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.6/lib -lgfortran" ./configure %c
--enable-mpi
+ F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.8/lib -lgfortran" ./configure %c
--enable-mpi
fi
else
if [ %m != "powerpc" ]; then
- F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.6/lib -lgfortran" ./configure %c
--without-gcc-arch
+ F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.8/lib -lgfortran" ./configure %c
--without-gcc-arch
else
- F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.6/lib -lgfortran" ./configure %c
+ F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.8/lib -lgfortran" ./configure %c
fi
fi
make install DESTDIR=%d
make clean
if [ "%type_raw[-mpi]" == "-mpi" ]; then
if [ %m != "powerpc" ]; then
- F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.6/lib -lgfortran" ./configure %c
--without-gcc-arch --enable-mpi --enable-float
+ F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.8/lib -lgfortran" ./configure %c
--without-gcc-arch --enable-mpi --enable-float
else
- F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.6/lib -lgfortran" ./configure %c
--enable-float --enable-altivec --enable-mpi
+ F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.8/lib -lgfortran" ./configure %c
--enable-float --enable-altivec --enable-mpi
fi
else
if [ %m != "powerpc" ]; then
- F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.6/lib -lgfortran" ./configure %c
--without-gcc-arch --enable-float
+ F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.8/lib -lgfortran" ./configure %c
--without-gcc-arch --enable-float
else
- F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.6/lib -lgfortran" ./configure %c
--enable-float --enable-altivec
+ F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.8/lib -lgfortran" ./configure %c
--enable-float --enable-altivec
fi
fi
make
Index: fftw.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/fftw.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fftw.patch 30 Dec 2007 04:17:57 -0000 1.2
+++ fftw.patch 2 Apr 2013 21:37:36 -0000 1.3
@@ -25,3 +25,19 @@
@titlepage
@sp 10
@comment The title is printed in a large font.
+--- fftw-2.1.5/doc/fftw.texi.orig 2013-02-22 21:43:44.000000000 -0500
++++ fftw-2.1.5/doc/fftw.texi 2013-02-22 21:44:30.000000000 -0500
+@@ -51,10 +51,10 @@
+ @titlepage
+ @sp 10
+ @comment The title is printed in a large font.
+-@title{FFTW User's Manual}
++@title FFTW User's Manual
+ @subtitle For version @value{VERSION}, @value{UPDATED}
+-@author{Matteo Frigo}
+-@author{Steven G. Johnson}
++@author Matteo Frigo
++@author Steven G. Johnson
+
+ @c The following two commands start the copyright page.
+ @page
------------------------------------------------------------------------------
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire
the most talented Cisco Certified professionals. Visit the
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
