audio/festival: Update to version 2.1-release

The previous version of festival, 1.95-beta, was extremely picky about
the compiler.  When DragonFly moved to gcc 4.4 as the default, this
package would no longer build because it didn't share the pre-requisite
gcc 3.3.6 with NetBSD.

The latest version will accept any version of gcc (tested by developers
to version 4.5).  Upgrading the package has the double benefit of once
again building on DragonFly and removing the requirement to build
gcc 3.3.6 on NetBSD.

11 files changed, 69 insertions, 117 deletions

diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index f40fea59725..ff40f9841f9 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,27 +1,27 @@
-# $NetBSD: Makefile,v 1.60 2009/01/10 00:28:57 jnemeth Exp $
+# $NetBSD: Makefile,v 1.61 2011/11/21 01:35:29 marino Exp $
 
-DISTNAME=	festival-1.95-beta
-PKGNAME=	festival-1.95beta
-PKGREVISION=	1
+DISTNAME=	festival-2.1-release
+PKGNAME=	festival-2.1
 CATEGORIES=	audio
-MASTER_SITES=	http://festvox.org/packed/festival/1.95/
+MASTER_SITES=	http://festvox.org/packed/festival/2.1/
 DISTFILES=	${DISTNAME}.tar.gz \
-		speech_tools-1.2.95-beta.tar.gz
+		speech_tools-2.1-release.tar.gz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	Advanced multi-lingual speech synthesis system
+LICENSE=	original-bsd	
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake pax
+USE_TOOLS+=	gmake pax perl
 MAKE_JOBS_SAFE=	no
+REPLACE_PERL=	festival/examples/festival_client.pl
 
 SPEECHTOOLS=	${WRKSRC}/speech_tools
 FESTIVAL=	${WRKSRC}/festival
-
 FHOME=		${PREFIX}/share/festival
 
 GNU_CONFIGURE=		yes
@@ -30,34 +30,25 @@ CONFIG_GUESS_OVERRIDE=	${SPEECHTOOLS}/config.guess ${FESTIVAL}/config.guess
 CONFIG_SUB_OVERRIDE=	${SPEECHTOOLS}/config.sub ${FESTIVAL}/config.sub
 
 .include "../../mk/bsd.prefs.mk"
-
-.if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*)
-GCC_REQD+=	3.3.6
-USE_PKGSRC_GCC= yes
-.endif
-
 .include "../../mk/compiler.mk"
 
 .if !empty(PKGSRC_COMPILER:Msunpro)
 PKG_COMPILER?=		suncc
 .else
 PKG_COMPILER_cmd=	case "${CC_VERSION}" in				\
-			gcc-2.6.*)	${ECHO} gcc26;;			\
 			gcc-2.7.*)	${ECHO} gcc27;;			\
 			gcc-2.8.*)	${ECHO} gcc28;;			\
 			gcc-2.95.*)	${ECHO} gcc295;;		\
-			gcc-3.3.*)	${ECHO} gcc32;;			\
-			gcc-3.4.*)	${ECHO} gcc32;;			\
+			gcc-2.96.*)	${ECHO} gcc296;;		\
+			gcc-3.0.*)	${ECHO} gcc30;;			\
+			gcc-3.1.*)	${ECHO} gcc31;;			\
+			gcc-3.2.*)	${ECHO} gcc32;;			\
 			egcs*)		${ECHO} egcs;;			\
-			*)		${ECHO} ;;			\
+			*)		${ECHO} gcc;;			\
 			esac
 PKG_COMPILER=		${PKG_COMPILER_cmd:sh}
 .endif
 
-.if empty(PKG_COMPILER)
-PKG_FAIL_REASON+=	"${CC_VERSION} is not currently supported."
-.endif
-
 MAKE_ENV+=	PKG_EST_HOME=${SPEECHTOOLS:Q}				\
 		EST_HOME=${SPEECHTOOLS:Q}				\
 		PKG_FESTIVAL_BUILD_HOME=${FESTIVAL:Q}			\
@@ -73,8 +64,6 @@ MAKE_ENV+=	PKG_EST_HOME=${SPEECHTOOLS:Q}				\
 		GCC28_CXX=${CXX:Q}					\
 		GCC27_CC=${CC:Q}					\
 		GCC27_CXX=${CXX:Q}					\
