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.
2001-07-18 15:19:35 +00:00 · 2001-07-18 15:19:35 +00:00 · a2719a456c
commit a2719a456c
parent 49a5b2f023
55 changed files with 337 additions and 332 deletions
--- a/audio/festdoc/Makefile
+++ b/audio/festdoc/Makefile
@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2001/07/14 12:37:45 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/07/18 15:19:35 wiz Exp $

 DISTNAME=	festdoc-1.4.0.1
 PKGNAME=	festival-doc-1.4.0.1
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/

 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
-COMMENT=	Festival documentation, in (text)info, html, dvi and ps formats
+COMMENT=	Festival documentation, in (tex)info, html, dvi and ps formats

 NO_BUILD=	yes

@ -25,10 +26,11 @@ post-extract:
 do-install:
 	${INSTALL_DATA_DIR} ${FDOC}
 	cd ${WRKSRC} && info=`${FIND} . -name '*.info*' -type f` && \
-	  ${CP} $$info ${PREFIX}/info && \
-	  ${CP} -r ${WRKSRC}/* ${FDOC} && \
-	  cd ${FDOC} && \
-	  ${RM} -f $$info && \
-	  ${RMDIR} festival/info
+		${CP} $$info ${PREFIX}/info && \
+		${CP} -r ${WRKSRC}/* ${FDOC} && \
+		cd ${FDOC} && \
+		${RM} -f $$info && \
+		${RMDIR} festival/info
+	${RM} ${PREFIX}/info/festival.info.orig

 .include "../../mk/bsd.pkg.mk"
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.16 2001/07/14 12:37:46 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/07/18 15:19:36 wiz Exp $

-DISTNAME=	festival-1.4.0
+DISTNAME=	festival-1.4.1
 WRKSRC=		${WRKDIR}
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/ \
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/ \
 		ftp://cslu.cse.ogi.edu/pub/tts/
 DISTFILES=	${DISTNAME}.tar.gz \
-		speech_tools-1.2.0.tar.gz \
-		OGIresLPC-2.0.3.tar.gz \
-		OGIfestpatch-1.4.0.tar.gz
+		speech_tools-1.2.1.tar.gz \
+		OGIresLPC-2.0.9.tar.gz \
+		OGIfestpatch-1.4.1.2.tar.gz
 # note that OGIfestpatch above file must be extracted last. it is, however
 # this behavior not defined in pkgsrc at the time of writing

@ -16,8 +17,6 @@ MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	Festival is an advanced multi-lingual speech synthesis system

-DEPENDS+=	nas>=1.2.5:../../audio/nas
-
 USE_GMAKE=	yes

 SPEECHTOOLS=	${WRKSRC}/speech_tools
@ -75,6 +74,7 @@ do-install:
 	${INSTALL_MAN} ${FESTIVAL}/doc/festival.1 ${PREFIX}/man/man1/festival.1
 	${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${PREFIX}/man/man1/festival_client.1

+.include "../../audio/nas/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"

 # has to be below bsd.pkg.mk, else ${ECHO} isn't expanded correctly
--- a/audio/festival/distinfo
+++ b/audio/festival/distinfo
@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 13:04:21 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/18 15:19:36 wiz Exp $

-SHA1 (festival-1.4.0.tar.gz) = cb39e0521b26a19bab137fc83cc51a9576e3ecc0
-Size (festival-1.4.0.tar.gz) = 526781 bytes
-SHA1 (speech_tools-1.2.0.tar.gz) = 9cecc961d966bff9f62bc67c75b96c9dcd42f93b
-Size (speech_tools-1.2.0.tar.gz) = 1190451 bytes
-SHA1 (OGIresLPC-2.0.3.tar.gz) = d6007c0476861dffbb90ee2434f34d354af1d7e5
-Size (OGIresLPC-2.0.3.tar.gz) = 113262 bytes
-SHA1 (OGIfestpatch-1.4.0.tar.gz) = fdea319950cbf7f0d0426a40d1ddc2df2bee2512
-Size (OGIfestpatch-1.4.0.tar.gz) = 13010 bytes
+SHA1 (festival-1.4.1.tar.gz) = d3be7d58b986c37c39444a2dcc044cdc3ee1e774
+Size (festival-1.4.1.tar.gz) = 543335 bytes
+SHA1 (speech_tools-1.2.1.tar.gz) = 6facbaeaacb5022a20e59d669eaaeee8d9899e42
+Size (speech_tools-1.2.1.tar.gz) = 1206616 bytes
+SHA1 (OGIresLPC-2.0.9.tar.gz) = e54b7d3f7ed1696a6eeca0fe1695a099d2ed3712
+Size (OGIresLPC-2.0.9.tar.gz) = 140306 bytes
+SHA1 (OGIfestpatch-1.4.1.2.tar.gz) = 12b1b0198facf10fc781ac5d0a1521d45da30c9d
+Size (OGIfestpatch-1.4.1.2.tar.gz) = 32904 bytes
 SHA1 (patch-aa) = be60f30a65bd7d7d49a438c274a8c1b1f0fb64fc
 SHA1 (patch-ab) = 5d49c932446fb625c9e6bd114af67c9d959bb2ba
 SHA1 (patch-ac) = 64597fabe79d93f402bcf5bf100ac2e9d0613e0c
-SHA1 (patch-ad) = 24110cc98f6d36becd5f38cba6a48c7785839f4b
+SHA1 (patch-ad) = 42d20ef5aca5752093224e50c177e55465a1155f
 SHA1 (patch-ae) = d045128bacdedf05cd18b0dd750ea6a6a34a0ce4
 SHA1 (patch-af) = 3bcd5f48bcc6f2ecc68e179d8a0c70cdd6cfa5fd
 SHA1 (patch-ag) = 17f19d5b738f44f98bb2572f0a8231429adb6065
--- a/audio/festival/files/NetBSD.mak
+++ b/audio/festival/files/NetBSD.mak
@ -5,11 +5,8 @@ ECHO_N = /usr/bin/printf "%s"

 NAWK=awk

-NAS_LIB=$(PKG_X11BASE)/lib
-NAS_INCLUDE=$(PKG_X11BASE)/include
+NAS_LIB=${BUILDLINK_DIR}/lib
+NAS_INCLUDE=${BUILDLINK_DIR}/include

 X11_LIB=$(PKG_X11BASE)/lib
 X11_INCLUDE=$(PKG_X11BASE)/include
-
-OS_INCLUDES+=-I$(PKG_PREFIX)/include
-OS_LIBS+=-L$(PKG_PREFIX)/lib
--- a/audio/festival/patches/patch-ad
+++ b/audio/festival/patches/patch-ad
@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 1999/10/11 14:13:49 proff Exp $
+$NetBSD: patch-ad,v 1.3 2001/07/18 15:19:36 wiz Exp $

--- speech_tools/config/config	Mon Oct 11 07:48:44 1999
-+++ speech_tools/config/config	Mon Oct 11 05:57:33 1999
+--- speech_tools/config/config.orig	Tue Jul 17 16:03:21 2001
+++ speech_tools/config/config
@@ -15,7 +15,7 @@
 ## You may need to set this explicitly if automounter or NFS
 ## side effects cause problems
@ -34,16 +34,19 @@ $NetBSD: patch-ad,v 1.2 1999/10/11 14:13:49 proff Exp $
 ###########################################################################
 ## Java system to use if you include the Java interface.
 ## Examples jdk
-@@ -77,10 +81,12 @@
+@@ -77,13 +81,15 @@
 ## specify a program to play files in a desired format.
 
 ## NCD's network audio system, This is recommended.
 -# INCLUDE_MODULES += NAS_AUDIO
 +INCLUDE_MODULES += NAS_AUDIO
 
+ ## Elightenment Sound Demon, for KDE etc.
+ # INCLUDE_MODULES += ESD_AUDIO
+ 
 ## Native audio for your platform (sun, linux, freebsd, irix, windows)
 -INCLUDE_MODULES += NATIVE_AUDIO
-+#INCLUDE_MODULES += NATIVE_AUDIO
+# INCLUDE_MODULES += NATIVE_AUDIO
 +# The NetBSD pkg doesn't support native audio at this time. NAS is
 +# superior for most applications.
 
--- a/audio/festival/pkg/PLIST
+++ b/audio/festival/pkg/PLIST
@ -1,73 +1,87 @@
-@comment $NetBSD: PLIST,v 1.3 1999/10/27 14:20:50 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/07/18 15:19:37 wiz Exp $
 bin/festival
 bin/festival_client
+libexec/audsp
 libexec/festival.naked
 libexec/festival_client.naked
-libexec/audsp
 man/man1/festival.1
 man/man1/festival_client.1
+share/festival/examples/Makefile
+share/festival/examples/addr-mode.scm
+share/festival/examples/benchmark
+share/festival/examples/benchmark.orig
+share/festival/examples/benchmark.text
+share/festival/examples/dumpfeats
+share/festival/examples/dumpfeats.sh
+share/festival/examples/durmeanstd
+share/festival/examples/durmeanstd.sh
+share/festival/examples/ex1.email
+share/festival/examples/ex1.ogi
+share/festival/examples/example.sable
+share/festival/examples/example.th
+share/festival/examples/example2.sable
+share/festival/examples/festival_client.c
+share/festival/examples/festival_client.h
+share/festival/examples/festival_client.pl
+share/festival/examples/intro.text
+share/festival/examples/latest
+share/festival/examples/latest.sh
+share/festival/examples/make_utts
+share/festival/examples/make_utts.sh
+share/festival/examples/saytime
+share/festival/examples/saytime.sh
+share/festival/examples/scfg_parse_text
+share/festival/examples/scfg_parse_text.sh
+share/festival/examples/speech_pm_1.0.tar
+share/festival/examples/spintro.text
+share/festival/examples/text2pos
+share/festival/examples/text2pos.sh
+share/festival/examples/text2wave
+share/festival/examples/text2wave.sh
+share/festival/examples/th-mode.scm
+share/festival/examples/tobi.stml
+share/festival/examples/toksearch.scm
+share/festival/examples/webdemo.scm
 share/festival/lib/Makefile
+share/festival/lib/Sable.v0_2.dtd
 share/festival/lib/VCLocalRules
-share/festival/lib/mrpa_phones.scm
-share/festival/lib/mrpa_allophones.scm
-share/festival/lib/radio_phones.scm
-share/festival/lib/holmes_phones.scm
-share/festival/lib/darpa_phones.scm
-share/festival/lib/phoneset.scm
-share/festival/lib/mrpa_durs.scm
-share/festival/lib/klatt_durs.scm
-share/festival/lib/gswdurtreeZ.scm
-share/festival/lib/f2bdurtreeZ.scm
-share/festival/lib/tobi.scm
-share/festival/lib/f2bf0lr.scm
-share/festival/lib/tobi_rules.scm
-share/festival/lib/tilt.scm
-share/festival/lib/sec.ts20.quad.ngrambin
-share/festival/lib/sec.B.hept.ngrambin
-share/festival/lib/init.scm
-share/festival/lib/synthesis.scm
-share/festival/lib/module_description.scm
-share/festival/lib/lexicons.scm
-share/festival/lib/festival.scm
-share/festival/lib/intonation.scm
-share/festival/lib/duration.scm
-share/festival/lib/pos.scm
-share/festival/lib/phrase.scm
-share/festival/lib/voices.scm
-share/festival/lib/tts.scm
-share/festival/lib/festdoc.scm
-share/festival/lib/languages.scm
-share/festival/lib/token.scm
-share/festival/lib/mbrola.scm
-share/festival/lib/display.scm
-share/festival/lib/postlex.scm
-share/festival/lib/tokenpos.scm
-share/festival/lib/festtest.scm
-share/festival/lib/cslush.scm
 share/festival/lib/cart_aux.scm
-share/festival/lib/pauses.scm
-share/festival/lib/scfg.scm
-share/festival/lib/mettree.scm
-share/festival/lib/java.scm
-share/festival/lib/lts.scm
+share/festival/lib/cslush.scm
+share/festival/lib/cstr.scm
+share/festival/lib/darpa_phones.scm
+share/festival/lib/display.scm
+share/festival/lib/duration.scm
+share/festival/lib/email-mode.scm
 share/festival/lib/engmorph.scm
 share/festival/lib/engmorphsyn.scm
-share/festival/lib/lts_build.scm
-share/festival/lib/Sable.v0_2.dtd
-share/festival/lib/sable-latin.ent
-share/festival/lib/festival.el
-share/festival/lib/scfg_wsj_wp20.gram
-share/festival/lib/speech.properties
-share/festival/lib/email-mode.scm
-share/festival/lib/ogimarkup-mode.scm
-share/festival/lib/sable-mode.scm
-share/festival/lib/soleml-mode.scm
 share/festival/lib/etc/Makefile
-share/festival/lib/etc/email_filter
 share/festival/lib/etc/NetBSD/.made
-@dirrm share/festival/lib/etc/NetBSD
-@dirrm share/festival/lib/etc
-share/festival/lib/ogi_cslush.scm
+share/festival/lib/etc/email_filter
+share/festival/lib/f2bdurtreeZ.scm
+share/festival/lib/f2bf0lr.scm
+share/festival/lib/festdoc.scm
+share/festival/lib/festival.el
+share/festival/lib/festival.scm
+share/festival/lib/festtest.scm
+share/festival/lib/fringe.scm
+share/festival/lib/gswdurtreeZ.scm
+share/festival/lib/holmes_phones.scm
+share/festival/lib/init.scm
+share/festival/lib/intonation.scm
+share/festival/lib/java.scm
+share/festival/lib/klatt_durs.scm
+share/festival/lib/languages.scm
+share/festival/lib/lexicons.scm
+share/festival/lib/lts.scm
+share/festival/lib/lts_build.scm
+share/festival/lib/mbrola.scm
+share/festival/lib/mettree.scm
+share/festival/lib/module_description.scm
+share/festival/lib/mrpa_allophones.scm
+share/festival/lib/mrpa_durs.scm
+share/festival/lib/mrpa_phones.scm
+share/festival/lib/ogi_effect.scm
+share/festival/lib/ogi_enhance.scm
 share/festival/lib/ogi_gswdurtreeZ_wb.scm
 share/festival/lib/ogi_hack.scm
 share/festival/lib/ogi_kddurtreeZ_wb.scm
@ -78,48 +92,40 @@ share/festival/lib/ogi_lts_worldbet.scm
 share/festival/lib/ogi_phrase.scm
 share/festival/lib/ogi_postlex.scm
 share/festival/lib/ogi_synthesis.scm
+share/festival/lib/ogi_token.scm
 share/festival/lib/ogi_unitsel.scm
+share/festival/lib/ogi_wordsynth.scm
 share/festival/lib/ogi_worldbet_phones.scm
+share/festival/lib/ogimarkup-mode.scm
+share/festival/lib/pauses.scm
+share/festival/lib/phoneset.scm
+share/festival/lib/phrase.scm
+share/festival/lib/pos.scm
+share/festival/lib/postlex.scm
+share/festival/lib/radio_phones.scm
+share/festival/lib/sable-latin.ent
+share/festival/lib/sable-mode.scm
+share/festival/lib/scfg.scm
+share/festival/lib/scfg_wsj_wp20.gram
+share/festival/lib/sec.B.hept.ngrambin
+share/festival/lib/sec.ts20.quad.ngrambin
 share/festival/lib/siod.scm
-share/festival/lib/web.scm
-share/festival/lib/cstr.scm
-share/festival/lib/fringe.scm
 share/festival/lib/sitevars.scm
+share/festival/lib/soleml-mode.scm
+share/festival/lib/speech.properties
+share/festival/lib/synthesis.scm
+share/festival/lib/tilt.scm
+share/festival/lib/tobi.scm
+share/festival/lib/tobi_rules.scm
+share/festival/lib/token.scm
+share/festival/lib/tokenpos.scm
+share/festival/lib/tts.scm
+share/festival/lib/voices.scm
+share/festival/lib/web.scm
+@unexec rm -r %D/share/festival/lib/voices
+@unexec rm -r %D/share/festival/lib/dicts
+@dirrm share/festival/lib/etc/NetBSD
+@dirrm share/festival/lib/etc
@dirrm share/festival/lib
-share/festival/examples/Makefile
-share/festival/examples/webdemo.scm
-share/festival/examples/ex1.email
-share/festival/examples/ex1.ogi
-share/festival/examples/example.sable
-share/festival/examples/example2.sable
-share/festival/examples/tobi.stml
-share/festival/examples/example.th
-share/festival/examples/intro.text
-share/festival/examples/spintro.text
-share/festival/examples/benchmark.text
-share/festival/examples/saytime.sh
-share/festival/examples/text2pos.sh
-share/festival/examples/latest.sh
-share/festival/examples/scfg_parse_text.sh
-share/festival/examples/text2wave.sh
-share/festival/examples/make_utts.sh
-share/festival/examples/dumpfeats.sh
-share/festival/examples/durmeanstd.sh
-share/festival/examples/benchmark
-share/festival/examples/festival_client.pl
-share/festival/examples/toksearch.scm
-share/festival/examples/th-mode.scm
-share/festival/examples/addr-mode.scm
-share/festival/examples/festival_client.c
-share/festival/examples/festival_client.h
-share/festival/examples/benchmark.orig
-share/festival/examples/saytime
-share/festival/examples/text2pos
-share/festival/examples/latest
-share/festival/examples/scfg_parse_text
-share/festival/examples/text2wave
-share/festival/examples/make_utts
-share/festival/examples/dumpfeats
-share/festival/examples/durmeanstd
@dirrm share/festival/examples
@dirrm share/festival
--- a/audio/festlex-cmu/Makefile
+++ b/audio/festlex-cmu/Makefile
@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2001/07/14 12:37:46 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/07/18 15:19:37 wiz Exp $

 DISTNAME=	festlex_CMU
 PKGNAME=	festlex-cmu-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/

 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	CMU American English pronounciation dictionary for Festival

-DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festival>=1.4.0:../festival

 NO_BUILD=	yes

--- a/audio/festlex-cmu/pkg/PLIST
+++ b/audio/festlex-cmu/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1999/10/27 15:34:11 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/07/18 15:19:37 wiz Exp $
 share/festival/lib/dicts/cmu/cmulex.scm
 share/festival/lib/dicts/cmu/cmu_lts_rules.scm
 share/festival/lib/dicts/cmu/cmudict-0.4.out
@ -9,4 +9,3 @@ share/festival/lib/dicts/cmu/cmu2ft
 share/festival/lib/dicts/cmu/cmudict_extensions.scm
 share/festival/lib/dicts/cmu/COPYING
@dirrm share/festival/lib/dicts/cmu
-@dirrm share/festival/lib/dicts
--- a/audio/festlex-oald/Makefile
+++ b/audio/festlex-oald/Makefile
@ -1,16 +1,19 @@
-# $NetBSD: Makefile,v 1.10 2001/07/14 12:37:46 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/07/18 15:19:37 wiz Exp $

 DISTNAME=	festlex_OALD
 PKGNAME=	festlex-oald-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/

 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	Oxford Advanced Learner's pronounciation dictionary for Festival

-DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festival>=1.4.0:../festival
+
+LICENSE=	no-commercial-use

 NO_BUILD=	yes

--- a/audio/festlex-oald/pkg/PLIST
+++ b/audio/festlex-oald/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/10/27 15:41:31 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/07/18 15:19:38 wiz Exp $
 share/festival/lib/dicts/oald/cuvoald710-0.2.scm
 share/festival/lib/dicts/oald/oald_lts_rules.scm
 share/festival/lib/dicts/oald/oaldlex.scm
@ -9,4 +9,3 @@ share/festival/lib/dicts/oald/oald2ft.tar.gz
 share/festival/lib/dicts/oald/oald-0.4.out
 share/festival/lib/dicts/oald/COPYING
@dirrm share/festival/lib/dicts/oald
-@dirrm share/festival/lib/dicts
--- a/audio/festlex-ogi/Makefile
+++ b/audio/festlex-ogi/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/14 12:37:47 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/07/18 15:19:38 wiz Exp $

 DISTNAME=	OGIlexicon-2.0
 PKGNAME=	festlex-ogi-2.0
@ -7,11 +7,11 @@ CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/

 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://cslu.cse.ogi.edu/tts
+HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	Composite pronounciation dictionary from ogi.edu for festival

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex

 LICENSE=	no-commercial-use

--- a/audio/festlex-ogi/pkg/PLIST
+++ b/audio/festlex-ogi/pkg/PLIST
@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/04/04 19:33:08 proff Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/18 15:19:38 wiz Exp $
 share/festival/lib/dicts/ogi_lex.out
+share/festival/lib/dicts/ogilex_lts_rules.scm
--- a/audio/festlex-poslex/Makefile
+++ b/audio/festlex-poslex/Makefile
@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2001/07/14 12:37:47 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/07/18 15:19:38 wiz Exp $

 DISTNAME=	festlex_POSLEX
 PKGNAME=	festlex-poslex-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/

 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	English lexicon suitable for use with Festival

-DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festival>=1.4.0:../festival

 NO_BUILD=	yes

--- a/audio/festlex-poslex/pkg/PLIST
+++ b/audio/festlex-poslex/pkg/PLIST
@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/04/04 19:33:21 proff Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/18 15:19:39 wiz Exp $
 share/festival/lib/dicts/wsj.wp39.poslexR
 share/festival/lib/dicts/wsj.wp39.tri.ngrambin
+share/festival/lib/dicts/COPYING.poslex
--- a/audio/festogi-spanish/Makefile
+++ b/audio/festogi-spanish/Makefile
@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.10 2001/07/14 12:37:47 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/07/18 15:19:39 wiz Exp $

-DISTNAME=	OGIspanish-2.0
-PKGNAME=	festogi-spanish-2.0
+DISTNAME=	OGIspanish-2.0.1
+PKGNAME=	festogi-spanish-2.0.1
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/

 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://cslu.cse.ogi.edu/tts
+HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	Festival Spanish (Mexican) language support routines (in scheme)

-DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festival>=1.4.0:../festival

 LICENSE=	no-commercial-use

@ -21,6 +21,7 @@ FHOME=		${PREFIX}/share/festival
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
 	@ ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
+	@ ${RM} -R ${WRKSRC}/lib/ogi_spanish/CVS

 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
--- a/audio/festogi-spanish/distinfo
+++ b/audio/festogi-spanish/distinfo
@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/05/09 21:55:32 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/07/18 15:19:39 wiz Exp $

-SHA1 (OGIspanish-2.0.tar.gz) = 7f62aaba99d20fe403ababcf5afcc79eac57fee7
-Size (OGIspanish-2.0.tar.gz) = 15683 bytes
+SHA1 (OGIspanish-2.0.1.tar.gz) = d5eeec91574606cf6edbb580ba53850a18f0af2c
+Size (OGIspanish-2.0.1.tar.gz) = 15783 bytes
--- a/audio/festogi-spanish/pkg/PLIST
+++ b/audio/festogi-spanish/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/04/04 19:33:34 proff Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/18 15:19:39 wiz Exp $
 share/festival/lib/ogi_spanish/ogi_span_mx_duration.scm
 share/festival/lib/ogi_spanish/ogi_span_mx_intonation.scm
 share/festival/lib/ogi_spanish/ogi_span_mx_lexicon.scm
@ -7,4 +7,4 @@ share/festival/lib/ogi_spanish/ogi_span_mx_phones.scm
 share/festival/lib/ogi_spanish/ogi_span_mx_phrasing.scm
 share/festival/lib/ogi_spanish/ogi_span_mx_syl.scm
 share/festival/lib/ogi_spanish/ogi_span_mx_token.scm
-@dirrm festival/lib/ogi_spanish
+@dirrm share/festival/lib/ogi_spanish
--- a/audio/festvox-abc/Makefile
+++ b/audio/festvox-abc/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/07/14 12:37:47 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:39 wiz Exp $

 DISTNAME=	voice_abc_di-2.0
 PKGNAME=	festvox-abc-2.0
@ -7,12 +7,12 @@ CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/

 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://cslu.cse.ogi.edu/tts
+HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	Mexican Spanish male voice for the festival speech synthesis system

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-ogi-2.0:../festlex-ogi
-DEPENDS+=	festogi-spanish-2.0:../festogi-spanish
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-ogi>=2.0:../festlex-ogi
+DEPENDS+=	festogi-spanish>=2.0:../festogi-spanish

 LICENSE=	no-commercial-use

--- a/audio/festvox-abc/pkg/PLIST
+++ b/audio/festvox-abc/pkg/PLIST
@ -1,10 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 1999/10/28 00:48:32 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/07/18 15:19:40 wiz Exp $
 share/festival/lib/voices/spanish/abc_diphone/festvox/abc_diphone.scm
 share/festival/lib/voices/spanish/abc_diphone/festvox/abcdiph.msec
 share/festival/lib/voices/spanish/abc_diphone/group/abc_di_resLPC.group
@dirrm share/festival/lib/voices/spanish/abc_diphone/festvox
@dirrm share/festival/lib/voices/spanish/abc_diphone/group
@dirrm share/festival/lib/voices/spanish/abc_diphone
-@dirrm share/festival/lib/voices/spanish
-@dirrm share/festival/lib/voices
-@dirrm share/festival/lib
--- a/audio/festvox-aec/Makefile
+++ b/audio/festvox-aec/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/07/14 12:37:48 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:40 wiz Exp $

 DISTNAME=	voice_aec_di-2.0
 PKGNAME=	festvox-aec-2.0
@ -7,11 +7,11 @@ CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/

 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://cslu.cse.ogi.edu/tts
+HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	American English male voice for the festival speech synthesis system

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-ogi-2.0:../festlex-ogi
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-ogi>=2.0:../festlex-ogi

 LICENSE=	no-commercial-use

--- a/audio/festvox-don/Makefile
+++ b/audio/festvox-don/Makefile
@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.13 2001/07/14 12:37:48 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:40 wiz Exp $

 DISTNAME=	festvox_don
 PKGNAME=	festvox-don-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/

 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	British English male voice for the festival speech synthesis system

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
-DEPENDS+=	festlex-oald-1.4.0:../festlex-oald
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
+DEPENDS+=	festlex-oald>=1.4.0:../festlex-oald

 NO_BUILD=	yes

--- a/audio/festvox-don/pkg/PLIST
+++ b/audio/festvox-don/pkg/PLIST
@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/04/04 19:34:09 proff Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/18 15:19:40 wiz Exp $
+share/festival/lib/voices/english/don_diphone/COPYING
 share/festival/lib/voices/english/don_diphone/diphlocs.txt
 share/festival/lib/voices/english/don_diphone/lpcdiphs.bin
-share/festival/lib/voices/english/don_diphone/festvox
 share/festival/lib/voices/english/don_diphone/festvox/don_diphone.scm
+@dirrm share/festival/lib/voices/english/don_diphone/festvox
@dirrm share/festival/lib/voices/english/don_diphone
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2001/07/14 12:37:48 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/07/18 15:19:41 wiz Exp $

 DISTNAME=	festvox_ellpc11k
 PKGNAME=	festvox-el11-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/

 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	Castilian Spanish male voice for the festival speech synthesis system

-DEPENDS+=	festival-1.4.0:../festival
+DEPENDS+=	festival>=1.4.1:../festival

 LICENSE=	no-commercial-use

--- a/audio/festvox-el11/pkg/PLIST
+++ b/audio/festvox-el11/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/04/04 19:34:21 proff Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/18 15:19:41 wiz Exp $
 share/festival/lib/voices/spanish/el_diphone/group/ellpc11k.group
@dirrm share/festival/lib/voices/spanish/el_diphone/group
 share/festival/lib/voices/spanish/el_diphone/festvox/el_diphone.scm
@ -6,4 +6,5 @@ share/festival/lib/voices/spanish/el_diphone/festvox/spanlex.scm
 share/festival/lib/voices/spanish/el_diphone/festvox/spanint.scm
 share/festival/lib/voices/spanish/el_diphone/festvox/sptoken.scm
@dirrm share/festival/lib/voices/spanish/el_diphone/festvox
+share/festival/lib/voices/spanish/el_diphone/COPYING
@dirrm share/festival/lib/voices/spanish/el_diphone
--- a/audio/festvox-en1/Makefile
+++ b/audio/festvox-en1/Makefile
@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.13 2001/07/14 12:37:48 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:41 wiz Exp $

 DISTNAME=	festvox_en1
 PKGNAME=	festvox-en1-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/

 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	MBROLA based British English male voice for festival

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
-DEPENDS+=	festlex-oald-1.4.0:../festlex-oald
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
+DEPENDS+=	festlex-oald>=1.4.0:../festlex-oald
 DEPENDS+=	mbrola-301h:../mbrola
 DEPENDS+=	mbrolavox-en1-980910:../mbrolavox-en1

@ -23,8 +24,6 @@ NO_BUILD=	yes
 FHOME=		${PREFIX}/share/festival
 MBROLA=		${FHOME}/lib/voices/english/en1_mbrola

-ONLY_FOR_PLATFORM=      NetBSD-*-i386
-
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
 	@ ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
--- a/audio/festvox-hvs/Makefile
+++ b/audio/festvox-hvs/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/07/14 12:37:49 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:41 wiz Exp $

 DISTNAME=	voice_hvs_di-2.0
 PKGNAME=	festvox-hvs-2.0
@ -7,12 +7,12 @@ CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/

 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://cslu.cse.ogi.edu/tts
+HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	Mexican Spanish female voice for the festival

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-ogi-2.0:../festlex-ogi
-DEPENDS+=	festogi-spanish-2.0:../festogi-spanish
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-ogi>=2.0:../festlex-ogi
+DEPENDS+=	festogi-spanish>=2.0:../festogi-spanish

 LICENSE=	no-commercial-use

--- a/audio/festvox-jph/Makefile
+++ b/audio/festvox-jph/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/07/14 12:37:49 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:42 wiz Exp $

 DISTNAME=	voice_jph_di-2.0
 PKGNAME=	festvox-jph-2.0
@ -7,11 +7,11 @@ CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/

 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://cslu.cse.ogi.edu/tts
+HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	American English male voice for the festival speech synthesis system

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-ogi-2.0:../festlex-ogi
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-ogi>=2.0:../festlex-ogi

 LICENSE=	no-commercial-use

--- a/audio/festvox-kal16/Makefile
+++ b/audio/festvox-kal16/Makefile
@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.11 2001/07/14 12:37:49 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/07/18 15:19:42 wiz Exp $

 DISTNAME=	festvox_kallpc16k
 PKGNAME=	festvox-kal16-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/

 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	16khz American English male voice for the festival speech synthesis system

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
-DEPENDS+=	festlex-cmu-1.4.0:../festlex-cmu
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
+DEPENDS+=	festlex-cmu>=1.4.0:../festlex-cmu

 CONFLICTS=	festvox-kal8-*

--- a/audio/festvox-kal16/pkg/PLIST
+++ b/audio/festvox-kal16/pkg/PLIST
@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/04/04 19:34:56 proff Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/18 15:19:42 wiz Exp $
+share/festival/lib/voices/english/kal_diphone/COPYING
 share/festival/lib/voices/english/kal_diphone/group/kallpc16k.group
@dirrm share/festival/lib/voices/english/kal_diphone/group
 share/festival/lib/voices/english/kal_diphone/festvox/kal_diphone.scm
--- a/audio/festvox-kal8/Makefile
+++ b/audio/festvox-kal8/Makefile
@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.13 2001/07/14 12:37:49 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:42 wiz Exp $

 DISTNAME=	festvox_kallpc8k
 PKGNAME=	festvox-kal8-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/

 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	8khz American English male voice for the festival speech synthesis system

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
-DEPENDS+=	festlex-cmu-1.4.0:../festlex-cmu
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
+DEPENDS+=	festlex-cmu>=1.4.0:../festlex-cmu

 CONFLICTS=	festvox-kal16-*

--- a/audio/festvox-ked16/Makefile
+++ b/audio/festvox-ked16/Makefile
@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.11 2001/07/14 12:37:50 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/07/18 15:19:43 wiz Exp $

 DISTNAME=	festvox_kedlpc16k
 PKGNAME=	festvox-ked16-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/

 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	16khz American English male voice for the festival speech synthesis system

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
-DEPENDS+=	festlex-cmu-1.4.0:../festlex-cmu
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
+DEPENDS+=	festlex-cmu>=1.4.0:../festlex-cmu

 CONFLICTS=	festvox-ked8-*

--- a/audio/festvox-ked16/pkg/PLIST
+++ b/audio/festvox-ked16/pkg/PLIST
@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/04/04 19:35:19 proff Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/18 15:19:43 wiz Exp $
+share/festival/lib/voices/english/ked_diphone/COPYING
 share/festival/lib/voices/english/ked_diphone/group/kedlpc16k.group
@dirrm share/festival/lib/voices/english/ked_diphone/group
 share/festival/lib/voices/english/ked_diphone/festvox/ked_diphone.scm
--- a/audio/festvox-ked8/Makefile
+++ b/audio/festvox-ked8/Makefile
@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.14 2001/07/14 12:37:50 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/07/18 15:19:43 wiz Exp $

 DISTNAME=	festvox_kedlpc8k
 PKGNAME=	festvox-ked8-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/

 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	8khz American English male voice for the festival speech synthesis system

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
-DEPENDS+=	festlex-cmu-1.4.0:../festlex-cmu
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
+DEPENDS+=	festlex-cmu>=1.4.0:../festlex-cmu

 CONFLICTS=	festvox-ked16-*

--- a/audio/festvox-mwm/Makefile
+++ b/audio/festvox-mwm/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/07/14 12:37:50 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:43 wiz Exp $

 DISTNAME=	voice_mwm_di-2.0
 PKGNAME=	festvox-mwm-2.0
@ -7,11 +7,11 @@ CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/

 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://cslu.cse.ogi.edu/tts
+HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	American English male voice for the festival speech synthesis system

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-ogi-2.0:../festlex-ogi
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-ogi>=2.0:../festlex-ogi

 LICENSE=	no-commercial-use

--- a/audio/festvox-mwm/pkg/PLIST
+++ b/audio/festvox-mwm/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/10/28 01:46:30 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/07/18 15:19:44 wiz Exp $
 share/festival/lib/voices/english/mwm_diphone/dic/mwmdiph.ms
 share/festival/lib/voices/english/mwm_diphone/dic/mwmgain.dat
 share/festival/lib/voices/english/mwm_diphone/dic/mwmdemi.ms
@ -6,6 +6,8 @@ share/festival/lib/voices/english/mwm_diphone/festvox/mwm_diphone.scm
 share/festival/lib/voices/english/mwm_diphone/festvox/mwmdiph.ms
 share/festival/lib/voices/english/mwm_diphone/festvox/mwmgain.dat
 share/festival/lib/voices/english/mwm_diphone/group/mwm_di_resLPC.group
+@dirrm share/festival/lib/voices/english/mwm_diphone/work
@dirrm share/festival/lib/voices/english/mwm_diphone/group
@dirrm share/festival/lib/voices/english/mwm_diphone/festvox
+@dirrm share/festival/lib/voices/english/mwm_diphone/dic
@dirrm share/festival/lib/voices/english/mwm_diphone
--- a/audio/festvox-ogirab/Makefile
+++ b/audio/festvox-ogirab/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/07/14 12:37:51 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:44 wiz Exp $

 DISTNAME=	voice_ogirab_di-2.0
 PKGNAME=	festvox-ogirab-2.0
@ -7,11 +7,11 @@ CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/

 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://cslu.cse.ogi.edu/tts
+HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	British English male voice for the festival speech synthesis system

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-ogi-2.0:../festlex-ogi
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-ogi>=2.0:../festlex-ogi

 LICENSE=	no-commercial-use

--- a/audio/festvox-rab16/Makefile
+++ b/audio/festvox-rab16/Makefile
@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.11 2001/07/14 12:37:51 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/07/18 15:19:44 wiz Exp $

 DISTNAME=	festvox_rablpc16k
 PKGNAME=	festvox-rab16-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/

 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	16khz British English male voice for the festival speech synthesis system

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
-DEPENDS+=	festlex-oald-1.4.0:../festlex-oald
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
+DEPENDS+=	festlex-oald>=1.4.0:../festlex-oald

 CONFLICTS=	festvox-rab8-*

--- a/audio/festvox-rab16/pkg/PLIST
+++ b/audio/festvox-rab16/pkg/PLIST
@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/04/04 19:36:19 proff Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/18 15:19:44 wiz Exp $
+share/festival/lib/voices/english/rab_diphone/COPYING
 share/festival/lib/voices/english/rab_diphone/group/rablpc16k.group
@dirrm share/festival/lib/voices/english/rab_diphone/group
 share/festival/lib/voices/english/rab_diphone/festvox/rab_diphone.scm
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.15 2001/07/14 12:37:51 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/07/18 15:19:44 wiz Exp $

 DISTNAME=	festvox_rablpc8k
 PKGNAME=	festvox-rab8-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/

 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	6khz British English male voice for the festival

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
-DEPENDS+=	festlex-oald-1.4.0:../festlex-oald
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
+DEPENDS+=	festlex-oald>=1.4.0:../festlex-oald

 CONFLICTS=	festvox-rab16-*

--- a/audio/festvox-tll/Makefile
+++ b/audio/festvox-tll/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/07/14 12:37:51 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:45 wiz Exp $

 DISTNAME=	voice_tll_di-2.0
 PKGNAME=	festvox-tll-2.0
@ -7,11 +7,11 @@ CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/

 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://cslu.cse.ogi.edu/tts
+HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	American English female voice for the festival speech synthesis system

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-ogi-2.0:../festlex-ogi
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-ogi>=2.0:../festlex-ogi

 LICENSE=	no-commercial-use

--- a/audio/festvox-us1/Makefile
+++ b/audio/festvox-us1/Makefile
@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.8 2001/07/14 12:37:51 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/07/18 15:19:45 wiz Exp $

 DISTNAME=	festvox_us1
 PKGNAME=	festvox-us1-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/

 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	MBROLA based American English female voice for festival

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
-DEPENDS+=	festlex-cmu-1.4.0:../festlex-cmu
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
+DEPENDS+=	festlex-cmu>=1.4.0:../festlex-cmu
 DEPENDS+=	mbrola-301h:../mbrola
 DEPENDS+=	mbrolavox-us1-980512:../mbrolavox-us1

@ -23,8 +24,6 @@ NO_BUILD=	yes
 FHOME=		${PREFIX}/share/festival
 MBROLA=		${FHOME}/lib/voices/english/us1_mbrola

-ONLY_FOR_PLATFORM=      NetBSD-*-i386
-
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
 	@ ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
--- a/audio/festvox-us2/Makefile
+++ b/audio/festvox-us2/Makefile
@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.8 2001/07/14 12:37:52 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/07/18 15:19:45 wiz Exp $

 DISTNAME=	festvox_us2
 PKGNAME=	festvox-us2-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/

 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	MBROLA based Americal English male voice for festival

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
-DEPENDS+=	festlex-cmu-1.4.0:../festlex-cmu
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
+DEPENDS+=	festlex-cmu>=1.4.0:../festlex-cmu
 DEPENDS+=	mbrola-301h:../mbrola
 DEPENDS+=	mbrolavox-us2-980812:../mbrolavox-us2

@ -23,8 +24,6 @@ NO_BUILD=	yes
 FHOME=		${PREFIX}/share/festival
 MBROLA=		${FHOME}/lib/voices/english/us2_mbrola

-ONLY_FOR_PLATFORM=      NetBSD-*-i386
-
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
 	@ ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
--- a/audio/festvox-us3/Makefile
+++ b/audio/festvox-us3/Makefile
@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.8 2001/07/14 12:37:52 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/07/18 15:19:45 wiz Exp $

 DISTNAME=	festvox_us3
 PKGNAME=	festvox-us3-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
+MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
+		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/

 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	MBROLA based American English male voice for festival

-DEPENDS+=	festival-1.4.0:../festival
-DEPENDS+=	festlex-poslex-1.4.0:../festlex-poslex
-DEPENDS+=	festlex-cmu-1.4.0:../festlex-cmu
+DEPENDS+=	festival>=1.4.0:../festival
+DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
+DEPENDS+=	festlex-cmu>=1.4.0:../festlex-cmu
 DEPENDS+=	mbrola-301h:../mbrola
 DEPENDS+=	mbrolavox-us3-990208:../mbrolavox-us3

@ -23,8 +24,6 @@ NO_BUILD=	yes
 FHOME=		${PREFIX}/share/festival
 MBROLA=		${FHOME}/lib/voices/english/us3_mbrola

-ONLY_FOR_PLATFORM=      NetBSD-*-i386
-
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
 	@ ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
--- 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
--- 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
--- 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
--- 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
--- a/audio/mbrolavox-en1/Makefile
+++ b/audio/mbrolavox-en1/Makefile
@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.12 2001/07/14 12:37:52 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/07/18 15:19:47 wiz Exp $

 DISTNAME=	en1-980910
 PKGNAME=	mbrolavox-en1-980910
 WRKSRC=		${WRKDIR}
 CATEGORIES=	audio
-MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/en1/
+MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/en1/ \
+		http://www.festvox.org/mbrola/dba/en1/
 EXTRACT_SUFX=	.zip

 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.festvox.org/mbrola/
 COMMENT=	British English male voice for MBROLA

 DEPENDS+=	mbrola-301h:../mbrola
@ -19,8 +20,6 @@ NO_BUILD=	yes

 MHOME=		${PREFIX}/share/mbrola/voices

-ONLY_FOR_PLATFORM=      NetBSD-*-i386
-
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
 	@ ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
--- a/audio/mbrolavox-en1/pkg/PLIST
+++ b/audio/mbrolavox-en1/pkg/PLIST
@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 1999/10/11 14:36:03 proff Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/07/18 15:19:47 wiz Exp $
 share/mbrola/voices/en1/en1
 share/mbrola/voices/en1/en1mrpa
 share/mbrola/voices/en1/en1.txt
-share/mbrola/voices/en1/TEST
 share/mbrola/voices/en1/TEST/euler.pho
 share/mbrola/voices/en1/TEST/eulerfr.pho
 share/mbrola/voices/en1/TEST/mbrola.pho
@ -11,5 +10,3 @@ share/mbrola/voices/en1/TEST/tobe.pho
 share/mbrola/voices/en1/TEST/mbroli.ini
@dirrm share/mbrola/voices/en1/TEST
@dirrm share/mbrola/voices/en1
-@dirrm share/mbrola/voices
-@dirrm share/mbrola
--- a/audio/mbrolavox-us1/Makefile
+++ b/audio/mbrolavox-us1/Makefile
@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2001/07/14 12:37:52 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/07/18 15:19:47 wiz Exp $

 DISTNAME=	us1-980512
 PKGNAME=	mbrolavox-us1-980512
 WRKSRC=		${WRKDIR}
 CATEGORIES=	audio
-MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us1/
+MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us1/ \
+		http://www.festvox.org/mbrola/dba/us1/
 EXTRACT_SUFX=	.zip

 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/
+HOMEPAGE=	http://www.festvox.org/mbrola/
 COMMENT=	American English female voice for MBROLA

 DEPENDS+=	mbrola-301h:../mbrola
@ -19,8 +20,6 @@ NO_BUILD=	yes

 MHOME=		${PREFIX}/share/mbrola/voices

-ONLY_FOR_PLATFORM=      NetBSD-*-i386
-
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
 	@ ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
--- a/audio/mbrolavox-us1/pkg/PLIST
+++ b/audio/mbrolavox-us1/pkg/PLIST
@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/10/11 16:02:30 proff Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/18 15:19:47 wiz Exp $
 share/mbrola/voices/us1/us1
 share/mbrola/voices/us1/us1mrpa
 share/mbrola/voices/us1/us1.txt
 share/mbrola/voices/us1/license.txt
-share/mbrola/voices/us1/TEST
 share/mbrola/voices/us1/TEST/alice.pho
 share/mbrola/voices/us1/TEST/xmas.pho
 share/mbrola/voices/us1/TEST/mbrola.pho
@ -11,5 +10,3 @@ share/mbrola/voices/us1/TEST/push.pho
 share/mbrola/voices/us1/TEST/mbroli.ini
@dirrm share/mbrola/voices/us1/TEST
@dirrm share/mbrola/voices/us1
-@dirrm share/mbrola/voices
-@dirrm share/mbrola
--- a/audio/mbrolavox-us2/Makefile
+++ b/audio/mbrolavox-us2/Makefile
@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.8 2001/07/14 12:37:53 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/07/18 15:19:48 wiz Exp $

 DISTNAME=	us2-980812
 PKGNAME=	mbrolavox-${DISTNAME}
 WRKSRC=		${WRKDIR}
 CATEGORIES=	audio
-MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us2/
+MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us2/ \
+		http://www.festvox.org/mbrola/dba/us2/
 EXTRACT_SUFX=	.zip

 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/mbrola.html
+HOMEPAGE=	http://www.festvox.org/mbrola/
 COMMENT=	American English male voice for MBROLA

 DEPENDS+=	mbrola-301h:../mbrola
@ -19,8 +20,6 @@ NO_BUILD=	yes

 MHOME=		${PREFIX}/share/mbrola/voices

-ONLY_FOR_PLATFORM=      NetBSD-*-i386
-
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
 	@ ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
--- a/audio/mbrolavox-us2/pkg/PLIST
+++ b/audio/mbrolavox-us2/pkg/PLIST
@ -1,13 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/10/11 18:27:59 proff Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/18 15:19:48 wiz Exp $
 share/mbrola/voices/us2/us2
 share/mbrola/voices/us2/us2.txt
 share/mbrola/voices/us2/license.txt
-share/mbrola/voices/us2/TEST
 share/mbrola/voices/us2/TEST/alice.pho
 share/mbrola/voices/us2/TEST/mbrola.pho
 share/mbrola/voices/us2/TEST/babel.pho
 share/mbrola/voices/us2/TEST/mbroli.ini
@dirrm share/mbrola/voices/us2/TEST
@dirrm share/mbrola/voices/us2
-@dirrm share/mbrola/voices
-@dirrm share/mbrola
--- a/audio/mbrolavox-us3/Makefile
+++ b/audio/mbrolavox-us3/Makefile
@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.8 2001/07/14 12:37:53 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/07/18 15:19:48 wiz Exp $

 DISTNAME=	us3-990208
 PKGNAME=	mbrolavox-${DISTNAME}
 WRKSRC=		${WRKDIR}
 CATEGORIES=	audio
-MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us3/
+MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us3/ \
+		http://www.festvox.org/mbrola/dba/us3/
 EXTRACT_SUFX=	.zip

 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/mbrola.html
+HOMEPAGE=	http://www.festvox.org/mbrola/
 COMMENT=	American English male voice for MBROLA

 DEPENDS+=	mbrola-301h:../mbrola
@ -19,8 +20,6 @@ NO_BUILD=	yes

 MHOME=		${PREFIX}/share/mbrola/voices

-ONLY_FOR_PLATFORM=      NetBSD-*-i386
-
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
 	@ ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
--- a/audio/mbrolavox-us3/pkg/PLIST
+++ b/audio/mbrolavox-us3/pkg/PLIST
@ -1,13 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/10/11 17:02:52 proff Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/18 15:19:48 wiz Exp $
 share/mbrola/voices/us3/us3
 share/mbrola/voices/us3/us3.txt
 share/mbrola/voices/us3/license.txt
-share/mbrola/voices/us3/TEST
 share/mbrola/voices/us3/TEST/mike.pho
 share/mbrola/voices/us3/TEST/diphone.pho
 share/mbrola/voices/us3/TEST/cslu.pho
 share/mbrola/voices/us3/TEST/mbroli.ini
@dirrm share/mbrola/voices/us3/TEST
@dirrm share/mbrola/voices/us3
-@dirrm share/mbrola/voices
-@dirrm share/mbrola