diff options
| author | woodsb02 <woodsb02@FreeBSD.org> | 2016-06-18 05:16:26 +0800 |
|---|---|---|
| committer | woodsb02 <woodsb02@FreeBSD.org> | 2016-06-18 05:16:26 +0800 |
| commit | 6c2c3d4c6ca052c4876276fa5017eea3b8aaf815 (patch) | |
| tree | f2214cb5506bb29340c640752714d8a0f6b91d8c /x11-wm | |
| parent | f867f0ca3d5d37f36ab7e68a4d300cfcee8f005b (diff) | |
| download | freebsd-ports-gnome-6c2c3d4c6ca052c4876276fa5017eea3b8aaf815.tar.gz freebsd-ports-gnome-6c2c3d4c6ca052c4876276fa5017eea3b8aaf815.tar.zst freebsd-ports-gnome-6c2c3d4c6ca052c4876276fa5017eea3b8aaf815.zip | |
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
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/xfce4-session/Makefile | 4 | ||||
| -rw-r--r-- | x11-wm/xfce4-session/files/patch-scripts_xflock4 | 16 |
2 files changed, 16 insertions, 4 deletions
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile index f303d29aca2c..101c0c5db4ce 100644 --- a/x11-wm/xfce4-session/Makefile +++ b/x11-wm/xfce4-session/Makefile @@ -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> diff --git a/x11-wm/xfce4-session/files/patch-scripts_xflock4 b/x11-wm/xfce4-session/files/patch-scripts_xflock4 index 797fb7b189f3..98ed11273452 100644 --- a/x11-wm/xfce4-session/files/patch-scripts_xflock4 +++ b/x11-wm/xfce4-session/files/patch-scripts_xflock4 @@ -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: |