audio/festival: 2.1 -> 2.4

- Updated HTS and CG engines
- Support for newer compilers
- Bug fixes galore.

PR:		204754
Submitted by:	Michael Danilov <mike.d.ft402@gmail.com>
Approved by:	mi (maintainer)

6 files changed, 27 insertions, 127 deletions

diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 553273c2c7b8..c26d0bc18487 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	festival
-PORTVERSION=	2.1
-PORTREVISION=	1
+PORTVERSION=	2.4
 CATEGORIES=	audio accessibility
 MASTER_SITES=	FESTIVAL
 DISTFILES=	${DISTNAME}-release.tar.gz 	\
@@ -41,19 +40,8 @@ MAKE_ARGS+=	CC="${CC}" GCC="${CC}" \
 		EST_HOME=${SPEECHTOOLS}
 WRKSRC=		${WRKDIR}
 
-SPT_PATCHES=	base__class_EST__TVector.cc	\
-		base__class_inst__tmpl_vector__dmatrix__t.cc	\
-		base__class_inst__tmpl_vector__dvector__t.cc	\
-		base__class_inst__tmpl_vector__fmatrix__t.cc	\
-		config_compilers_gcc__defaults.mak	\
-		include_EST__Ngrammar.h	\
-		include_EST__SCFG.h	\
-		include_EST__String.h	\
-		include_EST__error.h	\
-		include_ling__class_EST__FeatureFunctionPackage.h	\
-		include_unix_EST__socket__unix.h	\
-		stats_dynamic__program.cc	\
-		utils_EST__ServiceTable.cc
+SPT_PATCHES=	include_ling__class_EST__FeatureFunctionPackage.h	\
+		include_unix_EST__socket__unix.h
 
 do-build:
 .for d in speech_tools festival
diff --git a/audio/festival/distinfo b/audio/festival/distinfo
index 38aa35ea730b..4c406869f205 100644
--- a/audio/festival/distinfo
+++ b/audio/festival/distinfo
@@ -1,7 +1,7 @@
-SHA256 (festival/festival-2.1-release.tar.gz) = 06f3dcbad9d26e27443fc66947a0faf0c6679482220df4b5f42a261adf758080
-SIZE (festival/festival-2.1-release.tar.gz) = 787313
-SHA256 (festival/speech_tools-2.1-release.tar.gz) = ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9
-SIZE (festival/speech_tools-2.1-release.tar.gz) = 1681999
+SHA256 (festival/festival-2.4-release.tar.gz) = 1e47f293e0857ffde2bccead97947c040ea0b35ea12dd5796edb51583e5e5d84
+SIZE (festival/festival-2.4-release.tar.gz) = 788656
+SHA256 (festival/speech_tools-2.4-release.tar.gz) = fbc2482c443919aa79d2e599d6a5faee4e793df55a79ef377f1dc7e8ba237010
+SIZE (festival/speech_tools-2.4-release.tar.gz) = 1329613
 SHA256 (festival/src_modules_diphone_diphone.h.diff?id=b58a836) = 148ecd31aef84d5823470d339b3104b73af099404ab957fcee838520f8808104
 SIZE (festival/src_modules_diphone_diphone.h.diff?id=b58a836) = 870
 SHA256 (festival/src_modules_diphone_di_io.cc.diff?id=b58a836) = 0dfbe69e30ce8fbe695d30fed42a10c79bc6525dd4e971432a669c88bec4e048
@@ -36,10 +36,6 @@ SHA256 (festival/patch-speech__tools_include_EST__SCFG.h) = e6ec64c01faad49f0efb
 SIZE (festival/patch-speech__tools_include_EST__SCFG.h) = 519
 SHA256 (festival/patch-speech__tools_include_EST__String.h) = ce8b3513bf218fd369716101fb0b3defc8ddb4d8a57e28df2c0e80f95fe52e74
 SIZE (festival/patch-speech__tools_include_EST__String.h) = 1068
