various: adapt to math/fftwf removal

[Thomas Orgis <thomas%orgis.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Orgis <thomas%orgis.org@localhost>
Pushed By:	thor
Date:		Fri Apr 30 01:50:13 2021 +0200
Changeset:	30bacd7b5f079d4813cbc3ba09473bee72231e3f

Modified Files:
	gromacs/Makefile
	gromacs2018/Makefile
	rosegarden/Makefile
	sonic-visualiser/Makefile
	supercollider/Makefile
	wsjtx/Makefile
	xmms2/Makefile
	xmms2/options.mk

Log Message:
various: adapt to math/fftwf removal

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=30bacd7b5f079d4813cbc3ba09473bee72231e3f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gromacs/Makefile          | 2 +-
 gromacs2018/Makefile      | 2 +-
 rosegarden/Makefile       | 3 ++-
 sonic-visualiser/Makefile | 2 +-
 supercollider/Makefile    | 2 +-
 wsjtx/Makefile            | 4 ++--
 xmms2/Makefile            | 2 +-
 xmms2/options.mk          | 2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)

diffs:
diff --git a/gromacs/Makefile b/gromacs/Makefile
index 5bd3db0536..eefcd3c5aa 100644
--- a/gromacs/Makefile
+++ b/gromacs/Makefile
@@ -2,6 +2,7 @@
 #
 
 DISTNAME=		gromacs-2019
+PKGREVISION=		1
 CATEGORIES=		science
 MASTER_SITES=		ftp://ftp.gromacs.org/pub/gromacs/
 
@@ -28,7 +29,6 @@ CFLAGS+=	-msse -msse2
 .endif
 
 .include "../../math/fftw/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
 .include "../../math/gsl/buildlink3.mk"	# optional
 .include "../../parallel/hwloc/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"	# optional
diff --git a/gromacs2018/Makefile b/gromacs2018/Makefile
index ef74554a76..895179dd3a 100644
--- a/gromacs2018/Makefile
+++ b/gromacs2018/Makefile
@@ -2,6 +2,7 @@
 #
 
 DISTNAME=		gromacs-2018.4
+PKGREVISION=		1
 CATEGORIES=		science
 MASTER_SITES=		ftp://ftp.gromacs.org/pub/gromacs/
 
@@ -28,7 +29,6 @@ CFLAGS+=	-msse -msse2
 .endif
 
 .include "../../math/fftw/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
 .include "../../math/gsl/buildlink3.mk"	# optional
 .include "../../parallel/hwloc/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"	# optional
diff --git a/rosegarden/Makefile b/rosegarden/Makefile
index 1994b73a50..9cd436e1fe 100644
--- a/rosegarden/Makefile
+++ b/rosegarden/Makefile
@@ -3,6 +3,7 @@
 PKG_FAIL_REASON=	"Not packaged yet (MASTER_SITES changed)"
 
 DISTNAME=	rosegarden-14.12
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.cannam.demon.co.uk/rosegarden/distribution/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rosegarden/}
@@ -29,7 +30,7 @@ INSTALLATION_DIRS+=	bin lib/X11/app-defaults
 #.include "../../wip/libdssialsacompat/buildlink3.mk"
 #.include "../../audio/liblo/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../textproc/liblrdf/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/sonic-visualiser/Makefile b/sonic-visualiser/Makefile
index 4a2eb7383b..a419d7afee 100644
--- a/sonic-visualiser/Makefile
+++ b/sonic-visualiser/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	sonic-visualiser-2.5
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://code.soundsoftware.ac.uk/attachments/download/1675/
 
@@ -23,7 +24,6 @@ CONFIGURE_ARGS+=	QTDIR=${QTDIR}
 .include "../../audio/vamp-plugin-sdk/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/supercollider/Makefile b/supercollider/Makefile
index 2f2d0e0e5e..ff4010b881 100644
--- a/supercollider/Makefile
+++ b/supercollider/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2014/09/06 22:22:36 thomasklausner Exp $
 
 DISTNAME=	SuperCollider-3.7.2-Source
+PKGREVISION=	1
 GITHUB_PROJECT=	supercollider
 GITHUB_RELEASE=	Version-${PKGVERSION_NOREV}
 PKGNAME=	${DISTNAME:C/-Source//}
@@ -31,7 +32,6 @@ DL_AUTO_VARS=		yes
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../net/avahi/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/yaml-cpp/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/wsjtx/Makefile b/wsjtx/Makefile
index 2223d8d162..364c28771e 100644
--- a/wsjtx/Makefile
+++ b/wsjtx/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	wsjtx-2.3.0
+PKGREVISION=	1
 CATEGORIES=	ham
 MASTER_SITES=	https://physics.princeton.edu/pulsar/k1jt/
 EXTRACT_SUFX=	.tgz
@@ -57,8 +58,7 @@ SUBST_VARS.hamlib=	PREFIX
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
-#include "../../math/fftw/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../mk/libusb.buildlink3.mk"
 BUILDLINK_API_DEPENDS.hamlib+=	hamlib>=4.1
 .include "../../ham/hamlib/buildlink3.mk"
diff --git a/xmms2/Makefile b/xmms2/Makefile
index 282ea799a4..fa77aff2b9 100644
--- a/xmms2/Makefile
+++ b/xmms2/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	xmms2-0.8DrO_o
 PKGNAME=	${DISTNAME:S/DrO_o//1}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmms2/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/xmms2/options.mk b/xmms2/options.mk
index c881db41d9..4d799c34c7 100644
--- a/xmms2/options.mk
+++ b/xmms2/options.mk
@@ -67,7 +67,7 @@ WITHOUT_PLUGINS+=	avcodec
 .endif
 
 .if !empty(PKG_OPTIONS:Mfftw)
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 #PLIST.fftw=		yes
 .else
 WITHOUT_PLUGINS+=	fftw3f