svn commit: r497560 - in head/x11-wm/xfce4-session: . files

[Ben Woods]

Author: woodsb02
Date: Tue Apr  2 11:21:21 2019
New Revision: 497560
URL: https://svnweb.freebsd.org/changeset/ports/497560

Log:
  x11-wm/xfce4-session: Add xflock4 option for xfce4-screensaver-command
  
  This will ensure the "Super+L" key combination locks the screen when
  x11/xfce4-screensaver is being used.
  
  Approved by:	madpilot (xfce)
  Differential Revision:	https://reviews.freebsd.org/D19771

Modified:
  head/x11-wm/xfce4-session/Makefile
  head/x11-wm/xfce4-session/files/patch-scripts_xflock4

Modified: head/x11-wm/xfce4-session/Makefile
==============================================================================
--- head/x11-wm/xfce4-session/Makefile	Tue Apr  2 09:01:09 2019	(r497559)
+++ head/x11-wm/xfce4-session/Makefile	Tue Apr  2 11:21:21 2019	(r497560)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-session
 PORTVERSION=	4.12.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4

Modified: head/x11-wm/xfce4-session/files/patch-scripts_xflock4
==============================================================================
--- head/x11-wm/xfce4-session/files/patch-scripts_xflock4	Tue Apr  2 09:01:09 2019	(r497559)
+++ head/x11-wm/xfce4-session/files/patch-scripts_xflock4	Tue Apr  2 11:21:21 2019	(r497560)
@@ -1,6 +1,6 @@
 --- scripts/xflock4.orig	2014-08-30 18:24:02 UTC
 +++ scripts/xflock4
-@@ -21,7 +21,7 @@
+@@ -21,13 +21,14 @@
  #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  #
  
@@ -9,7 +9,15 @@
  export PATH
  
  # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
-@@ -35,12 +35,14 @@ done
+ for lock_cmd in \
+     "xscreensaver-command -lock" \
+-    "gnome-screensaver-command --lock"
++    "gnome-screensaver-command --lock" \
++    "xfce4-screensaver-command --lock"
+ do
+     $lock_cmd >/dev/null 2>&1 && exit
+ done
+@@ -35,12 +36,14 @@ done
  # else run another access locking utility, if installed
  for lock_cmd in \
    "xlock -mode blank" \