diff options
-rw-r--r-- | math/fftw3/Makefile | 14 | ||||
-rw-r--r-- | math/fftw3/distinfo | 6 | ||||
-rw-r--r-- | math/fftw3/files/patch-ltmain.sh | 15 | ||||
-rw-r--r-- | math/fftw3/pkg-plist | 6 |
4 files changed, 17 insertions, 24 deletions
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile index 122e4db37aa8..24ad178c0eb5 100644 --- a/math/fftw3/Makefile +++ b/math/fftw3/Makefile @@ -6,8 +6,8 @@ # $MCom: ports-experimental/math/fftw3/Makefile,v 1.1 2006/03/28 00:08:57 ahze Exp $ PORTNAME= fftw3 -PORTVERSION= 3.1.3 -PORTREVISION?= 1 +PORTVERSION= 3.2 +PORTREVISION?= 0 CATEGORIES= math MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \ ftp://ftp.fftw.org/pub/fftw/old/ @@ -22,7 +22,6 @@ FFTW3_FLAVOR?= default FFTW3_SUFX= GNU_CONFIGURE= yes -USE_FORTRAN= yes USE_GNOME= gnomehack gnometarget pkgconfig USE_PERL5_BUILD=yes USE_LDCONFIG= yes @@ -39,7 +38,14 @@ MAN1= fftw${FFTW3_SUFX}-wisdom.1 INSTALL_TARGET= install-pkgconfigDATA install-libLTLIBRARIES install-exec .endif -OPTIONS= OPTIMIZED_CFLAGS "Enable optimized CFLAGS" off +OPTIONS= OPTIMIZED_CFLAGS "Enable optimized CFLAGS" off \ + FORTRAN "Build Fortran shims (needs gcc from port)" on + +.include <bsd.port.options.mk> + +.if defined(WITH_FORTRAN) +USE_FORTRAN= yes +.endif .include <bsd.port.pre.mk> diff --git a/math/fftw3/distinfo b/math/fftw3/distinfo index 04794c3b3e78..cef85c4c7685 100644 --- a/math/fftw3/distinfo +++ b/math/fftw3/distinfo @@ -1,3 +1,3 @@ -MD5 (fftw-3.1.3.tar.gz) = a3dcba0d30880118310b86833023eea3 -SHA256 (fftw-3.1.3.tar.gz) = 96cc33243c6b9da6c9955a751402e62d973dbc654c275cc05fdbca65aba0bad5 -SIZE (fftw-3.1.3.tar.gz) = 2810399 +MD5 (fftw-3.2.tar.gz) = 280960ddbad368ebb96c073a2b642f5d +SHA256 (fftw-3.2.tar.gz) = 205a021a87cae27146741d15bff260353497d219332a97718c0c649ab81483d0 +SIZE (fftw-3.2.tar.gz) = 3670044 diff --git a/math/fftw3/files/patch-ltmain.sh b/math/fftw3/files/patch-ltmain.sh deleted file mode 100644 index d2b0fa90de55..000000000000 --- a/math/fftw3/files/patch-ltmain.sh +++ /dev/null @@ -1,15 +0,0 @@ ---- ltmain.sh.orig Sun Dec 19 23:35:06 2004 -+++ ltmain.sh Sun Dec 19 23:35:19 2004 -@@ -4280,10 +4280,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false ; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/math/fftw3/pkg-plist b/math/fftw3/pkg-plist index 934de32a0039..4b7967b27056 100644 --- a/math/fftw3/pkg-plist +++ b/math/fftw3/pkg-plist @@ -3,9 +3,11 @@ bin/fftw%%FFTW3_SUFX%%-wisdom %%DEF%%include/fftw3.f %%DEF%%include/fftw3.h lib/libfftw3%%FFTW3_SUFX%%.a +lib/libfftw3%%FFTW3_SUFX%%.la lib/libfftw3%%FFTW3_SUFX%%.so -lib/libfftw3%%FFTW3_SUFX%%.so.4 +lib/libfftw3%%FFTW3_SUFX%%.so.5 lib/libfftw3%%FFTW3_SUFX%%_threads.a +lib/libfftw3%%FFTW3_SUFX%%_threads.la lib/libfftw3%%FFTW3_SUFX%%_threads.so -lib/libfftw3%%FFTW3_SUFX%%_threads.so.4 +lib/libfftw3%%FFTW3_SUFX%%_threads.so.5 libdata/pkgconfig/fftw3%%FFTW3_SUFX%%.pc |