math/fftw and dependents: merge math/fftwf backin and add MPI and OpenMP

This yields one common package to provide libfftw3 (double) and libfftw3f
(single) by default and optionally the Fortran bindings as well as
OpenMP and MPI variants, and those with long double or quad precision.

This changes all packages depending on fftwf in the same commit to minimize
the time of inconsistency. Soon, math/fftwf will disappear.

36 files changed, 197 insertions, 110 deletions

diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index 134e8a1edd4..d7d29b2ccc3 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2021/04/21 13:24:20 adam Exp $
+# $NetBSD: Makefile,v 1.49 2021/04/29 23:30:12 thor Exp $
 
 DISTNAME=	Ardour-5.12.0
 PKGNAME=	${DISTNAME:tl}
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	audio
 # currently, distfiles must be downloaded by hand from ardour.org
 # and uploaded using `make upload-distfiles`.
@@ -109,7 +109,7 @@ post-install:
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/tool.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/liblrdf/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index a5704a346f8..a177fb27b16 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2020/08/18 17:57:25 leot Exp $
+# $NetBSD: Makefile,v 1.40 2021/04/29 23:30:13 thor Exp $
 #
 
 DISTNAME=	mxcl-liblastfm-0.3.3-0-gf0b3239
 PKGNAME=	liblastfm-0.3.3
-PKGREVISION=	28
+PKGREVISION=	29
 CATEGORIES=	audio net
 MASTER_SITES=	http://download.github.com/
 
@@ -40,7 +40,7 @@ pre-configure:
 .include "../../lang/ruby/replace.mk"
 BUILDLINK_DEPMETHOD.${RUBY_BASE}=	build
 .include "../../lang/ruby/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/liblastfm/buildlink3.mk b/audio/liblastfm/buildlink3.mk
index 90c446d9cbe..33a858a9c3c 100644
--- a/audio/liblastfm/buildlink3.mk
+++ b/audio/liblastfm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2020/08/18 17:57:25 leot Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2021/04/29 23:30:13 thor Exp $
 
 BUILDLINK_TREE+=	liblastfm
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.liblastfm+=	liblastfm>=0.3.3nb28
 BUILDLINK_PKGSRCDIR.liblastfm?=		../../audio/liblastfm
 
 .include "../../audio/libsamplerate/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .endif	# LIBLASTFM_BUILDLINK3_MK
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index 7775a1742c7..3a0f7835599 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.72 2021/04/21 11:40:59 adam Exp $
+# $NetBSD: Makefile,v 1.73 2021/04/29 23:30:13 thor Exp $
 
 DISTNAME=	lmms_1.2.2
 PKGNAME=	${DISTNAME:S/_/-/1}
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=LMMS/}
 GITHUB_PROJECT=	lmms
@@ -50,7 +50,7 @@ CHECK_PORTABILITY_SKIP+=	cmake/linux/package_linux.sh.in
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/fltk13/buildlink3.mk" # used for zynaddsubfx
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index d1eb4beedd9..c9209c7c09d 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2020/03/12 23:01:43 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2021/04/29 23:30:13 thor Exp $
 
 DISTNAME=	speex-1.2.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.us.xiph.org/releases/speex/
 
diff --git a/audio/speex/options.mk b/audio/speex/options.mk
index 43bc3f9b557..bb5533b7337 100644
--- a/audio/speex/options.mk
+++ b/audio/speex/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2011/07/07 12:26:45 obache Exp $
+# $NetBSD: options.mk,v 1.4 2021/04/29 23:30:13 thor Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.speex
@@ -28,5 +28,5 @@ CONFIGURE_ARGS+=	--enable-sse
 
 .if !empty(PKG_OPTIONS:Mfftw)
 CONFIGURE_ARGS+=	--with-fft=gpl-fftw3
-.  include "../../math/fftwf/buildlink3.mk"
+.  include "../../math/fftw/buildlink3.mk"
 .endif
