- Update to 1.22

- Add a line in pkg-descr: espeak is not only for English

5 files changed, 82 insertions, 23 deletions

diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index 132ee4ffdd40..b6e0c4307627 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	espeak
-PORTVERSION=	1.21
+PORTVERSION=	1.22
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/espeak/distinfo b/audio/espeak/distinfo
index 5a09ada99e8f..30d7aea6071a 100644
--- a/audio/espeak/distinfo
+++ b/audio/espeak/distinfo
@@ -1,3 +1,3 @@
-MD5 (espeak-1.21-source.zip) = 554bce374c5e86d2d886d030a5bcf16e
-SHA256 (espeak-1.21-source.zip) = f91057a29799e17f0f22e56e4741ca99487ecac99f0d62d7ab130b31356c1944
-SIZE (espeak-1.21-source.zip) = 696880
+MD5 (espeak-1.22-source.zip) = 57e84d1afc0992f65c568dcddea73fee
+SHA256 (espeak-1.22-source.zip) = 3de077fc0397d8b63488a6c7cdb53aafb7808b4446fc5f9f3dd3cb5abc83151e
+SIZE (espeak-1.22-source.zip) = 835112
diff --git a/audio/espeak/files/patch-src-Makefile b/audio/espeak/files/patch-src-Makefile
index 1f8d3b5657fe..2045d48f4d3d 100644
--- a/audio/espeak/files/patch-src-Makefile
+++ b/audio/espeak/files/patch-src-Makefile
@@ -1,5 +1,5 @@
---- src/Makefile	Fri Jan 26 10:20:06 2007
-+++ src/Makefile.port	Fri Jan 26 23:38:04 2007
+--- src/Makefile	Wed Apr  4 14:39:47 2007
++++ src/Makefile.port	Thu Apr  5 13:09:53 2007
 @@ -1,7 +1,7 @@
 -BINDIR=/usr/bin
 -INCDIR=/usr/include/espeak
@@ -10,30 +10,31 @@
 +LIBDIR=%%PREFIX%%/lib
 +DATADIR=%%DATADIR%%/espeak-data
  
- RELEASE = 1.19
+ RELEASE = 1.22
  BIN_NAME = speak
 @@ -28,17 +28,17 @@
  
  SRCS1=$(speak_SOURCES)
  OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
 -LIBS1=-lstdc++ -lportaudio -lpthread
-+LIBS1=-lstdc++ -L%%LOCALBASE%%/lib -lportaudio -lpthread
++LIBS1=-lstdc++ -L%%LOCALBASE%%/lib -lportaudio $(PTHREAD_LIBS)
  
  SRCS2=$(libespeak_SOURCES)
  OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
 -LIBS2=-lstdc++ -lportaudio -lpthread
-+LIBS2=-lstdc++ -L%%LOCALBASE%%/lib -lportaudio -lpthread
++LIBS2=-lstdc++ -L%%LOCALBASE%%/lib -lportaudio $(PTHREAD_LIBS)
  
  SRCS3 = espeak.cpp
  OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
- LIBS3=-lstdc++ ./libespeak.so
+-LIBS3=-lstdc++ ./libespeak.so
++LIBS3=-lstdc++ ./libespeak.so $(PTHREAD_LIBS)
  
 -CXXFLAGS=-O2
 +#CXXFLAGS=-O2
  ifeq ($(shell uname -m), ppc)
  	CXXFLAGS += -D ARCH_BIG
  endif
-@@ -48,22 +48,22 @@
+@@ -48,7 +48,7 @@
  	mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
  
  .cpp.o:
@@ -41,13 +42,8 @@
 +	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PTHREAD_CFLAGS) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $<
  
  $(BIN_NAME): $(OBJS1)
--	$(CXX) -o $@ $(OBJS1) $(LIBS1)
-+	$(CXX) $(PTHREAD_LIB) -o $@ $(OBJS1) $(LIBS1)
- 
- $(BIN2_NAME): $(OBJS3) $(LIB_NAME)
--	$(CXX) -o $@ $(OBJS3) $(LIBS3)
-+	$(CXX) $(PTHREAD_LIBS) -o $@ $(OBJS3) $(LIBS3)
- 
+ 	$(CXX) -o $@ $(OBJS1) $(LIBS1)
+@@ -59,7 +59,7 @@
  
  
  x_%.o: %.cpp
@@ -56,8 +52,19 @@
  	-I. -D LIBRARY -c -fno-exceptions $<  -o x_$*.o
  
  $(LIB_NAME): $(OBJS2)
