- Update to 1.36

PR:		ports/121810
Submitted by:	delphij

4 files changed, 72 insertions, 46 deletions

diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index c8f3262be323..b9d460f0079a 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	espeak
-PORTVERSION=	1.28
+PORTVERSION=	1.36
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/audio/espeak/distinfo b/audio/espeak/distinfo
index d6f69927dd54..bfa378e09813 100644
--- a/audio/espeak/distinfo
+++ b/audio/espeak/distinfo
@@ -1,3 +1,3 @@
-MD5 (espeak-1.28-source.zip) = 6eb2ee58909d2819550b1d016f30da74
-SHA256 (espeak-1.28-source.zip) = 94ef096b577e69c70e2852c3312ba8f53800940853a14af5e74387c4455ae867
-SIZE (espeak-1.28-source.zip) = 1054248
+MD5 (espeak-1.36-source.zip) = df2ebbe3d771e21be7de4ba53d28a4b0
+SHA256 (espeak-1.36-source.zip) = 7344a447df388e57b87a9b320229fca71248e6518f1ee72f678d435dd9056187
+SIZE (espeak-1.36-source.zip) = 1269634
diff --git a/audio/espeak/files/patch-src-Makefile b/audio/espeak/files/patch-src-Makefile
index 572df85f24c4..8c197a9e35f0 100644
--- a/audio/espeak/files/patch-src-Makefile
+++ b/audio/espeak/files/patch-src-Makefile
@@ -1,57 +1,59 @@
---- src/Makefile	Sat Apr 21 19:05:23 2007
-+++ src/Makefile.port	Mon Apr 23 15:50:29 2007
-@@ -1,7 +1,7 @@
--BINDIR=/usr/bin
--INCDIR=/usr/include/espeak
--LIBDIR=/usr/lib
--DATADIR=/usr/share/espeak-data
+--- src/Makefile.orig	2008-03-09 12:22:06.000000000 -0700
++++ src/Makefile	2008-03-17 16:12:11.322174163 -0700
+@@ -1,10 +1,9 @@
+ # remove -fno-exceptions  if it causes problems with stdio library on some platforms (ARM)
+ 
+-PREFIX=/
+-BINDIR=$(PREFIX)/usr/bin
+-INCDIR=$(PREFIX)/usr/include/espeak
+-LIBDIR=$(PREFIX)/usr/lib
+-DATADIR=$(PREFIX)/usr/share/espeak-data
 +BINDIR=%%PREFIX%%/bin
 +INCDIR=%%PREFIX%%/include/espeak
 +LIBDIR=%%PREFIX%%/lib
 +DATADIR=%%DATADIR%%/espeak-data
  
- RELEASE = 1.23
+ RELEASE = 1.36
  BIN_NAME = speak
-@@ -29,24 +29,24 @@
+@@ -53,24 +52,23 @@
  
  SRCS1=$(speak_SOURCES)
  OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
