Wed Feb 28 21:49:55 2018 UTC ()
espeak: honor LDFLAGS. Fixes RELRO build.

Bump PKGREVISION.


(wiz)
diff -r1.10 -r1.11 pkgsrc/audio/espeak/Makefile
diff -r1.4 -r1.5 pkgsrc/audio/espeak/distinfo
diff -r1.3 -r1.4 pkgsrc/audio/espeak/patches/patch-ac
cvs diff -r1.10 -r1.11 pkgsrc/audio/espeak/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/espeak/Makefile 2016/04/20 12:10:25 1.10
+++ pkgsrc/audio/espeak/Makefile 2018/02/28 21:49:55 1.11
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.10 2016/04/20 12:10:25 nros Exp $ 1# $NetBSD: Makefile,v 1.11 2018/02/28 21:49:55 wiz Exp $
2# 
3 2
4DISTNAME= espeak-1.31-source 3DISTNAME= espeak-1.31-source
5PKGNAME= ${DISTNAME:S/-source//} 4PKGNAME= ${DISTNAME:S/-source//}
 5PKGREVISION= 1
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=espeak/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=espeak/}
8EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://espeak.sourceforge.net/ 11HOMEPAGE= http://espeak.sourceforge.net/
12COMMENT= Speech synthesizer 12COMMENT= Speech synthesizer
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15USE_LANGUAGES= c++ 15USE_LANGUAGES= c++
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake
17WRKSRC= ${WRKDIR}/${DISTNAME}/src 17WRKSRC= ${WRKDIR}/${DISTNAME}/src
18 18
cvs diff -r1.4 -r1.5 pkgsrc/audio/espeak/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/espeak/distinfo 2015/11/03 01:12:28 1.4
+++ pkgsrc/audio/espeak/distinfo 2018/02/28 21:49:55 1.5
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.4 2015/11/03 01:12:28 agc Exp $ 1$NetBSD: distinfo,v 1.5 2018/02/28 21:49:55 wiz Exp $
2 2
3SHA1 (espeak-1.31-source.zip) = e33291b29153d0fc179da11ac4a61cc85fba679a 3SHA1 (espeak-1.31-source.zip) = e33291b29153d0fc179da11ac4a61cc85fba679a
4RMD160 (espeak-1.31-source.zip) = a26596f25d8897848238d81fe5e5d179d47f01a6 4RMD160 (espeak-1.31-source.zip) = a26596f25d8897848238d81fe5e5d179d47f01a6
5SHA512 (espeak-1.31-source.zip) = ec2e6a49be743952d1440bd5e80c270ed3a31fd522079c93d13d495fda9803e0fc9676a514a9ef168c469d668bf3551cbbc5dc269030f81f1ba8e785940063c9 5SHA512 (espeak-1.31-source.zip) = ec2e6a49be743952d1440bd5e80c270ed3a31fd522079c93d13d495fda9803e0fc9676a514a9ef168c469d668bf3551cbbc5dc269030f81f1ba8e785940063c9
6Size (espeak-1.31-source.zip) = 1204202 bytes 6Size (espeak-1.31-source.zip) = 1204202 bytes
7SHA1 (patch-aa) = a01dccb651c0160a7af5af14f3292578c8396ae0 7SHA1 (patch-aa) = a01dccb651c0160a7af5af14f3292578c8396ae0
8SHA1 (patch-ab) = 37e434f3c3e2fb722f927da4ca83a2b814c28879 8SHA1 (patch-ab) = 37e434f3c3e2fb722f927da4ca83a2b814c28879
9SHA1 (patch-ac) = e94b0597b0c104daaa24b6421b5bcf69147b1046 9SHA1 (patch-ac) = 33043b93dde7beea7879d1e9b7c751aef0728d44
cvs diff -r1.3 -r1.4 pkgsrc/audio/espeak/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/audio/espeak/patches/Attic/patch-ac 2008/02/28 20:16:55 1.3
+++ pkgsrc/audio/espeak/patches/Attic/patch-ac 2018/02/28 21:49:55 1.4
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ac,v 1.3 2008/02/28 20:16:55 drochner Exp $ 1$NetBSD: patch-ac,v 1.4 2018/02/28 21:49:55 wiz Exp $
2 2
3--- Makefile.orig 2008-01-19 22:50:27.000000000 +0100 3--- Makefile.orig 2008-01-19 21:50:27.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -1,7 +1,7 @@ 5@@ -1,7 +1,7 @@
6 BINDIR=/usr/bin 6 BINDIR=/usr/bin
7 INCDIR=/usr/include/espeak 7 INCDIR=/usr/include/espeak
8 LIBDIR=/usr/lib 8 LIBDIR=/usr/lib
9-DATADIR=/usr/share/espeak-data 9-DATADIR=/usr/share/espeak-data
10+DATADIR=${PREFIX}/share/espeak-data 10+DATADIR=${PREFIX}/share/espeak-data
11  11
12 RELEASE = 1.31 12 RELEASE = 1.31
13 BIN_NAME = speak 13 BIN_NAME = speak
14@@ -26,18 +26,19 @@ libespeak_SOURCES = speak_lib.cpp compil 14@@ -26,18 +26,19 @@ libespeak_SOURCES = speak_lib.cpp compil
15 tr_languages.cpp voices.cpp wavegen.cpp phonemelist.cpp \ 15 tr_languages.cpp voices.cpp wavegen.cpp phonemelist.cpp \
16 espeak_command.cpp event.cpp fifo.cpp wave.cpp debug.cpp 16 espeak_command.cpp event.cpp fifo.cpp wave.cpp debug.cpp
@@ -24,22 +24,37 @@ $NetBSD: patch-ac,v 1.3 2008/02/28 20:16 @@ -24,22 +24,37 @@ $NetBSD: patch-ac,v 1.3 2008/02/28 20:16
24  24
25 SRCS2=$(libespeak_SOURCES) 25 SRCS2=$(libespeak_SOURCES)
26 OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2)) 26 OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
27-LIBS2=-lstdc++ -lportaudio -lpthread 27-LIBS2=-lstdc++ -lportaudio -lpthread
28+LIBS2=-lstdc++ $(LPATH) -lportaudio ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 28+LIBS2=-lstdc++ $(LPATH) -lportaudio ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
29  29
30 SRCS3 = espeak.cpp 30 SRCS3 = espeak.cpp
31 OBJS3=$(patsubst %.cpp,%.o,$(SRCS3)) 31 OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
32-LIBS3=-lstdc++ ./libespeak.so 32-LIBS3=-lstdc++ ./libespeak.so
33+LIBS3=-lstdc++ $(LPATH) ./libespeak.so 33+LIBS3=-lstdc++ $(LPATH) ./libespeak.so
34  34
35 CXXFLAGS=-O2 35 CXXFLAGS=-O2
36  36
37@@ -58,7 +59,7 @@ $(BIN2_NAME): $(OBJS3) $(LIB_NAME) 37@@ -49,19 +50,19 @@ all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LI
 38 $(CXX) $(CXXFLAGS) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $<
 39
 40 $(BIN_NAME): $(OBJS1)
 41- $(CXX) -o $@ $(OBJS1) $(LIBS1)
 42+ $(CXX) -o $@ $(OBJS1) $(LIBS1) $(LDFLAGS)
 43
 44 $(BIN2_NAME): $(OBJS3) $(LIB_NAME)
 45- $(CXX) -o $@ $(OBJS3) $(LIBS3)
 46+ $(CXX) -o $@ $(OBJS3) $(LIBS3) $(LDFLAGS)
 47
 48
