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

[Ben Woods]

Author: woodsb02
Date: Fri Jun 17 21:16:26 2016
New Revision: 417036
URL: https://svnweb.freebsd.org/changeset/ports/417036

Log:
  x11-wm/xfce4-session:
  - Update patch-scripts_xflock4 to add support for x11/i3lock
  - Don't hard code /usr/local/bin in patch; change to %%LOCALBASE%%/bin
  
  Approved by:	sbruno (maintainer with XFCE hat), adamw (mentor)
  Differential Revision:	https://reviews.freebsd.org/D6884

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	Fri Jun 17 20:04:50 2016	(r417035)
+++ head/x11-wm/xfce4-session/Makefile	Fri Jun 17 21:16:26 2016	(r417036)
@@ -40,4 +40,8 @@ OPTIONS_SUB=	yes
 
 PLIST_SUB=	VERSION="4.6"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		${WRKSRC}/scripts/xflock4
+
 .include <bsd.port.mk>

Modified: head/x11-wm/xfce4-session/files/patch-scripts_xflock4
==============================================================================
--- head/x11-wm/xfce4-session/files/patch-scripts_xflock4	Fri Jun 17 20:04:50 2016	(r417035)
+++ head/x11-wm/xfce4-session/files/patch-scripts_xflock4	Fri Jun 17 21:16:26 2016	(r417036)
@@ -1,15 +1,23 @@
---- scripts/xflock4.orig	2012-04-28 20:43:27.000000000 +0000
-+++ scripts/xflock4	2013-04-24 19:55:56.000000000 +0000
+--- scripts/xflock4.orig	2014-08-30 18:24:02 UTC
++++ scripts/xflock4
 @@ -21,7 +21,7 @@
  #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  #
  
 -PATH=/bin:/usr/bin
-+PATH=/bin:/usr/bin:/usr/local/bin
++PATH=/bin:/usr/bin:%%LOCALBASE%%/bin
  export PATH
  
  # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
-@@ -41,6 +41,7 @@
+@@ -35,12 +35,14 @@ done
+ # else run another access locking utility, if installed
+ for lock_cmd in \
+   "xlock -mode blank" \
+-  "slock"
++  "slock" \
++  "i3lock -c 000000"
+   do
+     set -- $lock_cmd
      if command -v -- $1 >/dev/null 2>&1; then
          $lock_cmd >/dev/null 2>&1 &
  	# turn off display backlight: