Index: head/x11/slim/Makefile
===================================================================
--- head/x11/slim/Makefile	(revision 540724)
+++ head/x11/slim/Makefile	(revision 540725)
@@ -1,67 +1,67 @@
 # Created by: Tobias Roth <ports@fsck.ch>
 # $FreeBSD$
 
 PORTNAME=	slim
 PORTVERSION=	1.3.6
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.berlios.de/pub/slim/ \
 		SF/slim.berlios
 
 MAINTAINER= 	jsm@FreeBSD.org	
 COMMENT=	Graphical login manager for X11, derived from Login.app
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		cmake compiler:c++11-lang jpeg pkgconfig xorg
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrandr \
 		xrender xt
 USE_RC_SUBR=	slim
 USE_LDCONFIG=	yes
 
 SUB_FILES=	pkg-message
 
 CMAKE_ARGS=	-DUSE_CONSOLEKIT=yes \
 		-DBUILD_SLIMLOCK=no \
 		-DBUILD_SHARED_LIBS=yes
 
 OPTIONS_DEFINE=		XDEFAULT PAM UTF8 CONSOLEKIT
 OPTIONS_DEFAULT=	XDEFAULT PAM UTF8 CONSOLEKIT
 OPTIONS_SUB=	yes
 
 XDEFAULT_DESC=Allow to set a default xsession in .xinitrc
 UTF8_DESC=	Support UTF-8 characters
 CONSOLEKIT_DESC=Enable support for consolekit
 
 PLIST_SUB+=	VERSION="${PORTVERSION}"
 
 PAM_CMAKE_ON=	-DUSE_PAM=yes
 PAM_CMAKE_OFF=	-DUSE_PAM=no
 
 # patch taken from https://github.com/iwamatsu/slim/pull/1
 XDEFAULT_EXTRA_PATCHES+=  ${PATCHDIR}/extra-patch-xdefault
 
 # patch taken from slim-unicode in Arch User Repository
 UTF8_EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-utf8
 
 CONSOLEKIT_CMAKE_ON=	-DUSE_CONSOLEKIT=yes
 CONSOLEKIT_LIB_DEPENDS=	libck-connector.so:sysutils/consolekit2 \
 			libdbus-1.so:devel/dbus
 CONSOLEKIT_CMAKE_OFF=	-DUSE_CONSOLEKIT=no
 
 post-patch:
 	@${CP} ${WRKSRC}/slim.conf ${WRKSRC}/slim.conf.sample
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/slim.conf.sample
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
 		${WRKSRC}/slim.1
 
 post-install-PAM-on:
 	${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/slim.sample
 
 .include <bsd.port.mk>
Index: head/x11/slim/files/slim.in
===================================================================
--- head/x11/slim/files/slim.in	(revision 540724)
+++ head/x11/slim/files/slim.in	(revision 540725)
@@ -1,65 +1,65 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: slim
 # REQUIRE: LOGIN dbus hald
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable slim:
 # slim_enable="YES"
 #
 # Alternatively, edit /etc/ttys and change the line below
 #   ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  xterm   off secure
 # to this:
 #   ttyv8   "%%PREFIX%%/bin/slim"   xterm   on secure
 
 . /etc/rc.subr
 
 name="slim"
 rcvar=slim_enable
 
 load_rc_config slim
 
 : ${slim_enable:="NO"}
 
 command=%%PREFIX%%/bin/slim
 command_args="-d"
 start_precmd=${name}_rmfile
 stop_precmd=${name}_prestop
 stop_postcmd=${name}_rmfile
 
 find_pidfile()
 {
 	if get_pidfile_from_conf lockfile %%PREFIX%%/etc/${name}.conf; then
 		pidfile="$_pidfile_from_conf"
 	else
 		pidfile="/var/run/${name}.pid"
 	fi
 }
 
 slim_rmfile()
 {
 	local file
 
 	[ -z "$pidfile" ] && find_pidfile
 
 	for file in $pidfile /var/run/slim.auth; do
 		[ -e "$file" ] && unlink $file
 	done
 	
 	# Needed if neither file exists
 	return 0
 }
 
 slim_prestop()
 {
 	local xpid
 
 	find_pidfile
 
-	xpid=`ps -axww | grep '/bin/[X] .* -auth /var/run/slim.auth' | grep -v grep | awk '{print $1};'`
+	xpid=`pgrep -f 'Xorg .* -auth /var/run/slim.auth'`
 	[ -n "$xpid" ] && kill $xpid
 }
 
 run_rc_command "$1"