- Update to 1.6

PR:		ports/104308
Submitted by:	(Nicola Vitale) (maintainer)

6 files changed, 63 insertions, 31 deletions

diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index 9ab42f1324ad..d1cd1f936a8a 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	espeak
-PORTVERSION=	1.13
+PORTVERSION=	1.16
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	speak-${PORTVERSION}-source
+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	nivit@email.it
 COMMENT=	A software speech synthesizer
@@ -23,17 +23,22 @@ MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" CXX="${CXX}"
 
+PLIST_SUB+=	ESPEAK_LIBRARY=${ESPEAK_LIBRARY}
+
 USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
+USE_LDCONFIG=	yes
 USE_ZIP=	yes
 
 WRKSRC=	${WRKDIR}/${DISTNAME}
 BUILD_WRKSRC=	${WRKSRC}/src
-
+ESPEAK_LIBRARY=	lib${PORTNAME}.so.1.${PORTVERSION}
 FIND_DIRS=	espeak-data
 FIND_DOCS=	docs
 
-REPLACE_FILES=	 ${BUILD_WRKSRC}/Makefile  ${BUILD_WRKSRC}/speak.cpp
+LN_OPTS=	-sf
+
+REPLACE_FILES=	 ${BUILD_WRKSRC}/Makefile  ${BUILD_WRKSRC}/speech.h
 
 post-patch:
 	@for FILE in ${REPLACE_FILES}; do \
@@ -44,6 +49,8 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/speak ${PREFIX}/bin/speak
+	${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} {} \
diff --git a/audio/espeak/distinfo b/audio/espeak/distinfo
index 713aff8fea8d..077ecccd19eb 100644
--- a/audio/espeak/distinfo
+++ b/audio/espeak/distinfo
@@ -1,3 +1,3 @@
-MD5 (speak-1.13-source.zip) = 1cd76ad278fa134eced57b865b72175b
-SHA256 (speak-1.13-source.zip) = 373de2952e46e7470aa3a8cb111ed9df2904cf87e637d3aaaad21af0f2700b85
-SIZE (speak-1.13-source.zip) = 481980
+MD5 (espeak-1.16-source.zip) = c376ea94cddda90b093f231926f7ba44
+SHA256 (espeak-1.16-source.zip) = cdb213b50bff0c092a4d1941038eadac831251acee64acb48943e13ccae3471b
+SIZE (espeak-1.16-source.zip) = 528920
diff --git a/audio/espeak/files/patch-src-Makefile b/audio/espeak/files/patch-src-Makefile
index c1f4d2a54844..a55ee4fc0e48 100644
--- a/audio/espeak/files/patch-src-Makefile
+++ b/audio/espeak/files/patch-src-Makefile
@@ -1,19 +1,35 @@
---- src/Makefile	Thu Apr  6 17:40:54 2006
-+++ src/Makefile.port	Sat Sep  2 12:03:47 2006
-@@ -1,13 +1,13 @@
- SRCS=$(wildcard *.cpp)
- OBJS=$(patsubst %.cpp,%.o,$(SRCS))
--LIBS=-lstdc++ -lportaudio
-+LIBS=-lstdc++ -L%%LOCALBASE%%/lib $(LDFLAGS) -lportaudio
- all: speak
+--- src/Makefile	Tue Sep 19 23:56:53 2006
++++ src/Makefile.port	Fri Sep 22 13:14:34 2006
+@@ -11,7 +11,7 @@
+ 
+ SRCS1=$(speak_SOURCES)
+ OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
+-LIBS1=-lstdc++ -lportaudio
++LIBS1=-lstdc++ -L%%LOCALBASE%%/lib $(LDFLAGS) -lportaudio
+ 
+ SRCS2=$(libespeak_SOURCES)
+ OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
+@@ -23,19 +23,19 @@
+ 	mv libespeak.so libespeak.so.1.1.14
  
  .cpp.o:
 -	$(CXX) $(CXXFLAGS) -O2 -Wall -pedantic -I. -c -fno-exceptions $<
 +	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PTHREAD_CFLAGS) -Wall -pedantic -I. -c -fno-exceptions $<
  
- speak: $(OBJS)
--	$(CXX) -o $@ $(OBJS) $(LIBS)
-+	$(CXX) $(PTHREAD_LIBS) -o $@ $(OBJS) $(LIBS)
+ speak: $(OBJS1)
+-	$(CXX) -o $@ $(OBJS1) $(LIBS1)
++	$(CXX) $(PTHREAD_LIBS) -o $@ $(OBJS1) $(LIBS1)
+ 
+ 
+ 
+ x_%.o: %.cpp
+-	$(CXX) $(CXXFLAGS) -O2 -Wall -fpic -fvisibility=hidden -pedantic \
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PTHREAD_CFLAGS) -Wall -fpic -pedantic \
+ 	-I. -D LIBRARY -c -fno-exceptions $<  -o x_$*.o
+ 
+ libespeak.so: $(OBJS2)
+-	$(CXX) -shared -Wl,-soname,libespeak.so.1 -o $@ $(OBJS2) $(LIBS2)
++	$(CXX) $(PTHREAD_LIBS) -shared -Wl,-soname,libespeak.so.1 -o $@ $(OBJS2) $(LIBS2)
  
  clean:
  	rm -f *.o *~
