Wed Jul 12 12:55:51 2017 UTC ()
Honor LDFLAGS for RELRO builds.


(wiz)
diff -r1.6 -r1.7 pkgsrc/textproc/docbook2mdoc/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/docbook2mdoc/patches/patch-Makefile
cvs diff -r1.6 -r1.7 pkgsrc/textproc/docbook2mdoc/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/docbook2mdoc/distinfo 2016/04/01 12:55:43 1.6
+++ pkgsrc/textproc/docbook2mdoc/distinfo 2017/07/12 12:55:51 1.7
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.6 2016/04/01 12:55:43 jperkin Exp $ 1$NetBSD: distinfo,v 1.7 2017/07/12 12:55:51 wiz Exp $
2 2
3SHA1 (docbook2mdoc-0.0.9.tgz) = c95f34cc6c3905443ea63a25a408a82e6fd6e7ff 3SHA1 (docbook2mdoc-0.0.9.tgz) = c95f34cc6c3905443ea63a25a408a82e6fd6e7ff
4RMD160 (docbook2mdoc-0.0.9.tgz) = 73705dfbfb07c0fd39c7a00d23c135bb0c678c01 4RMD160 (docbook2mdoc-0.0.9.tgz) = 73705dfbfb07c0fd39c7a00d23c135bb0c678c01
5SHA512 (docbook2mdoc-0.0.9.tgz) = 1945acdaf137972b1fcae4c699177ebec27ae8550ec874899a3ad29d5cff185adff2dbb236dd88063da3b7acb6305ba696b6679ae51cf59612fe9c1f8a30ac18 5SHA512 (docbook2mdoc-0.0.9.tgz) = 1945acdaf137972b1fcae4c699177ebec27ae8550ec874899a3ad29d5cff185adff2dbb236dd88063da3b7acb6305ba696b6679ae51cf59612fe9c1f8a30ac18
6Size (docbook2mdoc-0.0.9.tgz) = 13022 bytes 6Size (docbook2mdoc-0.0.9.tgz) = 13022 bytes
7SHA1 (patch-Makefile) = ff7b5a55d646843a3c848e19c802a43a0f4c8ba9 7SHA1 (patch-Makefile) = 637dcd3082d7c097c533c3e40e611e99275096cf
cvs diff -r1.1 -r1.2 pkgsrc/textproc/docbook2mdoc/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/docbook2mdoc/patches/patch-Makefile 2016/04/01 12:55:43 1.1
+++ pkgsrc/textproc/docbook2mdoc/patches/patch-Makefile 2017/07/12 12:55:51 1.2
@@ -1,18 +1,26 @@ @@ -1,18 +1,26 @@
1$NetBSD: patch-Makefile,v 1.1 2016/04/01 12:55:43 jperkin Exp $ 1$NetBSD: patch-Makefile,v 1.2 2017/07/12 12:55:51 wiz Exp $
2 2
 3Honor LDFLAGS.
3Support PKGMANDIR. 4Support PKGMANDIR.
4 5
5--- Makefile.orig 2014-04-30 13:21:35.000000000 +0000 6--- Makefile.orig 2014-04-30 13:21:35.000000000 +0000
6+++ Makefile 7+++ Makefile
7@@ -12,9 +12,9 @@ www: index.html docbook2mdoc.1.html docb 8@@ -6,15 +6,15 @@ PREFIX = /usr/local
 9 all: docbook2mdoc
 10
 11 docbook2mdoc: docbook2mdoc.o rules.o
 12- $(CC) -o $@ docbook2mdoc.o rules.o -lexpat
 13+ $(CC) $(LDFLAGS) -o $@ docbook2mdoc.o rules.o -lexpat
 14
 15 www: index.html docbook2mdoc.1.html docbook2mdoc-$(VERSION).tgz README.txt
8  16
9 install: all 17 install: all
10 mkdir -p $(DESTDIR)$(PREFIX)/bin 18 mkdir -p $(DESTDIR)$(PREFIX)/bin
11- mkdir -p $(DESTDIR)$(PREFIX)/man/man1 19- mkdir -p $(DESTDIR)$(PREFIX)/man/man1
12+ mkdir -p $(DESTDIR)$(PREFIX)/${PKGMANDIR}/man1 20+ mkdir -p $(DESTDIR)$(PREFIX)/${PKGMANDIR}/man1
13 install -m 0755 docbook2mdoc $(DESTDIR)$(PREFIX)/bin 21 install -m 0755 docbook2mdoc $(DESTDIR)$(PREFIX)/bin
14- install -m 0444 docbook2mdoc.1 $(DESTDIR)$(PREFIX)/man/man1 22- install -m 0444 docbook2mdoc.1 $(DESTDIR)$(PREFIX)/man/man1
15+ install -m 0444 docbook2mdoc.1 $(DESTDIR)$(PREFIX)/${PKGMANDIR}/man1 23+ install -m 0444 docbook2mdoc.1 $(DESTDIR)$(PREFIX)/${PKGMANDIR}/man1
16  24
17 installwww: www 25 installwww: www
18 mkdir -p $(WWWPREFIX)/snapshots 26 mkdir -p $(WWWPREFIX)/snapshots