- mtree fixes

- when building Festival with OGI, make pkg-plist by concatenation

10 files changed, 36 insertions, 230 deletions

diff --git a/audio/festdoc/Makefile b/audio/festdoc/Makefile
index 2a86bb0d2dde..2636274b1077 100644
--- a/audio/festdoc/Makefile
+++ b/audio/festdoc/Makefile
@@ -30,6 +30,7 @@ post-extract:
 
 do-install:
 	${MKDIR} ${FDOC}
+	${RM} ${WRKSRC}/festival/info/festival.info.orig
 	cd ${WRKSRC} && info=`find . -name '*.info*' -type f` && \
 	  ${CP} $$info ${PREFIX}/info && \
 	  ${CP} -r ${WRKSRC}/* ${FDOC} && \
diff --git a/audio/festival+OGI/Makefile b/audio/festival+OGI/Makefile
index ba9178115956..399d1081de17 100644
--- a/audio/festival+OGI/Makefile
+++ b/audio/festival+OGI/Makefile
@@ -45,9 +45,8 @@ EXTRA_PATCHES=	${PATCHDIR}/extra-patch-aa-ogi
 RESTRICTED=	no-commercial-use
 .endif
 
-PLIST=		${PKGDIR}/pkg-plist
 .if defined (WITH_OGI)
-PLIST=		${PKGDIR}/pkg-plist-ogi
+PLIST=		${WRKDIR}/pkg-plist
 .endif
 
 WRKSRC=		${WRKDIR}
@@ -118,10 +117,17 @@ post-patch:
 	${CP} ${SPEECHTOOLS}/config/systems/ix86_FreeBSD4.0.mak \
 		${SPEECHTOOLS}/config/systems/ix86_FreeBSD5.0.mak
 
+pre-install:
+.if defined (WITH_OGI)
+	${CAT} ${PKGDIR}/pkg-plist-ogi ${PKGDIR}/pkg-plist > ${PLIST}
+.endif
+
 do-install:
-	${MKDIR} ${FHOME}
+	${MKDIR} ${FHOME}/lib/voices/english/
+	${MKDIR}  ${FHOME}/lib/voices/spanish/
+	${MKDIR} ${FHOME}/lib/dicts
 	${CHMOD} -R u+w,a+r,og-w ${FESTIVAL}/lib
-	${FIND} ${FESTIVAL}/lib -type d -print0| xargs -0 ${CHMOD} 755
+	find ${FESTIVAL}/lib -type d -print0| xargs -0 ${CHMOD} 755
 	cd ${FESTIVAL} && ${CP} -pPR lib examples ${FHOME}
 	${RM} -rf ${FHOME}/lib/etc/*FreeBSD*
 	${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/*FreeBSD*/audsp ${PREFIX}/libexec
diff --git a/audio/festival+OGI/pkg-plist b/audio/festival+OGI/pkg-plist
index 2c09eec7fd37..cf7c2d88f447 100644
--- a/audio/festival+OGI/pkg-plist
+++ b/audio/festival+OGI/pkg-plist
@@ -68,7 +68,6 @@ share/festival/lib/web.scm
 share/festival/lib/cstr.scm
 share/festival/lib/fringe.scm
 share/festival/lib/sitevars.scm
-@dirrm share/festival/lib
 share/festival/examples/Makefile
 share/festival/examples/webdemo.scm
 share/festival/examples/ex1.email
@@ -105,5 +104,10 @@ share/festival/examples/text2wave
 share/festival/examples/make_utts
 share/festival/examples/dumpfeats
 share/festival/examples/durmeanstd
+@dirrm share/festival/lib/voices/spanish
+@dirrm share/festival/lib/voices/english
+@dirrm share/festival/lib/voices
+@dirrm share/festival/lib/dicts
+@dirrm share/festival/lib
 @dirrm share/festival/examples
 @dirrm share/festival
diff --git a/audio/festival+OGI/pkg-plist-ogi b/audio/festival+OGI/pkg-plist-ogi
index d039fc7dd72e..61d021b24d7d 100644
--- a/audio/festival+OGI/pkg-plist-ogi
+++ b/audio/festival+OGI/pkg-plist-ogi
@@ -1,9 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1999/10/27 14:20:50 hubertf Exp $
-bin/festival
-bin/festival_client
-libexec/festival.naked
-libexec/festival_client.naked
-libexec/audsp
+share/festival/lib/ogi_effect.scm
 share/festival/lib/ogi_gswdurtreeZ_wb.scm
 share/festival/lib/ogi_hack.scm
 share/festival/lib/ogi_kddurtreeZ_wb.scm
@@ -13,109 +8,7 @@ share/festival/lib/ogi_lexicons.scm
 share/festival/lib/ogi_lts_worldbet.scm
 share/festival/lib/ogi_phrase.scm
 share/festival/lib/ogi_postlex.scm
+share/festival/lib/ogi_reslpc_analysis.scm
 share/festival/lib/ogi_synthesis.scm
 share/festival/lib/ogi_unitsel.scm
 share/festival/lib/ogi_worldbet_phones.scm
-share/festival/lib/Makefile
-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/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
-@dirrm share/festival/lib/etc
-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
-@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/speech_pm_1.0.tar
-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
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index ba9178115956..399d1081de17 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -45,9 +45,8 @@ EXTRA_PATCHES=	${PATCHDIR}/extra-patch-aa-ogi
 RESTRICTED=	no-commercial-use
 .endif
 