-SHA256 (festival/patch-speech__tools_include_EST__TIterator.h) = c44d8125a04447a63e8458cee910cd7fe4aa84d31d4c06139b76ae168c66bcf7
-SIZE (festival/patch-speech__tools_include_EST__TIterator.h) = 730
-SHA256 (festival/patch-speech__tools_include_EST__TNamedEnum.h) = c825a92c81ecdda555963319c400a026aa797c694897e2a6a232ea94660d6557
-SIZE (festival/patch-speech__tools_include_EST__TNamedEnum.h) = 608
 SHA256 (festival/patch-speech__tools_include_EST__error.h) = ad43dcfa0fb0222d3cfc86cc2a316badbe1f2e27b663a91139ee3ccc3fd325e5
 SIZE (festival/patch-speech__tools_include_EST__error.h) = 1210
 SHA256 (festival/patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = 2249d192d1c16697e0971263a1c1c1d8dbfecfe080c077abe49765e703775157
diff --git a/audio/festival/files/patch-debian-bug-667377 b/audio/festival/files/patch-debian-bug-667377
deleted file mode 100644
index 34af7d87e313..000000000000
--- a/audio/festival/files/patch-debian-bug-667377
+++ /dev/null
@@ -1,93 +0,0 @@
-Obtained from:
-	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667377
-
---- speech_tools/config/compilers/gcc_defaults.mak	2013-05-27 13:02:52.000000000 -0400
-+++ speech_tools/config/compilers/gcc_defaults.mak	2013-05-27 13:06:51.000000000 -0400
-@@ -82,5 +82,5 @@
- 
- ifndef GCC_MAKE_SHARED_LIB
--    MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
-+    MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname -Wl,YYY
- else
-     MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
---- speech_tools/base_class/EST_TSimpleMatrix.cc
-+++ speech_tools/base_class/EST_TSimpleMatrix.cc
-@@ -44,6 +44,7 @@
- #include "EST_TVector.h"
- #include <fstream>
- #include <iostream>
-+#include <cstring>
- #include "EST_cutils.h"
- 
- template<class T> 
-@@ -98,7 +99,7 @@ void EST_TSimpleMatrix<T>::resize(int ne
- 	{
- 	  int copy_r = Lof(this->num_rows(), new_rows);
- 
--	  just_resize(new_rows, new_cols, &old_vals);
-+	  this->just_resize(new_rows, new_cols, &old_vals);
- 
-           for (q=0; q<(copy_r*new_cols*sizeof(T)); q++) /* memcpy */
-               ((char *)this->p_memory)[q] = ((char *)old_vals)[q];
-@@ -127,9 +128,9 @@ void EST_TSimpleMatrix<T>::resize(int ne
- 	  int copy_r = Lof(this->num_rows(), new_rows);
- 	  int copy_c = Lof(this->num_columns(), new_cols);
- 	  
--	  just_resize(new_rows, new_cols, &old_vals);
-+	  this->just_resize(new_rows, new_cols, &old_vals);
- 
--	  set_values(old_vals,
-+	  this->set_values(old_vals,
- 		     old_row_step, old_column_step,
- 		     0, copy_r,
- 		     0, copy_c);
---- speech_tools/base_class/EST_TSimpleVector.cc
-+++ speech_tools/base_class/EST_TSimpleVector.cc
-@@ -43,6 +43,7 @@
- #include "EST_TSimpleVector.h"
- #include "EST_matrix_support.h"
- #include <fstream>
-+#include <cstring>
- #include "EST_cutils.h"
- 
- template<class T> void EST_TSimpleVector<T>::copy(const EST_TSimpleVector<T> &a)
-@@ -70,7 +71,7 @@ template<class T> void EST_TSimpleVector
-   int old_offset = this->p_offset;
-   unsigned int q;
- 
--  just_resize(newn, &old_vals);
-+  this->just_resize(newn, &old_vals);
- 
-   if (set && old_vals)
-     {
---- speech_tools/include/EST_TIterator.h
-+++ speech_tools/include/EST_TIterator.h
-@@ -209,7 +209,7 @@ public:
- 
-   /// Create an iterator ready to run over the given container.
-   EST_TStructIterator(const Container &over)
--    { begin(over); }
-+    { this->begin(over); }
- 
-   const Entry *operator ->() const
-     {return &this->current();}
-@@ -289,7 +289,7 @@ public:
- 
-   /// Create an iterator ready to run over the given container.
-   EST_TRwStructIterator(Container &over)
--    { begin(over); }
-+    { this->begin(over); }
- 
-   Entry *operator ->() const
-     {return &this->current();}
---- speech_tools/include/EST_TNamedEnum.h
-+++ speech_tools/include/EST_TNamedEnum.h
-@@ -130,7 +130,7 @@ public:
- 	{this->initialise((const void *)defs); };
-   EST_TNamedEnumI(EST_TValuedEnumDefinition<const char *,const char *,INFO> defs[], ENUM (*conv)(const char *))
- 	{this->initialise((const void *)defs, conv); };
--  const char *name(ENUM tok, int n=0) const {return value(tok,n); };
-+  const char *name(ENUM tok, int n=0) const {return this->value(tok,n); };
- 
- };
- 
diff --git a/audio/festival/files/patch-festival_src_modules_hts_engine_HTS_misc.c b/audio/festival/files/patch-festival_src_modules_hts_engine_HTS_misc.c
new file mode 100644
index 000000000000..ed8999d8da36
--- /dev/null
+++ b/audio/festival/files/patch-festival_src_modules_hts_engine_HTS_misc.c
@@ -0,0 +1,14 @@
+--- festival/src/modules/hts_engine/HTS_misc.c.orig	2013-07-03 19:43:35.000000000 +0600
++++ festival/src/modules/hts_engine/HTS_misc.c	2015-11-22 20:43:30.055818000 +0500
+@@ -245,11 +245,7 @@
+    } else if (fp->type == HTS_FILE) {
+       fpos_t pos;
+       fgetpos((FILE *) fp->pointer, &pos);
+-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__)
+       return (size_t) pos;
+-#else
+-      return (size_t) pos.__pos;
+-#endif                          /* _WIN32 || __APPLE__ */
+    }
+    HTS_error(0, "HTS_ftell: Unknown file type.\n");
+    return 0;
diff --git a/audio/festival/files/patch-voxware b/audio/festival/files/patch-voxware
index 70e4523e2629..8475342d6708 100644
--- a/audio/festival/files/patch-voxware
+++ b/audio/festival/files/patch-voxware
@@ -29,18 +29,11 @@
  #include <fcntl.h>
 -int linux16_supported = TRUE;
 -int freebsd16_supported = FALSE;
--static char *aud_sys_name = "Linux";
+-static const char *aud_sys_name = "Linux";
 +
  static int stereo_only = 0;
  
-@@ -152,5 +156,5 @@
-     int audio,actual_fmt;
-     int i,r,n;
--    char *audiodevice;
-+    const char *audiodevice;
- 
-     if (al.present("-audiodevice"))
-@@ -279,5 +283,5 @@
+@@ -764,5 +768,5 @@
      int audio=-1,actual_fmt;
      int i,r,n;
 -    char *audiodevice;
diff --git a/audio/festival/pkg-plist b/audio/festival/pkg-plist
index 1dd04e3e63b6..1ffcd754d468 100644
--- a/audio/festival/pkg-plist
+++ b/audio/festival/pkg-plist
@@ -26,12 +26,12 @@ man/man1/festival_client.1.gz
 %%DATADIR%%/examples/intro.text
 %%DATADIR%%/examples/latest
 %%DATADIR%%/examples/latest.sh
-%%DATADIR%%/examples/run-festival-script
-%%DATADIR%%/examples/run-festival-script.sh
 %%DATADIR%%/examples/make_utts
 %%DATADIR%%/examples/make_utts.sh
 %%DATADIR%%/examples/powmeanstd
 %%DATADIR%%/examples/powmeanstd.sh
+%%DATADIR%%/examples/run-festival-script
+%%DATADIR%%/examples/run-festival-script.sh
 %%DATADIR%%/examples/saytime
 %%DATADIR%%/examples/saytime.sh
 %%DATADIR%%/examples/scfg_parse_text
@@ -52,6 +52,8 @@ man/man1/festival_client.1.gz
 %%DATADIR%%/examples/spintro.text
 %%DATADIR%%/examples/text2pos
 %%DATADIR%%/examples/text2pos.sh
+%%DATADIR%%/examples/text2utt
+%%DATADIR%%/examples/text2utt.sh
 %%DATADIR%%/examples/text2wave
 %%DATADIR%%/examples/text2wave.sh
 %%DATADIR%%/examples/th-mode.scm