38  49
39 x_%.o: %.cpp 50 x_%.o: %.cpp
40 $(CXX) $(CXXFLAGS) -Wall -fpic -fvisibility=hidden -pedantic \ 51 $(CXX) $(CXXFLAGS) -Wall -fpic -fvisibility=hidden -pedantic \
41- -I. -D LIBRARY -c -fno-exceptions $< -o x_$*.o 52- -I. -D LIBRARY -c -fno-exceptions $< -o x_$*.o
42+ -I. -DLIBRARY -DPATH_ESPEAK_DATA=\"$(DATADIR)\" -c -fno-exceptions $< -o x_$*.o 53+ -I. -DLIBRARY -DPATH_ESPEAK_DATA=\"$(DATADIR)\" -c -fno-exceptions $< -o x_$*.o
43  54
44 $(LIB_NAME): $(OBJS2) 55 $(LIB_NAME): $(OBJS2)
45 $(CXX) -shared -Wl,-soname,$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2) 56- $(CXX) -shared -Wl,-soname,$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
 57+ $(CXX) -shared -Wl,-soname,$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2) $(LDFLAGS)
 58
 59 $(STATIC_LIB_NAME): $(OBJS2)
 60 $(AR) cqs $(STATIC_LIB_NAME) $(OBJS2)