4 files changed, 62 insertions, 49 deletions

diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index b9d460f0079a..4efa48785a8b 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	espeak
-PORTVERSION=	1.36
+PORTVERSION=	1.37
 CATEGORIES=	audio
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -22,8 +22,6 @@ MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" CXX="${CXX}"
 
-PLIST_SUB+=	ESPEAK_LIBRARY=${ESPEAK_LIBRARY}
-
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_ZIP=	yes
@@ -31,27 +29,17 @@ USE_ZIP=	yes
 WRKSRC=	${WRKDIR}/${DISTNAME}
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${WRKSRC}/src
-ESPEAK_LIBRARY=	lib${PORTNAME}.so.1.${PORTVERSION}
-FIND_DIRS=	espeak-data
-FIND_DOCS=	docs
-
-LN_OPTS=	-sf
 
-REINPLACE_FILES=	${BUILD_WRKSRC}/Makefile  ${BUILD_WRKSRC}/speech.h
-REINPLACE_ARGS=	-i.bak -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
-		-e "s|%%DATADIR%%|${DATADIR}|g" \
-		-e "s|%%PREFIX%%|${PREFIX}|g"
+REINPLACE_FILES=	Makefile speech.h
+REINPLACE_ARGS=	-i.bak -e "s|%%DATADIR%%|${DATADIR}|g"
 
 post-patch:
-	@${REINPLACE_CMD} ${REINPLACE_FILES}
+	cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} ${REINPLACE_FILES}
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/${FIND_DOCS} && ${FIND} . -type d -exec ${MKDIR} \
-		${DOCSDIR}/{} \;
-	cd ${WRKSRC}/${FIND_DOCS} && ${FIND} . -type f \
-		-exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/audio/espeak/distinfo b/audio/espeak/distinfo
index bfa378e09813..d93bd21e6597 100644
--- a/audio/espeak/distinfo
+++ b/audio/espeak/distinfo
@@ -1,3 +1,3 @@
-MD5 (espeak-1.36-source.zip) = df2ebbe3d771e21be7de4ba53d28a4b0
-SHA256 (espeak-1.36-source.zip) = 7344a447df388e57b87a9b320229fca71248e6518f1ee72f678d435dd9056187
-SIZE (espeak-1.36-source.zip) = 1269634
+MD5 (espeak-1.37-source.zip) = 5c7b292d0537232868b4ac1317d76c02
+SHA256 (espeak-1.37-source.zip) = 77f406c345362185ec4f362bf49f61d202e01ac9b9cd5c14f803195a544ce6d3
+SIZE (espeak-1.37-source.zip) = 1292986
diff --git a/audio/espeak/files/patch-src-Makefile b/audio/espeak/files/patch-src-Makefile
index 8c197a9e35f0..69cc6cc69628 100644
--- a/audio/espeak/files/patch-src-Makefile
+++ b/audio/espeak/files/patch-src-Makefile
@@ -1,38 +1,59 @@
---- 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 @@
+--- src/Makefile	2008-04-16 14:06:34.000000000 +0200
++++ src/Makefile.port	2008-07-15 14:28:18.000000000 +0200
+@@ -1,10 +1,10 @@
  # 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
+-PREFIX=/usr
++PREFIX?=/usr
+ BINDIR=$(PREFIX)/bin
+ INCDIR=$(PREFIX)/include/espeak
+ LIBDIR=$(PREFIX)/lib
+-DATADIR=$(PREFIX)/share/espeak-data
 +DATADIR=%%DATADIR%%/espeak-data
  
- RELEASE = 1.36
+ RELEASE = 1.37
  BIN_NAME = speak
