- Update to 3.1.1

- Mark fftw3-long ONLY_FOR_ARCHS=i386 sparc64

PR:		93925 (did not use)

6 files changed, 17 insertions, 32 deletions

diff --git a/math/fftw3-float/Makefile b/math/fftw3-float/Makefile
index 20294d95e587..1529610afecd 100644
--- a/math/fftw3-float/Makefile
+++ b/math/fftw3-float/Makefile
@@ -3,9 +3,9 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports-experimental/math/fftw3-float/Makefile,v 1.1 2006/03/28 00:08:57 ahze Exp $
 
-PORTREVISION=	2
+PORTREVISION=	0
 
 MAINTAINER=	ahze@ahze.net
 COMMENT=	Fast C routines (Single Percision)
diff --git a/math/fftw3-long/Makefile b/math/fftw3-long/Makefile
index 2b38019f91ac..886521d70754 100644
--- a/math/fftw3-long/Makefile
+++ b/math/fftw3-long/Makefile
@@ -3,15 +3,15 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports-experimental/math/fftw3-long/Makefile,v 1.1 2006/03/28 00:08:58 ahze Exp $
 
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	Fast C routines (Long Double Percision)
 
 FFTW3_FLAVOR=	long
 MASTERDIR=	${.CURDIR}/../../math/fftw3
 
-#ONLY_FOR_ARCHS=	i386 sparc64
+ONLY_FOR_ARCHS=	i386 sparc64
 
 .include "${MASTERDIR}/Makefile"
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 29ccda404a27..03e1747be96e 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -3,13 +3,14 @@
 # Whom:			Lars Koeller <Lars.Koeller@Uni-Bielefeld.DE>
 #
 # $FreeBSD$
-#
+#    $MCom: ports-experimental/math/fftw3/Makefile,v 1.1 2006/03/28 00:08:57 ahze Exp $
 
 PORTNAME=	fftw3
-PORTVERSION=	3.0.1
-PORTREVISION?=	5
+PORTVERSION=	3.1.1
+PORTREVISION?=	0
 CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.fftw.org/pub/fftw/old/
+MASTER_SITES=	ftp://ftp.fftw.org/pub/fftw/ 		\
+		http://www.fftw.org/
 PKGNAMESUFFIX=	${FFTW3_PKGNAMESUFFIX}
 DISTNAME=	fftw-${PORTVERSION}
 
@@ -20,12 +21,10 @@ COMMENT?=	Fast C routines to compute the Discrete Fourier Transform
 FFTW3_FLAVOR?=	default
 FFTW3_SUFX=
 
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_PERL5_BUILD=yes
 INSTALLS_SHLIB=	yes
-USE_LDOUBLE=	yes
 
 CONFIGURE_ARGS=	--enable-shared --enable-threads
 CONFIGURE_ENV=	CPPLAGS="${PTHREAD_CFLAGS}" \
@@ -60,7 +59,9 @@ USE_GCC=	3.4
 .endif
 .endif
 .if ${MACHINE_CPU:M3dnow}
+.if ${FFTW3_FLAVOR}!="float"
 CONFIGURE_ARGS+=--enable-k7
+.endif
 CFLAGS_3DNOW=	${CFLAGS:N-O:N-O*} -O3 -fomit-frame-pointer -fno-schedule-insns \
 		-fstrict-aliasing -mpreferred-stack-boundary=4 -ffast-math
 .if ${ARCH} != "amd64"
@@ -77,9 +78,7 @@ FFTW3_PKGNAMESUFFIX=	-float
 CONFIGURE_ARGS+=--enable-float
 .else
 .if ${FFTW3_FLAVOR}=="long"
-.if ${OSVERSION} < 504000 || defined(USE_LDOUBLE)
 LIB_DEPENDS+=	ml.0:${PORTSDIR}/math/ldouble
-.endif
 FFTW3_SUFX=	l
 FFTW3_PKGNAMESUFFIX=	-long
 CONFIGURE_ARGS+=--enable-long-double
@@ -112,12 +111,10 @@ post-patch:
 			${WRKSRC}/tools/Makefile.in
 .if ${FFTW3_FLAVOR}=="long"
 	@${REINPLACE_CMD} -e 's|cosl sinl tanl||' ${WRKSRC}/configure
-.if ${OSVERSION} < 504000 || defined(USE_LDOUBLE)
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -E -e \
 		's|@LIBS@|-lml @LIBS@|'
 .endif
 .endif
-.endif
 
 .if defined(FFTW3_FLAVOR) && ${FFTW3_FLAVOR}!="default"
 post-install:
diff --git a/math/fftw3/distinfo b/math/fftw3/distinfo
index 537481cca139..5762a8718f9a 100644
--- a/math/fftw3/distinfo
+++ b/math/fftw3/distinfo
@@ -1,3 +1,3 @@
-MD5 (fftw-3.0.1.tar.gz) = 76cd21ecc9a7bed6343566c473c36477
-SHA256 (fftw-3.0.1.tar.gz) = 14f2cf295eed74369c622db005fe34f57e74a5efbd3fb66144b8d6d284ce0cb1
-SIZE (fftw-3.0.1.tar.gz) = 1946361
+MD5 (fftw-3.1.1.tar.gz) = b35813b88a046e4e74a603017794ddcd
+SHA256 (fftw-3.1.1.tar.gz) = 1d3e90da1aab15928586ef814784e217ac91bbac878906d82392b0d2e64aff0c
+SIZE (fftw-3.1.1.tar.gz) = 2719997
diff --git a/math/fftw3/files/patch-alloc.c b/math/fftw3/files/patch-alloc.c
deleted file mode 100644
index 0294284563ef..000000000000
--- a/math/fftw3/files/patch-alloc.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- kernel/alloc.c.orig	Sat Mar 15 15:29:43 2003
-+++ kernel/alloc.c	Thu Dec  9 03:31:56 2004
-@@ -79,6 +79,9 @@
- #    undef real_free
- #    define real_free our_free16
- 
-+
-+#  elif defined(__FreeBSD__)
-+     p = malloc(n);
- #  elif defined(HAVE_MEMALIGN)
-      p = memalign(MIN_ALIGNMENT, n);
- 
diff --git a/math/fftw3/pkg-plist b/math/fftw3/pkg-plist
index 1ae67d67e933..934de32a0039 100644
--- a/math/fftw3/pkg-plist
+++ b/math/fftw3/pkg-plist
@@ -4,8 +4,8 @@ bin/fftw%%FFTW3_SUFX%%-wisdom
 %%DEF%%include/fftw3.h
 lib/libfftw3%%FFTW3_SUFX%%.a
 lib/libfftw3%%FFTW3_SUFX%%.so
-lib/libfftw3%%FFTW3_SUFX%%.so.3
+lib/libfftw3%%FFTW3_SUFX%%.so.4
 lib/libfftw3%%FFTW3_SUFX%%_threads.a
 lib/libfftw3%%FFTW3_SUFX%%_threads.so
-lib/libfftw3%%FFTW3_SUFX%%_threads.so.3
+lib/libfftw3%%FFTW3_SUFX%%_threads.so.4
 libdata/pkgconfig/fftw3%%FFTW3_SUFX%%.pc