diff options
| author | martin <martin> | 2001-11-17 16:29:07 +0000 |
|---|---|---|
| committer | martin <martin> | 2001-11-17 16:29:07 +0000 |
| commit | f693cf16972410c514915bb7be933ef3574ee69a (patch) | |
| tree | f3fc024055b2f21c9a5e8c5e08d299947ecebc4d | |
| parent | 442f292f55701034d89616cdb6af7f35f252bff3 (diff) | |
| download | pkgsrc-f693cf16972410c514915bb7be933ef3574ee69a.tar.gz | |
Bring this into the new toolchain world.
| -rw-r--r-- | audio/festival/Makefile | 5 | ||||
| -rw-r--r-- | audio/festival/distinfo | 3 | ||||
| -rw-r--r-- | audio/festival/patches/patch-am | 13 |
3 files changed, 19 insertions, 2 deletions
diff --git a/audio/festival/Makefile b/audio/festival/Makefile index 8f0d8fb951e..762e8846424 100644 --- a/audio/festival/Makefile +++ b/audio/festival/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/07/18 15:19:36 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2001/11/17 16:29:07 martin Exp $ DISTNAME= festival-1.4.1 WRKSRC= ${WRKDIR} @@ -35,6 +35,8 @@ MAKE_ENV+= PKG_EST_HOME="${SPEECHTOOLS}" \ PKG_PREFIX="${PREFIX}" \ EGCS_CC="${CC}" \ EGCS_CXX="${CXX}" \ + GCC295_CC="${CC}" \ + GCC295_CXX="${CXX}" \ GCC28_CC="${CC}" \ GCC28_CXX="${CXX}" \ GCC27_CC="${CC}" \ @@ -81,5 +83,6 @@ do-install: PKG_COMPILER!= case "`${CC} -v 2>&1`" in *2.6.*) ${ECHO} gcc26;;\ *2.7.*) ${ECHO} gcc27;;\ *2.8.*) ${ECHO} gcc28;;\ + *2.95.*) ${ECHO} gcc295;;\ *egcs*) ${ECHO} egcs;;\ esac diff --git a/audio/festival/distinfo b/audio/festival/distinfo index 1a1184936bb..f4f6fea4152 100644 --- a/audio/festival/distinfo +++ b/audio/festival/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/07/18 15:19:36 wiz Exp $ +$NetBSD: distinfo,v 1.4 2001/11/17 16:29:07 martin Exp $ SHA1 (festival-1.4.1.tar.gz) = d3be7d58b986c37c39444a2dcc044cdc3ee1e774 Size (festival-1.4.1.tar.gz) = 543335 bytes @@ -20,3 +20,4 @@ SHA1 (patch-ai) = 690a0649e8231296dae291b7210b6e7c84bae961 SHA1 (patch-aj) = a50a9e762096faf7dc1272325a925e54d2c882a0 SHA1 (patch-ak) = 705016ef010989c1b9ffe2d23b78ee9615a4c6f7 SHA1 (patch-al) = d8a22c5f509a6d75aa3295037654b594e8db4a4a +SHA1 (patch-am) = cd6e07df1729fecca5cd9869229701b63ba71d14 diff --git a/audio/festival/patches/patch-am b/audio/festival/patches/patch-am new file mode 100644 index 00000000000..7af404324a1 --- /dev/null +++ b/audio/festival/patches/patch-am @@ -0,0 +1,13 @@ +$NetBSD: patch-am,v 1.1 2001/11/17 16:29:08 martin Exp $ + +--- speech_tools/include/unix/EST_socket_unix.h.orig Sat Nov 17 16:55:44 2001 ++++ speech_tools/include/unix/EST_socket_unix.h Sat Nov 17 16:56:18 2001 +@@ -49,7 +49,7 @@ + typedef int ssize_t; + #endif + +-#if defined(__linux__) ++#if defined(__linux__) || defined(__NetBSD__) + /* gcc-2.95.1 is fussy and requies certain arguments to follow their type */ + /* Linux wants socklen_t params but other (even if they have this defined */ + /* want int or maybe unsigned int (pretty random actually) */ |