Index: external/mit/xorg/bin/proxymngr/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/bin/proxymngr/Makefile,v
retrieving revision 1.2
diff -p -u -u -r1.2 Makefile
--- external/mit/xorg/bin/proxymngr/Makefile	14 Oct 2008 23:37:19 -0000	1.2
+++ external/mit/xorg/bin/proxymngr/Makefile	23 Apr 2019 06:39:56 -0000
@@ -23,6 +23,9 @@ FILESDIR=	${PROXYMANAGERDIR}
 LDADD+=	-lXt -lSM -lICE -lXext -lX11
 DPADD+=	${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
 
+X11EXTRAMANTRANSFORMS+= \
+	__configdir__		${X11ETCDIR}/proxymngr
+
 .PATH:	${X11SRCDIR.${PROG}}
 
 .include <bsd.x11.mk>
Index: external/mit/xorg/bin/sessreg/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/bin/sessreg/Makefile,v
retrieving revision 1.6
diff -p -u -u -r1.6 Makefile
--- external/mit/xorg/bin/sessreg/Makefile	24 Aug 2014 18:27:16 -0000	1.6
+++ external/mit/xorg/bin/sessreg/Makefile	23 Apr 2019 06:39:56 -0000
@@ -12,6 +12,11 @@ X11EXTRAMANDEFS+=	-e 's,__ttys_file__,/e
 			-e 's,__utmp_file__,${XDMPIDDIR}/utmp,g' \
 			-e 's,__wtmp_file__,${XDMLOGDIR}/wtmp,g'
 
+X11EXTRAMANTRANSFORMS+= \
+	__utmp_manpage__	utmpx \
+	__wtmp_manpage__	wtmpx \
+	__lastlog_file__	lastlogx
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
 
Index: external/mit/xorg/bin/xinit/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/bin/xinit/Makefile,v
retrieving revision 1.6
diff -p -u -u -r1.6 Makefile
--- external/mit/xorg/bin/xinit/Makefile	3 Aug 2011 02:56:29 -0000	1.6
+++ external/mit/xorg/bin/xinit/Makefile	23 Apr 2019 06:39:56 -0000
@@ -27,8 +27,10 @@ FILESDIR=	${XINITDIR}
 LDADD+=	-lXmuu -lXt -lSM -lICE -lXext -lX11
 DPADD+=	${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
 
-X11EXTRAMANDEFS=-D__xinitdir__=${XINITDIR}
-X11MANCPP=	yes
+X11EXTRAMANTRANSFORMS+= \
+	__xinitdir__		${XINITDIR} \
+	__configdir__		${X11LIBDIR}/xinit \
+	__SCOMAN__		1
 
 .PATH:	${X11SRCDIR.${PROG}}
 .PATH:	${X11SRCDIR.${PROG}}/man
Index: external/mit/xorg/lib/libXaw/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXaw/Makefile,v
retrieving revision 1.11
diff -p -u -u -r1.11 Makefile
--- external/mit/xorg/lib/libXaw/Makefile	19 Jul 2015 07:55:07 -0000	1.11
+++ external/mit/xorg/lib/libXaw/Makefile	23 Apr 2019 06:39:56 -0000
@@ -69,6 +69,9 @@ LIBDPLIBS=\
 PKGCONFIG=	xaw7
 PKGDIST=	${LIBOLD}
 
+X11EXTRAMANTRANSFORMS+= \
+	__docdir__		${X11LIBDIR}/doc
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
 
Index: external/mit/xorg/lib/xkeyboard-config/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/xkeyboard-config/Makefile,v
retrieving revision 1.12
diff -p -u -u -r1.12 Makefile
--- external/mit/xorg/lib/xkeyboard-config/Makefile	15 Dec 2016 09:17:26 -0000	1.12
+++ external/mit/xorg/lib/xkeyboard-config/Makefile	23 Apr 2019 06:39:56 -0000
@@ -11,6 +11,9 @@ NOOBJ=		# defined
 
 PKGCONFIG=	xkeyboard-config
 
+X11EXTRAMANTRANSFORMS+= \
+	__xkb_base__		${X11LIBDIR}/xkb
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
 .include <bsd.subdir.mk>
Index: external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile,v
retrieving revision 1.7
diff -p -u -u -r1.7 Makefile
--- external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile	14 Aug 2016 03:43:04 -0000	1.7
+++ external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile	23 Apr 2019 06:39:56 -0000
@@ -12,5 +12,11 @@ FILESDIR=	${X11USRLIBDIR}/X11/doc
 MAN=	Xorg.1 xorg.conf.5
 # xorg.conf.d.5?
 
+X11EXTRAMANTRANSFORMS+= \
+	__xconfigdir__		xorg.conf.d \
+	__xkbdir__		${X11LIBDIR}/xkb \
+	__modulepath__		${X11ROOTDIR}/modules \
+	__X11datadir__		${X11LIBDIR}
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
Index: external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile,v
retrieving revision 1.1.1.1
diff -p -u -u -r1.1.1.1 Makefile
--- external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile	10 Jun 2016 03:42:14 -0000	1.1.1.1
+++ external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile	23 Apr 2019 06:39:56 -0000
@@ -12,5 +12,10 @@ FILESDIR=	${X11USRLIBDIR}/X11/doc
 MAN=	Xorg.1 xorg.conf.5
 # xorg.conf.d.5?
 
+X11EXTRAMANTRANSFORMS+= \
+	__xconfigdir__		xorg.conf.d \
+	__xkbdir__		${X11LIBDIR}/xkb \
+	__modulepath__		${X11ROOTDIR}/modules
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
Index: share/mk/bsd.x11.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.x11.mk,v
retrieving revision 1.124
diff -p -u -u -r1.124 bsd.x11.mk
--- share/mk/bsd.x11.mk	14 Dec 2016 16:03:19 -0000	1.124
+++ share/mk/bsd.x11.mk	23 Apr 2019 06:39:56 -0000
@@ -393,6 +393,10 @@ _X11MANTRANSFORM= \
 	__apploaddir__		${X11ROOTDIR}/lib/X11/app-defaults \
 	__appmansuffix__ 	1 \
 	__bindir__		${X11BINDIR} \
+	__datadir__		${X11LIBDIR} \
+	__libdir__		${X11ROOTDIR}/lib \
+	__xkbconfigroot__	${X11LIBDIR}/xkb \
+	__sysconfdir__		/etc \
 	__drivermansuffix__	4 \
 	__filemansuffix__	5 \
 	__LIB_MAN_SUFFIX__	3 \
@@ -411,7 +415,7 @@ _X11MANTRANSFORM+= \
 	__vendorversion__	${XORGVERSION:C/ /%/gW} \
 	__XCONFIGFILE__		xorg.conf \
 	__xconfigfile__		xorg.conf \
-	__XCONFIGFILEMAN__	'__XCONFIGFILE__%(__filemansuffix__)' \
+	__XCONFIGFILEMAN__	'xorg.conf(5)' \
 	__xorgversion__		${XORGVERSION:C/ /%/gW} \
 	__XSERVERNAME__		Xorg \
 	__xservername__		Xorg