diff --git a/games/powder-toy/Makefile b/games/powder-toy/Makefile
index 0ad0a015010..fd6fc627787 100644
--- a/games/powder-toy/Makefile
+++ b/games/powder-toy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2021/04/21 13:24:42 adam Exp $
+# $NetBSD: Makefile,v 1.9 2021/04/29 23:30:13 thor Exp $
 
 DISTNAME=	powder-toy-95.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ThePowderToy/}
 GITHUB_PROJECT=	The-Powder-Toy
diff --git a/games/powder-toy/options.mk b/games/powder-toy/options.mk
index 4e3d92e227e..e5dcff651cb 100644
--- a/games/powder-toy/options.mk
+++ b/games/powder-toy/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2019/04/13 12:08:04 nia Exp $
+# $NetBSD: options.mk,v 1.2 2021/04/29 23:30:13 thor Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.powder-toy
 PKG_SUPPORTED_OPTIONS=	debug fftw lua
@@ -23,7 +23,7 @@ SCONS_ARGS+=	--release
 .endif
 
 .if !empty(PKG_OPTIONS:Mfftw)
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .else
 SCONS_ARGS+=	--nofft
 .endif
diff --git a/graphics/luminance-hdr/Makefile b/graphics/luminance-hdr/Makefile
index 5ca745c15ac..cb6a996ae53 100644
--- a/graphics/luminance-hdr/Makefile
+++ b/graphics/luminance-hdr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2021/04/21 13:24:49 adam Exp $
+# $NetBSD: Makefile,v 1.55 2021/04/29 23:30:13 thor Exp $
 
 DISTNAME=	luminance-hdr-2.6.0
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qtpfsgui/}
 EXTRACT_SUFX=	.tar.bz2
@@ -25,7 +25,7 @@ CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/eigen3/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../math/gsl/buildlink3.mk"
 .include "../../parallel/openmp/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index d2ce11a6c21..c7ad49dac37 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2021/04/21 13:24:49 adam Exp $
+# $NetBSD: Makefile,v 1.73 2021/04/29 23:30:13 thor Exp $
 
 DISTNAME=	pfstools-2.1.0
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pfstools/}
 EXTRACT_SUFX=	.tgz
@@ -42,6 +42,6 @@ SUBST_SED.perl=		-e 's,@PERL_PATH@,${PERL5},g'
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../math/gsl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 1a2a8d7ca91..841372e4e96 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2021/04/21 11:41:57 adam Exp $
+# $NetBSD: Makefile,v 1.19 2021/04/29 23:30:13 thor Exp $
 
 DISTNAME=	rawtherapee-5.6
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	http://rawtherapee.com/shared/source/
 EXTRACT_SUFX=	.tar.xz
@@ -28,7 +28,7 @@ pre-configure:
 .include "../../graphics/libiptcdata/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/gtkmm3/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/ham/gnuradio-channels/Makefile b/ham/gnuradio-channels/Makefile
index c80c0111b39..a332bd62463 100644
--- a/ham/gnuradio-channels/Makefile
+++ b/ham/gnuradio-channels/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2021/04/21 13:24:50 adam Exp $
+# $NetBSD: Makefile,v 1.26 2021/04/29 23:30:13 thor Exp $
 
 PKGNAME=	gnuradio-channels-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Signal processing blocks to simulate channel models of GNU Radio
 
 .include	"../../ham/gnuradio-core/Makefile.common"
diff --git a/ham/gnuradio-companion/Makefile b/ham/gnuradio-companion/Makefile
index bdff07b15b1..c733e93324d 100644
--- a/ham/gnuradio-companion/Makefile
+++ b/ham/gnuradio-companion/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2021/04/21 13:24:50 adam Exp $
+# $NetBSD: Makefile,v 1.45 2021/04/29 23:30:14 thor Exp $
 
 PKGNAME=	gnuradio-companion-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	User interface entry of GNU Radio
 
 #CONF_FILES+=	${EGDIR}/grc.conf	${PKG_SYSCONFDIR}/grc.conf
