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...

1 files changed, 27 insertions, 20 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>