-		GCC26_CC=${CC:Q}					\
-		GCC26_CXX=${CXX:Q}					\
 		CC=${CC:Q}						\
 		CXX=${CXX:Q}
 
@@ -83,8 +72,8 @@ INSTALLATION_DIRS=	bin libexec ${PKGMANDIR}/man1
 post-patch:
 	${CP} ${FILESDIR}/top-Makefile ${WRKSRC}/Makefile
 .if exists(${FILESDIR}/unknown_${OPSYS}.mak)
-	${CP} ${FILESDIR}/unknown_${OPSYS}.mak ${SPEECHTOOLS}/config/systems/unknown_${OPSYS}.mak
-	${CP} ${FILESDIR}/unknown_${OPSYS}.mak ${FESTIVAL}/config/systems/unknown_${OPSYS}.mak
+	${CP} ${FILESDIR}/unknown_${OPSYS}.mak ${SPEECHTOOLS}/config/systems
+	${CP} ${FILESDIR}/unknown_${OPSYS}.mak ${FESTIVAL}/config/systems
 .endif
 
 do-install:
diff --git a/audio/festival/PLIST b/audio/festival/PLIST
index 4b2a0b836ec..4d1520e4803 100644
--- a/audio/festival/PLIST
+++ b/audio/festival/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 17:32:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/11/21 01:35:29 marino Exp $
 bin/festival
 bin/festival_client
 libexec/audsp
@@ -31,6 +31,8 @@ share/festival/examples/make_utts
 share/festival/examples/make_utts.sh
 share/festival/examples/powmeanstd
 share/festival/examples/powmeanstd.sh
+share/festival/examples/run-festival-script
+share/festival/examples/run-festival-script.sh
 share/festival/examples/saytime
 share/festival/examples/saytime.sh
 share/festival/examples/scfg_parse_text
@@ -135,5 +137,6 @@ share/festival/lib/tobi_rules.scm
 share/festival/lib/token.scm
 share/festival/lib/tokenpos.scm
 share/festival/lib/tts.scm
+share/festival/lib/unilex_phones.scm
 share/festival/lib/voices.scm
 share/festival/lib/web.scm
diff --git a/audio/festival/distinfo b/audio/festival/distinfo
index 51c8ede55f6..adbe068be76 100644
--- a/audio/festival/distinfo
+++ b/audio/festival/distinfo
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.15 2007/09/02 11:02:57 joerg Exp $
+$NetBSD: distinfo,v 1.16 2011/11/21 01:35:29 marino Exp $
 
-SHA1 (festival-1.95-beta.tar.gz) = 7bbf841b07a09cfe1ab17db23c2ebc12ea3d854b
-RMD160 (festival-1.95-beta.tar.gz) = 7f7cce6ab170ab1e83911ed92408576fff32cbd6
-Size (festival-1.95-beta.tar.gz) = 707573 bytes
-SHA1 (speech_tools-1.2.95-beta.tar.gz) = 5f0533a1b06c56f06e382d752b920ee62a5e8312
-RMD160 (speech_tools-1.2.95-beta.tar.gz) = 874b9e6d35bf8a59aeacd3d5b149e24e2a490008
-Size (speech_tools-1.2.95-beta.tar.gz) = 1281274 bytes
-SHA1 (patch-aa) = 016faac0fbd2291f349b3710aefdc4df736af0d8
-SHA1 (patch-ab) = 23e55253b22df5b8d2bc44b08f6757c90c1f13a8
-SHA1 (patch-ac) = c0a3fbd4e98ef941ef78c1ae800ef33a5153e8f9
-SHA1 (patch-ad) = b035df9c711d0f7ee1a31b663bc44c94bd904304
-SHA1 (patch-ae) = 2a0449f50e9a339767c02cc92045dd5467927ed3
-SHA1 (patch-af) = 372b65486dd9078058433461a18c6bcc8b019df8
-SHA1 (patch-ag) = baa40149e3a7213175739e9075faa97691e33b6f
+SHA1 (festival-2.1-release.tar.gz) = f0c5a4282667898c584516e3605742835f59cb77
+RMD160 (festival-2.1-release.tar.gz) = b3c646ecc532e4e05f846db06bbab12a13ec1d6b
+Size (festival-2.1-release.tar.gz) = 787313 bytes
+SHA1 (speech_tools-2.1-release.tar.gz) = bbf43b259de8bb91e0c5e8a1defc6e45a10e60f9
+RMD160 (speech_tools-2.1-release.tar.gz) = 59831fbe607f05308f339a3cfb3af53d7337328b
+Size (speech_tools-2.1-release.tar.gz) = 1681999 bytes
+SHA1 (patch-aa) = 053713a156c277fd47ff4e687b3623bf0061dd89
+SHA1 (patch-ab) = 7f22ea2a89caf72dcb18818eb98bdb54911d5e7c
+SHA1 (patch-ac) = 9ffe5f44dc50d9ab5161b9ca107956e799fff463
+SHA1 (patch-ae) = 9d630d198f829979508b90416ddb0f56d721b422
+SHA1 (patch-aq) = 81109b22e5db0f733fa2a3d8e7cdef1cdcbe0185
diff --git a/audio/festival/patches/patch-aa b/audio/festival/patches/patch-aa
index 816cde32fe3..d00744db78f 100644
--- a/audio/festival/patches/patch-aa
+++ b/audio/festival/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2005/03/07 10:35:44 agc Exp $
+$NetBSD: patch-aa,v 1.5 2011/11/21 01:35:29 marino Exp $
 
