Thu Feb 8 16:03:12 2018 UTC ()
Fixed x11/xlockmore so it compiles with RELRO flags.


(jaapb)
diff -r1.128 -r1.129 pkgsrc/x11/xlockmore/Makefile
diff -r1.54 -r1.55 pkgsrc/x11/xlockmore/distinfo
diff -r1.13 -r0 pkgsrc/x11/xlockmore/patches/patch-ac
diff -r1.8 -r0 pkgsrc/x11/xlockmore/patches/patch-ae
diff -r0 -r1.1 pkgsrc/x11/xlockmore/patches/patch-modes_Makefile.in
diff -r0 -r1.1 pkgsrc/x11/xlockmore/patches/patch-xglock_Makefile.in
cvs diff -r1.128 -r1.129 pkgsrc/x11/xlockmore/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xlockmore/Makefile 2018/01/28 20:11:10 1.128
+++ pkgsrc/x11/xlockmore/Makefile 2018/02/08 16:03:12 1.129
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.128 2018/01/28 20:11:10 wiz Exp $ 1# $NetBSD: Makefile,v 1.129 2018/02/08 16:03:12 jaapb Exp $
2 2
3PKGREVISION= 9 3PKGREVISION= 10
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6COMMENT= Like the XLock session-locker/screensaver, but with more 6COMMENT= Like the XLock session-locker/screensaver, but with more
7 7
8CONFIGURE_ARGS+= --with-opengl 8CONFIGURE_ARGS+= --with-opengl
9CONFIGURE_ARGS+= --with-mesa 9CONFIGURE_ARGS+= --with-mesa
10CONFIGURE_ARGS+= --without-ttf 10CONFIGURE_ARGS+= --without-ttf
11XPM_ENV= no_xpm= xpm_includes=${BUILDLINK_PREFIX.libXpm}/include xpm_libraries=${BUILDLINK_PREFIX.libXpm}/lib 11XPM_ENV= no_xpm= xpm_includes=${BUILDLINK_PREFIX.libXpm}/include xpm_libraries=${BUILDLINK_PREFIX.libXpm}/lib
12CONFIGURE_ENV+= ac_cv_path_xpm=${XPM_ENV:Q} 12CONFIGURE_ENV+= ac_cv_path_xpm=${XPM_ENV:Q}
13OPENGL_ENV= no_opengl= ac_opengl_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_opengl_libraries=${BUILDLINK_PREFIX.MesaLib}/lib 13OPENGL_ENV= no_opengl= ac_opengl_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_opengl_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
14CONFIGURE_ENV+= ac_cv_path_opengl=${OPENGL_ENV:Q} 14CONFIGURE_ENV+= ac_cv_path_opengl=${OPENGL_ENV:Q}
15MESA_ENV= no_mesa= ac_mesa_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_mesa_libraries=${BUILDLINK_PREFIX.MesaLib}/lib 15MESA_ENV= no_mesa= ac_mesa_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_mesa_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
16CONFIGURE_ENV+= ac_cv_path_mesa=${MESA_ENV:Q} 16CONFIGURE_ENV+= ac_cv_path_mesa=${MESA_ENV:Q}
cvs diff -r1.54 -r1.55 pkgsrc/x11/xlockmore/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xlockmore/distinfo 2015/11/04 03:29:08 1.54
+++ pkgsrc/x11/xlockmore/distinfo 2018/02/08 16:03:12 1.55
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.54 2015/11/04 03:29:08 agc Exp $ 1$NetBSD: distinfo,v 1.55 2018/02/08 16:03:12 jaapb Exp $
2 2
3SHA1 (xlockmore-5.46.tar.xz) = 849ba21a6a82493b0b352d5fbd9212e6d4581752 3SHA1 (xlockmore-5.46.tar.xz) = 849ba21a6a82493b0b352d5fbd9212e6d4581752
4RMD160 (xlockmore-5.46.tar.xz) = 978f8119c89c1c954ec5bc5f8cc8d8edea7c8c8e 4RMD160 (xlockmore-5.46.tar.xz) = 978f8119c89c1c954ec5bc5f8cc8d8edea7c8c8e
5SHA512 (xlockmore-5.46.tar.xz) = 4be4c70f72f9a820e26204fbd8450f2f920b6ed1583d413ba3983c4ced778c9d4e6dfa40a4c7919557b3fa7ecccba08e1a0bb0403924fa84770401d6758c7d9c 5SHA512 (xlockmore-5.46.tar.xz) = 4be4c70f72f9a820e26204fbd8450f2f920b6ed1583d413ba3983c4ced778c9d4e6dfa40a4c7919557b3fa7ecccba08e1a0bb0403924fa84770401d6758c7d9c
6Size (xlockmore-5.46.tar.xz) = 1610356 bytes 6Size (xlockmore-5.46.tar.xz) = 1610356 bytes
7SHA1 (patch-aa) = a8af264d041df95d0773cbe27984f9461e865722 7SHA1 (patch-aa) = a8af264d041df95d0773cbe27984f9461e865722
8SHA1 (patch-ab) = 918be6904fb2a1b616dfbf7ac3d9759cc39d1608 8SHA1 (patch-ab) = 918be6904fb2a1b616dfbf7ac3d9759cc39d1608
9SHA1 (patch-ac) = 465a9e5e9f6310b7207a0a71dca8cbdca0f33922 
10SHA1 (patch-ad) = 619c3413ae4bfdb420c77867062670dce336f5d8 9SHA1 (patch-ad) = 619c3413ae4bfdb420c77867062670dce336f5d8
11SHA1 (patch-ae) = 2dd755a188cf6701fd822472be169d8583ef04be 
12SHA1 (patch-config.cygport) = c120f9b9f9ca6a9ba60f8e46e9c2dd23225079d9 10SHA1 (patch-config.cygport) = c120f9b9f9ca6a9ba60f8e46e9c2dd23225079d9
 11SHA1 (patch-modes_Makefile.in) = 47236aa529a5324ccd7133da7e25ac96d4b2a60e
 12SHA1 (patch-xglock_Makefile.in) = 46a9860c0fac56d6d860adb4ffb0dbff5c79d82c
File Deleted: pkgsrc/x11/xlockmore/patches/Attic/patch-ac
File Deleted: pkgsrc/x11/xlockmore/patches/Attic/patch-ae
File Added: pkgsrc/x11/xlockmore/patches/patch-modes_Makefile.in
$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
File Added: pkgsrc/x11/xlockmore/patches/Attic/patch-xglock_Makefile.in
$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@