From b05bd3cb55eb033b2548e905e76d8dde7196c46e Mon Sep 17 00:00:00 2001
From: thor <thor@pkgsrc.org>
Date: Thu, 29 Apr 2021 23:30:12 +0000
Subject: 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.
---
 ham/gnuradio-channels/Makefile    | 4 ++--
 ham/gnuradio-companion/Makefile   | 4 ++--
 ham/gnuradio-core/Makefile        | 4 ++--
 ham/gnuradio-core/Makefile.common | 4 ++--
 ham/gnuradio-ctrlport/Makefile    | 4 ++--
 ham/gnuradio-digital/Makefile     | 4 ++--
 ham/gnuradio-doxygen/Makefile     | 4 ++--
 ham/gnuradio-dtv/Makefile         | 4 ++--
 ham/gnuradio-fec/Makefile         | 4 ++--
 ham/gnuradio-network/Makefile     | 4 ++--
 ham/gnuradio-qtgui/Makefile       | 4 ++--
 ham/gnuradio-trellis/Makefile     | 4 ++--
 ham/gnuradio-uhd/Makefile         | 4 ++--
 ham/gnuradio-utils/Makefile       | 4 ++--
 ham/gnuradio-video-sdl/Makefile   | 4 ++--
 ham/gnuradio-vocoder/Makefile     | 4 ++--
 ham/gnuradio-wavelet/Makefile     | 4 ++--
 ham/gnuradio-zeromq/Makefile      | 4 ++--
 ham/hackrf/Makefile               | 4 ++--
 19 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'ham')

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"
-- 
cgit v1.2.3