aboutsummaryrefslogtreecommitdiffstats
path: root/math
diff options
context:
space:
mode:
Diffstat (limited to 'math')
-rw-r--r--math/fftw3-float/Makefile2
-rw-r--r--math/fftw3-long/Makefile2
-rw-r--r--math/fftw3/Makefile7
-rw-r--r--math/fftw3/files/patch-ltmain.sh15
-rw-r--r--math/fftw3/pkg-plist3
5 files changed, 25 insertions, 4 deletions
diff --git a/math/fftw3-float/Makefile b/math/fftw3-float/Makefile
index 86abebdebaba..f75ed3080181 100644
--- a/math/fftw3-float/Makefile
+++ b/math/fftw3-float/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
MAINTAINER= ahze@ahze.net
COMMENT= Fast C routines (Single Percision)
diff --git a/math/fftw3-long/Makefile b/math/fftw3-long/Makefile
index dcdcd6935c59..d2e7f605f794 100644
--- a/math/fftw3-long/Makefile
+++ b/math/fftw3-long/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
COMMENT= Fast C routines (Long Double Percision)
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 8b9167ff378d..9a2349fadf24 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fftw3
PORTVERSION= 3.0.1
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= math
MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \
http://www.fftw.org/ \
@@ -24,7 +24,7 @@ FFTW3_FLAVOR?= default
FFTW3_SUFX=
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
USE_GNOME= gnomehack gnometarget pkgconfig
USE_REINPLACE= yes
USE_PERL5_BUILD=yes
@@ -73,6 +73,9 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS:N-O:N-O*} -O3 -fomit-frame-pointer -fno-schedul
.if defined(WITH_SMP_THREADS)
CONFIGURE_ARGS+=--enable-threads
+PLIST_SUB+= THREADS=""
+.else
+PLIST_SUB+= THREADS="@comment "
.endif
.if defined(FFTW3_FLAVOR)
diff --git a/math/fftw3/files/patch-ltmain.sh b/math/fftw3/files/patch-ltmain.sh
new file mode 100644
index 000000000000..d2b0fa90de55
--- /dev/null
+++ b/math/fftw3/files/patch-ltmain.sh
@@ -0,0 +1,15 @@
+--- 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 9973bc8d093f..66dab6394e8c 100644
--- a/math/fftw3/pkg-plist
+++ b/math/fftw3/pkg-plist
@@ -5,4 +5,7 @@ bin/fftw%%FFTW3_SUFX%%-wisdom
lib/libfftw3%%FFTW3_SUFX%%.a
lib/libfftw3%%FFTW3_SUFX%%.so
lib/libfftw3%%FFTW3_SUFX%%.so.3
+%%THREADS%%lib/libfftw3%%FFTW3_SUFX%%_threads.a
+%%THREADS%%lib/libfftw3%%FFTW3_SUFX%%_threads.so
+%%THREADS%%lib/libfftw3%%FFTW3_SUFX%%_threads.so.3
libdata/pkgconfig/fftw3%%FFTW3_SUFX%%.pc