diff --git a/ham/gnuradio-core/Makefile b/ham/gnuradio-core/Makefile
index c4b64f89cd6..a62fc953b4e 100644
--- a/ham/gnuradio-core/Makefile
+++ b/ham/gnuradio-core/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2021/04/21 13:24:50 adam Exp $
+# $NetBSD: Makefile,v 1.81 2021/04/29 23:30:14 thor Exp $
 
 PKGNAME=	gnuradio-core-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Core part of GNU Radio, all others need this
 
 PLIST_MINUS=	# empty
diff --git a/ham/gnuradio-core/Makefile.common b/ham/gnuradio-core/Makefile.common
index d807d910cb1..80b6c643354 100644
--- a/ham/gnuradio-core/Makefile.common
+++ b/ham/gnuradio-core/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2021/04/07 16:14:07 tnn Exp $
+# $NetBSD: Makefile.common,v 1.33 2021/04/29 23:30:14 thor Exp $
 # This Makefile fragment is included in the package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
 # settings).
@@ -143,7 +143,7 @@ BUILDLINK_API_DEPENDS.py-pybind11+=	${PYPKGPREFIX}-pybind11>=2.6.0
 .include	"../../graphics/cairo-gobject/buildlink3.mk"
 .include	"../../lang/python/application.mk"
 .include	"../../math/py-numpy/buildlink3.mk"
-.include	"../../math/fftwf/buildlink3.mk"
+.include	"../../math/fftw/buildlink3.mk"
 .include	"../../math/gsl/buildlink3.mk"
 .include	"../../math/volk/buildlink3.mk"
 .include	"../../textproc/log4cpp/buildlink3.mk"
diff --git a/ham/gnuradio-ctrlport/Makefile b/ham/gnuradio-ctrlport/Makefile
index 67427b39b99..33a29e3e01d 100644
--- a/ham/gnuradio-ctrlport/Makefile
+++ b/ham/gnuradio-ctrlport/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.27 2021/04/29 23:30:14 thor Exp $
 
 PKGNAME=	gnuradio-ctrlport-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	New set of hooks into GNU Radio to allow a remote client to attach
 .include	"../../ham/gnuradio-core/Makefile.common"
 .include	"../../ham/gnuradio-core/Nocore.mk"
diff --git a/ham/gnuradio-digital/Makefile b/ham/gnuradio-digital/Makefile
index 4f57aa9beaa..ac4e5921094 100644
--- a/ham/gnuradio-digital/Makefile
+++ b/ham/gnuradio-digital/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.27 2021/04/29 23:30:14 thor Exp $
 
 PKGNAME=	gnuradio-digital-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Digital related algorithms for GNU Radio
 
 .include	"../../ham/gnuradio-core/Makefile.common"
diff --git a/ham/gnuradio-doxygen/Makefile b/ham/gnuradio-doxygen/Makefile
index fafa6621cfa..db4b4821c07 100644
--- a/ham/gnuradio-doxygen/Makefile
+++ b/ham/gnuradio-doxygen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.42 2021/04/29 23:30:14 thor Exp $
 
 PKGNAME=	gnuradio-doxygen-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Doxygen documentation of GNU Radio
 
 .include	"../../ham/gnuradio-core/Makefile.common"
diff --git a/ham/gnuradio-dtv/Makefile b/ham/gnuradio-dtv/Makefile
index 7d5e7c26a59..86d0c350ffc 100644
--- a/ham/gnuradio-dtv/Makefile
+++ b/ham/gnuradio-dtv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.29 2021/04/29 23:30:14 thor Exp $
 
 PKGNAME=	gnuradio-dtv-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Various digital television standards of GNU Radio
 
 .include	"../../ham/gnuradio-core/Makefile.common"
diff --git a/ham/gnuradio-fec/Makefile b/ham/gnuradio-fec/Makefile
index 33f52d1ee7c..c233a2c7c14 100644
--- a/ham/gnuradio-fec/Makefile
+++ b/ham/gnuradio-fec/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.28 2021/04/29 23:30:14 thor Exp $
 
 PKGNAME=	gnuradio-fec-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Forward Error Correction blocks, utilities, & examples of GNU Radio
 
 .include	"../../ham/gnuradio-core/Makefile.common"
