[pkgsrc/trunk]: pkgsrc/textproc Honor LDFLAGS for RELRO builds.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/173dd820e5f1
branches:  trunk
changeset: 365269:173dd820e5f1
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jul 12 12:54:28 2017 +0000

description:
Honor LDFLAGS for RELRO builds.

diffstat:

 textproc/antiword/Makefile                   |   3 ++-
 textproc/antiword/distinfo                   |   4 ++--
 textproc/antiword/patches/patch-aa           |   4 ++--
 textproc/docbook2mdoc/distinfo               |   4 ++--
 textproc/docbook2mdoc/patches/patch-Makefile |  12 ++++++++++--
 5 files changed, 18 insertions(+), 9 deletions(-)

diffs (87 lines):

diff -r 046cfa9d7c05 -r 173dd820e5f1 textproc/antiword/Makefile
--- a/textproc/antiword/Makefile        Wed Jul 12 12:21:56 2017 +0000
+++ b/textproc/antiword/Makefile        Wed Jul 12 12:54:28 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2014/12/02 23:50:23 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2017/07/12 12:54:28 wiz Exp $
 
 DISTNAME=      antiword-0.37
 PKGREVISION=   2
@@ -15,6 +15,7 @@
 USE_TOOLS+=    mktemp:run
 
 CFLAGS.SunOS+= -D__STDC_ISO_10646__
+MAKEFLAGS+=    LDFLAGS=${LDFLAGS:Q}
 
 REPLACE_INTERPRETER+=  bash
 REPLACE.bash.old=      /bin/bash
diff -r 046cfa9d7c05 -r 173dd820e5f1 textproc/antiword/distinfo
--- a/textproc/antiword/distinfo        Wed Jul 12 12:21:56 2017 +0000
+++ b/textproc/antiword/distinfo        Wed Jul 12 12:54:28 2017 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2015/11/04 01:59:18 agc Exp $
+$NetBSD: distinfo,v 1.23 2017/07/12 12:54:28 wiz Exp $
 
 SHA1 (antiword-0.37.tar.gz) = 4364f7f99cb2d37f7d1d5bc14a335ccc0c67292e
 RMD160 (antiword-0.37.tar.gz) = 506ca4a7a7fa9fd4574092798a7fffacd9a3a0a0
 SHA512 (antiword-0.37.tar.gz) = 6cd8fb9137238417544cf8754829a2d5296055d730ea62a8a025236baa79516190317d146401ff40cde73e1ee2c3c374a2ea01b2e5d24e149310bcabb8bfdce8
 Size (antiword-0.37.tar.gz) = 317884 bytes
-SHA1 (patch-aa) = 2caa51e3364e7034443ded9fa56cdda4c4b74929
+SHA1 (patch-aa) = 544a2b0a35cfaa91165c194b1d65ffc7c39c65e1
 SHA1 (patch-ab) = d2cb15824b78346a8a5ae301b0618a81437ce971
 SHA1 (patch-wordole.c) = f2ab157173e4ff49e7983e836176cbdae537e46e
diff -r 046cfa9d7c05 -r 173dd820e5f1 textproc/antiword/patches/patch-aa
--- a/textproc/antiword/patches/patch-aa        Wed Jul 12 12:21:56 2017 +0000
+++ b/textproc/antiword/patches/patch-aa        Wed Jul 12 12:54:28 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.12 2009/11/12 05:03:47 obache Exp $
+$NetBSD: patch-aa,v 1.13 2017/07/12 12:54:28 wiz Exp $
 
 --- Makefile.orig      2005-10-29 19:13:15.000000000 +0200
 +++ Makefile
@@ -69,7 +69,7 @@
  antiword:     $(OBJS)
        @rm -f $@
 -      $(LD) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@
-+      $(CC) $(CFLAGS) $(OBJS) -o $@
++      $(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) -o $@
        @chmod 750 $@
  
  kantiword:    Unix-only/KDE3-only/kantiword.sh
diff -r 046cfa9d7c05 -r 173dd820e5f1 textproc/docbook2mdoc/distinfo
--- a/textproc/docbook2mdoc/distinfo    Wed Jul 12 12:21:56 2017 +0000
+++ b/textproc/docbook2mdoc/distinfo    Wed Jul 12 12:54:28 2017 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2016/04/01 12:55:43 jperkin Exp $
+$NetBSD: distinfo,v 1.7 2017/07/12 12:55:51 wiz Exp $
 
 SHA1 (docbook2mdoc-0.0.9.tgz) = c95f34cc6c3905443ea63a25a408a82e6fd6e7ff
 RMD160 (docbook2mdoc-0.0.9.tgz) = 73705dfbfb07c0fd39c7a00d23c135bb0c678c01
 SHA512 (docbook2mdoc-0.0.9.tgz) = 1945acdaf137972b1fcae4c699177ebec27ae8550ec874899a3ad29d5cff185adff2dbb236dd88063da3b7acb6305ba696b6679ae51cf59612fe9c1f8a30ac18
 Size (docbook2mdoc-0.0.9.tgz) = 13022 bytes
-SHA1 (patch-Makefile) = ff7b5a55d646843a3c848e19c802a43a0f4c8ba9
+SHA1 (patch-Makefile) = 637dcd3082d7c097c533c3e40e611e99275096cf
diff -r 046cfa9d7c05 -r 173dd820e5f1 textproc/docbook2mdoc/patches/patch-Makefile
--- a/textproc/docbook2mdoc/patches/patch-Makefile      Wed Jul 12 12:21:56 2017 +0000
+++ b/textproc/docbook2mdoc/patches/patch-Makefile      Wed Jul 12 12:54:28 2017 +0000
@@ -1,10 +1,18 @@
-$NetBSD: patch-Makefile,v 1.1 2016/04/01 12:55:43 jperkin Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/07/12 12:55:51 wiz Exp $
 
+Honor LDFLAGS.
 Support PKGMANDIR.
 
 --- Makefile.orig      2014-04-30 13:21:35.000000000 +0000
 +++ Makefile
-@@ -12,9 +12,9 @@ www: index.html docbook2mdoc.1.html docb
+@@ -6,15 +6,15 @@ PREFIX = /usr/local
+ all: docbook2mdoc
+ 
+ docbook2mdoc: docbook2mdoc.o rules.o
+-      $(CC) -o $@ docbook2mdoc.o rules.o -lexpat
++      $(CC) $(LDFLAGS) -o $@ docbook2mdoc.o rules.o -lexpat
+ 
+ www: index.html docbook2mdoc.1.html docbook2mdoc-$(VERSION).tgz README.txt
  
  install: all
        mkdir -p $(DESTDIR)$(PREFIX)/bin