Unbreak on !i386 systems (test on beast and on my amd64). Do not

lib-depend on NAS and ESD -- these are optional dependencies and are
not used by default even if present.

Once I figure out, how to turn them on, I'll add them as OPTIONS.

Use REINPLACE to improve the CC/CXX/CFLAGS/CXXFLAGS compliance.

Stop installing the audsp executable into two places. Adjust pkg-plist
to stop complaining about unempty directories populated by festlex and
festvox ports.

Bump PORTREVISION. May the festivities begin...

3 files changed, 48 insertions, 30 deletions

diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 2a93daf87ca7..b6649153cca6 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -9,22 +9,23 @@
 
 PORTNAME=	festival
 PORTVERSION=	1.95
+PORTREVISION=	1
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_FESTIVAL}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES=	${DISTNAME}-beta.tar.gz \
+DISTFILES=	${DISTNAME}-beta.tar.gz 	\
 		speech_tools-1.2.95-beta.tar.gz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Multi-lingual speech synthesis system
 
-LIB_DEPENDS=	audio.2:${PORTSDIR}/audio/nas \
-		esd.2:${PORTSDIR}/audio/esound
+#LIB_DEPENDS=	audio:${PORTSDIR}/audio/nas \
+#		esd:${PORTSDIR}/audio/esound
 
 DIST_SUBDIR=	festival
 
 CONFIGURE_WRKSRC=	${WRKDIR}/festival
-GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 SPEECHTOOLS=	${WRKSRC}/speech_tools
 FESTIVAL=	${WRKSRC}/festival
@@ -38,17 +39,7 @@ MAKE_ENV+=	GCC="${CC}" \
 		CXX="${CXX}"
 MAN1=		festival.1 festival_client.1
 WRKSRC=		${WRKDIR}
-
-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
+USE_REINPLACE=	yes
 
 do-build:
 .for ii in speech_tools festival
@@ -58,9 +49,22 @@ do-build:
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-BROKEN=		"Does not build on !i386"
-.endif
+do-configure:
+.for d in speech_tools festival
+	@cd ${WRKDIR}/$d && \
+		if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
+		CFLAGS="${CFLAGS}" 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/${ARCH}_unknown.mak
+	${REINPLACE_CMD} -E -e 's,^(CC|CXX) *=,\1 ?=,' \
+	    -e 's,^(CFLAGS|CXXFLAGS) *=,\1 +=,'	\
+	    -e 's,^OPTIMI,#OPTIMI,' \
+	    ${WRKSRC}/speech_tools/config/compilers/gcc*.mak
+.endfor
 
 do-install:
 	${MKDIR} ${FHOME}/lib/voices/english/
@@ -69,7 +73,9 @@ 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}
-	${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/*FreeBSD*/audsp ${PREFIX}/libexec
+	${RM} -rf ${FHOME}/lib/etc/Makefile ${FHOME}/lib/etc/*FreeBSD* \
+	    ${FHOME}/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
 	for n in festival.sh festival_client.sh sitevars.scm; \
@@ -82,5 +88,6 @@ do-install:
 	${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
+	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/audio/festival/distinfo b/audio/festival/distinfo
index 2645f7aa0857..cecb41e05531 100644
--- a/audio/festival/distinfo
+++ b/audio/festival/distinfo
@@ -4,3 +4,18 @@ SIZE (festival/festival-1.95-beta.tar.gz) = 707573
 MD5 (festival/speech_tools-1.2.95-beta.tar.gz) = 4a0a58d8c4bafaee9f0a913372ded8bd
 SHA256 (festival/speech_tools-1.2.95-beta.tar.gz) = d9d0693ed57ba1f6c9471a43fe60fb1b728683fe6f820e98ef2be13bbd1fe772
 SIZE (festival/speech_tools-1.2.95-beta.tar.gz) = 1281274
+MD5 (festival/festlex_POSLEX.tar.gz) = 742c266e4c4978fae2b5c1bf6f549eb4
+SHA256 (festival/festlex_POSLEX.tar.gz) = 5ef8cc5d35e9f2141b5a0a4774df82dc9731fe7e9800eb09ecf264f2f8503e7b
+SIZE (festival/festlex_POSLEX.tar.gz) = 242914
+MD5 (festival/festlex_CMU.tar.gz) = 86a765c48d6b64134b28af45affec1bf
+SHA256 (festival/festlex_CMU.tar.gz) = 507295934b4e205bcd242e0d56c15ee9b8a9401ad4ee6796d998ba2e40be4693
+SIZE (festival/festlex_CMU.tar.gz) = 1749300
+MD5 (festival/festvox_kallpc16k.tar.gz) = abbd12e1d04ecdcae07f1d0044f3a947
+SHA256 (festival/festvox_kallpc16k.tar.gz) = 9eb6336f35c202c8069d37e489fb009a7e9fd8539cd47644329db1e92c6aba83
+SIZE (festival/festvox_kallpc16k.tar.gz) = 4104056
+MD5 (festival/festvox_kedlpc16k.tar.gz) = 35d4a2f377d05913ddae61db542afca1
+SHA256 (festival/festvox_kedlpc16k.tar.gz) = 6b8f11424bda5c81ae8a58f7838e2a9d12fdb39cdfff6ed89f611305391b1a36
+SIZE (festival/festvox_kedlpc16k.tar.gz) = 4221528
+MD5 (festival/festvox_ellpc11k.tar.gz) = e96a97644d36fcb89952ca65c283cea3
+SHA256 (festival/festvox_ellpc11k.tar.gz) = 9599df46c58454200ce546184556eab8faaf53c44fbd16f1ff38b3f2c375cbf8
+SIZE (festival/festvox_ellpc11k.tar.gz) = 1473907
diff --git a/audio/festival/pkg-plist b/audio/festival/pkg-plist
index 8c83ea7f4cce..a491a84918b1 100644
--- a/audio/festival/pkg-plist
+++ b/audio/festival/pkg-plist
@@ -74,10 +74,7 @@ share/festival/lib/duration.scm
 share/festival/lib/email-mode.scm
 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
@@ -136,14 +133,13 @@ share/festival/lib/tokenpos.scm
 share/festival/lib/tts.scm
 share/festival/lib/voices.scm
 share/festival/lib/web.scm
-@dirrm share/festival/lib/voices/spanish
-@dirrm share/festival/lib/voices/english
-@dirrm share/festival/lib/voices
+@dirrmtry share/festival/lib/voices/spanish
+@dirrmtry share/festival/lib/voices/english
+@dirrmtry 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
+@dirrmtry share/festival/lib/dicts
+@dirrmtry share/festival/lib
 @dirrm share/festival/examples/songs
 @dirrm share/festival/examples
-@dirrm share/festival
+@dirrmtry share/festival