From owner-svn-ports-all@freebsd.org Fri Jun 17 21:16:28 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52A69A777E1; Fri, 17 Jun 2016 21:16:28 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 090F12F1E; Fri, 17 Jun 2016 21:16:27 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5HLGRZ0088697; Fri, 17 Jun 2016 21:16:27 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5HLGRXd088695; Fri, 17 Jun 2016 21:16:27 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201606172116.u5HLGRXd088695@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Fri, 17 Jun 2016 21:16:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417036 - in head/x11-wm/xfce4-session: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2016 21:16:28 -0000 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 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: