Update festival to 1.4.1, and fix dependent packages up while I'm here

(including fixing lots of PLISTs).
Changes since 1.4.0, from the NEWS file:
. SSFF (for emulabel) track support
. Java fixes
. various minor bug fixes
. WFST with proper quoting
. Wagon sample counts
. gcc-2.95.1 support

Also use newer distfile for mbrola.

Addresses pkg/10671.

4 files changed, 28 insertions, 29 deletions

diff --git a/audio/mbrola/Makefile b/audio/mbrola/Makefile
index bd6b643ff64..e7d851119eb 100644
--- a/audio/mbrola/Makefile
+++ b/audio/mbrola/Makefile
@@ -1,22 +1,29 @@
-# $NetBSD: Makefile,v 1.3 2001/02/20 11:40:08 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/07/18 15:19:46 wiz Exp $
 
 DISTNAME=		mbr301h
 PKGNAME=		mbrola-301h
 CATEGORIES=		audio
-MASTER_SITES=		ftp://tcts.fpms.ac.be/pub/mbrola/bsd/
+MASTER_SITES=		http://www.festvox.org/mbrola/bin/netbsd/
 EXTRACT_SUFX=		.zip
 
 MAINTAINER=		proff@iq.org
-HOMEPAGE=		http://tcts.fpms.ac.be/synthesis/
-COMMENT=		MBROLA diphone synthesizer executable (only for i386)
+HOMEPAGE=		http://www.festvox.org/mbrola/
+COMMENT=		MBROLA diphone synthesizer executable
 
 LICENSE=		no-commercial-use
 
+DIST_SUBDIR=		mbrola-20010717
 NO_WRKSUBDIR=
 NO_BUILD=
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ( ${OBJECT_FMT} != "a.out" )
+DEPENDS+=		compat14>=1.4.3:../../emulators/compat14
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mbrola-netbsd-i386 ${PREFIX}/bin/mbrola
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mbrola
diff --git a/audio/mbrola/distinfo b/audio/mbrola/distinfo
index 0aa0cc6e0ce..f3a550d1d73 100644
--- a/audio/mbrola/distinfo
+++ b/audio/mbrola/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 12:14:34 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/18 15:19:46 wiz Exp $
 
-SHA1 (mbr301h.zip) = 33c1a808b0b746378403b808d5ce617c62badc9f
-Size (mbr301h.zip) = 51771 bytes
+SHA1 (mbrola-20010717/mbr301h.zip) = 51cae305b5b39d0858a7bc035e9c113cb66e925e
+Size (mbrola-20010717/mbr301h.zip) = 72067 bytes
diff --git a/audio/mbrola/pkg/DESCR b/audio/mbrola/pkg/DESCR
index 6039136d5ab..a12619882fe 100644
--- a/audio/mbrola/pkg/DESCR
+++ b/audio/mbrola/pkg/DESCR
@@ -1,33 +1,24 @@
-MBROLA is a  speech synthesizer  based  on the concatenation  of
+MBROLA is a speech synthesizer based on the concatenation of
 diphones. It takes a list of phonemes as input, together with prosodic
-information  (duration of phonemes  and a piecewise linear description
-of  pitch), and produces  speech samples  on 16  bits (linear), at the
-sampling frequency of the diphone database. 
+information (duration of phonemes and a piecewise linear description
+of pitch), and produces speech samples on 16 bits (linear), at the
+sampling frequency of the diphone database.
 
-It is therefore NOT a Text-To-Speech  (TTS) synthesizer, since it does
-not accept raw text as input.  In  order to obtain  a full TTS system,
+It is therefore NOT a Text-To-Speech (TTS) synthesizer, since it does
+not accept raw text as input.  In order to obtain a full TTS system,
 you need to use this synthesizer in combination with a text processing
 system that produces phonetic and prosodic commands.
 
-We maintain a web page with pointers to such freely available systems:
-
-http://tcts.fpms.ac.be/synthesis/mbrtts.html
-
-This software is the heart of the MBROLA project,  the aim of which is
-to   obtain  a set a   speech  synthesizers for as   many languages as
+This software is the heart of the MBROLA project, the aim of which is
+to obtain a set a speech synthesizers for as many languages as
 possible, free of use for non-commercial applications.
-mbrola.exe  or mbrola: An  executable  file of the synthesizer  itself
-(depends on the computer supposed to run it) 
-readme.txt : This file
 
-As   such,  it  requires an  MBROLA    language/voice database  to run
-properly.   American  English,  Brazilian  Portuguese, Breton, British
+As such, it requires an MBROLA language/voice database to run
+properly.  American English, Brazilian Portuguese, Breton, British
 English, Croatian, Dutch, French, German, Greek, Romanian, Spanish and
-Swedish  voices are made   available. Additional languages and  voices
+Swedish voices are made available. Additional languages and voices
 will be available in the context of the MBROLA project.
 
 Some of these voices are available as mbrolavox-* packages, in the
-NetBSD packages system. For otheres, please consult the mbrola
+NetBSD packages system. For others, please consult the mbrola
 project's home page.
-
-http://tcts.fpms.ac.be/synthesis
diff --git a/audio/mbrola/pkg/PLIST b/audio/mbrola/pkg/PLIST
index 6eb82c6aa25..126833d9c9c 100644
--- a/audio/mbrola/pkg/PLIST
+++ b/audio/mbrola/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/10/11 14:00:34 proff Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/18 15:19:47 wiz Exp $
 bin/mbrola
 share/doc/mbrola/readme.txt
+@unexec rm -r %D/share/mbrola
 @dirrm share/doc/mbrola