- Updated to 1.18

Approved by: alexbl (mentor, implicit)
svn path=/head/; revision=182355
2024-11-24 00:45:52 +00:00 · 2007-01-14 14:31:58 +00:00 · 2007-01-14 14:31:58 +00:00 · 3bf4585ae5 · 2021-03-31 03:12:20 +00:00
commit 3bf4585ae5
parent 6ae81701d8
4 changed files with 50 additions and 21 deletions
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@ -6,7 +6,7 @@
 #

 PORTNAME=	espeak
-PORTVERSION=	1.17
+PORTVERSION=	1.18
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@ -49,6 +49,7 @@ post-patch:

 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} \
--- a/audio/espeak/distinfo
+++ b/audio/espeak/distinfo
@ -1,3 +1,3 @@
-MD5 (espeak-1.17-source.zip) = 37cddc50e1aa23c7fad468c2baaba29c
-SHA256 (espeak-1.17-source.zip) = 1709d5f602492c971c7f6c24043d9df75ad90fa80dadcf2c66a16e6aefe8332f
-SIZE (espeak-1.17-source.zip) = 552571
+MD5 (espeak-1.18-source.zip) = 48e27b8da9aea0fba6d0e4470d10ebdd
+SHA256 (espeak-1.18-source.zip) = 21d4207cebd86e9b93f278b13f7b5b7c67569732d798a444cb12a07534bb4eba
+SIZE (espeak-1.18-source.zip) = 658806
--- a/audio/espeak/files/patch-src-Makefile
+++ b/audio/espeak/files/patch-src-Makefile
@ -1,5 +1,5 @@
--- src/Makefile	Thu Nov 16 23:59:58 2006
-+++ src/Makefile.port	Fri Nov 17 23:23:12 2006
+--- src/Makefile	Sat Jan 13 17:01:15 2007
+++ src/Makefile.port	Sun Jan 14 14:56:02 2007
@@ -1,7 +1,7 @@
 BINDIR=/usr/local/bin
 INCDIR=/usr/include/espeak
@ -7,9 +7,9 @@
 -DATADIR=/usr/share/espeak-data
 +DATADIR=%%DATADIR%%/espeak-data
 
- RELEASE = 1.17
+ RELEASE = 1.18
 BIN_NAME = speak
-@@ -26,7 +26,7 @@
+@@ -28,15 +28,15 @@
 
 SRCS1=$(speak_SOURCES)
 OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
@ -18,17 +18,32 @@
 
 SRCS2=$(libespeak_SOURCES)
 OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
-@@ -39,19 +39,19 @@
+-LIBS2=-lstdc++ -lportaudio
+LIBS2=-lstdc++ -L%%LOCALBASE%%/lib $(LDFLAGS) -lportaudio
+ 
+ SRCS3 = espeak.cpp
+ OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
+-LIBS3=-lstdc++ -lespeak
+LIBS3=-lstdc++ -L%%LOCALBASE%%/lib $(LDFLAGS) -L. -lespeak
+ 
+ CXXFLAGS=-O2
+ 
+@@ -45,22 +45,22 @@
 	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) $(CPPFLAGS) $(PTHREAD_CFLAGS) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $<
 
 $(BIN_NAME): $(OBJS1)
 -	$(CXX) -o $@ $(OBJS1) $(LIBS1)
 +	$(CXX) $(PTHREAD_LIBS) -o $@ $(OBJS1) $(LIBS1)
 
+-$(BIN2_NAME): $(OBJS3)
+-	$(CXX) -o $@ $(OBJS3) $(LIBS3)
+$(BIN2_NAME): $(OBJS3) $(LIB_NAME)
+	$(CXX) $(PTHREAD_LIBS) -o $@ $(OBJS3) $(LIBS3)
+ 
 
 
 x_%.o: %.cpp
