update to 1.31

changes:
-Bug fixes and minor improvements
-Voice variants have names rather than numbers
-Added languages
-Add options for different intonation styles
-Added option for gaps (pauses) between words

4 files changed, 46 insertions, 32 deletions

diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index 2df2a249923..4560aca9fc6 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/08/04 12:52:56 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/02/28 20:16:55 drochner Exp $
 #
 
-DISTNAME=	espeak-1.28-source
-PKGNAME=	espeak-1.28
+DISTNAME=	espeak-1.31-source
+PKGNAME=	espeak-1.31
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=espeak/}
 EXTRACT_SUFX=	.zip
@@ -13,18 +13,18 @@ COMMENT=	Speech synthesizer
 
 USE_LANGUAGES=	c++
 USE_TOOLS+=	gmake
-WRKSRC=		${WRKDIR}/espeak-1.28-source/src
+WRKSRC=		${WRKDIR}/espeak-1.31-source/src
 
 #LICENSE=	GPLv3
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/espeak ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/libespeak.so.1.1.28 ${PREFIX}/lib
-	${LN} -sf ${PREFIX}/lib/libespeak.so.1.1.28 ${PREFIX}/lib/libespeak.so.1
-	${LN} -sf ${PREFIX}/lib/libespeak.so.1.1.28 ${PREFIX}/lib/libespeak.so
+	${INSTALL_DATA} ${WRKSRC}/libespeak.so.1.1.31 ${PREFIX}/lib
+	${LN} -sf ${PREFIX}/lib/libespeak.so.1.1.31 ${PREFIX}/lib/libespeak.so.1
+	${LN} -sf ${PREFIX}/lib/libespeak.so.1.1.31 ${PREFIX}/lib/libespeak.so
 	${INSTALL_DATA} ${WRKSRC}/libespeak.a ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/speak_lib.h ${PREFIX}/include
-	${CP} -r ${WRKDIR}/espeak-1.28-source/espeak-data ${PREFIX}/share
+	${CP} -r ${WRKDIR}/espeak-1.31-source/espeak-data ${PREFIX}/share
 
 .include "../../audio/portaudio/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/audio/espeak/PLIST b/audio/espeak/PLIST
index ffba6092f05..364b6849e9c 100644
--- a/audio/espeak/PLIST
+++ b/audio/espeak/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/07/17 19:18:44 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/02/28 20:16:55 drochner Exp $
 bin/espeak
 include/speak_lib.h
 lib/libespeak.a
@@ -16,27 +16,31 @@ share/espeak-data/eo_dict
 share/espeak-data/es_dict
 share/espeak-data/fi_dict
 share/espeak-data/fr_dict
+share/espeak-data/grc_dict
+share/espeak-data/hbs_dict
 share/espeak-data/hi_dict
-share/espeak-data/hr_dict
 share/espeak-data/hu_dict
 share/espeak-data/is_dict
 share/espeak-data/it_dict
+share/espeak-data/jbo_dict
 share/espeak-data/la_dict
 share/espeak-data/mbrola_ph/af1_phtrans
 share/espeak-data/mbrola_ph/ca1_phtrans
 share/espeak-data/mbrola_ph/cr1_phtrans
 share/espeak-data/mbrola_ph/cs_phtrans
 share/espeak-data/mbrola_ph/de4_phtrans
-share/espeak-data/mbrola_ph/de5_phtrans
+share/espeak-data/mbrola_ph/de6_phtrans
 share/espeak-data/mbrola_ph/en1_phtrans
 share/espeak-data/mbrola_ph/fr1_phtrans
 share/espeak-data/mbrola_ph/gr2_phtrans
+share/espeak-data/mbrola_ph/grc-de6_phtrans
 share/espeak-data/mbrola_ph/hu1_phtrans
 share/espeak-data/mbrola_ph/it3_phtrans
 share/espeak-data/mbrola_ph/la1_phtrans
 share/espeak-data/mbrola_ph/nl_phtrans
 share/espeak-data/mbrola_ph/pl1_phtrans
 share/espeak-data/mbrola_ph/ro1_phtrans
+share/espeak-data/mbrola_ph/sv2_phtrans
 share/espeak-data/mbrola_ph/sv_phtrans
 share/espeak-data/mbrola_ph/us3_phtrans
 share/espeak-data/mbrola_ph/us_phtrans
@@ -44,7 +48,6 @@ share/espeak-data/mk_dict
 share/espeak-data/nl_dict
 share/espeak-data/no_dict
 share/espeak-data/phondata
-share/espeak-data/phondata-manifest
 share/espeak-data/phonindex
 share/espeak-data/phontab
 share/espeak-data/pl_dict
@@ -55,39 +58,45 @@ share/espeak-data/sk_dict
 share/espeak-data/sv_dict
 share/espeak-data/sw_dict
 share/espeak-data/vi_dict
