Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1519854595272450"
MIME-Version: 1.0
Date: Wed, 28 Feb 2018 21:49:55 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/audio/espeak
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20180228214955.4799CFB40@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1519854595272450
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Wed Feb 28 21:49:55 UTC 2018

Modified Files:
	pkgsrc/audio/espeak: Makefile distinfo
	pkgsrc/audio/espeak/patches: patch-ac

Log Message:
espeak: honor LDFLAGS. Fixes RELRO build.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/espeak/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/espeak/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/espeak/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1519854595272450
Content-Disposition: inline
Content-Length: 3085
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/audio/espeak/Makefile
diff -u pkgsrc/audio/espeak/Makefile:1.10 pkgsrc/audio/espeak/Makefile:1.11
--- pkgsrc/audio/espeak/Makefile:1.10	Wed Apr 20 12:10:25 2016
+++ pkgsrc/audio/espeak/Makefile	Wed Feb 28 21:49:55 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2016/04/20 12:10:25 nros Exp $
-#
+# $NetBSD: Makefile,v 1.11 2018/02/28 21:49:55 wiz Exp $
 
 DISTNAME=	espeak-1.31-source
 PKGNAME=	${DISTNAME:S/-source//}
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=espeak/}
 EXTRACT_SUFX=	.zip

Index: pkgsrc/audio/espeak/distinfo
diff -u pkgsrc/audio/espeak/distinfo:1.4 pkgsrc/audio/espeak/distinfo:1.5
--- pkgsrc/audio/espeak/distinfo:1.4	Tue Nov  3 01:12:28 2015
+++ pkgsrc/audio/espeak/distinfo	Wed Feb 28 21:49:55 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 01:12:28 agc Exp $
+$NetBSD: distinfo,v 1.5 2018/02/28 21:49:55 wiz Exp $
 
 SHA1 (espeak-1.31-source.zip) = e33291b29153d0fc179da11ac4a61cc85fba679a
 RMD160 (espeak-1.31-source.zip) = a26596f25d8897848238d81fe5e5d179d47f01a6
@@ -6,4 +6,4 @@ SHA512 (espeak-1.31-source.zip) = ec2e6a
 Size (espeak-1.31-source.zip) = 1204202 bytes
 SHA1 (patch-aa) = a01dccb651c0160a7af5af14f3292578c8396ae0
 SHA1 (patch-ab) = 37e434f3c3e2fb722f927da4ca83a2b814c28879
-SHA1 (patch-ac) = e94b0597b0c104daaa24b6421b5bcf69147b1046
+SHA1 (patch-ac) = 33043b93dde7beea7879d1e9b7c751aef0728d44

Index: pkgsrc/audio/espeak/patches/patch-ac
diff -u pkgsrc/audio/espeak/patches/patch-ac:1.3 pkgsrc/audio/espeak/patches/patch-ac:1.4
--- pkgsrc/audio/espeak/patches/patch-ac:1.3	Thu Feb 28 20:16:55 2008
+++ pkgsrc/audio/espeak/patches/patch-ac	Wed Feb 28 21:49:55 2018
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2008/02/28 20:16:55 drochner Exp $
+$NetBSD: patch-ac,v 1.4 2018/02/28 21:49:55 wiz Exp $
 
---- Makefile.orig	2008-01-19 22:50:27.000000000 +0100
+--- Makefile.orig	2008-01-19 21:50:27.000000000 +0000
 +++ Makefile
 @@ -1,7 +1,7 @@
  BINDIR=/usr/bin
@@ -34,7 +34,18 @@ $NetBSD: patch-ac,v 1.3 2008/02/28 20:16
  
  CXXFLAGS=-O2
  
-@@ -58,7 +59,7 @@ $(BIN2_NAME): $(OBJS3) $(LIB_NAME)
+@@ -49,19 +50,19 @@ all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LI
+ 	$(CXX) $(CXXFLAGS) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $<
+ 
+ $(BIN_NAME): $(OBJS1)
+-	$(CXX) -o $@ $(OBJS1) $(LIBS1)
++	$(CXX) -o $@ $(OBJS1) $(LIBS1) $(LDFLAGS)
+ 
+ $(BIN2_NAME): $(OBJS3) $(LIB_NAME)
+-	$(CXX) -o $@ $(OBJS3) $(LIBS3)
++	$(CXX) -o $@ $(OBJS3) $(LIBS3) $(LDFLAGS)
+ 
+ 
  
  x_%.o: %.cpp
  	$(CXX) $(CXXFLAGS) -Wall -fpic -fvisibility=hidden -pedantic \
@@ -42,4 +53,8 @@ $NetBSD: patch-ac,v 1.3 2008/02/28 20:16
 +	-I. -DLIBRARY -DPATH_ESPEAK_DATA=\"$(DATADIR)\" -c -fno-exceptions $<  -o x_$*.o
  
  $(LIB_NAME): $(OBJS2)
- 	$(CXX) -shared -Wl,-soname,$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
+-	$(CXX) -shared -Wl,-soname,$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
++	$(CXX) -shared -Wl,-soname,$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2) $(LDFLAGS)
+ 
+ $(STATIC_LIB_NAME): $(OBJS2)
+ 	$(AR) cqs $(STATIC_LIB_NAME) $(OBJS2)


--_----------=_1519854595272450--