Add DragonFly support. Use CONFIGURE_SCRIPT instead of manual

do-configure rule. Allow GCC 3.4 build, there doesn't seem to
be a good reason to disallow it.

5 files changed, 62 insertions, 5 deletions

diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index ea4dcb3cf3b..991f0bd7fb2 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/10/30 04:55:59 minskim Exp $
+# $NetBSD: Makefile,v 1.46 2005/12/03 04:14:05 joerg Exp $
 
 DISTNAME=	festival-1.95-beta
 PKGNAME=	festival-1.95beta
@@ -20,6 +20,8 @@ FESTIVAL=	${WRKSRC}/festival
 
 FHOME=		${PREFIX}/share/festival
 
+GNU_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	${SPEECHTOOLS}/configure
 CONFIG_GUESS_OVERRIDE=	${SPEECHTOOLS}/config.guess ${FESTIVAL}/config.guess
 CONFIG_SUB_OVERRIDE=	${SPEECHTOOLS}/config.sub ${FESTIVAL}/config.sub
 
@@ -34,6 +36,7 @@ PKG_COMPILER_cmd=	case "${CC_VERSION}" in				\
 			gcc-2.8.*)	${ECHO} gcc28;;			\
 			gcc-2.95.*)	${ECHO} gcc295;;		\
 			gcc-3.3.*)	${ECHO} gcc32;;			\
+			gcc-3.4.*)	${ECHO} gcc32;;			\
 			egcs*)		${ECHO} egcs;;			\
 			*)		${ECHO} ;;			\
 			esac
@@ -73,9 +76,6 @@ post-patch:
 	@${CP} ${FILESDIR}/unknown_${OPSYS}.mak ${FESTIVAL}/config/systems/unknown_${OPSYS}.mak
 .endif
 
-do-configure:
-	cd ${SPEECHTOOLS} && ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}
-
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
 	${CHMOD} -R u+w,a+r,og-w ${FESTIVAL}/lib
diff --git a/audio/festival/distinfo b/audio/festival/distinfo
index d30bb6f2055..1d3191225c4 100644
--- a/audio/festival/distinfo
+++ b/audio/festival/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2005/03/07 11:32:08 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/12/03 04:14:05 joerg Exp $
 
 SHA1 (festival-1.95-beta.tar.gz) = 7bbf841b07a09cfe1ab17db23c2ebc12ea3d854b
 RMD160 (festival-1.95-beta.tar.gz) = 7f7cce6ab170ab1e83911ed92408576fff32cbd6
@@ -9,3 +9,5 @@ Size (speech_tools-1.2.95-beta.tar.gz) = 1281274 bytes
 SHA1 (patch-aa) = 016faac0fbd2291f349b3710aefdc4df736af0d8
 SHA1 (patch-ab) = 23e55253b22df5b8d2bc44b08f6757c90c1f13a8
 SHA1 (patch-ac) = c0a3fbd4e98ef941ef78c1ae800ef33a5153e8f9
+SHA1 (patch-ad) = b035df9c711d0f7ee1a31b663bc44c94bd904304
+SHA1 (patch-ae) = b957601a9038dc614fdec2a720da4b30909cab1b
diff --git a/audio/festival/files/unknown_DragonFly.mak b/audio/festival/files/unknown_DragonFly.mak
new file mode 100644
index 00000000000..623a1a1cfc5
--- /dev/null
+++ b/audio/festival/files/unknown_DragonFly.mak
@@ -0,0 +1,27 @@
+ ###########################################################################
+ ##                                                                       ##
+ ##                 Author: Alistair Crooks (agc@netbsd.org)              ##
+ ##                   Date: Wed Oct 27 2004                               ##
+ ## --------------------------------------------------------------------  ##
+ ## Settings for DragonFly.                                               ##
+ ##                                                                       ##
+ ###########################################################################
+
+include $(EST)/config/systems/default.mak
+
+## the native audio module for this type of system
+NATIVE_AUDIO_MODULE = freebsd16
+
+## echo -n doesn't work (well only sometimes ?)
+ECHO_N = /usr/bin/printf "%s"
+
+NAWK=awk
+
+# GCC_MAKE_SHARED_LIB = ld -Bshareable -x -o XXX
+
+DEFAULT_JAVA_HOME=${PREFIX}/java
+
+JAVA=$(JAVA_HOME)/bin/java
+JAVAC=$(JAVA_HOME)/bin/javac
+JAVAH=$(JAVA_HOME)/bin/javah -jni
+JAR=$(JAVA_HOME)/bin/jar cf0v 
diff --git a/audio/festival/patches/patch-ad b/audio/festival/patches/patch-ad
new file mode 100644
index 00000000000..e298e3ca28b
--- /dev/null
+++ b/audio/festival/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.5 2005/12/03 04:14:05 joerg Exp $
+
+--- speech_tools/audio/voxware.cc.orig	2005-12-03 02:59:39.000000000 +0000
++++ speech_tools/audio/voxware.cc
+@@ -66,6 +66,7 @@
+ 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/patches/patch-ae b/audio/festival/patches/patch-ae
new file mode 100644
index 00000000000..50b24a9b557
--- /dev/null
+++ b/audio/festival/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.4 2005/12/03 04:14:05 joerg Exp $
+
+--- speech_tools/include/EST_math.h.orig	2005-12-03 03:17:51.000000000 +0000
++++ speech_tools/include/EST_math.h
+@@ -94,6 +94,11 @@ extern "C" {
+ #define isnanf(X) isnan(X)
+ #endif
+ 
++/* If isnan is a macro, assume it is C99 type-variadic. */
++#if defined(__DragonFly__) && defined(isnan)
++#define isnanf(X) isnan(X)
++#endif
++
+ /* FreeBSD *and other 4.4 based systems require anything, isnanf is defined */
+ #if defined(__FreeBSD__)
+