--LIBS1=-lstdc++ -lportaudio -lpthread
-+LIBS1=-lstdc++ -L%%LOCALBASE%%/lib -lportaudio $(PTHREAD_LIBS)
+-LIBS1=-lstdc++ $(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
++LIBS1=-lstdc++ -L%%LOCALBASE%%/lib $(LIB_AUDIO) $(PTHREAD_LIBS) $(EXTRA_LIBS)
  
  SRCS2=$(libespeak_SOURCES)
  OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
--LIBS2=-lstdc++ -lportaudio -lpthread
-+LIBS2=-lstdc++ -L%%LOCALBASE%%/lib -lportaudio $(PTHREAD_LIBS)
+-LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread
++LIBS2=-lstdc++ -L%%LOCALBASE%%/lib $(LIB_AUDIO) $(PTHREAD_LIBS)
  
  SRCS3 = espeak.cpp
  OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
--LIBS3=-lstdc++ ./libespeak.so
-+LIBS3=-lstdc++ ./libespeak.so $(PTHREAD_LIBS)
+-LIBS3=-lstdc++ -L . -lespeak
  
 -CXXFLAGS=-O2
-+#CXXFLAGS=-O2
++LIBS3=-lstdc++ -L . -lespeak $(PTHREAD_LIBS)
  
  
  all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
  	mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
  
  .cpp.o:
--	$(CXX) $(CXXFLAGS) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $<
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PTHREAD_CFLAGS) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $<
+-	$(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions  $<
++	$(CXX) $(CXXFLAGS) $(PTHREAD_CFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions  $<
  
  $(BIN_NAME): $(OBJS1)
  	$(CXX) -o $@ $(OBJS1) $(LIBS1)
-@@ -57,7 +57,7 @@
+@@ -81,7 +79,7 @@
  
  
  x_%.o: %.cpp
--	$(CXX) $(CXXFLAGS) -Wall -fpic -fvisibility=hidden -pedantic \
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PTHREAD_CFLAGS) -Wall -fPIC -pedantic \
- 	-I. -D LIBRARY -c -fno-exceptions $<  -o x_$*.o
+-	$(CXX) $(CXXFLAGS) $(USE_AUDIO) -Wall -fpic -pedantic \
++	$(CXX) $(CXXFLAGS) $(PTHREAD_CFLAGS) $(USE_AUDIO) -Wall -fpic -pedantic \
+ 	-I. -D LIBRARY -c -fno-exceptions  $<  -o x_$*.o
  
  $(LIB_NAME): $(OBJS2)
-@@ -76,7 +76,7 @@
+@@ -100,7 +98,7 @@
  
  install: all
  	# Create directories
@@ -60,7 +62,7 @@
  	$(MKDIR) $(DESTDIR)$(BINDIR)
  	$(MKDIR) $(DESTDIR)$(LIBDIR)
  	$(MKDIR) $(DESTDIR)$(INCDIR)
-@@ -92,5 +92,5 @@
+@@ -116,5 +114,5 @@
  	# Install development headers
  	$(INSTALL) -pm 644 speak_lib.h $(DESTDIR)$(INCDIR)
  	# Install data files
diff --git a/audio/espeak/pkg-plist b/audio/espeak/pkg-plist
index b528cdac1379..a13ee8abd413 100644
--- a/audio/espeak/pkg-plist
+++ b/audio/espeak/pkg-plist
@@ -4,7 +4,7 @@ include/espeak/speak_lib.h
 lib/libespeak.a
 lib/libespeak.so
 lib/libespeak.so.1
-lib/libespeak.so.1.1.28
+lib/libespeak.so.1.1.36
 %%PORTDOCS%%%%DOCSDIR%%/add_language.html
 %%PORTDOCS%%%%DOCSDIR%%/analyse.html
 %%PORTDOCS%%%%DOCSDIR%%/commands.html
@@ -33,27 +33,35 @@ lib/libespeak.so.1.1.28
 %%DATADIR%%/espeak-data/es_dict
 %%DATADIR%%/espeak-data/fi_dict
 %%DATADIR%%/espeak-data/fr_dict
+%%DATADIR%%/espeak-data/grc_dict
+%%DATADIR%%/espeak-data/hbs_dict
 %%DATADIR%%/espeak-data/hi_dict
-%%DATADIR%%/espeak-data/hr_dict
 %%DATADIR%%/espeak-data/hu_dict
+%%DATADIR%%/espeak-data/id_dict
 %%DATADIR%%/espeak-data/is_dict
 %%DATADIR%%/espeak-data/it_dict
+%%DATADIR%%/espeak-data/jbo_dict
+%%DATADIR%%/espeak-data/ku_dict
 %%DATADIR%%/espeak-data/la_dict
 %%DATADIR%%/espeak-data/mbrola_ph/af1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/ca1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/cr1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/cs_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/de4_phtrans
-%%DATADIR%%/espeak-data/mbrola_ph/de5_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/de6_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/en1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/fr1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/gr2_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/grc-de6_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/hu1_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/id1_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/in1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/it3_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/la1_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/sv2_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/sv_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/us3_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/us_phtrans
@@ -61,7 +69,6 @@ lib/libespeak.so.1.1.28
 %%DATADIR%%/espeak-data/nl_dict
 %%DATADIR%%/espeak-data/no_dict
 %%DATADIR%%/espeak-data/phondata
-%%DATADIR%%/espeak-data/phondata-manifest
 %%DATADIR%%/espeak-data/phonindex
 %%DATADIR%%/espeak-data/phontab
 %%DATADIR%%/espeak-data/pl_dict
@@ -71,40 +78,50 @@ lib/libespeak.so.1.1.28
 %%DATADIR%%/espeak-data/sk_dict
 %%DATADIR%%/espeak-data/sv_dict
 %%DATADIR%%/espeak-data/sw_dict
+%%DATADIR%%/espeak-data/ta_dict
+%%DATADIR%%/espeak-data/tr_dict
 %%DATADIR%%/espeak-data/vi_dict
-%%DATADIR%%/espeak-data/voices/!v/!variant1
-%%DATADIR%%/espeak-data/voices/!v/!variant11
-%%DATADIR%%/espeak-data/voices/!v/!variant12
-%%DATADIR%%/espeak-data/voices/!v/!variant13
-%%DATADIR%%/espeak-data/voices/!v/!variant14
-%%DATADIR%%/espeak-data/voices/!v/!variant2
-%%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/!v/croak
+%%DATADIR%%/espeak-data/voices/!v/f1
+%%DATADIR%%/espeak-data/voices/!v/f2
+%%DATADIR%%/espeak-data/voices/!v/f3
+%%DATADIR%%/espeak-data/voices/!v/f4
+%%DATADIR%%/espeak-data/voices/!v/m1
+%%DATADIR%%/espeak-data/voices/!v/m2
+%%DATADIR%%/espeak-data/voices/!v/m3
+%%DATADIR%%/espeak-data/voices/!v/m4
+%%DATADIR%%/espeak-data/voices/!v/m5
+%%DATADIR%%/espeak-data/voices/!v/m6
+%%DATADIR%%/espeak-data/voices/!v/whisper
+%%DATADIR%%/espeak-data/voices/!v/wisper
 %%DATADIR%%/espeak-data/voices/af
+%%DATADIR%%/espeak-data/voices/bs
 %%DATADIR%%/espeak-data/voices/cs
 %%DATADIR%%/espeak-data/voices/cy
 %%DATADIR%%/espeak-data/voices/de
 %%DATADIR%%/espeak-data/voices/default
 %%DATADIR%%/espeak-data/voices/el
 %%DATADIR%%/espeak-data/voices/en/en
-%%DATADIR%%/espeak-data/voices/en/en-croak
 %%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-wisper
+%%DATADIR%%/espeak-data/voices/en/en-wi
 %%DATADIR%%/espeak-data/voices/en/en-wm
 %%DATADIR%%/espeak-data/voices/eo
 %%DATADIR%%/espeak-data/voices/es
+%%DATADIR%%/espeak-data/voices/es-la
 %%DATADIR%%/espeak-data/voices/fi
 %%DATADIR%%/espeak-data/voices/fr
+%%DATADIR%%/espeak-data/voices/grc
 %%DATADIR%%/espeak-data/voices/hi
 %%DATADIR%%/espeak-data/voices/hr
 %%DATADIR%%/espeak-data/voices/hu
+%%DATADIR%%/espeak-data/voices/id
 %%DATADIR%%/espeak-data/voices/is
 %%DATADIR%%/espeak-data/voices/it
+%%DATADIR%%/espeak-data/voices/jbo
+%%DATADIR%%/espeak-data/voices/ku
 %%DATADIR%%/espeak-data/voices/la
 %%DATADIR%%/espeak-data/voices/mb/mb-af1
 %%DATADIR%%/espeak-data/voices/mb/mb-af1-en
@@ -114,6 +131,8 @@ lib/libespeak.so.1.1.28
 %%DATADIR%%/espeak-data/voices/mb/mb-de4-en
 %%DATADIR%%/espeak-data/voices/mb/mb-de5
 %%DATADIR%%/espeak-data/voices/mb/mb-de5-en
+%%DATADIR%%/espeak-data/voices/mb/mb-de6
+%%DATADIR%%/espeak-data/voices/mb/mb-de6-grc
 %%DATADIR%%/espeak-data/voices/mb/mb-de7
 %%DATADIR%%/espeak-data/voices/mb/mb-en1
 %%DATADIR%%/espeak-data/voices/mb/mb-fr1
@@ -124,6 +143,7 @@ lib/libespeak.so.1.1.28
 %%DATADIR%%/espeak-data/voices/mb/mb-gr2-en
 %%DATADIR%%/espeak-data/voices/mb/mb-hu1
 %%DATADIR%%/espeak-data/voices/mb/mb-hu1-en
+%%DATADIR%%/espeak-data/voices/mb/mb-id1
 %%DATADIR%%/espeak-data/voices/mb/mb-it3
 %%DATADIR%%/espeak-data/voices/mb/mb-it4
 %%DATADIR%%/espeak-data/voices/mb/mb-la1
@@ -149,10 +169,15 @@ lib/libespeak.so.1.1.28
 %%DATADIR%%/espeak-data/voices/ro
 %%DATADIR%%/espeak-data/voices/ru
 %%DATADIR%%/espeak-data/voices/sk
+%%DATADIR%%/espeak-data/voices/sr
 %%DATADIR%%/espeak-data/voices/sv
 %%DATADIR%%/espeak-data/voices/sw
+%%DATADIR%%/espeak-data/voices/ta
+%%DATADIR%%/espeak-data/voices/tr
 %%DATADIR%%/espeak-data/voices/vi
+%%DATADIR%%/espeak-data/voices/zh
 %%DATADIR%%/espeak-data/voices/zhy
+%%DATADIR%%/espeak-data/zh_dict
 %%DATADIR%%/espeak-data/zhy_dict
 @dirrm include/espeak
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images