- Update to 1.6

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

3 files changed, 38 insertions, 23 deletions

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;