Index: head/x11-wm/xfce4-session/Makefile
===================================================================
--- head/x11-wm/xfce4-session/Makefile	(revision 497559)
+++ head/x11-wm/xfce4-session/Makefile	(revision 497560)
@@ -1,51 +1,51 @@
 # Created by: Matt Lancereau <matt@rimasec.net>
 # $FreeBSD$
 
 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
 
 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/consolekit2
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libdbus-1.so:devel/dbus \
 		libupower-glib.so:sysutils/upower \
 		libpolkit-gobject-1.so:sysutils/polkit \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		gettext-tools gmake gnome libtool pathfix pkgconfig \
 		tar:bzip2 xfce
 USE_GNOME=	cairo gtk20 glib20 intlhack intltool libwnck
 USE_LDCONFIG=	yes
 USE_XFCE=	libmenu
 USE_XORG=	ice sm x11
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--enable-legacy-sm \
 		--with-xsession-prefix=${PREFIX}
 SUB_FILES=	pkg-message
 PLIST_SUB=	VERSION="4.6"
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		NLS
 OPTIONS_SUB=		yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime
 
 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 497559)
+++ head/x11-wm/xfce4-session/files/patch-scripts_xflock4	(revision 497560)
@@ -1,27 +1,35 @@
 --- 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.
  #
  
 -PATH=/bin:/usr/bin
 +PATH=/bin:/usr/bin:%%LOCALBASE%%/bin
  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" \
 -  "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