The festival+OGI port was repo-copied from ports/audio/festival.

It is a port of Festival with the OGI extensions unconditionally
present.  Formerly they were enabled only when the user defined
WITH_OGI.  The dependencies ought to work better this way, and the
audio/festival port may now be updated without concern about getting
the OGI extensions to work with a version of Festival for which
they were not intended.  I made many cosmetic changes too.

Update OGIresLPC from 2.0.4 to 2.0.9 (needed by newer versions of
the OGI voices), and OGIfestpatch from 1.4.1 to 1.4.1.2, to which
the following apply:

Submitted by:	Sebastian Yepes
PR:		51900
Obtained from:	NetBSD pkgsrc

7 files changed, 84 insertions, 126 deletions

diff --git a/audio/festival+OGI/Makefile b/audio/festival+OGI/Makefile
index f78f62b06d21..74ce70f86427 100644
--- a/audio/festival+OGI/Makefile
+++ b/audio/festival+OGI/Makefile
@@ -1,61 +1,38 @@
-# New ports collection makefile for:	festival
-# Date created:        			2000-06-11
-# Whom:					Trevor Johnson
-# based on the NetBSD port
+# New ports collection makefile for:	festival+OGI
+# Date created:        			2003-11-05
+# Whom:					trevor
+# based on pkgsrc/audio/festival from NetBSD
 #
-# $NetBSD: Makefile,v 1.11 1999/12/28 04:19:58 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2003/10/06 21:40:17 jmc Exp $
 # $FreeBSD$
 #
 
-PORTNAME=	festival
+PORTNAME=	festival+OGI
 PORTVERSION=	1.4.1
-PORTREVISION=	1
 CATEGORIES=	audio accessibility
-MASTER_SITES=	${MASTER_SITE_FESTIVAL}
+MASTER_SITES=	${MASTER_SITE_FESTIVAL} ${MASTER_SITE_FESTIVAL_OGI}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
-.if defined (WITH_OGI)
-MASTER_SITES+=	${PATCH_SITES}
-PATCH_SITES=	${MASTER_SITE_FESTIVAL_OGI}
-.endif
-DISTFILES=	${DISTNAME}.tar.gz \
-		speech_tools-1.2.1.tar.gz
-.if defined (WITH_OGI)
-DISTFILES+=	OGIresLPC-2.0.4.tar.gz
-.endif
+DISTFILES=	festival-${PORTVERSION}.tar.gz \
+		speech_tools-1.2.1.tar.gz \
+		OGIresLPC-2.0.9.tar.gz
 
-.if defined (WITH_OGI)
-PATCHFILES=	OGIfestpatch-${PORTVERSION}.tar.gz
-.endif
+PATCH_SITES=	${MASTER_SITE_FESTIVAL_OGI}
+PATCHFILES=	OGIfestpatch-1.4.1.2.tar.gz
 
 MAINTAINER=	trevor@FreeBSD.org
-COMMENT=	Multi-lingual speech synthesis system
+COMMENT=	Text-to-speech system with OGI residual LPC synthesizer
 
 LIB_DEPENDS=	audio.2:${PORTSDIR}/audio/nas \
 		esd.2:${PORTSDIR}/audio/esound
 
+CONFLICTS=	festival-*
 DIST_SUBDIR=	festival
 
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-aa
-.if defined (WITH_OGI)
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-aa-ogi
 RESTRICTED=	no-commercial-use
-.endif
-
-FESTIVAL_ARCH=	${MACHINE_ARCH:S/i386/ix86/}
-USE_GCC=	2.95
-.if defined (WITH_OGI)
-PLIST=		${WRKDIR}/pkg-plist
-.endif
-
-WRKSRC=		${WRKDIR}
 
-USE_GMAKE=	yes
-
-SPEECHTOOLS=	${WRKSRC}/speech_tools
 FESTIVAL=	${WRKSRC}/festival
