diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index b9ce50db94b5..1f9635af3642 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,113 +1,113 @@
 PORTNAME=	festival
 PORTVERSION=	2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio accessibility
 MASTER_SITES=	FESTIVAL
 DISTFILES=	${DISTNAME}-release.tar.gz	\
 		speech_tools-${PORTVERSION}-release.tar.gz
 DIST_SUBDIR=	festival
 
 PATCHFILES=	src_modules_diphone_diphone.h.diff?id=b58a836:debian	\
 		src_modules_diphone_di_io.cc.diff?id=b58a836:debian	\
 		src_modules_diphone_diphone.cc.diff?id=b58a836:debian	\
 		src_modules_donovan_t2s.h.diff?id=b58a836:debian	\
 		src_modules_UniSyn_diphone_UniSyn_diphone.cc.diff?id=b58a836:debian	\
 		festival_el_utf8.diff?id=b58a836:debian	\
 		lintianspellpatch.diff?id=b58a836:debian	\
 		hts21compat.diff?id=b58a836:debian	\
 		languagespatch.diff?id=b58a836:debian	\
 		${SPT_PATCHES:C/.*/patch-speech__tools_\0:netbsd/}
 PATCH_SITES=	ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/audio/festival/patches/:netbsd	\
 		https://salsa.debian.org/tts-team/festival/-/raw/b58a836b84ff9a9afa82eb0283bac19bf9c22e71/debian/patches/:debian
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Multi-lingual speech synthesis system
 WWW=		https://www.cstr.ed.ac.uk/projects/festival/
 
 USES=		gmake
 USE_CXXSTD=	gnu++11
 
 OPTIONS_DEFINE=	NAS
 OPTIONS_DEFAULT=NAS
 
 CXXFLAGS+=	-DFTLIBDIR=${LOCALBASE}/share/festival/lib -fno-delete-null-pointer-checks
 CONFIGURE_WRKSRC=${WRKDIR}/festival
 SPEECHTOOLS=	${WRKSRC}/speech_tools
 FESTIVAL=	${WRKSRC}/festival
 MAKE_ARGS+=	CC="${CCACHE_BIN} ${CC}" GCC="${CCACHE_BIN} ${CC}" \
 		CXX="${CCACHE_BIN} ${CXX}" GXX="${CCACHE_BIN} ${CXX}" \
 		EST_HOME=${SPEECHTOOLS}
 WRKSRC=		${WRKDIR}
 
 SPT_PATCHES=	include_ling__class_EST__FeatureFunctionPackage.h	\
 		include_unix_EST__socket__unix.h
 
 do-build:
 .for d in speech_tools festival
 	${MAKE_CMD} -C ${WRKDIR}/$d ${MAKE_FLAGS} Makefile ${MAKE_ARGS}
 .endfor
 
 # Can not make test in `festival', because the voices may not be installed
 # XXX: this should fail, if the verdict is not "CORRECT"...
 post-build test:
 	${MAKE_CMD} -C ${WRKDIR}/speech_tools test
 
 # The below is needed, because Debian's patches expect a different
 # directory-name
 pre-patch:
 	${LN} -s festival ${WRKSRC}/festival-2.1~release
 	${LN} -s festival ${WRKSRC}/b
 
 post-patch::
 	${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g'	\
 		${WRKSRC}/*/config/systems/default.mak
 
 .for m in nas
 ${m:tu}_LIB_DEPENDS=	lib${m:nas=audio}.so:audio/${m}
 post-patch-${m:tu}-on:
 	${REINPLACE_CMD} -e 's,# INCLUDE_MODULES += ${m:tu}_AUDIO,INCLUDE_MODULES += ${m:tu}_AUDIO,' \
 		${WRKDIR}/*/config/config.in
 ${m:tu}_CONFIGURE_ENABLE=${m}
 .endfor
 
 do-configure:
 .for d in speech_tools festival
 	@cd ${WRKDIR}/$d && \
 		if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
 		CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}; then \
 		${ECHO_CMD} "===>  configuration script for $d failed."; \
 		${FALSE}; \
 	fi
 	# This step helps non-i386 systems and is harmless on i386
 	-${LN} -s ix86_FreeBSD.mak ${WRKDIR}/$d/config/systems/${MACHINE}_unknown.mak
 .endfor
 	@${REINPLACE_CMD} \
 	    -e '/^CFLAGS *=/s|$$| ${CFLAGS}|' \
 	    -e '/^CXXFLAGS *=/s|$$| ${CXXFLAGS}|' \
 	    -e 's,^OPTIMI,#OPTIMI,' \
 	    ${WRKSRC}/speech_tools/config/compilers/gcc*.mak
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${CHMOD} -R u+w,a+r,og-w ${FESTIVAL}/lib
 	${FIND} ${FESTIVAL}/lib -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 	${FIND} ${FESTIVAL} -type f -name *.orig -delete
 	${CP} -pPR ${FESTIVAL}/lib ${FESTIVAL}/examples ${STAGEDIR}${DATADIR}
 	${RM} -r ${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 ${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
+	${INSTALL_MAN} ${FESTIVAL}/doc/festival.1 ${STAGEDIR}${PREFIX}/share/man/man1/festival.1
+	${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${STAGEDIR}${PREFIX}/share/man/man1/festival_client.1
 
 .include <bsd.port.mk>
diff --git a/audio/festival/pkg-plist b/audio/festival/pkg-plist
index 1ffcd754d468..bf94016b3e43 100644
--- a/audio/festival/pkg-plist
+++ b/audio/festival/pkg-plist
@@ -1,151 +1,151 @@
 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
+share/man/man1/festival.1.gz
+share/man/man1/festival_client.1.gz
 %%DATADIR%%/examples/Makefile
 %%DATADIR%%/examples/addr-mode.scm
 %%DATADIR%%/examples/apml.dtd
 %%DATADIR%%/examples/benchmark
 %%DATADIR%%/examples/benchmark.text
 %%DATADIR%%/examples/dumpfeats
 %%DATADIR%%/examples/dumpfeats.sh
 %%DATADIR%%/examples/durmeanstd
 %%DATADIR%%/examples/durmeanstd.sh
 %%DATADIR%%/examples/ex1.email
 %%DATADIR%%/examples/ex1.ogi
 %%DATADIR%%/examples/example.apml
 %%DATADIR%%/examples/example.sable
 %%DATADIR%%/examples/example.th
 %%DATADIR%%/examples/example2.sable
 %%DATADIR%%/examples/festival_client.c
 %%DATADIR%%/examples/festival_client.h
 %%DATADIR%%/examples/festival_client.pl
 %%DATADIR%%/examples/intro.text
 %%DATADIR%%/examples/latest
 %%DATADIR%%/examples/latest.sh
 %%DATADIR%%/examples/make_utts
 %%DATADIR%%/examples/make_utts.sh
 %%DATADIR%%/examples/powmeanstd
 %%DATADIR%%/examples/powmeanstd.sh
 %%DATADIR%%/examples/run-festival-script
 %%DATADIR%%/examples/run-festival-script.sh
 %%DATADIR%%/examples/saytime
 %%DATADIR%%/examples/saytime.sh
 %%DATADIR%%/examples/scfg_parse_text
 %%DATADIR%%/examples/scfg_parse_text.sh
 %%DATADIR%%/examples/songs/Makefile
 %%DATADIR%%/examples/songs/america1.xml
 %%DATADIR%%/examples/songs/america2.xml
 %%DATADIR%%/examples/songs/america3.xml
 %%DATADIR%%/examples/songs/america4.xml
 %%DATADIR%%/examples/songs/daisy.xml
 %%DATADIR%%/examples/songs/doremi.xml
 %%DATADIR%%/examples/songs/lochlomond.xml
 %%DATADIR%%/examples/songs/spice1.xml
 %%DATADIR%%/examples/songs/spice2.xml
 %%DATADIR%%/examples/songs/spice3.xml
 %%DATADIR%%/examples/songs/spice4.xml
 %%DATADIR%%/examples/speech_pm_1.0.tar
 %%DATADIR%%/examples/spintro.text
 %%DATADIR%%/examples/text2pos
 %%DATADIR%%/examples/text2pos.sh
 %%DATADIR%%/examples/text2utt
 %%DATADIR%%/examples/text2utt.sh
 %%DATADIR%%/examples/text2wave
 %%DATADIR%%/examples/text2wave.sh
 %%DATADIR%%/examples/th-mode.scm
 %%DATADIR%%/examples/tobi.stml
 %%DATADIR%%/examples/toksearch.scm
 %%DATADIR%%/examples/webdemo.scm
 %%DATADIR%%/lib/Makefile
 %%DATADIR%%/lib/Sable.v0_2.dtd
 %%DATADIR%%/lib/Singing.v0_1.dtd
 %%DATADIR%%/lib/VCLocalRules
 %%DATADIR%%/lib/apml.scm
 %%DATADIR%%/lib/apml_f2bf0lr.scm
 %%DATADIR%%/lib/apml_kaldurtreeZ.scm
 %%DATADIR%%/lib/cart_aux.scm
 %%DATADIR%%/lib/clunits.scm
 %%DATADIR%%/lib/clunits_build.scm
 %%DATADIR%%/lib/cmusphinx2_phones.scm
 %%DATADIR%%/lib/cslush.scm
 %%DATADIR%%/lib/cstr.scm
 %%DATADIR%%/lib/darpa_phones.scm
 %%DATADIR%%/lib/display.scm
 %%DATADIR%%/lib/duration.scm
 %%DATADIR%%/lib/email-mode.scm
 %%DATADIR%%/lib/engmorph.scm
 %%DATADIR%%/lib/engmorphsyn.scm
 %%DATADIR%%/lib/etc/email_filter
 %%DATADIR%%/lib/f2bdurtreeZ.scm
 %%DATADIR%%/lib/f2bf0lr.scm
 %%DATADIR%%/lib/festdoc.scm
 %%DATADIR%%/lib/festival.el
 %%DATADIR%%/lib/festival.scm
 %%DATADIR%%/lib/festtest.scm
 %%DATADIR%%/lib/fringe.scm
 %%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
 %%DATADIR%%/lib/mbrola.scm
 %%DATADIR%%/lib/mettree.scm
 %%DATADIR%%/lib/module_description.scm
 %%DATADIR%%/lib/mrpa_allophones.scm
 %%DATADIR%%/lib/mrpa_durs.scm
 %%DATADIR%%/lib/mrpa_phones.scm
 %%DATADIR%%/lib/multisyn/Makefile
 %%DATADIR%%/lib/multisyn/multisyn.scm
 %%DATADIR%%/lib/multisyn/multisyn_pauses.scm
 %%DATADIR%%/lib/multisyn/radio_phones_multisyn.scm
 %%DATADIR%%/lib/multisyn/send_xwaves.scm
 %%DATADIR%%/lib/multisyn/target_cost.scm
 %%DATADIR%%/lib/ogimarkup-mode.scm
 %%DATADIR%%/lib/pauses.scm
 %%DATADIR%%/lib/phoneset.scm
 %%DATADIR%%/lib/phrase.scm
 %%DATADIR%%/lib/pos.scm
 %%DATADIR%%/lib/postlex.scm
 %%DATADIR%%/lib/radio_phones.scm
 %%DATADIR%%/lib/sable-latin.ent
 %%DATADIR%%/lib/sable-mode.scm
 %%DATADIR%%/lib/scfg.scm
 %%DATADIR%%/lib/scfg_wsj_wp20.gram
 %%DATADIR%%/lib/sec.B.hept.ngrambin
 %%DATADIR%%/lib/sec.ts20.quad.ngrambin
 %%DATADIR%%/lib/singing-mode.scm
 %%DATADIR%%/lib/siod.scm
 %%DATADIR%%/lib/siteinit.scm
 %%DATADIR%%/lib/sitevars.scm
 %%DATADIR%%/lib/soleml-mode.scm
 %%DATADIR%%/lib/speech.properties
 %%DATADIR%%/lib/synthesis.scm
 %%DATADIR%%/lib/tilt.scm
 %%DATADIR%%/lib/tobi.scm
 %%DATADIR%%/lib/tobi_rules.scm
 %%DATADIR%%/lib/token.scm
 %%DATADIR%%/lib/tokenpos.scm
 %%DATADIR%%/lib/tts.scm
 %%DATADIR%%/lib/unilex_phones.scm
 %%DATADIR%%/lib/voices.scm
 %%DATADIR%%/lib/web.scm