Update to 1.95 beta (obsoletes PRs 49056, 51900 and 58653).

15 files changed, 73 insertions, 244 deletions

diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 0118e3b993f8..b18f0c6ec799 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -8,13 +8,12 @@
 #
 
 PORTNAME=	festival
-PORTVERSION=	1.4.1
-PORTREVISION=	2
+PORTVERSION=	1.95
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_FESTIVAL}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES=	${DISTNAME}.tar.gz \
-		speech_tools-1.2.1.tar.gz
+DISTFILES=	${DISTNAME}-beta.tar.gz \
+		speech_tools-1.2.95-beta.tar.gz
 
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Multi-lingual speech synthesis system
@@ -24,71 +23,41 @@ LIB_DEPENDS=	audio.2:${PORTSDIR}/audio/nas \
 
 DIST_SUBDIR=	festival
 
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-aa
-
-FESTIVAL_ARCH=	${ARCH:S/i386/ix86/}
-USE_GCC=	2.95
-
-WRKSRC=		${WRKDIR}
-
+CONFIGURE_WRKSRC=	${WRKDIR}/festival
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-
 SPEECHTOOLS=	${WRKSRC}/speech_tools
 FESTIVAL=	${WRKSRC}/festival
-
 FHOME=		${PREFIX}/share/festival
-
-MAKE_ENV+=	PKG_EST_HOME=${SPEECHTOOLS} \
+MAKE_ENV+=	GCC="${CC}" \
+		GXX="${CXX}" \
 		EST_HOME=${SPEECHTOOLS} \
-		PKG_FESTIVAL_BUILD_HOME=${FESTIVAL} \
-		PKG_FESTIVAL_HOME=${FHOME} \
-		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
+WRKSRC=		${WRKDIR}
 
-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
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-.if ${OSVERSION} >= 500113
-.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 \
-		> ${SPEECHTOOLS}/config/${ii}
-.endfor
-.endif
-	@${CP} ${FILESDIR}/top-Makefile ${WRKSRC}/Makefile
-	@${CP} ${FILESDIR}/FreeBSD.mak ${SPEECHTOOLS}/config/systems/FreeBSD.mak
-.for i in 4 5
-	@${LN} -fs ${SPEECHTOOLS}/config/systems/ix86_FreeBSD3.3.mak \
-		${SPEECHTOOLS}/config/systems/${FESTIVAL_ARCH}_FreeBSD3.${i}.mak
-.endfor
-	@${MV} ${SPEECHTOOLS}/config/systems/ix86_FreeBSD4.0.mak \
-		${SPEECHTOOLS}/config/systems/ix86_FreeBSD4.x.mak
-.for ii in 4 5 6 7
-.for jj in 0 1 2 3 4 5 6 7 8 9 10 11
-	@${LN} -fs ${SPEECHTOOLS}/config/systems/ix86_FreeBSD4.x.mak \
-	${SPEECHTOOLS}/config/systems/${FESTIVAL_ARCH}_FreeBSD${ii}.${jj}.mak
+do-configure:
+.for ii in speech_tools festival
+	@cd ${WRKDIR}/${ii} && \
+		if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+		${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}; then \
+		${ECHO_CMD} "===>  configuration script for ${ii} failed."; \
+		${FALSE}; \
+	 fi
 .endfor
+
+do-build:
+.for ii in speech_tools festival
+	@(cd ${WRKDIR}/${ii}; \
+	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${MAKE_ARGS})
 .endfor
 
+.include <bsd.port.pre.mk>
+
 do-install:
 	${MKDIR} ${FHOME}/lib/voices/english/
 	${MKDIR} ${FHOME}/lib/voices/spanish/