diff --git a/ham/gnuradio-network/Makefile b/ham/gnuradio-network/Makefile
index 6f6c7e0efa4..b9b896e47aa 100644
--- a/ham/gnuradio-network/Makefile
+++ b/ham/gnuradio-network/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.4 2021/04/29 23:30:14 thor Exp $
 
 PKGNAME=	gnuradio-network-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Network blocks for GNU Radio
 
 .include	"../../ham/gnuradio-core/Makefile.common"
diff --git a/ham/gnuradio-qtgui/Makefile b/ham/gnuradio-qtgui/Makefile
index 82da2081302..a8c43d88b54 100644
--- a/ham/gnuradio-qtgui/Makefile
+++ b/ham/gnuradio-qtgui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.37 2021/04/29 23:30:14 thor Exp $
 
 PKGNAME=	gnuradio-qtgui-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Qt GUI module of GNU Radio
 
 .include	"../../ham/gnuradio-core/Makefile.common"
diff --git a/ham/gnuradio-trellis/Makefile b/ham/gnuradio-trellis/Makefile
index e8e24eebd83..4ca7a2247b2 100644
--- a/ham/gnuradio-trellis/Makefile
+++ b/ham/gnuradio-trellis/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.45 2021/04/29 23:30:15 thor Exp $
 
 PKGNAME=	gnuradio-trellis-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Trellis-based encoding and decoding algorithms for GNU Radio
 
 .include	"../../ham/gnuradio-core/Makefile.common"
diff --git a/ham/gnuradio-uhd/Makefile b/ham/gnuradio-uhd/Makefile
index 40400745ca4..4cc22c306f8 100644
--- a/ham/gnuradio-uhd/Makefile
+++ b/ham/gnuradio-uhd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.28 2021/04/29 23:30:15 thor Exp $
 
 PKGNAME=	gnuradio-uhd-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Uhd-based encoding and decoding algorithms for GNU Radio
 
 .include	"../../ham/gnuradio-core/Makefile.common"
diff --git a/ham/gnuradio-utils/Makefile b/ham/gnuradio-utils/Makefile
index 8097be16d2f..3c8d486117d 100644
--- a/ham/gnuradio-utils/Makefile
+++ b/ham/gnuradio-utils/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2021/04/21 13:24:52 adam Exp $
+# $NetBSD: Makefile,v 1.29 2021/04/29 23:30:15 thor Exp $
 
 PKGNAME=	gnuradio-utils-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Utilities in GNU Radio
 
 .include	"../../ham/gnuradio-core/Makefile.common"
diff --git a/ham/gnuradio-video-sdl/Makefile b/ham/gnuradio-video-sdl/Makefile
index 6c5196ec071..b853b5fc409 100644
--- a/ham/gnuradio-video-sdl/Makefile
+++ b/ham/gnuradio-video-sdl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2021/04/21 13:24:52 adam Exp $
+# $NetBSD: Makefile,v 1.42 2021/04/29 23:30:15 thor Exp $
 
 PKGNAME=	gnuradio-video-sdl-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	SDL (Simple DirectMedia Layer) bindings for GNU Radio
 
 .include	"../../ham/gnuradio-core/Makefile.common"
diff --git a/ham/gnuradio-vocoder/Makefile b/ham/gnuradio-vocoder/Makefile
index 4cedbac3ddc..751b6d0e3bc 100644
--- a/ham/gnuradio-vocoder/Makefile
+++ b/ham/gnuradio-vocoder/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2021/04/21 13:24:52 adam Exp $
+# $NetBSD: Makefile,v 1.27 2021/04/29 23:30:15 thor Exp $
 
 PKGNAME=	gnuradio-vocoder-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	All available vocoders in GNU Radio
 
 .include	"../../ham/gnuradio-core/Makefile.common"
