Update math/ffts to 20170617.

The package does not include a change log, but one major feature
added since 20140106 is support for transforms of sizes other
than powers of two by means of the chirp Z transform.

6 files changed, 52 insertions, 58 deletions

diff --git a/math/ffts/Makefile b/math/ffts/Makefile
index 114c242c0f6..6932ff1ec05 100644
--- a/math/ffts/Makefile
+++ b/math/ffts/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2016/01/22 14:57:41 gson Exp $
+# $NetBSD: Makefile,v 1.2 2017/07/04 19:51:42 gson Exp $
 
-GIT_COMMIT=		fa1780c68593762b1e4bdbc46d83912db3eba27a
+GIT_COMMIT=		fe86885ecafd0d16eb122f3212403d1d5a86e24e
 
 DISTNAME=		${GIT_COMMIT}
-PKGNAME=		ffts-20140106
+PKGNAME=		ffts-20170617
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_GITHUB:=anthonix/}/ffts/archive/
 
@@ -14,9 +14,14 @@ LICENSE=		modified-bsd
 
 WRKSRC=			${WRKDIR}/ffts-${GIT_COMMIT}
 
+USE_TOOLS+=		gmake autoconf automake autoheader aclocal
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--enable-sse --enable-single
 
+pre-configure:
+	set -e; cd ${WRKSRC}; \
+	aclocal; autoheader; automake -a --foreign -i; autoconf
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/ffts/distinfo b/math/ffts/distinfo
index 038e53a4e70..2dd4787e8d6 100644
--- a/math/ffts/distinfo
+++ b/math/ffts/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1 2016/01/22 14:57:41 gson Exp $
+$NetBSD: distinfo,v 1.2 2017/07/04 19:51:42 gson Exp $
 