-
+FESTIVAL_ARCH=	${MACHINE_ARCH:S/i386/ix86/}
 FHOME=		${PREFIX}/share/festival
-
 MAKE_ENV+=	PKG_EST_HOME=${SPEECHTOOLS} \
 		EST_HOME=${SPEECHTOOLS} \
 		PKG_FESTIVAL_BUILD_HOME=${FESTIVAL} \
@@ -63,47 +40,35 @@ MAKE_ENV+=	PKG_EST_HOME=${SPEECHTOOLS} \
 		PKG_COMPILER="${CC}" \
 		PKG_X11BASE=${X11BASE} \
 		PKG_PREFIX=${PREFIX} \
-		EGCS_CC="${CC}" \
-		EGCS_CXX="${CXX}" \
-		GCC28_CC="${CC}" \
-		GCC28_CXX="${CXX}" \
 		GCC27_CC="${CC}" \
 		GCC27_CXX="${CXX}" \
-		GCC26_CC="${CC}" \
-		GCC26_CXX="${CXX}" \
 		CC="${CC}" \
 		CXX="${CXX}"
-
 MAN1=		festival.1 festival_client.1
+USE_GCC=	2.95
+USE_GMAKE=	yes
+SPEECHTOOLS=	${WRKSRC}/speech_tools
+WRKSRC=		${WRKDIR}
 