diff --git a/ham/gnuradio-wavelet/Makefile b/ham/gnuradio-wavelet/Makefile
index 8b973831cfc..ab413a80c14 100644
--- a/ham/gnuradio-wavelet/Makefile
+++ b/ham/gnuradio-wavelet/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2021/04/21 13:24:52 adam Exp $
+# $NetBSD: Makefile,v 1.26 2021/04/29 23:30:15 thor Exp $
 
 PKGNAME=	gnuradio-wavelet-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Wavelet transform of GNU Radio
 
 .include	"../../ham/gnuradio-core/Makefile.common"
diff --git a/ham/gnuradio-zeromq/Makefile b/ham/gnuradio-zeromq/Makefile
index 32c76abb0d0..eb7abc18b99 100644
--- a/ham/gnuradio-zeromq/Makefile
+++ b/ham/gnuradio-zeromq/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2021/04/21 13:24:52 adam Exp $
+# $NetBSD: Makefile,v 1.29 2021/04/29 23:30:15 thor Exp $
 
 PKGNAME=	gnuradio-zeromq-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	All of the zeromq blocks, utilities, and examples
 
 #  zmq.hpp: No such file or directory
diff --git a/ham/hackrf/Makefile b/ham/hackrf/Makefile
index 371ff140ad3..81c87904eae 100644
--- a/ham/hackrf/Makefile
+++ b/ham/hackrf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/04/05 12:49:22 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2021/04/29 23:30:15 thor Exp $
 
 DISTNAME=		hackrf-2021.03.1
 CATEGORIES=		ham
@@ -40,5 +40,5 @@ post-install:
 
 .include "../../lang/python/application.mk"
 .include "../../devel/libusb1/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index a70d623aa43..983df2beab4 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -1,14 +1,69 @@
-# $NetBSD: Makefile,v 1.61 2020/08/31 18:10:11 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2021/04/29 23:30:15 thor Exp $
 
-.include "Makefile.common"
-
-PKGREVISION=	3
+PKGREVISION=	4
 
 COMMENT=	Collection of fast C routines to compute DFTs
 
+DISTNAME=	fftw-3.3.9
+CATEGORIES=	math
+MASTER_SITES=	ftp://ftp.fftw.org/pub/fftw/
+MASTER_SITES+=	http://www.fftw.org/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.fftw.org/
+LICENSE=	gnu-gpl-v2
+
+SUPERSEDES=	fftwf
+CONFLICTS+=	fftwf-[0-9]*
+
+USE_LANGUAGES=		c
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-shared
+TEST_TARGET=		check
+
+.include "../../mk/bsd.prefs.mk"
+
 PKGCONFIG_OVERRIDE+=	fftw.pc.in
 INFO_FILES=		yes
 
+# The standard precision is double. We always build at least
+# single in addition. Others enabled by options.
+FFTW_PRECISION=	double float
 .include "options.mk"
 
+# Test will only use the default build.
+.if defined(PKGSRC_RUN_TEST) && !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
+USE_TOOLS+=		perl
+.endif
+
+PLIST_VARS+=		pthreads
+PTHREAD_OPTS=		native
+.include "../../mk/pthread.buildlink3.mk"
+.if ${PTHREAD_TYPE} == "native"
+CONFIGURE_ARGS+=	--enable-threads
+PLIST.pthreads=		yes
+.endif
+
+CONFIGURE_SCRIPT=	./configure
+.for p in ${FFTW_PRECISION}
+CONFIGURE_DIRS+=	build/${p}
+MAKE_DIRS+=		build/${p}
+.endfor
+
+pre-configure:
+.for d in ${CONFIGURE_DIRS}
+	mkdir -p ${WRKSRC:Q}/${d}
+.if ${d} == "build/quad-precision"
+	printf '#!/bin/sh\nexec ../../configure "$$@" --enable-${d:S,build/,,} --disable-mpi\n' \
+	> ${WRKSRC:Q}/${d}/configure
+.else
+	printf '#!/bin/sh\nexec ../../configure "$$@" --enable-${d:S,build/,,}\n' \
+	> ${WRKSRC:Q}/${d}/configure
+.endif
+	chmod +x ${WRKSRC:Q}/${d}/configure
+.endfor
+
 .include "../../mk/bsd.pkg.mk"
