Index: head/x11/xdm/Makefile
===================================================================
--- head/x11/xdm/Makefile	(revision 420928)
+++ head/x11/xdm/Makefile	(revision 420929)
@@ -1,50 +1,50 @@
 # $FreeBSD$
 
 PORTNAME=	xdm
 PORTVERSION=	1.1.11
-PORTREVISION=	5
+PORTREVISION=	6
 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-greeter-greet.c
===================================================================
--- head/x11/xdm/files/patch-greeter-greet.c	(revision 420928)
+++ head/x11/xdm/files/patch-greeter-greet.c	(revision 420929)
@@ -1,19 +1,10 @@
 --- greeter/greet.c.orig	2011-09-25 07:35:47 UTC
 +++ greeter/greet.c
 @@ -639,6 +639,7 @@ greet_user_rtn GreetUser(
      }
      DeleteXloginResources (d, *dpy);
      CloseGreet (d);
 +    login = NULL;
      Debug ("Greet loop finished\n");
      /*
       * Run system-wide initialization file
-@@ -729,6 +730,8 @@ static int pamconv(int num_msg,
- 	goto pam_error;
-     }
- 
-+    if (login == NULL) goto pam_error;
-+
-     for (i = 0; i < num_msg; i++ , m++ , r++) {
- 	char *username;
- 	int promptId = 0;