fftwf: updated to 3.3.8

Sync with fftw
Add Makefile.common

3 files changed, 18 insertions, 70 deletions

diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 47ce3983fab..9652bd0d6a0 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -1,42 +1,14 @@
-# $NetBSD: Makefile,v 1.58 2018/08/22 09:45:35 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2019/05/24 15:48:49 adam Exp $
+
+.include "Makefile.common"
 
-DISTNAME=	fftw-3.3.8
 PKGREVISION=	1
-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/
 COMMENT=	Collection of fast C routines to compute DFTs
-LICENSE=	gnu-gpl-v2
-
-USE_LANGUAGES=		c
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-shared
-
-.include "options.mk"
 
 PKGCONFIG_OVERRIDE+=	fftw.pc.in
 INFO_FILES=		yes
 
-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 !empty(PTHREAD_TYPE:Mnative)
-CONFIGURE_ARGS+=	--enable-threads
-PLIST.pthreads=		yes
-.endif
+.include "options.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/fftwf/Makefile b/math/fftwf/Makefile
index ecd646a20ee..882443e93b9 100644
--- a/math/fftwf/Makefile
+++ b/math/fftwf/Makefile
@@ -1,50 +1,25 @@
-# $NetBSD: Makefile,v 1.25 2018/08/22 09:45:36 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/05/24 15:48:49 adam Exp $
 
-DISTNAME=	fftw-3.3.6-pl1
-PKGNAME=	${DISTNAME:C/fftw/fftwf/:S/-pl1/pl1/}
-PKGREVISION=	1
-CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.fftw.org/pub/fftw/
-MASTER_SITES+=	http://www.fftw.org/
+.include "../../math/fftw/Makefile.common"
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.fftw.org/
-COMMENT=	Collection of fast C routines to compute DFTs
-LICENSE=	gnu-gpl-v2
+PKGNAME=	${DISTNAME:C/fftw/fftwf/}
 
-USE_LIBTOOL=		yes
-PKGCONFIG_OVERRIDE+=	fftw.pc.in
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-shared
-CONFIGURE_ARGS+=	--enable-float
+COMMENT=	Collection of fast C routines to compute DFTs
 
-DEPENDS+=		fftw>=3.2:../../math/fftw
+CONFIGURE_ARGS+=	--enable-single
 
-.if (${MACHINE_ARCH} == "i386")
+.if ${MACHINE_ARCH} == "i386"
 #CONFIGURE_ARGS+=	--enable-sse
 CONFIGURE_ARGS+=	--with-our-malloc16
 .endif
-USE_LANGUAGES=		c fortran77
-USE_TOOLS+=		gmake
-# For the "test" target:
-USE_TOOLS+=		perl
 
-TEST_TARGET=		check
+.include "../../math/fftw/options.mk"
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man1
 INSTALL_TARGET=		install-libLTLIBRARIES install-pkgconfigDATA
 
-
-PLIST_VARS+=		pthreads
-PTHREAD_OPTS=		native
-.include "../../mk/pthread.buildlink3.mk"
-.if !empty(PTHREAD_TYPE:Mnative)
-CONFIGURE_ARGS+=	--enable-threads
-PLIST.pthreads=		yes
-.endif
-
 post-install:
-.if !empty(PTHREAD_TYPE:Mnative)
+.if ${PTHREAD_TYPE} == "native"
 	cd ${WRKSRC}/threads &&						\
 	${SETENV} ${INSTALL_ENV} ${MAKE_ENV} 				\
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS}	\
@@ -57,4 +32,5 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/tools/fftwf-wisdom.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
+.include "../../math/fftw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/fftwf/distinfo b/math/fftwf/distinfo
index 3083438df8c..701828e778e 100644
--- a/math/fftwf/distinfo
+++ b/math/fftwf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2017/01/22 14:48:57 wiz Exp $
+$NetBSD: distinfo,v 1.11 2019/05/24 15:48:49 adam Exp $
 
-SHA1 (fftw-3.3.6-pl1.tar.gz) = b7730928b6b420733a6fd08c18616bf8ae4f625d
-RMD160 (fftw-3.3.6-pl1.tar.gz) = 9ea19d97852ad2eb97eea065d3145a2a5981e89b
-SHA512 (fftw-3.3.6-pl1.tar.gz) = e2ed33fcb068a36a841bbd898d12ceec74f4e9a0a349e7c55959878b50224a69a0f87656347dad7d7e1448ebc50d28d8f34f6da7992c43072d26942fd97c0134
-Size (fftw-3.3.6-pl1.tar.gz) = 4179807 bytes
+SHA1 (fftw-3.3.8.tar.gz) = 59831bd4b2705381ee395e54aa6e0069b10c3626
+RMD160 (fftw-3.3.8.tar.gz) = ce2d1c266a13c96af85d51d75252417458947dc6
+SHA512 (fftw-3.3.8.tar.gz) = ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
+Size (fftw-3.3.8.tar.gz) = 4110137 bytes