Add support for LDFLAGS

This notably fixes building with RELRO enabled.

6 files changed, 28 insertions, 16 deletions

diff --git a/sysutils/estd/Makefile b/sysutils/estd/Makefile
index 4f47bf6fd9a..d5063baefad 100644
--- a/sysutils/estd/Makefile
+++ b/sysutils/estd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2017/08/01 17:40:15 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2017/10/25 21:38:52 khorben Exp $
 
 DISTNAME=	estd-r11
 PKGNAME=	estd-0.11
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.ecademix.com/JohannesHofmann/
 
@@ -11,6 +11,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Dynamically sets the CPU-frequency on SpeedStep and PowerNow CPUs
 LICENSE=	2-clause-bsd
 
+MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
+
 INSTALLATION_DIRS=	share/examples/rc.d
 
 ONLY_FOR_PLATFORM=	NetBSD-2.99.*-i386 NetBSD-[3-9]*-i386 \
diff --git a/sysutils/estd/distinfo b/sysutils/estd/distinfo
index 2a7106dbf30..ff1eba67cd8 100644
--- a/sysutils/estd/distinfo
+++ b/sysutils/estd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2015/11/04 01:32:13 agc Exp $
+$NetBSD: distinfo,v 1.23 2017/10/25 21:38:52 khorben Exp $
 
 SHA1 (estd-r11.tar.gz) = 6c1148d66ff93b2e45af0411f1234fcccd1a2407
 RMD160 (estd-r11.tar.gz) = 261a6a79e54f2502a50aad79e336259604376f3c
 SHA512 (estd-r11.tar.gz) = 37b005ab451f7a26248064cee5736ca43c6345b419e00050186158d5830fe96035fa78d2651a908899e6c61d44b1aaeb8b3cac0fbde19fb4c82976f709b011dc
 Size (estd-r11.tar.gz) = 9361 bytes
-SHA1 (patch-aa) = d377a38dacee5e93feaf67747d5bf2a7a32c036b
+SHA1 (patch-aa) = 6671d042e8b593b33e8633d657b14acaf3f115eb
 SHA1 (patch-estd.c) = e813e795a18fa16ced0070fe7485dff3f3de61ac
diff --git a/sysutils/estd/patches/patch-aa b/sysutils/estd/patches/patch-aa
index 8c20228dad2..1d85ae63806 100644
--- a/sysutils/estd/patches/patch-aa
+++ b/sysutils/estd/patches/patch-aa
@@ -1,11 +1,18 @@
-$NetBSD: patch-aa,v 1.10 2015/03/06 18:08:38 khorben Exp $
+$NetBSD: patch-aa,v 1.11 2017/10/25 21:38:52 khorben Exp $
 
-Use BSD_INSTALL_* instead of directly invoking install(1), add DESTDIR
-support and install all the files in the proper locations.
+- Use BSD_INSTALL_* instead of directly invoking install(1)
+- Add DESTDIR support and install all the files in the proper locations.
+- Add support for LDFLAGS
 
 --- Makefile.orig	2015-02-18 21:38:03.000000000 +0000
 +++ Makefile
-@@ -19,7 +19,8 @@ estd:	estd.c
+@@ -14,12 +14,13 @@ clean:
+ 	rm -f *~
+ 
+ estd:	estd.c
+-	gcc ${CFLAGS} ${LIBS} -o estd estd.c
++	gcc ${CFLAGS} ${LDFLAGS} ${LIBS} -o estd estd.c
+ 	
  all: estd
  
  install: all
diff --git a/sysutils/wmSMPmon/Makefile b/sysutils/wmSMPmon/Makefile
index fc93d28b20e..675d43aaf81 100644
--- a/sysutils/wmSMPmon/Makefile
+++ b/sysutils/wmSMPmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/10/25 21:30:42 khorben Exp $
+# $NetBSD: Makefile,v 1.16 2017/10/25 21:32:35 khorben Exp $
 
 DISTNAME=	wmSMPmon-2.3
 PKGREVISION=	1
@@ -13,6 +13,7 @@ COMMENT=	Dockable CPU (SMP) monitor
 WRKSRC=		${WRKDIR}/wmSMPmon-2.x/wmSMPmon
 
 MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
diff --git a/sysutils/wmSMPmon/distinfo b/sysutils/wmSMPmon/distinfo
index e2568a193eb..ed167b0446e 100644
--- a/sysutils/wmSMPmon/distinfo
+++ b/sysutils/wmSMPmon/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 01:32:38 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/10/25 21:32:35 khorben Exp $
 
 SHA1 (wmSMPmon-2.3.tar.gz) = 90d6665e7314fd4e5dd21cde5d90abd887e519cf
 RMD160 (wmSMPmon-2.3.tar.gz) = 2c95b70488d33b811bd261b0cbb4aad26c845e86
 SHA512 (wmSMPmon-2.3.tar.gz) = 034cc44dd9bdfd09b2accb5e71b2d61ee6cd2dc5feaad3cf65e09a536e3b463bbfbd9c77cad5c27ac424bc392bd16b5032bf4db2f603ef6b59ab08c08e22a986
 Size (wmSMPmon-2.3.tar.gz) = 16413 bytes
-SHA1 (patch-aa) = 312453d6f8646453d9676451d182f7cf1d669515
+SHA1 (patch-aa) = c4f3f9fa4cd0f3a31747009b164bc7b0eed7d498
 SHA1 (patch-ab) = 68275308cf08d2911383f1eeacbdc16e94ad2ed7
diff --git a/sysutils/wmSMPmon/patches/patch-aa b/sysutils/wmSMPmon/patches/patch-aa
index b82a55820b4..03babb194d5 100644
--- a/sysutils/wmSMPmon/patches/patch-aa
+++ b/sysutils/wmSMPmon/patches/patch-aa
@@ -1,7 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/01/12 11:52:10 agc Exp $
---- Makefile.orig	2003-03-10 13:54:28.000000000 +0100
-+++ Makefile	2004-08-25 15:04:13.000000000 +0200
-@@ -3,21 +3,22 @@
+$NetBSD: patch-aa,v 1.2 2017/10/25 21:32:35 khorben Exp $
+--- Makefile.orig	2003-03-10 12:54:28.000000000 +0000
++++ Makefile
+@@ -2,22 +2,23 @@
+ 
  SRC = wmSMPmon.c ../wmgeneral/wmgeneral.c 
  EXE = wmSMPmon
 -OBJ = $(SRC:.c=.o)
@@ -17,7 +18,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/01/12 11:52:10 agc Exp $
 -all: $(OBJ)
 -	$(CC) -o $(EXE) $(OBJ) $(LIB)
 +all: ${OBJ}
-+	${CC} -o ${EXE} ${OBJ} ${INC} ${LIB}
++	${CC} ${LDFLAGS} -o ${EXE} ${OBJ} ${INC} ${LIB}
  
 -$(OBJ): %.o : %.c 
 -	$(CC) $(CFLAGS) -c -o $@ $<