-PLIST=		${PKGDIR}/pkg-plist
 .if defined (WITH_OGI)
-PLIST=		${PKGDIR}/pkg-plist-ogi
+PLIST=		${WRKDIR}/pkg-plist
 .endif
 
 WRKSRC=		${WRKDIR}
@@ -118,10 +117,17 @@ post-patch:
 	${CP} ${SPEECHTOOLS}/config/systems/ix86_FreeBSD4.0.mak \
 		${SPEECHTOOLS}/config/systems/ix86_FreeBSD5.0.mak
 
+pre-install:
+.if defined (WITH_OGI)
+	${CAT} ${PKGDIR}/pkg-plist-ogi ${PKGDIR}/pkg-plist > ${PLIST}
+.endif
+
 do-install:
-	${MKDIR} ${FHOME}
+	${MKDIR} ${FHOME}/lib/voices/english/
+	${MKDIR}  ${FHOME}/lib/voices/spanish/
+	${MKDIR} ${FHOME}/lib/dicts
 	${CHMOD} -R u+w,a+r,og-w ${FESTIVAL}/lib
-	${FIND} ${FESTIVAL}/lib -type d -print0| xargs -0 ${CHMOD} 755
+	find ${FESTIVAL}/lib -type d -print0| xargs -0 ${CHMOD} 755
 	cd ${FESTIVAL} && ${CP} -pPR lib examples ${FHOME}
 	${RM} -rf ${FHOME}/lib/etc/*FreeBSD*
 	${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/*FreeBSD*/audsp ${PREFIX}/libexec
diff --git a/audio/festival/pkg-plist b/audio/festival/pkg-plist
index 2c09eec7fd37..cf7c2d88f447 100644
--- a/audio/festival/pkg-plist
+++ b/audio/festival/pkg-plist
@@ -68,7 +68,6 @@ share/festival/lib/web.scm
 share/festival/lib/cstr.scm
 share/festival/lib/fringe.scm
 share/festival/lib/sitevars.scm
-@dirrm share/festival/lib
 share/festival/examples/Makefile
 share/festival/examples/webdemo.scm
 share/festival/examples/ex1.email
@@ -105,5 +104,10 @@ share/festival/examples/text2wave
 share/festival/examples/make_utts
 share/festival/examples/dumpfeats
 share/festival/examples/durmeanstd
+@dirrm share/festival/lib/voices/spanish
+@dirrm share/festival/lib/voices/english
+@dirrm share/festival/lib/voices
+@dirrm share/festival/lib/dicts
+@dirrm share/festival/lib
 @dirrm share/festival/examples
 @dirrm share/festival
diff --git a/audio/festival/pkg-plist-ogi b/audio/festival/pkg-plist-ogi
index d039fc7dd72e..61d021b24d7d 100644
--- a/audio/festival/pkg-plist-ogi
+++ b/audio/festival/pkg-plist-ogi
@@ -1,9 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1999/10/27 14:20:50 hubertf Exp $
-bin/festival
-bin/festival_client
-libexec/festival.naked
-libexec/festival_client.naked
-libexec/audsp
+share/festival/lib/ogi_effect.scm
 share/festival/lib/ogi_gswdurtreeZ_wb.scm
 share/festival/lib/ogi_hack.scm
 share/festival/lib/ogi_kddurtreeZ_wb.scm
@@ -13,109 +8,7 @@ share/festival/lib/ogi_lexicons.scm
 share/festival/lib/ogi_lts_worldbet.scm
 share/festival/lib/ogi_phrase.scm
 share/festival/lib/ogi_postlex.scm
+share/festival/lib/ogi_reslpc_analysis.scm
 share/festival/lib/ogi_synthesis.scm
 share/festival/lib/ogi_unitsel.scm
 share/festival/lib/ogi_worldbet_phones.scm
-share/festival/lib/Makefile
-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/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
-@dirrm share/festival/lib/etc
-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
-@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/speech_pm_1.0.tar
-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
diff --git a/audio/festlex-poslex/Makefile b/audio/festlex-poslex/Makefile
index 1349179df1bc..d47d9b4ac5d0 100644
--- a/audio/festlex-poslex/Makefile
+++ b/audio/festlex-poslex/Makefile
@@ -30,7 +30,6 @@ post-extract:
 	@ find ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
 
 do-install:
-	${MKDIR} ${FHOME}
 	cd ${WRKSRC} && ${CP} -pPR * ${FHOME}
 
 .include <bsd.port.mk>
diff --git a/audio/festlex-poslex/pkg-plist b/audio/festlex-poslex/pkg-plist
index f816254ee7c2..ca8a0d155fc7 100644
--- a/audio/festlex-poslex/pkg-plist
+++ b/audio/festlex-poslex/pkg-plist
@@ -2,4 +2,3 @@
 share/festival/lib/dicts/COPYING.poslex
 share/festival/lib/dicts/wsj.wp39.poslexR
 share/festival/lib/dicts/wsj.wp39.tri.ngrambin
-@dirrm share/festival/lib/dicts
diff --git a/audio/festvox-kal16/pkg-plist b/audio/festvox-kal16/pkg-plist
index 747a90011160..dfd696b86aec 100644
--- 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 $
+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