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.

5 files changed, 126 insertions, 120 deletions

diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 40b66047ca5..8f0d8fb951e 100644
--- 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
diff --git a/audio/festival/distinfo b/audio/festival/distinfo
index 3d7104aacaa..1a1184936bb 100644
--- 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
diff --git a/audio/festival/files/NetBSD.mak b/audio/festival/files/NetBSD.mak
index 26854d2f3cb..2c7f5e44dfe 100644
--- 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
diff --git a/audio/festival/patches/patch-ad b/audio/festival/patches/patch-ad
index 3945e8fba91..ecd1fec83cd 100644
--- 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.
  
diff --git a/audio/festival/pkg/PLIST b/audio/festival/pkg/PLIST
index 28830e7b9b9..6f9bec207fe 100644
--- 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/cart_aux.scm
+share/festival/lib/cslush.scm
+share/festival/lib/cstr.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/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/etc/Makefile
+share/festival/lib/etc/NetBSD/.made
+share/festival/lib/etc/email_filter
 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/festival.el
+share/festival/lib/festival.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/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/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/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