Index: head/x11-wm/xfce4-session/Makefile
===================================================================
--- head/x11-wm/xfce4-session/Makefile	(revision 417035)
+++ head/x11-wm/xfce4-session/Makefile	(revision 417036)
@@ -1,43 +1,47 @@
 # Created by: Matt Lancereau <matt@rimasec.net>
 # $FreeBSD$
 
 PORTNAME=	xfce4-session
 PORTVERSION=	4.12.1
 PORTREVISION=	2
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce's session manager
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	iceauth:x11/iceauth
 RUN_DEPENDS=	iceauth:x11/iceauth \
 		console-kit-daemon:sysutils/consolekit
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libupower-glib.so:sysutils/upower \
 		libpolkit-gobject-1.so:sysutils/polkit
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gtk20 glib20 intltool intlhack libwnck
 USES=		pathfix pkgconfig gmake libtool gettext-tools xfce tar:bzip2
 USE_LDCONFIG=	yes
 USE_XFCE=	libmenu
 USE_XORG=	x11 sm ice
 
 CONFIGURE_ARGS+=--enable-legacy-sm \
 		--with-xsession-prefix=${PREFIX}
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	NLS
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 OPTIONS_SUB=	yes
 
 PLIST_SUB=	VERSION="4.6"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		${WRKSRC}/scripts/xflock4
+
 .include <bsd.port.mk>
Index: head/x11-wm/xfce4-session/files/patch-scripts_xflock4
===================================================================
--- head/x11-wm/xfce4-session/files/patch-scripts_xflock4	(revision 417035)
+++ head/x11-wm/xfce4-session/files/patch-scripts_xflock4	(revision 417036)
@@ -1,19 +1,27 @@
---- 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:
 +	sleep 1
  	xset dpms force off
          exit
      fi