aboutsummaryrefslogtreecommitdiffstats
path: root/audio/espeak/files
diff options
context:
space:
mode:
authornivit <nivit@FreeBSD.org>2007-01-27 08:44:33 +0800
committernivit <nivit@FreeBSD.org>2007-01-27 08:44:33 +0800
commite602083ec5d2ad34649d08fb57fa66f911d3613e (patch)
tree1d99fbcb0fd201be4f999c7a902fba7fca5de073 /audio/espeak/files
parent63a06ae307a58cf05b4951c61ddb3f716a77e307 (diff)
downloadfreebsd-ports-gnome-e602083ec5d2ad34649d08fb57fa66f911d3613e.tar.gz
freebsd-ports-gnome-e602083ec5d2ad34649d08fb57fa66f911d3613e.tar.zst
freebsd-ports-gnome-e602083ec5d2ad34649d08fb57fa66f911d3613e.zip
- Updated to 1.19
- Added files/patch-src-speech.h - Replaced do-install target with post-install Approved by: alexbl (mentor, implicit)
Diffstat (limited to 'audio/espeak/files')
-rw-r--r--audio/espeak/files/patch-src-Makefile37
-rw-r--r--audio/espeak/files/patch-src-speech.h11
2 files changed, 32 insertions, 16 deletions
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;