Index: head/x11/xdm/Makefile
===================================================================
--- head/x11/xdm/Makefile	(revision 509217)
+++ head/x11/xdm/Makefile	(revision 509218)
@@ -1,52 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	xdm
-PORTVERSION=	1.1.11
-PORTREVISION=	8
+PORTVERSION=	1.1.12
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org X display manager
 
 LICENSE=	MIT
 
 XORG_CAT=	app
 USES=		cpe libtool
 USE_LDCONFIG=	yes
-USE_XORG=	x11 xau xaw xdmcp xext xinerama xmu xpm xt
+USE_XORG=	x11 xau xaw xdmcp xext xinerama xmu xpm xrender xt
 CPE_PRODUCT=	x_display_manager
 CPE_VENDOR=	x
 
 CONFIGURE_ARGS+=	--with-xdmconfigdir=${PREFIX}/etc/X11/xdm \
 			--with-xdmscriptdir=${PREFIX}/etc/X11/xdm \
 			--with-pixmapdir=${PREFIX}/share/pixmaps \
 			--with-authdir=/var/db/xdm
 
 CFFILES=	GiveConsole TakeConsole Xaccess Xreset Xresources \
 		Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config
 
 OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=	XDMSHELL XFT
 OPTIONS_DEFAULT=	XFT
 XDMSHELL_DESC=	Install xdmshell
 
 XDMSHELL_CONFIGURE_ENABLE=	xdmshell
 
 XFT_USE=	xorg=xft
 XFT_CONFIGURE_WITH=	xft
 
 INSTALL_TARGET=	install-strip
 
 post-patch:
 	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s|@DESTDIR@||" ${WRKSRC}/Makefile.in
 
 post-install:
 .for f in ${CFFILES}
 	@${MV} ${STAGEDIR}${PREFIX}/etc/X11/xdm/${f} ${STAGEDIR}${PREFIX}/etc/X11/xdm/${f}.sample
 .endfor
 	@${MKDIR} ${STAGEDIR}/var/db/xdm
 
 .include <bsd.port.mk>
Index: head/x11/xdm/distinfo
===================================================================
--- head/x11/xdm/distinfo	(revision 509217)
+++ head/x11/xdm/distinfo	(revision 509218)
@@ -1,2 +1,3 @@
-SHA256 (xorg/app/xdm-1.1.11.tar.bz2) = d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47
-SIZE (xorg/app/xdm-1.1.11.tar.bz2) = 446612
+TIMESTAMP = 1560812972
+SHA256 (xorg/app/xdm-1.1.12.tar.bz2) = 0dd283f72dda098d09e2925b9278c95e21551e693a5802ab442d1b577d8327f4
+SIZE (xorg/app/xdm-1.1.12.tar.bz2) = 512074
Index: head/x11/xdm/files/patch-config_xdm-config.cpp
===================================================================
--- head/x11/xdm/files/patch-config_xdm-config.cpp	(revision 509217)
+++ head/x11/xdm/files/patch-config_xdm-config.cpp	(nonexistent)
@@ -1,10 +0,0 @@
---- config/xdm-config.cpp.orig	2011-09-25 07:35:47 UTC
-+++ config/xdm-config.cpp
-@@ -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 */

Property changes on: head/x11/xdm/files/patch-config_xdm-config.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/x11/xdm/files/patch-config-Xresources.cpp
===================================================================
--- head/x11/xdm/files/patch-config-Xresources.cpp	(revision 509217)
+++ head/x11/xdm/files/patch-config-Xresources.cpp	(nonexistent)
@@ -1,14 +0,0 @@
---- config/Xresources.cpp.orig	2011-09-25 07:35:47 UTC
-+++ config/Xresources.cpp
-@@ -60,9 +60,9 @@ xlogin*hiColor: black
- XHASHendif
- #ifdef XPM
- XHASHif PLANES >= 8
--xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
-+xlogin*logoFileName: BITMAPDIR/XDM_PIXMAP
- XHASHelse
--xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
-+xlogin*logoFileName: BITMAPDIR/XDM_BWPIXMAP
- XHASHendif
- xlogin*useShape: true
- xlogin*logoPadding: 10

