[pkgsrc/trunk]: pkgsrc Honor LDFLAGS. Fixes RELRO build.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8bccf759926a
branches:  trunk
changeset: 365384:8bccf759926a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jul 15 14:09:22 2017 +0000

description:
Honor LDFLAGS. Fixes RELRO build.

diffstat:

 net/wmpload/distinfo            |   4 ++--
 net/wmpload/patches/patch-ab    |  12 ++++++++++--
 print/transfig/distinfo         |   6 +++---
 print/transfig/patches/patch-aa |  25 +++++++++++++++----------
 print/transfig/patches/patch-ac |  14 ++++++++++----
 5 files changed, 40 insertions(+), 21 deletions(-)

diffs (160 lines):

diff -r 5a9d65744795 -r 8bccf759926a net/wmpload/distinfo
--- a/net/wmpload/distinfo      Sat Jul 15 13:20:50 2017 +0000
+++ b/net/wmpload/distinfo      Sat Jul 15 14:09:22 2017 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 00:35:45 agc Exp $
+$NetBSD: distinfo,v 1.9 2017/07/15 14:10:52 wiz Exp $
 
 SHA1 (wmpload-0.9.5.tar.gz) = 8627bb43d789f4639ecbca67b198f371c9487e65
 RMD160 (wmpload-0.9.5.tar.gz) = d0bf961b4593797caab667b160ef97f4c6d4d16c
 SHA512 (wmpload-0.9.5.tar.gz) = 052b6d6ff95692b528392e745b243af53c99a1fc7c5a84eeb64f174a75431d54e5dc18307b713e7cfcd63d5f2864428a99a5dc7f60486b8988e602ac02c67bb7
 Size (wmpload-0.9.5.tar.gz) = 25373 bytes
 SHA1 (patch-aa) = 57521e37e6a0d1c7d26ce52f2e01b12a3ce8206f
-SHA1 (patch-ab) = dfc510295d8c59908fe4a619b3ec22af90021271
+SHA1 (patch-ab) = 4be791f204c1f9c408e792a4b0253ff4200623f5
 SHA1 (patch-configure) = 0780b9f9b8245ec2f2d4c657b5fafa6e898112fc
diff -r 5a9d65744795 -r 8bccf759926a net/wmpload/patches/patch-ab
--- a/net/wmpload/patches/patch-ab      Sat Jul 15 13:20:50 2017 +0000
+++ b/net/wmpload/patches/patch-ab      Sat Jul 15 14:09:22 2017 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.3 2004/11/27 00:15:30 abs Exp $
+$NetBSD: patch-ab,v 1.4 2017/07/15 14:10:52 wiz Exp $
 
 --- Imakefile.orig     2000-02-01 07:49:01.000000000 +0000
 +++ Imakefile