--	$(CXX) -shared -Wl,-soname,$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
-+	$(CXX) $(PTHREAD_LIBS) -shared -Wl,-soname,$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
+@@ -75,7 +75,7 @@
+ 
+ install: all
+ 	# Create directories
+-	rm -r $(DESTDIR)$(DATADIR)
++	#rm -r $(DESTDIR)$(DATADIR)
+ 	$(MKDIR) $(DESTDIR)$(BINDIR)
+ 	$(MKDIR) $(DESTDIR)$(LIBDIR)
+ 	$(MKDIR) $(DESTDIR)$(INCDIR)
+@@ -89,5 +89,5 @@
+ 	# Install development headers
+ 	$(INSTALL) -pm 644 speak_lib.h $(DESTDIR)$(INCDIR)
+ 	# Install data files
+-	cp -prf ../espeak-data/* $(DESTDIR)$(DATADIR)
++	cp -pRf ../espeak-data/* $(DESTDIR)$(DATADIR)
  
- clean:
- 	rm -f *.o *~
diff --git a/audio/espeak/pkg-descr b/audio/espeak/pkg-descr
index 67d556e298ce..c717c4e35f51 100644
--- a/audio/espeak/pkg-descr
+++ b/audio/espeak/pkg-descr
@@ -1,3 +1,6 @@
+eSpeak is a compact open source software speech synthesizer for English
+and other languages. 
+
 eSpeak produces good quality English speech. It uses a different
 synthesis method from other open source TTS engines, and sounds quite
 different. It's perhaps not as natural or "smooth", but I find the
diff --git a/audio/espeak/pkg-plist b/audio/espeak/pkg-plist
index d33f77096d74..fcde6a3454ee 100644
--- a/audio/espeak/pkg-plist
+++ b/audio/espeak/pkg-plist
@@ -3,7 +3,7 @@ bin/espeak
 include/espeak/speak_lib.h
 lib/libespeak.so
 lib/libespeak.so.1
-lib/libespeak.so.1.1.21
+lib/libespeak.so.1.1.22
 %%PORTDOCS%%%%DOCSDIR%%/add_language.html
 %%PORTDOCS%%%%DOCSDIR%%/analyse.html
 %%PORTDOCS%%%%DOCSDIR%%/commands.html
@@ -15,6 +15,7 @@ lib/libespeak.so.1.1.21
 %%PORTDOCS%%%%DOCSDIR%%/images/sand-light.jpg
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/languages.html
+%%PORTDOCS%%%%DOCSDIR%%/mbrola.html
 %%PORTDOCS%%%%DOCSDIR%%/phonemes.html
 %%PORTDOCS%%%%DOCSDIR%%/phontab.html
 %%PORTDOCS%%%%DOCSDIR%%/speak_lib.h
@@ -22,6 +23,7 @@ lib/libespeak.so.1.1.21
 %%PORTDOCS%%%%DOCSDIR%%/voices.html
 %%DATADIR%%/espeak-data/af_dict
 %%DATADIR%%/espeak-data/config
+%%DATADIR%%/espeak-data/cs_dict
 %%DATADIR%%/espeak-data/cy_dict
 %%DATADIR%%/espeak-data/de_dict
 %%DATADIR%%/espeak-data/el_dict
@@ -33,6 +35,18 @@ lib/libespeak.so.1.1.21
 %%DATADIR%%/espeak-data/hi_dict
 %%DATADIR%%/espeak-data/hu_dict
 %%DATADIR%%/espeak-data/it_dict
+%%DATADIR%%/espeak-data/mbrola_ph/af1_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/ca1_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/cs_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/de4_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/en1_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/fr1_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/nl_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/pl1_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/ro1_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/sv_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/us3_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/us_phtrans
 %%DATADIR%%/espeak-data/nl_dict
 %%DATADIR%%/espeak-data/no_dict
 %%DATADIR%%/espeak-data/phondata
@@ -42,6 +56,7 @@ lib/libespeak.so.1.1.21
 %%DATADIR%%/espeak-data/pt_dict
 %%DATADIR%%/espeak-data/ro_dict
 %%DATADIR%%/espeak-data/ru_dict
+%%DATADIR%%/espeak-data/sk_dict
 %%DATADIR%%/espeak-data/sv_dict
 %%DATADIR%%/espeak-data/sw_dict
 %%DATADIR%%/espeak-data/vi_dict
@@ -54,7 +69,9 @@ lib/libespeak.so.1.1.21
 %%DATADIR%%/espeak-data/voices/!v/!variant3
 %%DATADIR%%/espeak-data/voices/!v/!variant4
 %%DATADIR%%/espeak-data/voices/!v/!variant5
+%%DATADIR%%/espeak-data/voices/!v/!variant6
 %%DATADIR%%/espeak-data/voices/af
+%%DATADIR%%/espeak-data/voices/cs
 %%DATADIR%%/espeak-data/voices/cy
 %%DATADIR%%/espeak-data/voices/de
 %%DATADIR%%/espeak-data/voices/default
@@ -64,29 +81,61 @@ lib/libespeak.so.1.1.21
 %%DATADIR%%/espeak-data/voices/en/en-n
 %%DATADIR%%/espeak-data/voices/en/en-r
 %%DATADIR%%/espeak-data/voices/en/en-rp
+%%DATADIR%%/espeak-data/voices/en/en-sc
 %%DATADIR%%/espeak-data/voices/en/en-wm
 %%DATADIR%%/espeak-data/voices/eo
 %%DATADIR%%/espeak-data/voices/es
 %%DATADIR%%/espeak-data/voices/fi
 %%DATADIR%%/espeak-data/voices/fr
+%%DATADIR%%/espeak-data/voices/fr-ca
 %%DATADIR%%/espeak-data/voices/hi
 %%DATADIR%%/espeak-data/voices/hu
 %%DATADIR%%/espeak-data/voices/it
+%%DATADIR%%/espeak-data/voices/mb/mb-af1
+%%DATADIR%%/espeak-data/voices/mb/mb-af1-en
+%%DATADIR%%/espeak-data/voices/mb/mb-cz2
+%%DATADIR%%/espeak-data/voices/mb/mb-de4
+%%DATADIR%%/espeak-data/voices/mb/mb-de4-en
+%%DATADIR%%/espeak-data/voices/mb/mb-en1
+%%DATADIR%%/espeak-data/voices/mb/mb-fr1
+%%DATADIR%%/espeak-data/voices/mb/mb-fr1-en
+%%DATADIR%%/espeak-data/voices/mb/mb-fr4
+%%DATADIR%%/espeak-data/voices/mb/mb-fr4-en
+%%DATADIR%%/espeak-data/voices/mb/mb-nl2
+%%DATADIR%%/espeak-data/voices/mb/mb-nl2-en
+%%DATADIR%%/espeak-data/voices/mb/mb-pl1
+%%DATADIR%%/espeak-data/voices/mb/mb-pl1-en
+%%DATADIR%%/espeak-data/voices/mb/mb-ro1
+%%DATADIR%%/espeak-data/voices/mb/mb-ro1-en
+%%DATADIR%%/espeak-data/voices/mb/mb-sw1
+%%DATADIR%%/espeak-data/voices/mb/mb-sw1-en
+%%DATADIR%%/espeak-data/voices/mb/mb-sw2
+%%DATADIR%%/espeak-data/voices/mb/mb-sw2-en
+%%DATADIR%%/espeak-data/voices/mb/mb-us1
+%%DATADIR%%/espeak-data/voices/mb/mb-us2
+%%DATADIR%%/espeak-data/voices/mb/mb-us3
 %%DATADIR%%/espeak-data/voices/nl
 %%DATADIR%%/espeak-data/voices/no
 %%DATADIR%%/espeak-data/voices/pl
 %%DATADIR%%/espeak-data/voices/pt
+%%DATADIR%%/espeak-data/voices/pt-pt
 %%DATADIR%%/espeak-data/voices/ro
 %%DATADIR%%/espeak-data/voices/ru
+%%DATADIR%%/espeak-data/voices/sk
 %%DATADIR%%/espeak-data/voices/sv
 %%DATADIR%%/espeak-data/voices/sw
 %%DATADIR%%/espeak-data/voices/vi
+%%DATADIR%%/espeak-data/voices/zhy
+%%DATADIR%%/espeak-data/zhy_dict
 @dirrm include/espeak
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/espeak-data/mbrola
+@dirrm %%DATADIR%%/espeak-data/mbrola_ph
 @dirrm %%DATADIR%%/espeak-data/soundicons
 @dirrm %%DATADIR%%/espeak-data/voices/!v
 @dirrm %%DATADIR%%/espeak-data/voices/en
+@dirrm %%DATADIR%%/espeak-data/voices/mb
 @dirrm %%DATADIR%%/espeak-data/voices
 @dirrm %%DATADIR%%/espeak-data
 @dirrm %%DATADIR%%