Index: x11/xdm/Makefile
===================================================================
--- x11/xdm/Makefile
+++ x11/xdm/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xdm
 PORTVERSION=	1.1.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -19,19 +19,13 @@
 CFFILES=	GiveConsole TakeConsole Xaccess Xreset Xresources \
 		Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config
 
+OPTIONS_SUB=	yes
+
 OPTIONS_DEFINE=	XDMSHELL
 XDMSHELL_DESC=	Install xdmshell
 
-.include <bsd.port.options.mk>
+CONFIGURE_ENABLE=	xdmshell
 
-.if ${PORT_OPTIONS:MXDMSHELL}
-CONFIGURE_ARGS+=--enable-xdmshell
-PLIST_SUB+=	XDMSHELL=""
-.else
-CONFIGURE_ARGS+=--disable-xdmshell
-PLIST_SUB+=	XDMSHELL="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 		${WRKSRC}/configure
@@ -50,7 +44,7 @@
 .for f in ${CFFILES}
 	${CP} -n ${EXAMPLESDIR}/$f ${STAGEDIR}${PREFIX}/lib/X11/xdm/$f || ${TRUE}
 .endfor
-	${MKDIR} /var/lib/xdm/authdir
+	${MKDIR} ${STAGEDIR}/var/lib/xdm/authdir
 	${LN} -sf /var/lib/xdm/authdir ${STAGEDIR}${PREFIX}/lib/X11/xdm/authdir
 
 .include <bsd.port.mk>
Index: x11/xdm/pkg-plist
===================================================================
--- x11/xdm/pkg-plist
+++ x11/xdm/pkg-plist
@@ -41,14 +41,12 @@
 @exec cp -n %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup
 @exec cp -n %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling
 @exec cp -n %D/%%EXAMPLESDIR%%/xdm-config %D/lib/X11/xdm/xdm-config
-@exec mkdir -p /var/lib/xdm/authdir
 @dirrmtry share/X11/app-defaults
 @dirrmtry share/X11
-@unexec rm -f /var/lib/xdm/authdir/authfiles/* 2>/dev/null || true
-@unexec rmdir /var/lib/xdm/authdir/authfiles 2>/dev/null || true
-@unexec rmdir /var/lib/xdm/authdir 2>/dev/null
-@unexec rmdir /var/lib/xdm 2>/dev/null
-@unexec rmdir /var/lib 2>/dev/null
+@unexec rm -rf /var/lib/xdm/authdir/* 2>/dev/null || true
+@dirrm /var/lib/xdm/authdir
+@dirrm /var/lib/xdm
+@dirrmtry /var/lib
 @dirrm lib/X11/xdm/pixmaps
 @dirrm lib/X11/xdm
 @dirrm %%EXAMPLESDIR%%