diff --git a/audio/espeak/files/patch-src-speak.cpp b/audio/espeak/files/patch-src-speak.cpp
deleted file mode 100644
index 32e15d00ca5d..000000000000
--- a/audio/espeak/files/patch-src-speak.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$FreeBSD$
---- src/speak.cpp	Fri Mar 24 16:22:56 2006
-+++ src/speak.cpp.port	Sat Mar 25 11:50:37 2006
-@@ -135,7 +135,7 @@
- 	sprintf(path_home,"%s/espeak-data",getenv("HOME"));
- 	if(access(path_home,R_OK) != 0)
- 	{
--		strcpy(path_home,"/usr/share/espeak-data");
-+		strcpy(path_home,"%%DATADIR%%/espeak-data");
- 	}
- 
- 	WavegenInit(22050,0);
diff --git a/audio/espeak/files/patch-src-speech.h b/audio/espeak/files/patch-src-speech.h
new file mode 100644
index 000000000000..405fb7a64650
--- /dev/null
+++ b/audio/espeak/files/patch-src-speech.h
@@ -0,0 +1,11 @@
+--- src/speech.h	Tue Oct  3 00:51:13 2006
++++ src/speech.h.port	Wed Oct 11 23:43:20 2006
+@@ -36,7 +36,7 @@
+ #endif
+ 
+ // will look for espeak_data directory here, and also in user's home directory
+-#define PATH_ESPEAK_DATA  "/usr/share/espeak-data"
++#define PATH_ESPEAK_DATA  "%%DATADIR%%/espeak-data"
+ 
+ typedef unsigned short USHORT;
+ typedef unsigned char  UCHAR;
diff --git a/audio/espeak/pkg-plist b/audio/espeak/pkg-plist
index e386ae6288ba..482482ca6de0 100644
--- a/audio/espeak/pkg-plist
+++ b/audio/espeak/pkg-plist
@@ -1,5 +1,7 @@
 @comment $FreeBSD$
 bin/speak
+lib/libespeak.so.1
+lib/%%ESPEAK_LIBRARY%%
 %%PORTDOCS%%%%DOCSDIR%%/add_language.html
 %%PORTDOCS%%%%DOCSDIR%%/commands.html
 %%PORTDOCS%%%%DOCSDIR%%/dictionary.html
@@ -9,23 +11,29 @@ bin/speak
 %%PORTDOCS%%%%DOCSDIR%%/images/lips.png
 %%PORTDOCS%%%%DOCSDIR%%/images/sand-light.jpg
 %%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/languages.html
 %%PORTDOCS%%%%DOCSDIR%%/phonemes.html
 %%PORTDOCS%%%%DOCSDIR%%/phontab.html
 %%PORTDOCS%%%%DOCSDIR%%/speak_lib.h
+%%PORTDOCS%%%%DOCSDIR%%/ssml.html
 %%PORTDOCS%%%%DOCSDIR%%/voices.html
 %%DATADIR%%/espeak-data/af_dict
 %%DATADIR%%/espeak-data/config
+%%DATADIR%%/espeak-data/cy_dict
 %%DATADIR%%/espeak-data/de_dict
 %%DATADIR%%/espeak-data/el_dict
 %%DATADIR%%/espeak-data/en_dict
 %%DATADIR%%/espeak-data/eo_dict
 %%DATADIR%%/espeak-data/es_dict
+%%DATADIR%%/espeak-data/fi_dict
 %%DATADIR%%/espeak-data/it_dict
 %%DATADIR%%/espeak-data/phondata
 %%DATADIR%%/espeak-data/phonindex
 %%DATADIR%%/espeak-data/phontab
 %%DATADIR%%/espeak-data/pl_dict
+%%DATADIR%%/espeak-data/ru_dict
 %%DATADIR%%/espeak-data/voices/af
+%%DATADIR%%/espeak-data/voices/cy
 %%DATADIR%%/espeak-data/voices/de
 %%DATADIR%%/espeak-data/voices/default
 %%DATADIR%%/espeak-data/voices/el
@@ -47,9 +55,11 @@ bin/speak
 %%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/it
 %%DATADIR%%/espeak-data/voices/pl
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/images
+%%DATADIR%%/espeak-data/voices/ru
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/espeak-data/soundicons
 @dirrm %%DATADIR%%/espeak-data/voices/en