Fixed x11/xlockmore so it compiles with RELRO flags.

4 files changed, 29 insertions, 7 deletions

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 9db9c9471ef..db57afbb3a8 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.128 2018/01/28 20:11:10 wiz Exp $
+# $NetBSD: Makefile,v 1.129 2018/02/08 16:03:12 jaapb Exp $
 
-PKGREVISION= 9
+PKGREVISION= 10
 .include "Makefile.common"
 
 COMMENT=	Like the XLock session-locker/screensaver, but with more
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index 29e707ed0b6..f3001849546 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2015/11/04 03:29:08 agc Exp $
+$NetBSD: distinfo,v 1.55 2018/02/08 16:03:12 jaapb Exp $
 
 SHA1 (xlockmore-5.46.tar.xz) = 849ba21a6a82493b0b352d5fbd9212e6d4581752
 RMD160 (xlockmore-5.46.tar.xz) = 978f8119c89c1c954ec5bc5f8cc8d8edea7c8c8e
@@ -6,7 +6,7 @@ SHA512 (xlockmore-5.46.tar.xz) = 4be4c70f72f9a820e26204fbd8450f2f920b6ed1583d413
 Size (xlockmore-5.46.tar.xz) = 1610356 bytes
 SHA1 (patch-aa) = a8af264d041df95d0773cbe27984f9461e865722
 SHA1 (patch-ab) = 918be6904fb2a1b616dfbf7ac3d9759cc39d1608
-SHA1 (patch-ac) = 465a9e5e9f6310b7207a0a71dca8cbdca0f33922
 SHA1 (patch-ad) = 619c3413ae4bfdb420c77867062670dce336f5d8
-SHA1 (patch-ae) = 2dd755a188cf6701fd822472be169d8583ef04be
 SHA1 (patch-config.cygport) = c120f9b9f9ca6a9ba60f8e46e9c2dd23225079d9
+SHA1 (patch-modes_Makefile.in) = 47236aa529a5324ccd7133da7e25ac96d4b2a60e
+SHA1 (patch-xglock_Makefile.in) = 46a9860c0fac56d6d860adb4ffb0dbff5c79d82c
diff --git a/x11/xlockmore/patches/patch-ae b/x11/xlockmore/patches/patch-modes_Makefile.in
index a6b2c55f302..e7ca141b013 100644
--- a/x11/xlockmore/patches/patch-ae
+++ b/x11/xlockmore/patches/patch-modes_Makefile.in
@@ -1,7 +1,18 @@
-$NetBSD: patch-ae,v 1.8 2015/04/15 07:31:15 spz Exp $
+$NetBSD: patch-modes_Makefile.in,v 1.1 2018/02/08 16:03:12 jaapb Exp $
 
+Honour LDFLAGS.
+Use INSTALL properly.
 --- modes/Makefile.in.orig	2015-02-13 04:24:37.000000000 +0000
 +++ modes/Makefile.in
+@@ -334,7 +334,7 @@ CFLAGS = @CFLAGS@
+ CXXFLAGS = @CXXFLAGS@
+ #CFLAGS = -O
+ #CFLAGS = -g
+-XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG)
++XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG) @LDFLAGS@
+ XLIBS = @XLIBS@
+ XLOCKLIBS = $(MODULELIB) @XLOCKLIBS@ -lcrypt
+ 
 @@ -600,21 +600,22 @@ install : install-program install-man in
  	@ $(ECHO) ""
  
diff --git a/x11/xlockmore/patches/patch-ac b/x11/xlockmore/patches/patch-xglock_Makefile.in
index d68c1a675bc..98cc14de4a8 100644
--- a/x11/xlockmore/patches/patch-ac
+++ b/x11/xlockmore/patches/patch-xglock_Makefile.in
@@ -1,7 +1,18 @@
-$NetBSD: patch-ac,v 1.13 2015/04/15 07:31:15 spz Exp $
+$NetBSD: patch-xglock_Makefile.in,v 1.1 2018/02/08 16:03:12 jaapb Exp $
 
+Honour LDFLAGS.
+Use INSTALL properly.
 --- xglock/Makefile.in.orig	2010-04-19 13:34:35.000000000 +0000
 +++ xglock/Makefile.in
+@@ -92,7 +92,7 @@ XGLOCKINC = @XGLOCKINC@ -I.. -I$(top_src
+ CFLAGS = @GTK_CFLAGS@ @CFLAGS@
+ #CFLAGS = -O
+ #CFLAGS = -g
+-XGLOCKLDFLAGS = @XGLOCKLDFLAGS@
++XGLOCKLDFLAGS = @XGLOCKLDFLAGS@ @LDFLAGS@
+ XLIBS = @XLIBS@
+ XGLOCKLIBS = @XGLOCKLIBS@
+ #If you have purify, and want to use it, uncomment this definition or
 @@ -117,14 +117,14 @@ install_xglock : install-program install
  	@ $(ECHO) ""