-SHA1 (fa1780c68593762b1e4bdbc46d83912db3eba27a.tar.gz) = 6dfb95b6c9575005d5cc06b6acb8b5cb47a27328
-RMD160 (fa1780c68593762b1e4bdbc46d83912db3eba27a.tar.gz) = 495ae3f6ffcd03740553765dbd0cff03b5f7e89b
-SHA512 (fa1780c68593762b1e4bdbc46d83912db3eba27a.tar.gz) = 2bfab39f3661e53fb625a465f7c05986b2923af2679f8e2c493ec8130032e6dd68f379501bcb6ea28c728ce2d605faf9868cd57d96442e26507cd0e00f4d4b71
-Size (fa1780c68593762b1e4bdbc46d83912db3eba27a.tar.gz) = 414064 bytes
-SHA1 (patch-src_codegen.c) = 09b9d234092607fbad9747ac08df0f0962df693d
-SHA1 (patch-tests_test.c) = 14b291a46caaccb3d78462bedee171e0e9e01797
+SHA1 (fe86885ecafd0d16eb122f3212403d1d5a86e24e.tar.gz) = bd54bc97b9592335f3196c216f7e0e456729b254
+RMD160 (fe86885ecafd0d16eb122f3212403d1d5a86e24e.tar.gz) = d832f7375d82b851e008b3a82747e3914b15fd3b
+SHA512 (fe86885ecafd0d16eb122f3212403d1d5a86e24e.tar.gz) = 3d96705a22948cb1b06b32bcad2fcaf516fb9f5da594e8626879be122edc29cd5b1c2eec3a493f4e98b49034b0a14d179765716ac59ba12bab6b4b388d299a66
+Size (fe86885ecafd0d16eb122f3212403d1d5a86e24e.tar.gz) = 588465 bytes
+SHA1 (patch-src_Makefile.am) = 1f8827b30b9e3909268957e0d35714109c99e156
+SHA1 (patch-src_ffts_trig.c) = 7732a617f43e54dc61ae64b87a7ac3d6d6174036
diff --git a/math/ffts/patches/patch-src_Makefile.am b/math/ffts/patches/patch-src_Makefile.am
new file mode 100644
index 00000000000..b8a257b8ad1
--- /dev/null
+++ b/math/ffts/patches/patch-src_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Makefile.am,v 1.1 2017/07/04 19:51:42 gson Exp $
+
+Fix build error.  Submitted upstream in https://github.com/anthonix/ffts/pull/60.
+
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ lib_LTLIBRARIES = libffts.la
+ 
+-libffts_la_SOURCES = ffts.c ffts_nd.c ffts_real.c ffts_real_nd.c ffts_transpose.c ffts_trig.c ffts_static.c
++libffts_la_SOURCES = ffts.c ffts_nd.c ffts_real.c ffts_real_nd.c ffts_transpose.c ffts_trig.c ffts_static.c ffts_chirp_z.c
+ libffts_la_SOURCES += codegen.h codegen_arm.h codegen_sse.h ffts.h ffts_nd.h ffts_real.h ffts_real_nd.h ffts_small.h ffts_static.h macros-alpha.h macros-altivec.h macros-neon.h macros-sse.h macros.h neon.h neon_float.h patterns.h types.h vfp.h
+ 
+ if DYNAMIC_DISABLED
diff --git a/math/ffts/patches/patch-src_codegen.c b/math/ffts/patches/patch-src_codegen.c
deleted file mode 100644
index 796bf6348e5..00000000000
--- a/math/ffts/patches/patch-src_codegen.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_codegen.c,v 1.1 2016/01/22 14:57:41 gson Exp $
-
-Provide the appropriate arguents to mmap on NetBSD.
-
---- src/codegen.c.orig	2014-01-05 22:32:16.000000000 +0000
-+++ src/codegen.c
-@@ -181,6 +181,8 @@ void ffts_generate_func_code(ffts_plan_t
- 
- #ifdef __APPLE__
- 	p->transform_base = mmap(NULL, p->transform_size, PROT_WRITE | PROT_READ, MAP_ANON | MAP_SHARED, -1, 0);
-+#elif defined(__NetBSD__)
-+	p->transform_base = mmap(NULL, p->transform_size, PROT_WRITE | PROT_READ | PROT_EXEC, MAP_ANON | MAP_SHARED, -1, 0);
- #else
- #define MAP_ANONYMOUS 0x20	
- 	p->transform_base = mmap(NULL, p->transform_size, PROT_WRITE | PROT_READ, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
diff --git a/math/ffts/patches/patch-src_ffts_trig.c b/math/ffts/patches/patch-src_ffts_trig.c
new file mode 100644
index 00000000000..14138f841a6
--- /dev/null
+++ b/math/ffts/patches/patch-src_ffts_trig.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_ffts_trig.c,v 1.1 2017/07/04 19:51:42 gson Exp $
+
+Fix build error.  Submitted upstream in https://github.com/anthonix/ffts/pull/60.
+
+--- src/ffts_trig.c
++++ src/ffts_trig.c
+@@ -881,7 +881,7 @@ int
+ ffts_generate_cosine_sine_pow2_32f(ffts_cpx_32f *const table, int table_size)
+ {
+     const ffts_cpx_64f *FFTS_RESTRICT ct;
+-    const double_t *FFTS_RESTRICT hs;
++    const ffts_double_t *FFTS_RESTRICT hs;
+     ffts_cpx_64f FFTS_ALIGN(16) w[32];
+     int i, log_2, offset;
+ 
+@@ -1136,4 +1136,4 @@ last:
+     }
+ 
+     return 0;
+-}
+\ No newline at end of file
++}
diff --git a/math/ffts/patches/patch-tests_test.c b/math/ffts/patches/patch-tests_test.c
deleted file mode 100644
index ed0dc09bab1..00000000000
--- a/math/ffts/patches/patch-tests_test.c
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-tests_test.c,v 1.1 2016/01/22 14:57:41 gson Exp $
-
-NetBSD lacks sinl(), cosl(), and sqrtl().
-
---- tests/test.c.orig	2014-01-05 22:32:16.000000000 +0000
-+++ tests/test.c
-@@ -44,7 +44,7 @@
- #define PI 3.1415926535897932384626433832795028841971693993751058209
- 
- float impulse_error(int N, int sign, float *data) {
--#ifdef __ANDROID__
-+#if defined(__ANDROID__) || defined(__NetBSD__)
- 	double delta_sum = 0.0f;
- 	double sum = 0.0f;
- #else
-@@ -54,7 +54,7 @@ float impulse_error(int N, int sign, flo
- 
- 	int i;
- 	for(i=0;i<N;i++) {
--#ifdef __ANDROID__
-+#if defined(__ANDROID__) || defined(__NetBSD__)
- 		double re, im;
- 		if(sign < 0) {
- 			re = cos(2 * PI * (double)i / (double)N); 
-@@ -81,7 +81,7 @@ float impulse_error(int N, int sign, flo
- 		delta_sum += re * re + im * im;
- 
- 	}
--#ifdef __ANDROID__
-+#if defined(__ANDROID__) || defined(__NetBSD__)
- 	return sqrt(delta_sum) / sqrt(sum);
- #else
- 	return sqrtl(delta_sum) / sqrtl(sum);