+
diff --git a/math/fftw/Makefile.common b/math/fftw/Makefile.common
deleted file mode 100644
index 903a42dd26c..00000000000
--- a/math/fftw/Makefile.common
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile.common,v 1.2 2021/01/04 10:27:37 wiz Exp $
-# used by math/fftw/Makefile
-# used by math/fftwf/Makefile
-
-DISTNAME=	fftw-3.3.9
-CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.fftw.org/pub/fftw/
-MASTER_SITES+=	http://www.fftw.org/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.fftw.org/
-LICENSE=	gnu-gpl-v2
-
-USE_LANGUAGES=		c
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-shared
-TEST_TARGET=		check
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(PKGSRC_RUN_TEST) && !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
-USE_TOOLS+=		perl
-.endif
-
-PLIST_VARS+=		pthreads
-PTHREAD_OPTS=		native
-.include "../../mk/pthread.buildlink3.mk"
-.if ${PTHREAD_TYPE} == "native"
-CONFIGURE_ARGS+=	--enable-threads
-PLIST.pthreads=		yes
-.endif
diff --git a/math/fftw/PLIST b/math/fftw/PLIST
index 22b560b776f..c108910f159 100644
--- a/math/fftw/PLIST
+++ b/math/fftw/PLIST
@@ -1,16 +1,47 @@
-@comment $NetBSD: PLIST,v 1.13 2017/11/23 20:24:13 wiz Exp $
-bin/fftw-wisdom
+@comment $NetBSD: PLIST,v 1.14 2021/04/29 23:30:15 thor Exp $
 bin/fftw-wisdom-to-conf
+bin/fftw-wisdom
+bin/fftwf-wisdom
+${PLIST.long}bin/fftwl-wisdom
+${PLIST.quad}bin/fftwq-wisdom
 include/fftw3.f
 include/fftw3.f03
 include/fftw3.h
+${PLIST.mpi}include/fftw3-mpi.h
 include/fftw3l.f03
 include/fftw3q.f03
 info/fftw3.info
 lib/cmake/fftw3/FFTW3Config.cmake
 lib/cmake/fftw3/FFTW3ConfigVersion.cmake
+lib/cmake/fftw3/FFTW3fConfig.cmake
+lib/cmake/fftw3/FFTW3fConfigVersion.cmake
+${PLIST.long}lib/cmake/fftw3/FFTW3lConfig.cmake
+${PLIST.long}lib/cmake/fftw3/FFTW3lConfigVersion.cmake
+${PLIST.quad}lib/cmake/fftw3/FFTW3qConfig.cmake
+${PLIST.quad}lib/cmake/fftw3/FFTW3qConfigVersion.cmake
 lib/libfftw3.la
+lib/libfftw3f.la
+${PLIST.long}lib/libfftw3l.la
+${PLIST.quad}lib/libfftw3q.la
 ${PLIST.pthreads}lib/libfftw3_threads.la
+${PLIST.pthreads}lib/libfftw3f_threads.la
+${PLIST.pthreads}${PLIST.long}lib/libfftw3l_threads.la
+${PLIST.pthreads}${PLIST.quad}lib/libfftw3q_threads.la
+${PLIST.omp}lib/libfftw3_omp.la
+${PLIST.omp}lib/libfftw3f_omp.la
+${PLIST.omp}${PLIST.long}lib/libfftw3l_omp.la
+${PLIST.omp}${PLIST.quad}lib/libfftw3q_omp.la
+${PLIST.mpi}lib/libfftw3_mpi.la
+${PLIST.mpi}lib/libfftw3f_mpi.la
+${PLIST.mpi}${PLIST.long}lib/libfftw3l_mpi.la
+${PLIST.mpi}include/fftw3l-mpi.f03
+${PLIST.mpi}include/fftw3-mpi.f03
 lib/pkgconfig/fftw3.pc