--- a/audio/espeak/pkg-plist
+++ b/audio/espeak/pkg-plist
@ -1,8 +1,10 @@
@comment $FreeBSD$
+bin/espeak
 bin/speak
 lib/libespeak.so.1
 lib/%%ESPEAK_LIBRARY%%
 %%PORTDOCS%%%%DOCSDIR%%/add_language.html
+%%PORTDOCS%%%%DOCSDIR%%/analyse.html
 %%PORTDOCS%%%%DOCSDIR%%/commands.html
 %%PORTDOCS%%%%DOCSDIR%%/dictionary.html
 %%PORTDOCS%%%%DOCSDIR%%/docindex.html
@ -26,14 +28,29 @@ lib/%%ESPEAK_LIBRARY%%
 %%DATADIR%%/espeak-data/eo_dict
 %%DATADIR%%/espeak-data/es_dict
 %%DATADIR%%/espeak-data/fi_dict
+%%DATADIR%%/espeak-data/fr_dict
+%%DATADIR%%/espeak-data/hi_dict
 %%DATADIR%%/espeak-data/it_dict
 %%DATADIR%%/espeak-data/nl_dict
+%%DATADIR%%/espeak-data/no_dict
 %%DATADIR%%/espeak-data/phondata
 %%DATADIR%%/espeak-data/phonindex
 %%DATADIR%%/espeak-data/phontab
 %%DATADIR%%/espeak-data/pl_dict
 %%DATADIR%%/espeak-data/pt_dict
+%%DATADIR%%/espeak-data/ro_dict
 %%DATADIR%%/espeak-data/ru_dict
+%%DATADIR%%/espeak-data/sv_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/af
 %%DATADIR%%/espeak-data/voices/cy
 %%DATADIR%%/espeak-data/voices/de
@ -41,31 +58,27 @@ lib/%%ESPEAK_LIBRARY%%
 %%DATADIR%%/espeak-data/voices/el
 %%DATADIR%%/espeak-data/voices/en/en
 %%DATADIR%%/espeak-data/voices/en/en-croak
-%%DATADIR%%/espeak-data/voices/en/en-f
 %%DATADIR%%/espeak-data/voices/en/en-n
-%%DATADIR%%/espeak-data/voices/en/en-n-f
 %%DATADIR%%/espeak-data/voices/en/en-rp
-%%DATADIR%%/espeak-data/voices/en/en-rp-f
 %%DATADIR%%/espeak-data/voices/en/en-wm
-%%DATADIR%%/espeak-data/voices/en/en-wm-f
-%%DATADIR%%/espeak-data/voices/en/en1
-%%DATADIR%%/espeak-data/voices/en/en2
-%%DATADIR%%/espeak-data/voices/en/en3
-%%DATADIR%%/espeak-data/voices/en/en4
-%%DATADIR%%/espeak-data/voices/en/en6
-%%DATADIR%%/espeak-data/voices/en/en7
-%%DATADIR%%/espeak-data/voices/en/en8
 %%DATADIR%%/espeak-data/voices/eo
 %%DATADIR%%/espeak-data/voices/es
 %%DATADIR%%/espeak-data/voices/fi
+%%DATADIR%%/espeak-data/voices/fr
+%%DATADIR%%/espeak-data/voices/hi
 %%DATADIR%%/espeak-data/voices/it
 %%DATADIR%%/espeak-data/voices/nl
+%%DATADIR%%/espeak-data/voices/no
 %%DATADIR%%/espeak-data/voices/pl
 %%DATADIR%%/espeak-data/voices/pt
+%%DATADIR%%/espeak-data/voices/ro
 %%DATADIR%%/espeak-data/voices/ru
+%%DATADIR%%/espeak-data/voices/sv
+%%DATADIR%%/espeak-data/voices/vi
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/espeak-data/soundicons
+@dirrm %%DATADIR%%/espeak-data/voices/!v
@dirrm %%DATADIR%%/espeak-data/voices/en
@dirrm %%DATADIR%%/espeak-data/voices
@dirrm %%DATADIR%%/espeak-data