aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--math/fftw3-float/Makefile2
-rw-r--r--math/fftw3-long/Makefile2
-rw-r--r--math/fftw3/Makefile14
-rw-r--r--math/fftw3/pkg-plist6
4 files changed, 8 insertions, 16 deletions
diff --git a/math/fftw3-float/Makefile b/math/fftw3-float/Makefile
index f75ed3080181..20294d95e587 100644
--- a/math/fftw3-float/Makefile
+++ b/math/fftw3-float/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
MAINTAINER= ahze@ahze.net
COMMENT= Fast C routines (Single Percision)
diff --git a/math/fftw3-long/Makefile b/math/fftw3-long/Makefile
index 227ffd6a8005..d2c697364a05 100644
--- a/math/fftw3-long/Makefile
+++ b/math/fftw3-long/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Fast C routines (Long Double Percision)
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index fa18c0a9a18b..788c7e90f25f 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fftw3
PORTVERSION= 3.0.1
-PORTREVISION?= 4
+PORTREVISION?= 5
CATEGORIES= math
MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \
http://www.fftw.org/
@@ -29,7 +29,7 @@ USE_PERL5_BUILD=yes
INSTALLS_SHLIB= yes
USE_LDOUBLE= yes
-CONFIGURE_ARGS= --enable-shared
+CONFIGURE_ARGS= --enable-shared --enable-threads
CONFIGURE_ENV= CPPLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
@@ -41,8 +41,7 @@ MAN1= fftw${FFTW3_SUFX}-wisdom.1
INSTALL_TARGET= install-pkgconfigDATA install-libLTLIBRARIES install-exec
.endif
-OPTIONS= OPTIMIZED_CFLAGS "Enable optimized CFLAGS" off \
- SMP_THREADS "Enable FFTW SMP threads library" off
+OPTIONS= OPTIMIZED_CFLAGS "Enable optimized CFLAGS" off
.include <bsd.port.pre.mk>
@@ -73,13 +72,6 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS_3DNOW}"
.endif
.endif # end WITH_OPTIMIZED_CFLAGS
-.if defined(WITH_SMP_THREADS)
-CONFIGURE_ARGS+=--enable-threads
-PLIST_SUB+= THREADS=""
-.else
-PLIST_SUB+= THREADS="@comment "
-.endif
-
.if defined(FFTW3_FLAVOR)
.if ${FFTW3_FLAVOR}=="float"
FFTW3_SUFX= f
diff --git a/math/fftw3/pkg-plist b/math/fftw3/pkg-plist
index 66dab6394e8c..1ae67d67e933 100644
--- a/math/fftw3/pkg-plist
+++ b/math/fftw3/pkg-plist
@@ -5,7 +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
+lib/libfftw3%%FFTW3_SUFX%%_threads.a
+lib/libfftw3%%FFTW3_SUFX%%_threads.so
+lib/libfftw3%%FFTW3_SUFX%%_threads.so.3
libdata/pkgconfig/fftw3%%FFTW3_SUFX%%.pc