@@ -96,7 +65,6 @@ do-install:
 	${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
diff --git a/audio/festival/distinfo b/audio/festival/distinfo
index 7fa03cc66931..f22e6336d1a4 100644
--- a/audio/festival/distinfo
+++ b/audio/festival/distinfo
@@ -1,5 +1,4 @@
-$FreeBSD$
-MD5 (festival/festival-1.4.1.tar.gz) = 1cf585adfd5f8f14a3eed71200c5cbde
-SIZE (festival/festival-1.4.1.tar.gz) = 543335
-MD5 (festival/speech_tools-1.2.1.tar.gz) = 4b77d63f202a410868cc79b5e0640b9b
-SIZE (festival/speech_tools-1.2.1.tar.gz) = 1206616
+MD5 (festival/festival-1.95-beta.tar.gz) = 0a44e30f922fa57ed1a7aa437baf4dd6
+SIZE (festival/festival-1.95-beta.tar.gz) = 707573
+MD5 (festival/speech_tools-1.2.95-beta.tar.gz) = 4a0a58d8c4bafaee9f0a913372ded8bd
+SIZE (festival/speech_tools-1.2.95-beta.tar.gz) = 1281274
diff --git a/audio/festival/files/FreeBSD.mak b/audio/festival/files/FreeBSD.mak
deleted file mode 100644
index 26854d2f3cbf..000000000000
--- a/audio/festival/files/FreeBSD.mak
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(EST)/config/systems/default.mak
-
-## echo -n doesn't work (well only sometimes ?)
-ECHO_N = /usr/bin/printf "%s"
-
-NAWK=awk
-
-NAS_LIB=$(PKG_X11BASE)/lib
-NAS_INCLUDE=$(PKG_X11BASE)/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/files/extra-patch-aa b/audio/festival/files/extra-patch-aa
deleted file mode 100644
index e6072304c475..000000000000
--- a/audio/festival/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/files/patch-ab b/audio/festival/files/patch-ab
deleted file mode 100644
index e8e939e1f994..000000000000
--- a/audio/festival/files/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1999/10/11 14:13:49 proff Exp $
-
---- festival/doc/Makefile	Thu Jun 17 20:29:54 1999
-+++ festival/doc/Makefile	Mon Oct 11 06:06:35 1999
-@@ -44,7 +44,7 @@
- 
- EXAMPLE_TO_DOCUMENT=
- 
--FESTIVAL=$(TOP)/bin/festival --libdir $(TOP)/lib
-+FESTIVAL=$(TOP)/src/main/festival --libdir $(TOP)/lib
- 
- # Include some of EST documentation.
- DOCXX_EXTRA_FILES = 
-@@ -72,9 +72,9 @@
- %.1 : %.head %.options %.tail 
- 	cat $^ >$@
- %.options : $(TOP)/src/main/%
--	$(TOP)/bin/$* -man_options >$@
-+	$(FESTIVAL)$* -man_options >$@
- %.options : $(TOP)/src/main/%.exe
--	$(TOP)/bin/$* -man_options >$@
-+	$(FESTIVAL)$* -man_options >$@
- 
- festival.info: festival.texi festfunc.texi festvars.texi festfeat.texi
- 	@ if [ ! -d info ] ; \
diff --git a/audio/festival/files/patch-ac b/audio/festival/files/patch-ac
deleted file mode 100644
index 628ef33f0d22..000000000000
--- a/audio/festival/files/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1999/10/11 14:13:49 proff Exp $
-
---- festival/examples/benchmark	Thu Feb 27 00:47:45 1997
-+++ festival/examples/benchmark	Mon Oct 11 05:41:14 1999
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--default_libdir="/projects/festival/lib"
-+default_libdir="$FESTIVAL_HOME/lib"
- 
- while true
- 	do
-@@ -15,9 +15,9 @@
- 	esac
- done
- 
--text=${1-"$HOME/projects/festival/examples/benchmark.text"}
-+text=${1-"$FESTIVAL_HOME/examples/benchmark.text"}
- 
--for i in . src/main ../src/main $HOME/projects/festival/src/main /cstr/bin
-+for i in . src/main ../src/main $FESTIVAL_HOME/src/main
- 	do
- 	if [ -n "$festival" ]
- 		then
diff --git a/audio/festival/files/patch-ad b/audio/festival/files/patch-ad
deleted file mode 100644
index 31e40bb6e906..000000000000
--- a/audio/festival/files/patch-ad
+++ /dev/null
@@ -1,33 +0,0 @@
---- speech_tools/config/config.orig	Thu Nov 18 19:10:29 1999
-+++ speech_tools/config/config	Fri Jun 16 17:03:16 2000
-@@ -15,7 +15,7 @@
- ## You may need to set this explicitly if automounter or NFS
- ## side effects cause problems
- 
--EST_HOME := $(shell (cd $(EST); pwd))
-+EST_HOME := $(PKG_EST_HOME)
- 
- ###########################################################################
- ## System type. 
-@@ -77,10 +77,10 @@
- ## 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
-+INCLUDE_MODULES += ESD_AUDIO
- 
- ## Native audio for your platform (sun, linux, freebsd, irix, windows)
- INCLUDE_MODULES += NATIVE_AUDIO
-@@ -95,7 +95,7 @@
- INCLUDE_MODULES += EDITLINE
- 
- # speech recognition
--#INCLUDE_MODULES += ASR
-+INCLUDE_MODULES += ASR
- 
- 
- ## Scheme
diff --git a/audio/festival/files/patch-af b/audio/festival/files/patch-af
deleted file mode 100644
index 63a2742d378d..000000000000
--- a/audio/festival/files/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1 1999/10/11 14:13:49 proff Exp $
-
---- festival/config/project.mak-dist	Mon Oct 11 21:41:08 1999
-+++ festival/config/project.mak	Mon Oct 11 22:27:37 1999
-@@ -70,8 +70,8 @@
- 
- # Place where programs are compiled
- 
--PROJECT_MAIN_DIR=$(FESTIVAL_HOME)/src/main
--PROJECT_SCRIPTS_DIR=$(FESTIVAL_HOME)/src/scripts
-+PROJECT_MAIN_DIR=$(PKG_FESTIVAL_BUILD_HOME)/src/main
-+PROJECT_SCRIPTS_DIR=$(PKG_FESTIVAL_BUILD_HOME)/src/scripts
- 
- # Where the main RCS tree is, probably only used within CSTR
- 
diff --git a/audio/festival/files/patch-am b/audio/festival/files/patch-am
deleted file mode 100644
index 3cd79202f9d1..000000000000
--- a/audio/festival/files/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-passing `int *' as argument 3 of `accept(int, sockaddr *, socklen_t *)' changes signedness
-
---- speech_tools/utils/EST_Server.cc.orig	Thu Nov 18 23:14:51 1999
-+++ speech_tools/utils/EST_Server.cc	Sun Jun 11 17:27:17 2000
-@@ -647,7 +647,7 @@
- 
-   while (connected() && 
- 	 (csocket = accept(p_socket, (struct sockaddr *) &sin, 
--			   SOCKLEN_CAST &sin_size))>=0)
-+			   (socklen_t *) &sin_size))>=0)
-     {
-       if (p_trace)
- 	*p_trace << "connection " << csocket << "\n";
diff --git a/audio/festival/files/patch-an b/audio/festival/files/patch-an
deleted file mode 100644
index 405e46cffbff..000000000000
--- a/audio/festival/files/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-passing `int *' as argument 3 of `getsockname(int, sockaddr *, socklen_t *)' changes signedness
-
---- speech_tools/utils/EST_ServiceTable.cc.orig	Thu Nov 18 23:15:21 1999
-+++ speech_tools/utils/EST_ServiceTable.cc	Sun Jun 11 17:28:29 2000
-@@ -296,7 +296,7 @@
- 
-   // This only gets the port number
- 
--  if (getsockname(socket, (struct sockaddr *)&sin, SOCKLEN_CAST &size) != 0)
-+  if (getsockname(socket, (struct sockaddr *)&sin, (socklen_t *) &size) != 0)
-     EST_sys_error("Can't find my address");
- 
- 
diff --git a/audio/festival/files/patch-ao b/audio/festival/files/patch-ao
deleted file mode 100644
index 73b77083ebf9..000000000000
--- a/audio/festival/files/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-passing `int *' as argument 3 of `getpeername(int, sockaddr *, socklen_t *)' changes signedness
-
---- ./festival/src/arch/festival/server.cc.orig	Thu Nov 18 23:46:47 1999
-+++ ./festival/src/arch/festival/server.cc	Sun Jun 11 17:48:45 2000
-@@ -206,7 +206,7 @@
-     const char *client_hostnum;
-     const char *reason = "";
-     
--    getpeername(fd,(struct sockaddr *)&peer,SOCKLEN_CAST &addrlen);
-+    getpeername(fd,(struct sockaddr *)&peer, (socklen_t *) &addrlen);
-     clienthost = gethostbyaddr((char *)&peer.sin_addr,
- 			       sizeof(peer.sin_addr),AF_INET);
-     client_hostnum = inet_ntoa(peer.sin_addr);
diff --git a/audio/festival/files/patch-aq b/audio/festival/files/patch-aq
deleted file mode 100644
index 012bfe0c9817..000000000000
--- a/audio/festival/files/patch-aq
+++ /dev/null
@@ -1,10 +0,0 @@
---- speech_tools/audio/esd.cc.orig	Mon Oct  4 15:39:01 1999
-+++ speech_tools/audio/esd.cc	Fri Jun 16 17:49:10 2000
-@@ -66,7 +66,6 @@
- 
- bool esd_supported = TRUE;
- 
--int endian_int = 1;
- #define ESD_BIG_ENDIAN (((char *)&endian_int)[0] == 0)
- 
- EST_String server;
diff --git a/audio/festival/files/patch-speech_tools_voxware.cc b/audio/festival/files/patch-speech_tools_voxware.cc
index 6e9b564ed8ab..71e0f90520f2 100644
--- a/audio/festival/files/patch-speech_tools_voxware.cc
+++ b/audio/festival/files/patch-speech_tools_voxware.cc
@@ -1,8 +1,6 @@
-$FreeBSD$
-
---- speech_tools/audio/voxware.cc.orig	Tue Sep 28 16:38:22 1999
-+++ speech_tools/audio/voxware.cc	Wed Oct 29 08:06:38 2003
-@@ -61,7 +61,7 @@
+--- speech_tools/audio/voxware.cc.orig	Fri Apr 30 16:56:49 2004
++++ speech_tools/audio/voxware.cc	Sun Oct 16 12:43:12 2005
+@@ -61,11 +61,12 @@
  #include "EST_error.h"
  
  #ifdef SUPPORT_FREEBSD16
@@ -11,3 +9,8 @@ $FreeBSD$
  #include <fcntl.h>
  int freebsd16_supported = TRUE;
  int linux16_supported = FALSE;
+ static char *aud_sys_name = "FreeBSD";
++static int stereo_only = 0;
+ #endif
+ 
+ #ifdef SUPPORT_LINUX16
diff --git a/audio/festival/files/top-Makefile b/audio/festival/files/top-Makefile
deleted file mode 100644
index ee190c4fe49e..000000000000
--- a/audio/festival/files/top-Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-all:
-	cd speech_tools && $(MAKE)
-	cd festival && $(MAKE)
diff --git a/audio/festival/pkg-plist b/audio/festival/pkg-plist
index 49b5f68fbb28..8c83ea7f4cce 100644
--- a/audio/festival/pkg-plist
+++ b/audio/festival/pkg-plist
@@ -6,8 +6,8 @@ libexec/festival.naked
 libexec/festival_client.naked
 share/festival/examples/Makefile
 share/festival/examples/addr-mode.scm
+share/festival/examples/apml.dtd
 share/festival/examples/benchmark
-share/festival/examples/benchmark.orig
 share/festival/examples/benchmark.text
 share/festival/examples/dumpfeats
 share/festival/examples/dumpfeats.sh
@@ -15,6 +15,7 @@ share/festival/examples/durmeanstd
 share/festival/examples/durmeanstd.sh
 share/festival/examples/ex1.email
 share/festival/examples/ex1.ogi
+share/festival/examples/example.apml
 share/festival/examples/example.sable
 share/festival/examples/example.th
 share/festival/examples/example2.sable
@@ -26,10 +27,24 @@ share/festival/examples/latest
 share/festival/examples/latest.sh
 share/festival/examples/make_utts
 share/festival/examples/make_utts.sh
+share/festival/examples/powmeanstd
+share/festival/examples/powmeanstd.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/songs/Makefile
+share/festival/examples/songs/america1.xml
+share/festival/examples/songs/america2.xml
+share/festival/examples/songs/america3.xml
+share/festival/examples/songs/america4.xml
+share/festival/examples/songs/daisy.xml
+share/festival/examples/songs/doremi.xml
+share/festival/examples/songs/lochlomond.xml
+share/festival/examples/songs/spice1.xml
+share/festival/examples/songs/spice2.xml
+share/festival/examples/songs/spice3.xml
+share/festival/examples/songs/spice4.xml
 share/festival/examples/speech_pm_1.0.tar
 share/festival/examples/spintro.text
 share/festival/examples/text2pos
@@ -42,8 +57,15 @@ share/festival/examples/toksearch.scm
 share/festival/examples/webdemo.scm
 share/festival/lib/Makefile
 share/festival/lib/Sable.v0_2.dtd
+share/festival/lib/Singing.v0_1.dtd
 share/festival/lib/VCLocalRules
+share/festival/lib/apml.scm
+share/festival/lib/apml_f2bf0lr.scm
+share/festival/lib/apml_kaldurtreeZ.scm
 share/festival/lib/cart_aux.scm
+share/festival/lib/clunits.scm
+share/festival/lib/clunits_build.scm
+share/festival/lib/cmusphinx2_phones.scm
 share/festival/lib/cslush.scm
 share/festival/lib/cstr.scm
 share/festival/lib/darpa_phones.scm
@@ -54,6 +76,8 @@ share/festival/lib/engmorph.scm
 share/festival/lib/engmorphsyn.scm
 share/festival/lib/etc/Makefile
 share/festival/lib/etc/email_filter
+share/festival/lib/etc/ix86_FreeBSD/.made
+share/festival/lib/etc/ix86_FreeBSD/audsp
 share/festival/lib/f2bdurtreeZ.scm
 share/festival/lib/f2bf0lr.scm
 share/festival/lib/festdoc.scm
@@ -63,6 +87,7 @@ share/festival/lib/festtest.scm
 share/festival/lib/fringe.scm
 share/festival/lib/gswdurtreeZ.scm
 share/festival/lib/holmes_phones.scm
+share/festival/lib/hts.scm
 share/festival/lib/init.scm
 share/festival/lib/intonation.scm
 share/festival/lib/java.scm
@@ -77,6 +102,12 @@ 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/multisyn/Makefile
+share/festival/lib/multisyn/multisyn.scm
+share/festival/lib/multisyn/multisyn_pauses.scm
+share/festival/lib/multisyn/radio_phones_multisyn.scm
+share/festival/lib/multisyn/send_xwaves.scm
+share/festival/lib/multisyn/target_cost.scm
 share/festival/lib/ogimarkup-mode.scm
 share/festival/lib/pauses.scm
 share/festival/lib/phoneset.scm
@@ -90,7 +121,9 @@ 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/singing-mode.scm
 share/festival/lib/siod.scm
+share/festival/lib/siteinit.scm
 share/festival/lib/sitevars.scm
 share/festival/lib/soleml-mode.scm
 share/festival/lib/speech.properties
@@ -106,8 +139,11 @@ share/festival/lib/web.scm
 @dirrm share/festival/lib/voices/spanish
 @dirrm share/festival/lib/voices/english
 @dirrm share/festival/lib/voices
+@dirrm share/festival/lib/multisyn
+@dirrm share/festival/lib/etc/ix86_FreeBSD
 @dirrm share/festival/lib/etc
 @dirrm share/festival/lib/dicts
 @dirrm share/festival/lib
+@dirrm share/festival/examples/songs
 @dirrm share/festival/examples
 @dirrm share/festival