Honor LDFLAGS. Fixes RELRO build.

8 files changed, 43 insertions, 17 deletions

diff --git a/devel/argp/distinfo b/devel/argp/distinfo
index dc6920a90f4..e4f59c1821e 100644
--- a/devel/argp/distinfo
+++ b/devel/argp/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 03:27:14 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/07/12 11:05:59 wiz Exp $
 
 SHA1 (argp-standalone-1.3.tar.gz) = 815c560680ebdc11694b88de2f8ec15133e0bfa0
 RMD160 (argp-standalone-1.3.tar.gz) = 1c5cd0b1c382d93774be636a1ea2758d530cfef4
 SHA512 (argp-standalone-1.3.tar.gz) = 58c3feb8852b90248fff39e49b5019bd0dcf646790c3eaf70c3262eb81dda31a61dc0a45963c7b4a010e80fc14b37288dcb3b3ef48d02f2d33dd72c1c62e62d9
 Size (argp-standalone-1.3.tar.gz) = 130255 bytes
-SHA1 (patch-aa) = 056655a5322beda281f370a02e08a71810b8439d
+SHA1 (patch-aa) = 57560cba79069b6809de78a7edbad64e2f717c61
 SHA1 (patch-ab) = 7ed54ce579b922416aceb0c4e3959307557e8af6
 SHA1 (patch-argp-fmtstream.c) = c7e763bb317702e5072570783629d8e973e5f077
 SHA1 (patch-argp-fmtstream.h) = 7fd13de60b376001ee5eee72a065385b4abf9923
diff --git a/devel/argp/patches/patch-aa b/devel/argp/patches/patch-aa
index 6722e863531..5accfa0ed4a 100644
--- a/devel/argp/patches/patch-aa
+++ b/devel/argp/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2007/12/22 01:40:21 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2017/07/12 11:05:59 wiz Exp $
 
 --- Makefile.in.orig	2004-02-23 19:22:09.000000000 +0100
 +++ Makefile.in
@@ -51,7 +51,7 @@ $NetBSD: patch-aa,v 1.1 2007/12/22 01:40:21 joerg Exp $
 -	$(libargp_a_AR) libargp.a $(libargp_a_OBJECTS) $(libargp_a_LIBADD)
 -	$(RANLIB) libargp.a
 +libargp.la: $(libargp_a_OBJECTS) $(libargp_a_DEPENDENCIES) 
-+	libtool --mode=link ${CC} -o $@ -rpath ${libdir} $(LIBOBJS:C/.o$/.lo/) $(libargp_a_OBJECTS:C/.o$/.lo/)
++	libtool --mode=link ${CC} ${LDFLAGS} -o $@ -rpath ${libdir} $(LIBOBJS:C/.o$/.lo/) $(libargp_a_OBJECTS:C/.o$/.lo/)
  
  clean-noinstPROGRAMS:
  	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo
index e259d2928cb..9812cfacd91 100644
--- a/devel/gtexinfo/distinfo
+++ b/devel/gtexinfo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2016/10/19 12:49:39 wiz Exp $
+$NetBSD: distinfo,v 1.50 2017/07/12 11:04:59 wiz Exp $
 
 SHA1 (texinfo-6.3.tar.gz) = 29b16c646c7bc9cd351b2f1d8dafdce70e5377f6
 RMD160 (texinfo-6.3.tar.gz) = 5673030cc0a9907489c206fd0c4bf1a925b69ea9
@@ -9,6 +9,6 @@ SHA1 (patch-ac) = 7f7226ee521fddba9f967be4fe199f6bedcfa148
 SHA1 (patch-gnulib_lib_mbiter.h) = 34c291e6994c6eb51aba803f3ebf5f09d46e9bdd
 SHA1 (patch-gnulib_lib_mbuiter.h) = be293674c37cb91746527be07aa40acbd285d2f4
 SHA1 (patch-texindex_texindex.awk) = 1f022f1495c951337997036ef1cd758ef9c116a7
+SHA1 (patch-tp_Texinfo_Convert_XSParagraph_Makefile.in) = cdb6c78c2c15d3f8ee5755625694c11ecd9004e9
 SHA1 (patch-tp_Texinfo_Convert_XSParagraph_configure) = d4557bae4417cd42297bceaa76478b00b3875df3
