Update to 3.0.1:

* Some speed improvements in SIMD code.

* --without-cycle-counter option is removed.  If no cycle counter is found,
  then the estimator is always used.  A --with-slow-timer option is provided
  to force the use of lower-resolution timers.

* Added missing static keyword that prevented simultaneous linkage
  of different-precision versions; thanks to Rasmus Larson for the bug report.

* Corrected accidental omission of f77_wisdom.f file; thanks to Alan Watson.

* Removed non-portable use of 'tempfile' in fftw-wisdom-to-conf script;
  thanks to Nicolas Decoster for the patch.

* Added 'make smallcheck' target in tests/ directory, at the request of
  James Treacy.

4 files changed, 19 insertions, 32 deletions

diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index ca475a0677f..6cd2ead93ab 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2003/06/10 00:25:16 jmc Exp $
+# $NetBSD: Makefile,v 1.11 2003/07/08 14:05:29 wiz Exp $
 
 .if (${MACHINE_ARCH} == "powerpc")
-DISTNAME=		fftw-3.0-fma
+DISTNAME=		fftw-3.0.1-fma
 .else
-DISTNAME=		fftw-3.0
+DISTNAME=		fftw-3.0.1
 .endif
-PKGNAME=		fftw-3.0
-PKGREVISION=		1
+PKGNAME=		fftw-3.0.1
 CATEGORIES=		math
 MASTER_SITES=		ftp://ftp.fftw.org/pub/fftw/ \
 			http://www.fftw.org/
@@ -21,10 +20,10 @@ PKGCONFIG_OVERRIDE+=	${WRKSRC}/fftw.pc.in
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--enable-shared
 USE_FORTRAN=		yes
+USE_NEW_TEXINFO=	yes
 USE_GMAKE=		yes
 INFO_FILES=		fftw3.info
-TEXINFO_OVERRIDE=	yes
-TEXINFO_REQD=		4.5
 
-.include "../../mk/texinfo.mk"
+TEST_TARGET=		check
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/fftw/PLIST b/math/fftw/PLIST
index a56c014a99f..b13f52b22db 100644
--- a/math/fftw/PLIST
+++ b/math/fftw/PLIST
@@ -1,16 +1,19 @@
-@comment $NetBSD: PLIST,v 1.5 2003/06/23 19:21:40 jmc Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/07/08 14:05:30 wiz Exp $
 bin/fftw-wisdom
 bin/fftw-wisdom-to-conf
 include/fftw3.f
 include/fftw3.h
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/fftw3.info
 info/fftw3.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/fftw3.info
+info/fftw3.info-1
+info/fftw3.info-2
+info/fftw3.info-3
+info/fftw3.info-4
+info/fftw3.info-5
 lib/libfftw3.a
 lib/libfftw3.la
 lib/libfftw3.so
 lib/libfftw3.so.3
-lib/libfftw3.so.${PKGVERSION}
+lib/libfftw3.so.3.1
 lib/pkgconfig/fftw3.pc
 man/man1/fftw-wisdom-to-conf.1
 man/man1/fftw-wisdom.1
diff --git a/math/fftw/distinfo b/math/fftw/distinfo
index 22a688a59ed..55f67833bf4 100644
--- a/math/fftw/distinfo
+++ b/math/fftw/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.5 2003/06/05 21:41:42 wiz Exp $
+$NetBSD: distinfo,v 1.6 2003/07/08 14:05:30 wiz Exp $
 
-SHA1 (fftw-3.0.tar.gz) = a4f33bdc975b24884c56c227e1ec02fa42185cac
-Size (fftw-3.0.tar.gz) = 1951812 bytes
-
-SHA1 (fftw-3.0-fma.tar.gz) = a0b5cc3ce30d4570d0b8971e3bd318bacd80dffa
-Size (fftw-3.0-fma.tar.gz) = 1964699 bytes
-SHA1 (patch-aa) = dd7dbb6d9bb68efa30a19361cb76d5d8f5108a25
+SHA1 (fftw-3.0.1.tar.gz) = e392a005dd93583f47de29ec4992687aa21bf3a2
+Size (fftw-3.0.1.tar.gz) = 1946361 bytes
+SHA1 (fftw-3.0.1-fma.tar.gz) = e2c931168f1ff1e21d34bbdced2c07798fcc853a
+Size (fftw-3.0.1-fma.tar.gz) = 1961977 bytes
diff --git a/math/fftw/patches/patch-aa b/math/fftw/patches/patch-aa
deleted file mode 100644
index b0d63ed41c8..00000000000
--- a/math/fftw/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/06/05 21:41:42 wiz Exp $
-
---- doc/fftw3.texi.orig	Tue Apr 15 20:53:44 2003
-+++ doc/fftw3.texi
-@@ -90,7 +90,7 @@ approved by the Free Software Foundation
- 
- @dircategory Texinfo documentation system
- @direntry
--* fftw3: (fftw3)FFTW User's Manual.
-+* fftw3: (fftw3).	FFTW User's Manual.
- @end direntry
- 
- @titlepage