- Updated to 1.19

- Added files/patch-src-speech.h
- Replaced do-install target with post-install

Approved by:	alexbl (mentor, implicit)

5 files changed, 46 insertions, 33 deletions

diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index 53c1654e9705..150630bb7497 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	espeak
-PORTVERSION=	1.18
+PORTVERSION=	1.19
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -32,6 +32,7 @@ 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
@@ -44,19 +45,11 @@ post-patch:
 	@for FILE in ${REPLACE_FILES}; do \
 	    ${REINPLACE_CMD} \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
-		-e "s|%%DATADIR%%|${DATADIR}|g" $${FILE} ;\
+		-e "s|%%DATADIR%%|${DATADIR}|g" \
+		-e "s|%%PREFIX%%|${PREFIX}|g" $${FILE} ;\
 	done;
 
-do-install:
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/speak ${PREFIX}/bin/speak
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/espeak ${PREFIX}/bin/espeak
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${ESPEAK_LIBRARY} ${PREFIX}/lib/${ESPEAK_LIBRARY}
-	${LN} ${LN_OPTS} ${PREFIX}/lib/${ESPEAK_LIBRARY} ${PREFIX}/lib/${ESPEAK_LIBRARY:S/.${PORTVERSION}//g}
-	cd ${WRKSRC} && ${FIND} ${FIND_DIRS}  -type d -exec ${MKDIR} \
-		${DATADIR}/{} \;
-	cd ${WRKSRC} && ${FIND} ${FIND_DIRS}  -type f -exec ${INSTALL_DATA} {} \
-		${DATADIR}/{} \;
-
+post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/${FIND_DOCS} && ${FIND} . -type d -exec ${MKDIR} \
diff --git a/audio/espeak/distinfo b/audio/espeak/distinfo
index e222177ed99c..814e26ca745b 100644
--- a/audio/espeak/distinfo
+++ b/audio/espeak/distinfo
@@ -1,3 +1,3 @@
-MD5 (espeak-1.18-source.zip) = 8e5ed7ff85c56ca2c5f2fcaba36df110
-SHA256 (espeak-1.18-source.zip) = 7d20b69419a5b19d3fb901701edd18b272f2cbf97dee1dd5775f50e44503a878
-SIZE (espeak-1.18-source.zip) = 658805
+MD5 (espeak-1.19-source.zip) = 49d70bd49f7cc7c1151f5973ee26c152
+SHA256 (espeak-1.19-source.zip) = 32ded8994f317b9f5f12a2ee5fff621acc4770d5906aaccde6d6d97b06568c79
+SIZE (espeak-1.19-source.zip) = 669628
diff --git a/audio/espeak/files/patch-src-Makefile b/audio/espeak/files/patch-src-Makefile
index a001f9e959c1..1f8d3b5657fe 100644
--- a/audio/espeak/files/patch-src-Makefile
+++ b/audio/espeak/files/patch-src-Makefile
@@ -1,34 +1,39 @@
---- src/Makefile	Mon Jan 15 02:08:03 2007
-+++ src/Makefile.port	Wed Jan 17 22:09:54 2007
+--- src/Makefile	Fri Jan 26 10:20:06 2007
++++ src/Makefile.port	Fri Jan 26 23:38:04 2007
 @@ -1,7 +1,7 @@
- BINDIR=/usr/bin
- INCDIR=/usr/include/espeak
- LIBDIR=/usr/lib
+-BINDIR=/usr/bin
+-INCDIR=/usr/include/espeak
+-LIBDIR=/usr/lib
 -DATADIR=/usr/share/espeak-data
++BINDIR=%%PREFIX%%/bin
++INCDIR=%%PREFIX%%/include/espeak
++LIBDIR=%%PREFIX%%/lib
 +DATADIR=%%DATADIR%%/espeak-data
  
- RELEASE = 1.18
+ RELEASE = 1.19
  BIN_NAME = speak
-@@ -28,39 +28,36 @@
+@@ -28,17 +28,17 @@
  
  SRCS1=$(speak_SOURCES)
  OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
--LIBS1=-lstdc++ -lportaudio
-+LIBS1=-lstdc++ -L%%LOCALBASE%%/lib -lportaudio
+-LIBS1=-lstdc++ -lportaudio -lpthread
++LIBS1=-lstdc++ -L%%LOCALBASE%%/lib -lportaudio -lpthread
  
  SRCS2=$(libespeak_SOURCES)
  OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
--LIBS2=-lstdc++ -lportaudio
-+LIBS2=-lstdc++ -L%%LOCALBASE%%/lib -lportaudio
+-LIBS2=-lstdc++ -lportaudio -lpthread
++LIBS2=-lstdc++ -L%%LOCALBASE%%/lib -lportaudio -lpthread
  
  SRCS3 = espeak.cpp
  OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
  LIBS3=-lstdc++ ./libespeak.so
  
 -CXXFLAGS=-O2
--
--
- all: $(BIN_NAME) $(LIB_NAME) $(BIN2_NAME)
++#CXXFLAGS=-O2
+ ifeq ($(shell uname -m), ppc)
+ 	CXXFLAGS += -D ARCH_BIG
+ endif
+@@ -48,22 +48,22 @@
  	mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
  
  .cpp.o:
@@ -37,9 +42,9 @@
  
  $(BIN_NAME): $(OBJS1)
 -	$(CXX) -o $@ $(OBJS1) $(LIBS1)
-+	$(CXX) $(PTHREAD_LIBS) -o $@ $(OBJS1) $(LIBS1)
++	$(CXX) $(PTHREAD_LIB) -o $@ $(OBJS1) $(LIBS1)
  
- $(BIN2_NAME): $(OBJS3)
+ $(BIN2_NAME): $(OBJS3) $(LIB_NAME)
 -	$(CXX) -o $@ $(OBJS3) $(LIBS3)
 +	$(CXX) $(PTHREAD_LIBS) -o $@ $(OBJS3) $(LIBS3)
  
diff --git a/audio/espeak/files/patch-src-speech.h b/audio/espeak/files/patch-src-speech.h
new file mode 100644
index 000000000000..0e20f71a5185
--- /dev/null
+++ b/audio/espeak/files/patch-src-speech.h
@@ -0,0 +1,11 @@
+--- src/speech.h	Fri Jan 26 10:11:59 2007
++++ src/speech.h.port	Sat Jan 27 00:46:28 2007
+@@ -34,7 +34,7 @@
+ 
+ // will look for espeak_data directory here, and also in user's home directory
+ #ifndef PATH_ESPEAK_DATA
+-   #define PATH_ESPEAK_DATA  "/usr/share/espeak-data"
++   #define PATH_ESPEAK_DATA  "%%DATADIR%%/espeak-data"
+ #endif
+ 
+ typedef unsigned short USHORT;
diff --git a/audio/espeak/pkg-plist b/audio/espeak/pkg-plist
index 279abd92d114..57be07c7c5bc 100644
--- a/audio/espeak/pkg-plist
+++ b/audio/espeak/pkg-plist
@@ -1,8 +1,9 @@
 @comment $FreeBSD$
 bin/espeak
-bin/speak
+include/espeak/speak_lib.h
+lib/libespeak.so
 lib/libespeak.so.1
-lib/%%ESPEAK_LIBRARY%%
+lib/libespeak.so.1.1.19
 %%PORTDOCS%%%%DOCSDIR%%/add_language.html
 %%PORTDOCS%%%%DOCSDIR%%/analyse.html
 %%PORTDOCS%%%%DOCSDIR%%/commands.html
@@ -59,12 +60,14 @@ lib/%%ESPEAK_LIBRARY%%
 %%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-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/it
 %%DATADIR%%/espeak-data/voices/nl
@@ -75,6 +78,7 @@ lib/%%ESPEAK_LIBRARY%%
 %%DATADIR%%/espeak-data/voices/ru
 %%DATADIR%%/espeak-data/voices/sv
 %%DATADIR%%/espeak-data/voices/vi
+@dirrm include/espeak
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/espeak-data/soundicons