Property changes on: head/x11/xdm/files/patch-config-Xresources.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/x11/xdm/files/patch-config_Xresources.in
===================================================================
--- head/x11/xdm/files/patch-config_Xresources.in	(nonexistent)
+++ head/x11/xdm/files/patch-config_Xresources.in	(revision 509218)
@@ -0,0 +1,14 @@
+--- config/Xresources.in.orig	2019-03-02 22:06:13 UTC
++++ config/Xresources.in
+@@ -59,9 +59,9 @@ xlogin*hiColor: black
+ XHASHendif
+ #ifdef XPM
+ XHASHif PLANES >= 8
+-xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
++xlogin*logoFileName: BITMAPDIR/XDM_PIXMAP
+ XHASHelse
+-xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
++xlogin*logoFileName: BITMAPDIR/XDM_BWPIXMAP
+ XHASHendif
+ xlogin*useShape: true
+ xlogin*logoPadding: 10

Property changes on: head/x11/xdm/files/patch-config_Xresources.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/x11/xdm/files/patch-config_xdm-config.in
===================================================================
--- head/x11/xdm/files/patch-config_xdm-config.in	(nonexistent)
+++ head/x11/xdm/files/patch-config_xdm-config.in	(revision 509218)
@@ -0,0 +1,10 @@
+--- config/xdm-config.in.orig	2019-03-02 22:06:13 UTC
++++ config/xdm-config.in
+@@ -25,6 +25,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 */

Property changes on: head/x11/xdm/files/patch-config_xdm-config.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/x11/xdm/files/patch-xdm_session.c
===================================================================
--- head/x11/xdm/files/patch-xdm_session.c	(revision 509217)
+++ head/x11/xdm/files/patch-xdm_session.c	(revision 509218)
@@ -1,27 +1,27 @@
---- xdm/session.c.orig	2011-09-25 07:35:47 UTC
+--- xdm/session.c.orig	2019-03-02 22:06:13 UTC
 +++ xdm/session.c
-@@ -575,6 +575,7 @@ StartClient (
+@@ -594,6 +594,7 @@ StartClient (
      pid_t	pid;
  #ifdef HAVE_SETUSERCONTEXT
      struct passwd* pwd;
 +    extern char **environ;
  #endif
  #ifdef USE_PAM
      pam_handle_t *pamh = thepamh ();
-@@ -695,6 +696,8 @@ StartClient (
+@@ -678,6 +679,8 @@ StartClient (
  	 * Set the user's credentials: uid, gid, groups,
  	 * environment variables, resource limits, and umask.
  	 */
 +	/* destroy user environment before calling setusercontext */
 +	environ = verify->userEnviron;
  	pwd = getpwnam(name);
  	if (pwd) {
  	    if (setusercontext(NULL, pwd, pwd->pw_uid, LOGIN_SETALL) < 0) {
-@@ -702,6 +705,7 @@ StartClient (
+@@ -685,6 +688,7 @@ StartClient (
  			  name, _SysErrorMsg (errno));
  		return (0);
  	    }
 +	    verify->userEnviron = environ;
  	    endpwent();
  	} else {
  	    LogError ("getpwnam for \"%s\" failed: %s\n",
Index: head/x11/xdm/pkg-plist
===================================================================
--- head/x11/xdm/pkg-plist	(revision 509217)
+++ head/x11/xdm/pkg-plist	(revision 509218)
@@ -1,23 +1,23 @@
 bin/xdm
 %%XDMSHELL%%bin/xdmshell
 @sample etc/X11/xdm/GiveConsole.sample
 @sample etc/X11/xdm/TakeConsole.sample
 @sample etc/X11/xdm/Xaccess.sample
 @sample etc/X11/xdm/Xreset.sample
 @sample etc/X11/xdm/Xresources.sample
 @sample etc/X11/xdm/Xservers.sample
 @sample etc/X11/xdm/Xsession.sample
 @sample etc/X11/xdm/Xsetup_0.sample
 @sample etc/X11/xdm/Xstartup.sample
 @sample etc/X11/xdm/Xwilling.sample
 @sample etc/X11/xdm/xdm-config.sample
 lib/X11/xdm/chooser
 lib/X11/xdm/libXdmGreet.so
-man/man1/xdm.1.gz
+man/man8/xdm.8.gz
 %%XDMSHELL%%man/man1/xdmshell.1.gz
 share/X11/app-defaults/Chooser
 share/pixmaps/xorg-bw.xpm
 share/pixmaps/xorg.xpm
 @postunexec rm -rf /var/db/xdm/* 2>/dev/null || true
 @dir /var/db/xdm
 @dir /var/db