2 files changed, 29 insertions, 18 deletions

diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 1a70e6529d5e..f65441c23aa0 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	festival
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_FESTIVAL}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
@@ -34,7 +35,6 @@ DIST_SUBDIR=	festival
 CXXFLAGS+=	-DFTLIBDIR=${LOCALBASE}/share/festival/lib
 CONFIGURE_WRKSRC=	${WRKDIR}/festival
 USES=		gmake
-NO_STAGE=	yes
 SPEECHTOOLS=	${WRKSRC}/speech_tools
 FESTIVAL=	${WRKSRC}/festival
 MAKE_ENV+=	GCC="${CC}" \
@@ -42,7 +42,6 @@ MAKE_ENV+=	GCC="${CC}" \
 		EST_HOME=${SPEECHTOOLS} \
 		EGCS_CC="${CC}" \
 		EGCS_CXX="${CXX}"
-MAN1=		festival.1 festival_client.1
 WRKSRC=		${WRKDIR}
 
 SPT_PATCHES=	base__class_EST__TVector.cc	\
@@ -115,27 +114,27 @@ do-configure:
 		${LN} -s gcc_defaults.mak ${WRKDIR}/speech_tools/config/compilers/${CC}.mak
 
 do-install:
-	${MKDIR} ${DATADIR}/lib/voices/english/
-	${MKDIR} ${DATADIR}/lib/voices/spanish/
-	${MKDIR} ${DATADIR}/lib/dicts
+	@${MKDIR} ${STAGEDIR}${DATADIR}/lib/voices/english/
+	@${MKDIR} ${STAGEDIR}${DATADIR}/lib/voices/spanish/
+	@${MKDIR} ${STAGEDIR}${DATADIR}/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 ${DATADIR}
-	${RM} -rf ${DATADIR}/lib/etc/Makefile ${DATADIR}/lib/etc/*FreeBSD* \
-	    ${DATADIR}/lib/etc/*unknown
-	${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/*/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
+	${FIND} ${FESTIVAL} -type f -name *.orig -delete
+	cd ${FESTIVAL} && ${CP} -pPR lib examples ${STAGEDIR}${DATADIR}
+	${RM} -rf ${STAGEDIR}${DATADIR}/lib/etc/Makefile ${STAGEDIR}${DATADIR}/lib/etc/*FreeBSD* \
+	    ${STAGEDIR}${DATADIR}/lib/etc/*unknown
+	${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/*/audsp ${STAGEDIR}${PREFIX}/libexec
+	${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival ${STAGEDIR}${PREFIX}/libexec/festival.naked
+	${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival_client ${STAGEDIR}${PREFIX}/libexec/festival_client.naked
 	for n in festival.sh festival_client.sh sitevars.scm; \
 	do {\
 	  ${SED} "s%@PKG_FESTIVAL_LOCATION@%${DATADIR}%; \
 	       s%@PKG_PREFIX@%${PREFIX}%" <${FILESDIR}/$$n > ${WRKDIR}/$$n ;} \
 	done
-	${INSTALL_SCRIPT} ${WRKDIR}/festival.sh ${PREFIX}/bin/festival
-	${INSTALL_SCRIPT} ${WRKDIR}/festival_client.sh ${PREFIX}/bin/festival_client
-	${INSTALL_DATA} ${WRKDIR}/sitevars.scm ${DATADIR}/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
-	${CAT} ${PKGMESSAGE}
+	${INSTALL_SCRIPT} ${WRKDIR}/festival.sh ${STAGEDIR}${PREFIX}/bin/festival
+	${INSTALL_SCRIPT} ${WRKDIR}/festival_client.sh ${STAGEDIR}${PREFIX}/bin/festival_client
+	${INSTALL_DATA} ${WRKDIR}/sitevars.scm ${STAGEDIR}${DATADIR}/lib/sitevars.scm
+	${INSTALL_MAN} ${FESTIVAL}/doc/festival.1 ${STAGEDIR}${PREFIX}/man/man1/festival.1
+	${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${STAGEDIR}${PREFIX}/man/man1/festival_client.1
 
 .include <bsd.port.mk>
diff --git a/audio/festival/pkg-plist b/audio/festival/pkg-plist
index 8a821f2d9edd..9705dd0d05ac 100644
--- a/audio/festival/pkg-plist
+++ b/audio/festival/pkg-plist
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 1999/10/27 14:20:50 hubertf Exp $
 bin/festival
 bin/festival_client
 libexec/audsp
 libexec/festival.naked
 libexec/festival_client.naked
+man/man1/festival.1.gz
+man/man1/festival_client.1.gz
 %%DATADIR%%/examples/Makefile
 %%DATADIR%%/examples/addr-mode.scm
 %%DATADIR%%/examples/apml.dtd
@@ -87,11 +88,21 @@ libexec/festival_client.naked
 %%DATADIR%%/lib/gswdurtreeZ.scm
 %%DATADIR%%/lib/holmes_phones.scm
 %%DATADIR%%/lib/hts.scm
+%%DATADIR%%/lib/hts21compat.scm
 %%DATADIR%%/lib/init.scm
 %%DATADIR%%/lib/intonation.scm
 %%DATADIR%%/lib/java.scm
 %%DATADIR%%/lib/klatt_durs.scm
 %%DATADIR%%/lib/languages.scm
+%%DATADIR%%/lib/languages/language_american_english.scm
+%%DATADIR%%/lib/languages/language_british_english.scm
+%%DATADIR%%/lib/languages/language_castillian_spanish.scm
+%%DATADIR%%/lib/languages/language_czech.scm
+%%DATADIR%%/lib/languages/language_finnish.scm
+%%DATADIR%%/lib/languages/language_italian.scm
+%%DATADIR%%/lib/languages/language_russian.scm
+%%DATADIR%%/lib/languages/language_scots_gaelic.scm
+%%DATADIR%%/lib/languages/language_welsh.scm
 %%DATADIR%%/lib/lexicons.scm
 %%DATADIR%%/lib/lts.scm
 %%DATADIR%%/lib/lts_build.scm
@@ -141,6 +152,7 @@ libexec/festival_client.naked
 @dirrmtry %%DATADIR%%/lib/voices/spanish
 @dirrmtry %%DATADIR%%/lib/voices/english
 @dirrmtry %%DATADIR%%/lib/voices
+@dirrmtry %%DATADIR%%/lib/languages
 @dirrm %%DATADIR%%/lib/multisyn
 @dirrm %%DATADIR%%/lib/etc
 @exec mkdir -p %D/%%DATADIR%%/lib/dicts