4 files changed, 28 insertions, 18 deletions

diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index 76ad8ecbcce4..7a805ce991a7 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	espeak
-PORTVERSION=	1.22
+PORTVERSION=	1.23
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/espeak/distinfo b/audio/espeak/distinfo
index 30d7aea6071a..5f1aa23c8794 100644
--- a/audio/espeak/distinfo
+++ b/audio/espeak/distinfo
@@ -1,3 +1,3 @@
-MD5 (espeak-1.22-source.zip) = 57e84d1afc0992f65c568dcddea73fee
-SHA256 (espeak-1.22-source.zip) = 3de077fc0397d8b63488a6c7cdb53aafb7808b4446fc5f9f3dd3cb5abc83151e
-SIZE (espeak-1.22-source.zip) = 835112
+MD5 (espeak-1.23-source.zip) = 6fb175b1cf167d3ba58c9c3f087ca2aa
+SHA256 (espeak-1.23-source.zip) = cd74c49bcfe458d3bbb51cec72de2166f65f262a7c546249f033cfea2778dec2
+SIZE (espeak-1.23-source.zip) = 853848
diff --git a/audio/espeak/files/patch-src-Makefile b/audio/espeak/files/patch-src-Makefile
index 2045d48f4d3d..572df85f24c4 100644
--- a/audio/espeak/files/patch-src-Makefile
+++ b/audio/espeak/files/patch-src-Makefile
@@ -1,5 +1,5 @@
---- src/Makefile	Wed Apr  4 14:39:47 2007
-+++ src/Makefile.port	Thu Apr  5 13:09:53 2007
+--- 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
@@ -10,9 +10,9 @@
 +LIBDIR=%%PREFIX%%/lib
 +DATADIR=%%DATADIR%%/espeak-data
  
- RELEASE = 1.22
+ RELEASE = 1.23
  BIN_NAME = speak
-@@ -28,17 +28,17 @@
+@@ -29,24 +29,24 @@
  
  SRCS1=$(speak_SOURCES)
  OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
@@ -31,10 +31,9 @@
  
 -CXXFLAGS=-O2
 +#CXXFLAGS=-O2
- ifeq ($(shell uname -m), ppc)
- 	CXXFLAGS += -D ARCH_BIG
- endif
-@@ -48,7 +48,7 @@
+ 
+ 
+ all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
  	mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
  
  .cpp.o:
@@ -43,7 +42,7 @@
  
  $(BIN_NAME): $(OBJS1)
  	$(CXX) -o $@ $(OBJS1) $(LIBS1)
-@@ -59,7 +59,7 @@
+@@ -57,7 +57,7 @@
  
  
  x_%.o: %.cpp
@@ -52,16 +51,16 @@
  	-I. -D LIBRARY -c -fno-exceptions $<  -o x_$*.o
  
  $(LIB_NAME): $(OBJS2)
-@@ -75,7 +75,7 @@
+@@ -76,7 +76,7 @@
  
  install: all
  	# Create directories
--	rm -r $(DESTDIR)$(DATADIR)
-+	#rm -r $(DESTDIR)$(DATADIR)
+-	rm -rf $(DESTDIR)$(DATADIR)
++	#rm -rf $(DESTDIR)$(DATADIR)
  	$(MKDIR) $(DESTDIR)$(BINDIR)
  	$(MKDIR) $(DESTDIR)$(LIBDIR)
  	$(MKDIR) $(DESTDIR)$(INCDIR)
-@@ -89,5 +89,5 @@
+@@ -92,5 +92,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 fcde6a3454ee..c4f4ebf337ac 100644
--- a/audio/espeak/pkg-plist
+++ b/audio/espeak/pkg-plist
@@ -1,9 +1,10 @@
 @comment $FreeBSD$
 bin/espeak
 include/espeak/speak_lib.h
+lib/libespeak.a
 lib/libespeak.so
 lib/libespeak.so.1
-lib/libespeak.so.1.1.22
+lib/libespeak.so.1.1.23
 %%PORTDOCS%%%%DOCSDIR%%/add_language.html
 %%PORTDOCS%%%%DOCSDIR%%/analyse.html
 %%PORTDOCS%%%%DOCSDIR%%/commands.html
@@ -33,14 +34,18 @@ lib/libespeak.so.1.1.22
 %%DATADIR%%/espeak-data/fi_dict
 %%DATADIR%%/espeak-data/fr_dict
 %%DATADIR%%/espeak-data/hi_dict
+%%DATADIR%%/espeak-data/hr_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/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/en1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/fr1_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/hu1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/nl_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/pl1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/ro1_phtrans
@@ -89,18 +94,24 @@ lib/libespeak.so.1.1.22
 %%DATADIR%%/espeak-data/voices/fr
 %%DATADIR%%/espeak-data/voices/fr-ca
 %%DATADIR%%/espeak-data/voices/hi
+%%DATADIR%%/espeak-data/voices/hr
 %%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-cr1
 %%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-de5
+%%DATADIR%%/espeak-data/voices/mb/mb-de5-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-hu1
+%%DATADIR%%/espeak-data/voices/mb/mb-hu1-en
 %%DATADIR%%/espeak-data/voices/mb/mb-nl2
 %%DATADIR%%/espeak-data/voices/mb/mb-nl2-en
 %%DATADIR%%/espeak-data/voices/mb/mb-pl1