-share/espeak-data/voices/!v/!variant1
-share/espeak-data/voices/!v/!variant11
-share/espeak-data/voices/!v/!variant12
-share/espeak-data/voices/!v/!variant13
-share/espeak-data/voices/!v/!variant14
-share/espeak-data/voices/!v/!variant2
-share/espeak-data/voices/!v/!variant3
-share/espeak-data/voices/!v/!variant4
-share/espeak-data/voices/!v/!variant5
-share/espeak-data/voices/!v/!variant6
+share/espeak-data/voices/!v/croak
+share/espeak-data/voices/!v/f1
+share/espeak-data/voices/!v/f2
+share/espeak-data/voices/!v/f3
+share/espeak-data/voices/!v/f4
+share/espeak-data/voices/!v/m1
+share/espeak-data/voices/!v/m2
+share/espeak-data/voices/!v/m3
+share/espeak-data/voices/!v/m4
+share/espeak-data/voices/!v/m5
+share/espeak-data/voices/!v/m6
+share/espeak-data/voices/!v/test
+share/espeak-data/voices/!v/whisper
+share/espeak-data/voices/!v/wisper
 share/espeak-data/voices/af
+share/espeak-data/voices/bs
 share/espeak-data/voices/cs
 share/espeak-data/voices/cy
 share/espeak-data/voices/de
 share/espeak-data/voices/default
 share/espeak-data/voices/el
 share/espeak-data/voices/en/en
-share/espeak-data/voices/en/en-croak
 share/espeak-data/voices/en/en-n
 share/espeak-data/voices/en/en-r
 share/espeak-data/voices/en/en-rp
 share/espeak-data/voices/en/en-sc
-share/espeak-data/voices/en/en-wisper
+share/espeak-data/voices/en/en-wi
 share/espeak-data/voices/en/en-wm
 share/espeak-data/voices/eo
 share/espeak-data/voices/es
 share/espeak-data/voices/fi
 share/espeak-data/voices/fr
+share/espeak-data/voices/grc
 share/espeak-data/voices/hi
 share/espeak-data/voices/hr
 share/espeak-data/voices/hu
 share/espeak-data/voices/is
 share/espeak-data/voices/it
+share/espeak-data/voices/jbo
 share/espeak-data/voices/la
 share/espeak-data/voices/mb/mb-af1
 share/espeak-data/voices/mb/mb-af1-en
@@ -97,6 +106,8 @@ share/espeak-data/voices/mb/mb-de4
 share/espeak-data/voices/mb/mb-de4-en
 share/espeak-data/voices/mb/mb-de5
 share/espeak-data/voices/mb/mb-de5-en
+share/espeak-data/voices/mb/mb-de6
+share/espeak-data/voices/mb/mb-de6-grc
 share/espeak-data/voices/mb/mb-de7
 share/espeak-data/voices/mb/mb-en1
 share/espeak-data/voices/mb/mb-fr1
@@ -132,10 +143,13 @@ share/espeak-data/voices/pt-pt
 share/espeak-data/voices/ro
 share/espeak-data/voices/ru
 share/espeak-data/voices/sk
+share/espeak-data/voices/sr
 share/espeak-data/voices/sv
 share/espeak-data/voices/sw
 share/espeak-data/voices/vi
+share/espeak-data/voices/zh
 share/espeak-data/voices/zhy
+share/espeak-data/zh_dict
 share/espeak-data/zhy_dict
 @dirrm share/espeak-data/voices/mb
 @dirrm share/espeak-data/voices/en
diff --git a/audio/espeak/distinfo b/audio/espeak/distinfo
index 5731eeb94e4..06ba7f01f2d 100644
--- a/audio/espeak/distinfo
+++ b/audio/espeak/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2007/08/04 12:52:57 joerg Exp $
+$NetBSD: distinfo,v 1.3 2008/02/28 20:16:55 drochner Exp $
 
-SHA1 (espeak-1.28-source.zip) = e2c017c821ee93b28a70de1027591bb999365622
-RMD160 (espeak-1.28-source.zip) = e48f57daca3710326b0918c3adf6cc444830c7fc
-Size (espeak-1.28-source.zip) = 1054248 bytes
+SHA1 (espeak-1.31-source.zip) = e33291b29153d0fc179da11ac4a61cc85fba679a
+RMD160 (espeak-1.31-source.zip) = a26596f25d8897848238d81fe5e5d179d47f01a6
+Size (espeak-1.31-source.zip) = 1204202 bytes
 SHA1 (patch-aa) = a01dccb651c0160a7af5af14f3292578c8396ae0
 SHA1 (patch-ab) = 37e434f3c3e2fb722f927da4ca83a2b814c28879
-SHA1 (patch-ac) = 7fec475aa7a6d77d8cb641e51c02e1cd1d96e545
+SHA1 (patch-ac) = e94b0597b0c104daaa24b6421b5bcf69147b1046
diff --git a/audio/espeak/patches/patch-ac b/audio/espeak/patches/patch-ac
index d0af11f50a8..802d3249925 100644
--- a/audio/espeak/patches/patch-ac
+++ b/audio/espeak/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2007/08/04 12:52:57 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2008/02/28 20:16:55 drochner Exp $
 
---- Makefile.orig	2007-07-16 17:52:51.000000000 +0000
+--- Makefile.orig	2008-01-19 22:50:27.000000000 +0100
 +++ Makefile
 @@ -1,7 +1,7 @@
  BINDIR=/usr/bin
@@ -9,7 +9,7 @@ $NetBSD: patch-ac,v 1.2 2007/08/04 12:52:57 joerg Exp $
 -DATADIR=/usr/share/espeak-data
 +DATADIR=${PREFIX}/share/espeak-data
  
- RELEASE = 1.28
+ RELEASE = 1.31
  BIN_NAME = speak
 @@ -26,18 +26,19 @@ libespeak_SOURCES = speak_lib.cpp compil
  	tr_languages.cpp voices.cpp wavegen.cpp phonemelist.cpp \