+lib/pkgconfig/fftw3f.pc
+${PLIST.long}lib/pkgconfig/fftw3l.pc
+${PLIST.quad}lib/pkgconfig/fftw3q.pc
 man/man1/fftw-wisdom-to-conf.1
 man/man1/fftw-wisdom.1
+man/man1/fftwf-wisdom.1
+${PLIST.long}man/man1/fftwl-wisdom.1
+${PLIST.quad}man/man1/fftwq-wisdom.1
diff --git a/math/fftw/buildlink3.mk b/math/fftw/buildlink3.mk
index da4835a80bc..aaef405b17e 100644
--- a/math/fftw/buildlink3.mk
+++ b/math/fftw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:56 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2021/04/29 23:30:15 thor Exp $
 
 BUILDLINK_TREE+=	fftw
 
@@ -8,6 +8,13 @@ FFTW_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.fftw+=	fftw>=3.0
 BUILDLINK_ABI_DEPENDS.fftw+=	fftw>=3.1nb1
 BUILDLINK_PKGSRCDIR.fftw?=	../../math/fftw
+
+pkgbase := fftw
+.include "../../mk/pkg-build-options.mk"
+.if ${PKG_BUILD_OPTIONS.fftw:Mmpi}
+.include "../../mk/mpi.buildlink3.mk"
+.endif
+
 .endif # FFTW_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-fftw
diff --git a/math/fftw/options.mk b/math/fftw/options.mk
index 757a6cc2c0b..7607bbbf24c 100644
--- a/math/fftw/options.mk
+++ b/math/fftw/options.mk
@@ -1,7 +1,9 @@
-# $NetBSD: options.mk,v 1.3 2018/05/30 06:45:58 adam Exp $
+# $NetBSD: options.mk,v 1.4 2021/04/29 23:30:15 thor Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fftw
-PKG_SUPPORTED_OPTIONS=	fftw-fortran
+# fftw (double) and fftwf (single) are always built, you can add
+# fftwl (long) and fftwq (quad).
+PKG_SUPPORTED_OPTIONS=	fftw-fortran openmp mpi fftw-long fftw-quad
 # Enable fortran support by default on platforms supported by lang/g95.
 .if (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64) || \
 	!empty(MACHINE_ARCH:Mia64) || !empty(MACHINE_ARCH:Mpowerpc*) || \
@@ -18,3 +20,28 @@ USE_LANGUAGES+=		fortran77
 .else
 CONFIGURE_ARGS+=	--disable-fortran
 .endif
+
+PLIST_VARS+=	omp
+.if !empty(PKG_OPTIONS:Mopenmp)
+PLIST.omp=	yes
+CONFIGURE_ARGS+=	--enable-openmp
+.endif
+
+PLIST_VARS+=	mpi
+.if !empty(PKG_OPTIONS:Mmpi)
+PLIST.mpi=	yes
+CONFIGURE_ARGS+=	--enable-mpi
+.include "../../mk/mpi.buildlink3.mk"
+.endif
+
+PLIST_VARS+=	long quad
+
+.if !empty(PKG_OPTIONS:Mfftw-long)
+FFTW_PRECISION+=	long-double
+PLIST.long=	yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mfftw-quad)
+FFTW_PRECISION+=	quad-precision
+PLIST.quad=	yes
+.endif
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 0af4b8e1128..f0ae735934d 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.217 2021/04/21 13:25:00 adam Exp $
+# $NetBSD: Makefile,v 1.218 2021/04/29 23:30:16 thor Exp $
 
 DISTNAME=	octave-5.2.0
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU:=octave/}
 EXTRACT_SUFX=	.tar.xz
@@ -108,7 +108,6 @@ post-install:
 .include "../../math/arpack-ng/buildlink3.mk"
 .include "../../mk/blas.buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/fltk13/buildlink3.mk"