---- speech_tools/config/system.sh	2005/01/10 09:00:19	1.1
-+++ speech_tools/config/system.sh	2005/01/10 09:02:26
-@@ -46,7 +46,7 @@
+--- speech_tools/config/system.sh.orig	2002-12-27 18:39:26.000000000 +0000
++++ speech_tools/config/system.sh
+@@ -46,7 +46,7 @@ OSTYPE=`uname -s |
  	sed -e '/^\([^_]*\).*/s//\1/' -e '/\//s///g'`
  
  # CPU, downcased, /s and some uninteresting details eliminated
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2005/03/07 10:35:44 agc Exp $
  	tr ABCDEFGHIJKLMNOPQRSTUVWXYZ/ abcdefghijklmnopqrstuvwxyz_ | 
  	sed -e 's/i[0-9]86/ix86/' \
  	    -e 's/sun4/sparc/' \
-@@ -56,7 +56,7 @@
+@@ -56,7 +56,7 @@ MACHINETYPE=`{ mach || uname -m || echo
  	    `
  
  # OR revision, only take first two numbers.
diff --git a/audio/festival/patches/patch-ab b/audio/festival/patches/patch-ab
index ac0d080b1a1..56e821fe9a5 100644
--- a/audio/festival/patches/patch-ab
+++ b/audio/festival/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2005/03/07 10:35:44 agc Exp $
+$NetBSD: patch-ab,v 1.5 2011/11/21 01:35:29 marino Exp $
 
---- festival/config/system.sh	2005/01/10 09:08:39	1.1
-+++ festival/config/system.sh	2005/01/10 09:08:58
-@@ -46,7 +46,7 @@
+--- festival/config/system.sh.orig	2002-12-27 18:39:26.000000000 +0000
++++ festival/config/system.sh
+@@ -46,7 +46,7 @@ OSTYPE=`uname -s |
  	sed -e '/^\([^_]*\).*/s//\1/' -e '/\//s///g'`
  
  # CPU, downcased, /s and some uninteresting details eliminated
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.4 2005/03/07 10:35:44 agc Exp $
  	tr ABCDEFGHIJKLMNOPQRSTUVWXYZ/ abcdefghijklmnopqrstuvwxyz_ | 
  	sed -e 's/i[0-9]86/ix86/' \
  	    -e 's/sun4/sparc/' \
-@@ -56,7 +56,7 @@
+@@ -56,7 +56,7 @@ MACHINETYPE=`{ mach || uname -m || echo
  	    `
  
  # OR revision, only take first two numbers.
diff --git a/audio/festival/patches/patch-ac b/audio/festival/patches/patch-ac
index 4581b324706..e4d0531a0ce 100644
--- a/audio/festival/patches/patch-ac
+++ b/audio/festival/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2005/03/07 11:32:09 agc Exp $
+$NetBSD: patch-ac,v 1.5 2011/11/21 01:35:29 marino Exp $
 
