summaryrefslogtreecommitdiff
path: root/textproc/antiword
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2017-07-12 12:54:28 +0000
committerwiz <wiz@pkgsrc.org>2017-07-12 12:54:28 +0000
commitadc3793437c1c5386454e7377925f06fba37d0e7 (patch)
tree5e0baca65d64d831010ba2154ab8271e609674bf /textproc/antiword
parentf70f8042d7ad321aae65612f14cd41ee1e70fd0d (diff)
downloadpkgsrc-adc3793437c1c5386454e7377925f06fba37d0e7.tar.gz
Honor LDFLAGS for RELRO builds.
Diffstat (limited to 'textproc/antiword')
-rw-r--r--textproc/antiword/Makefile3
-rw-r--r--textproc/antiword/distinfo4
-rw-r--r--textproc/antiword/patches/patch-aa4
3 files changed, 6 insertions, 5 deletions
diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index ca0f5a8d5ee..b92e3207eac 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -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 @@ CONFLICTS= siag<3.6.1
USE_TOOLS+= mktemp:run
CFLAGS.SunOS+= -D__STDC_ISO_10646__
+MAKEFLAGS+= LDFLAGS=${LDFLAGS:Q}
REPLACE_INTERPRETER+= bash
REPLACE.bash.old= /bin/bash
diff --git a/textproc/antiword/distinfo b/textproc/antiword/distinfo
index 3ca2ac49c12..be000a43890 100644
--- a/textproc/antiword/distinfo
+++ b/textproc/antiword/distinfo
@@ -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 --git a/textproc/antiword/patches/patch-aa b/textproc/antiword/patches/patch-aa
index b0fe49e7320..b28bec7279b 100644
--- a/textproc/antiword/patches/patch-aa
+++ b/textproc/antiword/patches/patch-aa
@@ -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 @@ $NetBSD: patch-aa,v 1.12 2009/11/12 05:03:47 obache Exp $
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