-@@ -53,24 +52,23 @@
+@@ -24,18 +24,18 @@
+ LN_SF = /bin/ln -sf
+ MKDIR = mkdir -p
+ 
+-AUDIO = portaudio
++AUDIO ?= portaudio
+ #AUDIO = pulseaudio
+ #AUDIO = sada
+ 
+ ifeq ($(AUDIO),pulseaudio)
+ WAVE=wave_pulse.cpp
+-LIB_AUDIO=-lpulse
++LIB_AUDIO=-L$(LOCALBASE)/lib -lpulse
+ USE_AUDIO=-DUSE_PULSEAUDIO
+ else
+ ifeq ($(AUDIO),portaudio)
+ WAVE=wave.cpp
+-LIB_AUDIO=-lportaudio
++LIB_AUDIO=-L$(LOCALBASE)/lib -lportaudio
+ USE_AUDIO=-DUSE_PORTAUDIO
+ else
+ ifeq ($(AUDIO),sada)
+@@ -60,24 +60,24 @@
  
  SRCS1=$(speak_SOURCES)
  OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
 -LIBS1=-lstdc++ $(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
-+LIBS1=-lstdc++ -L%%LOCALBASE%%/lib $(LIB_AUDIO) $(PTHREAD_LIBS) $(EXTRA_LIBS)
++LIBS1=-lstdc++ $(LIB_AUDIO) $(PTHREAD_LIBS) $(EXTRA_LIBS)
  
  SRCS2=$(libespeak_SOURCES)
  OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
 -LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread
-+LIBS2=-lstdc++ -L%%LOCALBASE%%/lib $(LIB_AUDIO) $(PTHREAD_LIBS)
++LIBS2=-lstdc++ $(LIB_AUDIO) $(PTHREAD_LIBS)
  
  SRCS3 = espeak.cpp
  OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
 -LIBS3=-lstdc++ -L . -lespeak
++LIBS3=-lstdc++ -L . -lespeak $(PTHREAD_LIBS)
  
 -CXXFLAGS=-O2
-+LIBS3=-lstdc++ -L . -lespeak $(PTHREAD_LIBS)
++CXXFLAGS?=-O2
  
  
  all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
@@ -44,25 +65,25 @@
  
  $(BIN_NAME): $(OBJS1)
  	$(CXX) -o $@ $(OBJS1) $(LIBS1)
-@@ -81,7 +79,7 @@
+@@ -88,7 +88,7 @@
  
  
  x_%.o: %.cpp
 -	$(CXX) $(CXXFLAGS) $(USE_AUDIO) -Wall -fpic -pedantic \
-+	$(CXX) $(CXXFLAGS) $(PTHREAD_CFLAGS) $(USE_AUDIO) -Wall -fpic -pedantic \
++	$(CXX) $(CXXFLAGS) $(PHREAD_CFLAGS) $(USE_AUDIO) -Wall -fpic -pedantic \
  	-I. -D LIBRARY -c -fno-exceptions  $<  -o x_$*.o
  
  $(LIB_NAME): $(OBJS2)
-@@ -100,7 +98,7 @@
+@@ -107,7 +107,7 @@
  
  install: all
  	# Create directories
 -	rm -rf $(DESTDIR)$(DATADIR)
-+	#rm -rf $(DESTDIR)$(DATADIR)
++	# rm -rf $(DESTDIR)$(DATADIR)
  	$(MKDIR) $(DESTDIR)$(BINDIR)
  	$(MKDIR) $(DESTDIR)$(LIBDIR)
  	$(MKDIR) $(DESTDIR)$(INCDIR)
-@@ -116,5 +114,5 @@
+@@ -123,5 +123,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 a13ee8abd413..26dd27890783 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.36
+lib/libespeak.so.1.1.37
 %%PORTDOCS%%%%DOCSDIR%%/add_language.html
 %%PORTDOCS%%%%DOCSDIR%%/analyse.html
 %%PORTDOCS%%%%DOCSDIR%%/commands.html
@@ -50,6 +50,8 @@ lib/libespeak.so.1.1.36
 %%DATADIR%%/espeak-data/mbrola_ph/de4_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/de6_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/en1_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/es4_phtrans
+%%DATADIR%%/espeak-data/mbrola_ph/es_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/fr1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/gr2_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/grc-de6_phtrans
@@ -135,6 +137,8 @@ lib/libespeak.so.1.1.36
 %%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-es1
+%%DATADIR%%/espeak-data/voices/mb/mb-es2
 %%DATADIR%%/espeak-data/voices/mb/mb-fr1
 %%DATADIR%%/espeak-data/voices/mb/mb-fr1-en
 %%DATADIR%%/espeak-data/voices/mb/mb-fr4
@@ -180,14 +184,14 @@ lib/libespeak.so.1.1.36
 %%DATADIR%%/espeak-data/zh_dict
 %%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/en
+@dirrm %%DATADIR%%/espeak-data/voices/!v
 @dirrm %%DATADIR%%/espeak-data/voices
+@dirrm %%DATADIR%%/espeak-data/soundicons
+@dirrm %%DATADIR%%/espeak-data/mbrola_ph
+@dirrm %%DATADIR%%/espeak-data/mbrola
 @dirrm %%DATADIR%%/espeak-data
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%