CVS commit: pkgsrc/sysutils/wmSMPmon

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Wed Oct 25 21:32:35 UTC 2017

Modified Files:
        pkgsrc/sysutils/wmSMPmon: Makefile distinfo
        pkgsrc/sysutils/wmSMPmon/patches: patch-aa

Log Message:
Add support for LDFLAGS

This notably fixes building with RELRO enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/wmSMPmon/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/wmSMPmon/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/sysutils/wmSMPmon/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/wmSMPmon/Makefile
diff -u pkgsrc/sysutils/wmSMPmon/Makefile:1.15 pkgsrc/sysutils/wmSMPmon/Makefile:1.16
--- pkgsrc/sysutils/wmSMPmon/Makefile:1.15      Wed Oct 25 21:30:42 2017
+++ pkgsrc/sysutils/wmSMPmon/Makefile   Wed Oct 25 21:32:35 2017
@@ -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
 

Index: pkgsrc/sysutils/wmSMPmon/distinfo
diff -u pkgsrc/sysutils/wmSMPmon/distinfo:1.4 pkgsrc/sysutils/wmSMPmon/distinfo:1.5
--- pkgsrc/sysutils/wmSMPmon/distinfo:1.4       Wed Nov  4 01:32:38 2015
+++ pkgsrc/sysutils/wmSMPmon/distinfo   Wed Oct 25 21:32:35 2017
@@ -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

Index: pkgsrc/sysutils/wmSMPmon/patches/patch-aa
diff -u pkgsrc/sysutils/wmSMPmon/patches/patch-aa:1.1.1.1 pkgsrc/sysutils/wmSMPmon/patches/patch-aa:1.2
--- pkgsrc/sysutils/wmSMPmon/patches/patch-aa:1.1.1.1   Wed Jan 12 11:52:10 2005
+++ pkgsrc/sysutils/wmSMPmon/patches/patch-aa   Wed Oct 25 21:32:35 2017
@@ -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 1
 -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 $@ $<