-.if defined (WITH_OGI)
-post-extract:
-	@${GUNZIP_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/OGIfestpatch-${PORTVERSION}.tar.gz \
-	| ${TAR} -C ${WRKSRC} -xf -
-.endif
+pre-everything::
+	@${ECHO_CMD} "* WARNING:  the source code for this port has not   *"
+	@${ECHO_CMD} "* been properly reviewed by the FreeBSD maintainer. *"
+	@${ECHO_CMD} "* Waiting ten seconds (control-C cancels build).    *"
+	@sleep 10
 
-.if !defined(WITH_OGI)
-pre-fetch:
-	@${ECHO}
-	@${ECHO_MSG} "********************************************************"
-	@${ECHO_MSG} "* To build this port with the OGI enhancements, define *"
-	@${ECHO_MSG} "* \"WITH_OGI\" and restart the build.  The license for *"
-	@${ECHO_MSG} "* the OGI materials prohibits commercial use, but they *"
-	@${ECHO_MSG} "* are required by some of the voices.                  *"
-	@${ECHO_MSG} "********************************************************"
-	@${ECHO}
-.endif
+post-extract:
+	@${TAR} -C ${WRKSRC} -xzf \
+		${DISTDIR}/${DIST_SUBDIR}/OGIfestpatch-1.4.1.2.tar.gz
 
 pre-patch:
-	${CP} ${SPEECHTOOLS}/config/config-dist ${SPEECHTOOLS}/config/config &&\
-		${CHMOD} u+w ${SPEECHTOOLS}/config/config
-	${CP} ${FESTIVAL}/config/config-dist ${FESTIVAL}/config/config && \
-		${CHMOD} u+w ${FESTIVAL}/config/config
+	${CP} ${FESTIVAL}/config/config-dist ${FESTIVAL}/config/config
+	${CP} ${SPEECHTOOLS}/config/config-dist ${SPEECHTOOLS}/config/config
+	${CHMOD} u+w ${FESTIVAL}/config/config ${SPEECHTOOLS}/config/config
 
 .include <bsd.port.pre.mk>
 
 post-patch:
-.if ${OSVERSION} >= 500113
+.if ${OSVERSION} > 500112
 .for ii in compilers/gcc27.mak config config-dist
 	@${MV} ${SPEECHTOOLS}/config/${ii} ${SPEECHTOOLS}/config/${ii}.orig
 	@${SED} -e "s:= gcc:= gcc295:g" < ${SPEECHTOOLS}/config/${ii}.orig \
@@ -123,31 +88,28 @@ post-patch:
 .endfor
 .endfor
 
-pre-install:
-.if defined (WITH_OGI)
-	${CAT} ${PKGDIR}/pkg-plist-ogi ${PKGDIR}/pkg-plist > ${PLIST}
-.endif
-
 do-install:
-	${MKDIR} ${FHOME}/lib/voices/english/
-	${MKDIR} ${FHOME}/lib/voices/spanish/
-	${MKDIR} ${FHOME}/lib/dicts
+	${MKDIR} ${FHOME}/lib/voices/english/ ${FHOME}/lib/voices/spanish/ \
+		${FHOME}/lib/dicts
 	${CHMOD} -R u+w,a+r,og-w ${FESTIVAL}/lib
 	${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
-	${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival ${PREFIX}/libexec/festival.naked
-	${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival_client ${PREFIX}/libexec/festival_client.naked
-	for n in festival.sh festival_client.sh sitevars.scm; \
-	do {\
-	  ${SED} "s%@PKG_FESTIVAL_LOCATION@%${FHOME}%; \
-	       s%@PKG_PREFIX@%${PREFIX}%" <${FILESDIR}/$$n > ${WRKDIR}/$$n ;} \
-	done
+.for ii in festival festival_client
+	${INSTALL_PROGRAM} ${FESTIVAL}/src/main/${ii} \
+		${PREFIX}/libexec/${ii}.naked
+.endfor
+.for ii in festival.sh festival_client.sh sitevars.scm
+	${SED} "s%@PKG_FESTIVAL_LOCATION@%${FHOME}%; \
+		s%@PKG_PREFIX@%${PREFIX}%" <${FILESDIR}/${ii} > ${WRKDIR}/${ii}
+.endfor
 	${INSTALL_SCRIPT} ${WRKDIR}/festival.sh ${PREFIX}/bin/festival
-	${INSTALL_SCRIPT} ${WRKDIR}/festival_client.sh ${PREFIX}/bin/festival_client
+	${INSTALL_SCRIPT} ${WRKDIR}/festival_client.sh \
+		${PREFIX}/bin/festival_client
 	${INSTALL_DATA} ${WRKDIR}/sitevars.scm ${FHOME}/lib/sitevars.scm
-	${INSTALL_MAN} ${FESTIVAL}/doc/festival.1 ${PREFIX}/man/man1/festival.1
-	${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${PREFIX}/man/man1/festival_client.1
+.for ii in ${MAN1}
+	${INSTALL_MAN} ${FESTIVAL}/doc/${ii} ${PREFIX}/man/man1/
+.endfor
 
 .include <bsd.port.post.mk>
diff --git a/audio/festival+OGI/distinfo b/audio/festival+OGI/distinfo
index 8df832e77811..088fe722f4b9 100644
--- a/audio/festival+OGI/distinfo
+++ b/audio/festival+OGI/distinfo
@@ -1,4 +1,5 @@
+$FreeBSD$
 MD5 (festival/festival-1.4.1.tar.gz) = 1cf585adfd5f8f14a3eed71200c5cbde
 MD5 (festival/speech_tools-1.2.1.tar.gz) = 4b77d63f202a410868cc79b5e0640b9b
-MD5 (festival/OGIresLPC-2.0.4.tar.gz) = d9ef4871ae35bd750dfb649de8ec1728
-MD5 (festival/OGIfestpatch-1.4.1.tar.gz) = a94d02c9c6415d373e50536f6aeaeac4
+MD5 (festival/OGIresLPC-2.0.9.tar.gz) = abd5246049210028a24a5c1a349d21c7
+MD5 (festival/OGIfestpatch-1.4.1.2.tar.gz) = aae864d857fd6a1a7eec06fcc963268d
diff --git a/audio/festival+OGI/files/extra-patch-aa b/audio/festival+OGI/files/extra-patch-aa
deleted file mode 100644
index e6072304c475..000000000000
--- a/audio/festival+OGI/files/extra-patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/10/11 14:13:49 proff Exp $
-
---- festival/config/config	Mon Oct 11 07:48:44 1999
-+++ festival/config/config	Mon Oct 11 05:48:33 1999
-@@ -20,7 +20,7 @@
- ## You may need to set this explicitly if automounter or NFS
- ## side effects cause problems
- 
--FESTIVAL_HOME := $(shell (cd $(TOP); pwd))
-+FESTIVAL_HOME := $(PKG_FESTIVAL_HOME)
- 
- ###########################################################################
- ## Feature selection.
diff --git a/audio/festival+OGI/files/extra-patch-aa-ogi b/audio/festival+OGI/files/patch-festival_config_config
index 5bd4cb84e40d..f205088536aa 100644
--- a/audio/festival+OGI/files/extra-patch-aa-ogi
+++ b/audio/festival+OGI/files/patch-festival_config_config
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1999/10/11 14:13:49 proff Exp $
+$FreeBSD$
 
 --- festival/config/config	Mon Oct 11 07:48:44 1999
 +++ festival/config/config	Mon Oct 11 05:48:33 1999
diff --git a/audio/festival+OGI/pkg-descr b/audio/festival+OGI/pkg-descr
index b5849f03e14a..8b53b5920d12 100644
--- a/audio/festival+OGI/pkg-descr
+++ b/audio/festival+OGI/pkg-descr
@@ -1,18 +1,23 @@
-from the authors:
+This is Festival 1.4.1 with OGIresLPC, the residual LPC synthesizer
+plugin from the Center for Spoken Language Understanding at the
+Oregon Health & Science University (formerly Oregon Graduate Institute
+of Science & Technology).  The plugin "provides a new signal
+processing engine and new voices" (it is needed by the abc, aec,
+hvs, jph, mwm and tll voices) but is for non-commercial use only.
 
-The Festival Speech Synthesis System is a general multi-lingual
-text-to-speech system for Unix platforms.  It is written in C++ and
-includes a Scheme-based scripting language.  Included with Festival
-are lexicons and voices that together form a whole text-to-speech
-system.
+from the Festival authors:
+
+	The Festival Speech Synthesis System is a general multi-lingual
+	text-to-speech system for Unix platforms.  It is written
+	in C++ and includes a Scheme-based scripting language.
+	Included with Festival are lexicons and voices that together
+	form a whole text-to-speech system.
 
 For output via esd do:
 
 	(Parameter.set 'Audio_Method 'esdaudio)
 
-NAS and direct output are documented in section 23 of the users'
-manual.
-
-WWW:  http://www.cstr.ed.ac.uk/projects/festival/
+NAS and direct output are documented in section 23 of the manual.
 
-Trevor Johnson
+WWW:  http://www.cslu.ogi.edu/tts/
+      http://www.cstr.ed.ac.uk/projects/festival/
diff --git a/audio/festival+OGI/pkg-plist b/audio/festival+OGI/pkg-plist
index cf7c2d88f447..e79d82e93ead 100644
--- a/audio/festival+OGI/pkg-plist
+++ b/audio/festival+OGI/pkg-plist
@@ -1,4 +1,21 @@
-@comment $NetBSD: PLIST,v 1.3 1999/10/27 14:20:50 hubertf Exp $
+@comment $FreeBSD$
+@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:49 zuntum Exp $
+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
+share/festival/lib/ogi_klatt_durs_wb.scm
+share/festival/lib/ogi_languages.scm
+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_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
 bin/festival
 bin/festival_client
 libexec/festival.naked
diff --git a/audio/festival+OGI/pkg-plist-ogi b/audio/festival+OGI/pkg-plist-ogi
deleted file mode 100644
index 61d021b24d7d..000000000000
--- a/audio/festival+OGI/pkg-plist-ogi
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-share/festival/lib/ogi_klatt_durs_wb.scm
-share/festival/lib/ogi_languages.scm
-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