-@@ -13,7 +13,7 @@ DEFINES = -DVERSION="\"$(VER)\"" $(OSDEF
+@@ -6,6 +6,7 @@ XCOMM
+ include osdefs.mk
+ DEPLIBS = $(DEPXLIB)
+ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB)
++LOCAL_LDFLAGS=        $(LDFLAGS)
+ SYS_LIBRARIES   = MathLibrary
+ HEADERS = wmpload.h
+ VER = 0.9.5
+@@ -13,7 +14,7 @@ DEFINES = -DVERSION="\"$(VER)\"" $(OSDEF
  
  ComplexProgramTarget(wmpload)
  
diff -r 5a9d65744795 -r 8bccf759926a print/transfig/distinfo
--- a/print/transfig/distinfo   Sat Jul 15 13:20:50 2017 +0000
+++ b/print/transfig/distinfo   Sat Jul 15 14:09:22 2017 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.22 2015/11/04 01:03:01 agc Exp $
+$NetBSD: distinfo,v 1.23 2017/07/15 14:09:22 wiz Exp $
 
 SHA1 (transfig.3.2.5e.tar.gz) = 27aa9691bf84f8775db9be39c453a8132148bad1
 RMD160 (transfig.3.2.5e.tar.gz) = cc919f081483c3f570abeca6a8cadd4796d25015
 SHA512 (transfig.3.2.5e.tar.gz) = ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
 Size (transfig.3.2.5e.tar.gz) = 531256 bytes
-SHA1 (patch-aa) = bd898082a8c34825efe04d0102ddb33b2f4cffbd
+SHA1 (patch-aa) = 1c831b806eca90142348aab8e565d020466e6a96
 SHA1 (patch-ab) = b056ff88914bccfc172f15adb663eda0f254e125
-SHA1 (patch-ac) = 0258794cf6f6d22d3355ed01c2cc89c7ee0088d4
+SHA1 (patch-ac) = 6508bac36a86a69b910f5e3b4f08e09a25055dfe
 SHA1 (patch-ae) = d38a07c99e27606a238b3dc89cd938ed9635291d
 SHA1 (patch-fig2dev_dev_genibmgl.c) = 86d75d687066e77f90f5e35914a5edc409708e3e
diff -r 5a9d65744795 -r 8bccf759926a print/transfig/patches/patch-aa
--- a/print/transfig/patches/patch-aa   Sat Jul 15 13:20:50 2017 +0000
+++ b/print/transfig/patches/patch-aa   Sat Jul 15 14:09:22 2017 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2008/08/20 10:25:12 is Exp $
+$NetBSD: patch-aa,v 1.12 2017/07/15 14:09:23 wiz Exp $
 
---- fig2dev/Imakefile.orig     Fri Oct 28 01:56:02 2005
-+++ fig2dev/Imakefile  Wed Nov  9 22:49:57 2005
-@@ -34,7 +34,7 @@
+--- fig2dev/Imakefile.orig     2010-06-02 19:18:16.000000000 +0000
++++ fig2dev/Imakefile
+@@ -34,7 +34,7 @@ XCOMM ******
  XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
  XCOMM and installed xfig.
  
@@ -11,7 +11,7 @@
  
  XCOMM ******
  XCOMM If your system doesn't have the strerror() function (has sys_errlist) then
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ XCOMM Uncomment the following line if yo
  XCOMM inline functions. With the "INLINE" keyword, you should notice that
  XCOMM the display will be a bit faster in complex figures
  
@@ -20,7 +20,7 @@
  
  XCOMM ****************
  XCOMM Change RGB if necessary, to point to your rgb.txt color database
-@@ -76,7 +76,7 @@
+@@ -76,7 +76,7 @@ XCOMM file are in different places
  #ifdef USEPNG
  PNGLIBDIR = $(USRLIBDIR)
  ZLIBDIR = $(USRLIBDIR)
@@ -29,7 +29,7 @@
  #endif
  
  XCOMM ****************
-@@ -92,7 +92,19 @@
+@@ -92,7 +92,19 @@ XCOMM
  
  #ifdef USEXPM
  XPMLIBDIR = $(USRLIBDIR)
@@ -50,7 +50,7 @@
  #endif
  
  XCOMM ****************
-@@ -141,8 +153,8 @@
+@@ -141,8 +153,8 @@ XCOMM Comment out the next line if you h
  
  #ifdef I18N
  I18N_DEFS = -DI18N 
@@ -61,7 +61,7 @@
  
  #endif /* I18N */
  
-@@ -150,30 +162,37 @@
+@@ -150,30 +162,37 @@ XCOMM **********************************
  XCOMM *** You shouldn't have to change anything below this point ***
  XCOMM **************************************************************
  
@@ -105,7 +105,7 @@
                $(DDLATEX2E_GRAPHICS) $(DDEPSFIG) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS)
  
  #define IHaveSubdirs
-@@ -189,9 +208,9 @@
+@@ -189,9 +208,9 @@ INCLUDES = -I..
  
  LOCAL_LIBRARIES = $(LIBTRANSFIG)
  #if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture)
@@ -117,3 +117,8 @@
  #endif
  DEPLIBS = $(LIBTRANSFIG)
  
+@@ -255,3 +274,4 @@ pic2tpic.man:: ../doc/pic2tpic.1
+       $(RM) pic2tpic.man
+       -$(LN) ../doc/pic2tpic.1 pic2tpic.man
+ 
++LOCAL_LDFLAGS=        ${LDFLAGS}
diff -r 5a9d65744795 -r 8bccf759926a print/transfig/patches/patch-ac
--- a/print/transfig/patches/patch-ac   Sat Jul 15 13:20:50 2017 +0000
+++ b/print/transfig/patches/patch-ac   Sat Jul 15 14:09:22 2017 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2005/11/10 14:29:01 itohy Exp $
+$NetBSD: patch-ac,v 1.5 2017/07/15 14:09:23 wiz Exp $
 
---- transfig/Imakefile.orig    Wed Mar 26 05:52:37 2003
-+++ transfig/Imakefile Wed Nov  9 21:44:38 2005
-@@ -32,7 +32,7 @@
+--- transfig/Imakefile.orig    2003-03-25 20:52:38.000000000 +0000
++++ transfig/Imakefile
+@@ -32,7 +32,7 @@ XCOMM Uncomment the USELATEX2E flag to u
  XCOMM \\usepackage{} command for LaTeX2e. 
  XCOMM The default is to use \\documentstyle{} for LaTeX209.
  
@@ -11,3 +11,9 @@
  
  XCOMM ******* DON'T CHANGE ANYTHING BELOW THIS POINT *******
  
+@@ -68,3 +68,5 @@ pic2tpic.man:: ../doc/pic2tpic.1
+ 
+ clean::
+       rm -f *.man
++
++LOCAL_LDFLAGS=        ${LDFLAGS}