Copy the ix86_SunOS5.mak file from the distribution into files. It's

a bit crazy that we deliberately break the config script in this
package and have to replicate everything into files/ just to support
NetBSD, it's significantly reducing the portability.

Avoid ssize_t clash on newer Solaris.

These fixes make the package now build on Solaris.

3 files changed, 74 insertions, 1 deletions

diff --git a/audio/festival/distinfo b/audio/festival/distinfo
index 707ab7b92fc..17af9046f76 100644
--- a/audio/festival/distinfo
+++ b/audio/festival/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2012/05/04 16:01:04 joerg Exp $
+$NetBSD: distinfo,v 1.19 2012/12/18 13:27:10 jperkin Exp $
 
 SHA1 (festival-2.1-release.tar.gz) = f0c5a4282667898c584516e3605742835f59cb77
 RMD160 (festival-2.1-release.tar.gz) = b3c646ecc532e4e05f846db06bbab12a13ec1d6b
@@ -22,5 +22,6 @@ SHA1 (patch-speech__tools_include_EST__SCFG.h) = d58bc030dec4d526a89719e32c3624c
 SHA1 (patch-speech__tools_include_EST__TIterator.h) = db7617f5c4a802672ce3b098ecd512b6cdb96aeb
 SHA1 (patch-speech__tools_include_EST__TNamedEnum.h) = f240a338d17d7a36a5dba1b0f3b48190b235bf03
 SHA1 (patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = ec5eb54fba5a50b43d1a0c9f0a5ae36407f55bff
+SHA1 (patch-speech__tools_include_unix_EST__socket__unix.h) = f81c0cda0858d121e2d24182f39c7ab8fc673174
 SHA1 (patch-speech__tools_stats_dynamic__program.cc) = d932f865d5c5577f7c1adc446adf9a2ab25c59c9
 SHA1 (patch-speech__tools_utils_EST__ServiceTable.cc) = d085b9e1a925a12e80e0fc25884f4373ba271fd5
diff --git a/audio/festival/files/unknown_SunOS.mak b/audio/festival/files/unknown_SunOS.mak
new file mode 100644
index 00000000000..d27e104ebd7
--- /dev/null
+++ b/audio/festival/files/unknown_SunOS.mak
@@ -0,0 +1,57 @@
+ ###########################################################################
+ ##                                                                       ##
+ ##                Centre for Speech Technology Research                  ##
+ ##                     University of Edinburgh, UK                       ##
+ ##                         Copyright (c) 1996                            ##
+ ##                        All Rights Reserved.                           ##
+ ##                                                                       ##
+ ##  Permission is hereby granted, free of charge, to use and distribute  ##
+ ##  this software and its documentation without restriction, including   ##
+ ##  without limitation the rights to use, copy, modify, merge, publish,  ##
+ ##  distribute, sublicense, and/or sell copies of this work, and to      ##
+ ##  permit persons to whom this work is furnished to do so, subject to   ##
+ ##  the following conditions:                                            ##
+ ##   1. The code must retain the above copyright notice, this list of    ##
+ ##      conditions and the following disclaimer.                         ##
+ ##   2. Any modifications must be clearly marked as such.                ##
+ ##   3. Original authors' names are not deleted.                         ##
+ ##   4. The authors' names are not used to endorse or promote products   ##
+ ##      derived from this software without specific prior written        ##
+ ##      permission.                                                      ##
+ ##                                                                       ##
+ ##  THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK        ##
+ ##  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      ##
+ ##  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   ##
+ ##  SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE     ##
+ ##  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    ##
+ ##  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   ##
+ ##  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          ##
+ ##  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       ##
+ ##  THIS SOFTWARE.                                                       ##
+ ##                                                                       ##
+ ###########################################################################
+ ##                                                                       ##
+ ##                 Author: Richard Caley (rjc@cstr.ed.ac.uk)             ##
+ ##                   Date: Thu Oct  2 1997                               ##
+ ## --------------------------------------------------------------------  ##
+ ## Settings for SunOS 5 on Intel platform.                               ##
+ ##                                                                       ##
+ ###########################################################################
+
+include $(EST)/config/systems/default.mak
+
+DEFAULT_JAVA_HOME=/usr/java1.1
+
+## Libraries needed for sockets based programs.
+OS_LIBS = -lsocket -lnsl
+
+## the native audio module for this type of system
+NATIVE_AUDIO_MODULE = SUN16
+
+## echo -n doesn't work (well only sometimes ?)
+ECHO_N = /bin/printf "%s"
+
+SYSTEM_JAVA_INCLUDES  = -I$(JAVA_HOME)/include/solaris
+
+
+
diff --git a/audio/festival/patches/patch-speech__tools_include_unix_EST__socket__unix.h b/audio/festival/patches/patch-speech__tools_include_unix_EST__socket__unix.h
new file mode 100644
index 00000000000..690c402c161
--- /dev/null
+++ b/audio/festival/patches/patch-speech__tools_include_unix_EST__socket__unix.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-speech__tools_include_unix_EST__socket__unix.h,v 1.1 2012/12/18 13:27:10 jperkin Exp $
+
+Avoid ssize_t declaration in newer Solaris.
+
+--- ./speech_tools/include/unix/EST_socket_unix.h.orig	2012-12-18 13:04:33.464265098 +0000
++++ ./speech_tools/include/unix/EST_socket_unix.h	2012-12-18 13:07:17.081805920 +0000
+@@ -45,7 +45,7 @@
+ #include <errno.h>
+ 
+ /* Solaris defines this, linux doesn't */
+-#if defined(sun) && !defined(SVR4)
++#if defined(sun) && !defined(SVR4) && !defined(_SSIZE_T)
+ typedef int ssize_t;
+ #endif
+