Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_151810579212000"
MIME-Version: 1.0
Date: Thu, 8 Feb 2018 16:03:12 +0000
From: "Jaap Boender" <jaapb@netbsd.org>
Subject: CVS commit: pkgsrc/x11/xlockmore
To: pkgsrc-changes@NetBSD.org
Reply-To: jaapb@netbsd.org
Message-Id: <20180208160312.DCFDEFB40@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_151810579212000
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jaapb
Date:		Thu Feb  8 16:03:12 UTC 2018

Modified Files:
	pkgsrc/x11/xlockmore: Makefile distinfo
Added Files:
	pkgsrc/x11/xlockmore/patches: patch-modes_Makefile.in
	    patch-xglock_Makefile.in
Removed Files:
	pkgsrc/x11/xlockmore/patches: patch-ac patch-ae

Log Message:
Fixed x11/xlockmore so it compiles with RELRO flags.


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 pkgsrc/x11/xlockmore/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/x11/xlockmore/distinfo
cvs rdiff -u -r1.13 -r0 pkgsrc/x11/xlockmore/patches/patch-ac
cvs rdiff -u -r1.8 -r0 pkgsrc/x11/xlockmore/patches/patch-ae
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xlockmore/patches/patch-modes_Makefile.in \
    pkgsrc/x11/xlockmore/patches/patch-xglock_Makefile.in

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


--_----------=_151810579212000
Content-Disposition: inline
Content-Length: 5459
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/xlockmore/Makefile
diff -u pkgsrc/x11/xlockmore/Makefile:1.128 pkgsrc/x11/xlockmore/Makefile:1.129
--- pkgsrc/x11/xlockmore/Makefile:1.128	Sun Jan 28 20:11:10 2018
+++ pkgsrc/x11/xlockmore/Makefile	Thu Feb  8 16:03:12 2018
@@ -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

Index: pkgsrc/x11/xlockmore/distinfo
diff -u pkgsrc/x11/xlockmore/distinfo:1.54 pkgsrc/x11/xlockmore/distinfo:1.55
--- pkgsrc/x11/xlockmore/distinfo:1.54	Wed Nov  4 03:29:08 2015
+++ pkgsrc/x11/xlockmore/distinfo	Thu Feb  8 16:03:12 2018
@@ -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) = 4be4c70
 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

Added files:

Index: pkgsrc/x11/xlockmore/patches/patch-modes_Makefile.in
diff -u /dev/null pkgsrc/x11/xlockmore/patches/patch-modes_Makefile.in:1.1
--- /dev/null	Thu Feb  8 16:03:12 2018
+++ pkgsrc/x11/xlockmore/patches/patch-modes_Makefile.in	Thu Feb  8 16:03:12 2018
@@ -0,0 +1,47 @@
+$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) ""
+ 
+ install-program : xlock
+-	$(top_srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL_PROGRAM) $(INSTPGMFLAGS) $(UTILOBJDIR)xlock$(E) $(bindir)
+-	@MODULES@mkdir -p $(DEF_MODULEPATH)
+-	@MODULES@cp *.xlk $(DEF_MODULEPATH)
+-	@MODULES@cp glx/*.xlk $(DEF_MODULEPATH)
++	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
++	$(INSTALL_PROGRAM) $(UTILOBJDIR)xlock$(E) ${DESTDIR}$(bindir)
++	@MODULES@mkdir -p ${DESTDIR}$(DEF_MODULEPATH)
++	@MODULES@cp *.xlk ${DESTDIR}$(DEF_MODULEPATH)
++	@MODULES@cp glx/*.xlk ${DESTDIR}$(DEF_MODULEPATH)
+ 
+ install-man :
+-	$(top_srcdir)/mkinstalldirs $(mandir)
+-	$(INSTALL_DATA) $(UTILDIR)xlock.man $(mandir)/xlock.1
++	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(mandir)
++	$(INSTALL_DATA) $(UTILDIR)xlock.man ${DESTDIR}$(mandir)/xlock.1
+ 
+ install-ad :
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(xapploaddir)
+-	$(INSTALL_DATA) $(UTILDIR)XLock.ad $(DESTDIR)$(xapploaddir)/XLock
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)${datarootdir}/examples/xlock/app-defaults
++	$(INSTALL_DATA) $(UTILDIR)XLock.ad $(DESTDIR)${datarootdir}/examples/xlock/app-defaults/XLock
+ 	@FORTUNE@sed 's;^XLock.program: fortune;XLock.program: $(FORTUNE);' $(UTILDIR)XLock.ad > $(UTILOBJDIR)XLock.ad.tmp 
+-	@FORTUNE@$(INSTALL_DATA) $(UTILOBJDIR)XLock.ad.tmp $(DESTDIR)$(xapploaddir)/XLock
++	@FORTUNE@$(INSTALL_DATA) $(UTILOBJDIR)XLock.ad.tmp $(DESTDIR)${datarootdir}/examples/xlock/app-defaults/XLock
+ 	@FORTUNE@rm -f $(UTILOBJDIR)XLock.ad.tmp
+ 
+ uninstall : uninstall-program uninstall-man uninstall-ad
Index: pkgsrc/x11/xlockmore/patches/patch-xglock_Makefile.in
diff -u /dev/null pkgsrc/x11/xlockmore/patches/patch-xglock_Makefile.in:1.1
--- /dev/null	Thu Feb  8 16:03:12 2018
+++ pkgsrc/x11/xlockmore/patches/patch-xglock_Makefile.in	Thu Feb  8 16:03:12 2018
@@ -0,0 +1,34 @@
+$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) ""
+ 
+ install-program : xglock
+-	$(top_srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL_PROGRAM) xglock$(E) $(bindir)
++	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
++	$(INSTALL_PROGRAM) xglock$(E) ${DESTDIR}$(bindir)
+ 
+ install-man :
+ 
+ install-ad :
+-	$(top_srcdir)/mkinstalldirs $(datadir)/xlock
+-	$(INSTALL_PROGRAM) $(top_srcdir)/xglock/xglockrc $(datadir)/xlock/xglockrc
++	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir)/xlock
++	$(INSTALL_DATA) $(top_srcdir)/xglock/xglockrc ${DESTDIR}$(datadir)/xlock/xglockrc
+ 
+ uninstall : @UNINSTALL_XGLOCK@
+ 


--_----------=_151810579212000--