Index: head/x11/xdm/Makefile
===================================================================
--- head/x11/xdm/Makefile	(revision 420925)
+++ head/x11/xdm/Makefile	(revision 420926)
@@ -1,50 +1,50 @@
 # $FreeBSD$
 
 PORTNAME=	xdm
 PORTVERSION=	1.1.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org X display manager
 
 LICENSE=	MIT
 
 XORG_CAT=	app
 USE_XORG=	xmu x11 xau xinerama xpm xdmcp xt xext xaw
 CONFIGURE_ARGS+=	--with-xdmconfigdir=${PREFIX}/lib/X11/xdm \
 			--with-xdmscriptdir=${PREFIX}/lib/X11/xdm
 USES=		cpe libtool
 CPE_PRODUCT=	x_display_manager
 CPE_VENDOR=	x
 
 CFFILES=	GiveConsole TakeConsole Xaccess Xreset Xresources \
 		Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config
 
 OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=	XDMSHELL
 XDMSHELL_DESC=	Install xdmshell
 
 XDMSHELL_CONFIGURE_ENABLE=	xdmshell
 
 INSTALL_TARGET=	install-strip
 
 post-patch:
 	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s|XDMCONFIGDIR/|${PREFIX}/lib/X11/xdm/|" \
 		-e "s|XDMSCRIPTDIR/|${PREFIX}/lib/X11/xdm/|" \
 			${WRKSRC}/config/xdm-config.cpp \
 			${WRKSRC}/config/Xstartup.cpp \
 			${WRKSRC}/config/Xreset.cpp
 	@${REINPLACE_CMD} -e "s|@DESTDIR@||" ${WRKSRC}/Makefile.in
 
 post-install:
 .for f in ${CFFILES}
 	@${MV} ${STAGEDIR}${PREFIX}/lib/X11/xdm/${f} ${STAGEDIR}${PREFIX}/lib/X11/xdm/${f}.sample
 .endfor
 	@${MKDIR} ${STAGEDIR}/var/lib/xdm/authdir
 	@${LN} -sf /var/lib/xdm/authdir ${STAGEDIR}${PREFIX}/lib/X11/xdm/authdir
 
 .include <bsd.port.mk>
Index: head/x11/xdm/files/patch-config_xdm-config.cpp
===================================================================
--- head/x11/xdm/files/patch-config_xdm-config.cpp	(revision 420925)
+++ head/x11/xdm/files/patch-config_xdm-config.cpp	(revision 420926)
@@ -1,40 +1,10 @@
 --- config/xdm-config.cpp.orig	2011-09-25 07:35:47 UTC
 +++ config/xdm-config.cpp
-@@ -12,25 +12,26 @@
- DisplayManager.authDir:	XDMXAUTHDIR
- DisplayManager.errorLogFile:	XDMLOGDIR/xdm.log
- DisplayManager.pidFile:		XDMPIDDIR/xdm.pid
--DisplayManager.keyFile:		XDMCONFIGDIR/xdm-keys
--DisplayManager.servers:		XDMCONFIGDIR/Xservers
--DisplayManager.accessFile:	XDMCONFIGDIR/Xaccess
--DisplayManager*resources:	XDMCONFIGDIR/Xresources
--DisplayManager.willing:		SU nobody -s /bin/sh -c XDMSCRIPTDIR/Xwilling
-+DisplayManager.keyFile:		/usr/local/lib/X11/xdm/xdm-keys
-+DisplayManager.servers:		/usr/local/lib/X11/xdm/Xservers
-+DisplayManager.accessFile:	/usr/local/lib/X11/xdm/Xaccess
-+DisplayManager*resources:	/usr/local/lib/X11/xdm/Xresources
-+DisplayManager.willing:		SU nobody -s /bin/sh -c /usr/local/lib/X11/xdm/Xwilling
- ! All displays should use authorization, but we cannot be sure
- ! X terminals may not be configured that way, so they will require
- ! individual resource settings.
- DisplayManager*authorize:	true
- !
- DisplayManager*chooser:		CHOOSERPATH
--DisplayManager*startup:		XDMSCRIPTDIR/Xstartup
--DisplayManager*session:		XDMSCRIPTDIR/Xsession
--DisplayManager*reset:		XDMSCRIPTDIR/Xreset
-+DisplayManager*startup:		/usr/local/lib/X11/xdm/Xstartup
-+DisplayManager*session:		/usr/local/lib/X11/xdm/Xsession
-+DisplayManager*reset:		/usr/local/lib/X11/xdm/Xreset
- DisplayManager*authComplain:	true
- ! The following three resources set up display :0 as the console.
--DisplayManager._0.setup:	XDMSCRIPTDIR/Xsetup_0
--DisplayManager._0.startup:	XDMSCRIPTDIR/GiveConsole
--DisplayManager._0.reset:	XDMSCRIPTDIR/TakeConsole
-+DisplayManager._0.setup:	/usr/local/lib/X11/xdm/Xsetup_0
-+DisplayManager._0.startup:	/usr/local/lib/X11/xdm/GiveConsole
-+DisplayManager._0.reset:	/usr/local/lib/X11/xdm/TakeConsole
+@@ -31,6 +31,7 @@ DisplayManager*authComplain:	true
+ DisplayManager._0.setup:	XDMSCRIPTDIR/Xsetup_0
+ DisplayManager._0.startup:	XDMSCRIPTDIR/GiveConsole
+ DisplayManager._0.reset:	XDMSCRIPTDIR/TakeConsole
 +DisplayManager.*.authName:     MIT-MAGIC-COOKIE-1
  #ifdef XPM
  DisplayManager*loginmoveInterval:	10
  #endif /* XPM */