If isnan is a macro, assume it is type-variadic or can handle float as

well. This fixes the build on DragonFly and other platforms without
isnanf.

3 files changed, 35 insertions, 1 deletions

diff --git a/audio/festival/distinfo b/audio/festival/distinfo
index 098c0eddbea..51c8ede55f6 100644
--- a/audio/festival/distinfo
+++ b/audio/festival/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2007/08/30 09:15:52 rillig Exp $
+$NetBSD: distinfo,v 1.15 2007/09/02 11:02:57 joerg Exp $
 
 SHA1 (festival-1.95-beta.tar.gz) = 7bbf841b07a09cfe1ab17db23c2ebc12ea3d854b
 RMD160 (festival-1.95-beta.tar.gz) = 7f7cce6ab170ab1e83911ed92408576fff32cbd6
@@ -11,3 +11,5 @@ SHA1 (patch-ab) = 23e55253b22df5b8d2bc44b08f6757c90c1f13a8
 SHA1 (patch-ac) = c0a3fbd4e98ef941ef78c1ae800ef33a5153e8f9
 SHA1 (patch-ad) = b035df9c711d0f7ee1a31b663bc44c94bd904304
 SHA1 (patch-ae) = 2a0449f50e9a339767c02cc92045dd5467927ed3
+SHA1 (patch-af) = 372b65486dd9078058433461a18c6bcc8b019df8
+SHA1 (patch-ag) = baa40149e3a7213175739e9075faa97691e33b6f
diff --git a/audio/festival/patches/patch-af b/audio/festival/patches/patch-af
new file mode 100644
index 00000000000..a10c84ef98c
--- /dev/null
+++ b/audio/festival/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.3 2007/09/02 11:02:59 joerg Exp $
+
+--- speech_tools/sigpr/pda/smooth_pda.cc.orig	2007-09-02 09:36:35.000000000 +0000
++++ speech_tools/sigpr/pda/smooth_pda.cc
+@@ -112,7 +112,11 @@ void smooth_portion(EST_Track &c, EST_Fe
+ 
+     for (i = 0; i < c.num_frames(); ++i)
+     {   // occasionally NaNs result...
++#if defined(isnan)
++	if (isnan(a[i]))
++#else
+ 	if (isnanf(a[i]))
++#endif
+ 	{
+ 	    c.set_break(i);
+ 	    c.a(i) = 0.0;
diff --git a/audio/festival/patches/patch-ag b/audio/festival/patches/patch-ag
new file mode 100644
index 00000000000..c4a10594c43
--- /dev/null
+++ b/audio/festival/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.4 2007/09/02 11:03:03 joerg Exp $
+
+--- speech_tools/stats/confusion.cc.orig	2007-09-02 09:59:39.000000000 +0000
++++ speech_tools/stats/confusion.cc
+@@ -138,7 +138,11 @@ void print_confusion(const EST_FMatrix &
+ 	cout.precision(3);
+ 	cout.setf(ios::right);
+ //	cout.setf(ios::fixed, ios::floatfield);
++#ifdef isnan
++	if (isnan(correct(i)))
++#else
+ 	if (isnanf(correct(i)))
++#endif
+ 	    cout << endl;
+ 	else
+ 	    cout << correct(i) << endl;