---- festival/examples/Makefile	2005/03/07 11:05:22	1.1
-+++ festival/examples/Makefile	2005/03/07 11:05:45
-@@ -55,7 +55,7 @@
+--- festival/examples/Makefile.orig	2008-11-23 21:07:52.000000000 +0000
++++ festival/examples/Makefile
+@@ -55,7 +55,7 @@ include $(TOP)/config/common_make_rules
  $(ALL) : % : %.sh
  	rm -f $@
  	@echo "#!/bin/sh" >$@
diff --git a/audio/festival/patches/patch-ad b/audio/festival/patches/patch-ad
deleted file mode 100644
index e298e3ca28b..00000000000
--- a/audio/festival/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2005/12/03 04:14:05 joerg Exp $
-
---- speech_tools/audio/voxware.cc.orig	2005-12-03 02:59:39.000000000 +0000
-+++ speech_tools/audio/voxware.cc
-@@ -66,6 +66,7 @@
- int freebsd16_supported = TRUE;
- int linux16_supported = FALSE;
- static char *aud_sys_name = "FreeBSD";
-+static int stereo_only = 0;
- #endif
- 
- #ifdef SUPPORT_LINUX16
diff --git a/audio/festival/patches/patch-ae b/audio/festival/patches/patch-ae
index e3d53391129..35dc8136044 100644
--- a/audio/festival/patches/patch-ae
+++ b/audio/festival/patches/patch-ae
@@ -1,22 +1,13 @@
-$NetBSD: patch-ae,v 1.5 2007/08/30 09:15:53 rillig Exp $
+$NetBSD: patch-ae,v 1.6 2011/11/21 01:35:29 marino Exp $
 
---- speech_tools/include/EST_math.h.orig	2004-04-30 18:56:49.000000000 +0200
-+++ speech_tools/include/EST_math.h	2007-08-30 10:51:43.000000000 +0200
-@@ -46,6 +46,7 @@
- extern "C" int isnan(double);
- #endif
+--- speech_tools/include/EST_math.h.orig	2011-11-20 22:34:00.490181000 +0000
++++ speech_tools/include/EST_math.h
+@@ -111,6 +111,15 @@ extern "C" {
  
-+#include <cmath>
- #include <math.h>
- #include <limits.h>
- #include <float.h>
-@@ -94,6 +95,16 @@ extern "C" {
- #define isnanf(X) isnan(X)
  #endif
  
-+/* If isnan is a macro, assume it is C99 type-variadic. */
-+#if defined(__DragonFly__) && defined(isnan)
-+#define isnanf(X) isnan(X)
++#if defined(__DragonFly__)
++#define isnanf(X) __isnanf(X)
 +#endif
 +
 +/* The g++-3.3.6 <cmath> header undefines the macro isnan, but shouldn't. */
@@ -24,6 +15,6 @@ $NetBSD: patch-ae,v 1.5 2007/08/30 09:15:53 rillig Exp $
 +#define isnan(X) __fpmacro_unary_floating(isnan, (X))
 +#endif
 +
- /* FreeBSD *and other 4.4 based systems require anything, isnanf is defined */
- #if defined(__FreeBSD__)
- 
+ /* Cygwin (at least cygwin 1.7 with gcc 4.3.4) */ 
+ #if defined(__CYGWIN__)
+ #if __GNUG__ > 3
diff --git a/audio/festival/patches/patch-af b/audio/festival/patches/patch-af
deleted file mode 100644
index a10c84ef98c..00000000000
--- a/audio/festival/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
deleted file mode 100644
index c4a10594c43..00000000000
--- a/audio/festival/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$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;
diff --git a/audio/festival/patches/patch-aq b/audio/festival/patches/patch-aq
new file mode 100644
index 00000000000..13f9f273a7e
--- /dev/null
+++ b/audio/festival/patches/patch-aq
@@ -0,0 +1,15 @@
+$NetBSD: patch-aq,v 1.1 2011/11/21 01:35:30 marino Exp $
+
+--- speech_tools/audio/linux_sound.cc.orig	2009-04-29 17:06:36.000000000 +0000
++++ speech_tools/audio/linux_sound.cc
+@@ -863,8 +863,10 @@ int record_linux_wave(EST_Wave &inwave,
+ 
+ #else /* not supported */
+ 
++#if !defined(SUPPORT_LINUX16) && !defined(SUPPORT_FREEBSD16)
+ int freebsd16_supported = FALSE;
+ int linux16_supported = FALSE;
++#endif
+ 
+ int play_linux_wave(EST_Wave &inwave, EST_Option &al)
+ {