-SHA1 (patch-tp_Texinfo_Convert_XSParagraph_xspara.c) = 198d64b5bc38a3b934ade641c282e8be3e41c4df
-SHA1 (patch-util_texi2dvi) = d17608312d4b5546a2295e1be2b193124ad97256
+SHA1 (patch-util_texi2dvi) = c894eb109ef3faa7ed1cb544556ca6a97af439e9
diff --git a/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_Makefile.in b/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_Makefile.in
new file mode 100644
index 00000000000..48584d2565e
--- /dev/null
+++ b/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-tp_Texinfo_Convert_XSParagraph_Makefile.in,v 1.1 2017/07/12 11:04:59 wiz Exp $
+
+Honor LDFLAGS for RELRO builds.
+
+--- tp/Texinfo/Convert/XSParagraph/Makefile.in.orig	2017-07-12 10:57:18.518824283 +0000
++++ tp/Texinfo/Convert/XSParagraph/Makefile.in
+@@ -573,7 +573,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LD = @LD@
+-LDFLAGS = $(PERL_EXT_LDFLAGS)
++LDFLAGS = $(PERL_EXT_LDFLAGS) @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/devel/gtexinfo/patches/patch-util_texi2dvi b/devel/gtexinfo/patches/patch-util_texi2dvi
index e4aa6196b03..dedeb1199b9 100644
--- a/devel/gtexinfo/patches/patch-util_texi2dvi
+++ b/devel/gtexinfo/patches/patch-util_texi2dvi
@@ -1,14 +1,12 @@
-$NetBSD: patch-util_texi2dvi,v 1.5 2015/06/30 11:00:33 ryoon Exp $
+$NetBSD: patch-util_texi2dvi,v 1.6 2017/07/12 11:04:59 wiz Exp $
 
 As indicated in pkg/48075, pdksh doesn't support double-parens
 if not containing an arithmetic expression of a particular form.
 Older bash and ast-ksh apparently also had problems with this.
 
---- util/texi2dvi.orig	2015-06-26 12:49:37.000000000 +0000
+--- util/texi2dvi.orig	2016-09-10 19:25:16.000000000 +0000
 +++ util/texi2dvi
-@@ -25,10 +25,10 @@
- # If possible, please send a copy of the output of the script called with
- # the `--debug' option when making a bug report.
+@@ -27,6 +27,6 @@
  
 -test -f /bin/ksh && test -z "$RUNNING_KSH" \
 -  && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
@@ -19,5 +17,3 @@ Older bash and ast-ksh apparently also had problems with this.
 +#  && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
 +#unset RUNNING_KSH
  
- # No failure shall remain unpunished.
- set -e
diff --git a/devel/lua-lpeg/Makefile b/devel/lua-lpeg/Makefile
index ab760edec75..5ab9e87e42b 100644
--- a/devel/lua-lpeg/Makefile
+++ b/devel/lua-lpeg/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/01/30 21:16:34 alnsn Exp $
-#
+# $NetBSD: Makefile,v 1.14 2017/07/12 11:07:36 wiz Exp $
 
 DISTNAME=	lpeg-1.0.1
 PKGNAME=	${DISTNAME:S/lpeg/${LUA_PKGPREFIX}-lpeg/}
diff --git a/devel/lua-lpeg/distinfo b/devel/lua-lpeg/distinfo
index 6d4b36a1784..40971481be7 100644
--- a/devel/lua-lpeg/distinfo
+++ b/devel/lua-lpeg/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2017/01/24 08:18:48 alnsn Exp $
+$NetBSD: distinfo,v 1.8 2017/07/12 11:07:36 wiz Exp $
 
 SHA1 (lpeg-1.0.1.tar.gz) = b2f81624e0ce9c99c0731287c3475fac1f1c0f50
 RMD160 (lpeg-1.0.1.tar.gz) = ce31666f7d55ad6957c2b274983d7d201fa797dd
 SHA512 (lpeg-1.0.1.tar.gz) = 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa
 Size (lpeg-1.0.1.tar.gz) = 71527 bytes
+SHA1 (patch-makefile) = b68221029ee287aa72605f69d679eae45dfa34a3
diff --git a/devel/lua-lpeg/patches/patch-makefile b/devel/lua-lpeg/patches/patch-makefile
new file mode 100644
index 00000000000..c58e0c10639
--- /dev/null
+++ b/devel/lua-lpeg/patches/patch-makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-makefile,v 1.1 2017/07/12 11:07:36 wiz Exp $
+
+Honor LDFLAGS for RELRO builds.
+
+--- makefile.orig	2017-01-14 18:57:16.000000000 +0000
++++ makefile
+@@ -36,7 +36,7 @@ macosx:
+ 	make lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
+ 
+ lpeg.so: $(FILES)
+-	env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
++	env $(CC) $(LDFLAGS) $(DLLFLAGS) $(FILES) -o lpeg.so
+ 
+ $(FILES): makefile
+