Index: head/x11-drivers/xorgxrdp/Makefile
===================================================================
--- head/x11-drivers/xorgxrdp/Makefile	(revision 554001)
+++ head/x11-drivers/xorgxrdp/Makefile	(revision 554002)
@@ -1,53 +1,47 @@
 # $FreeBSD$
 
 PORTNAME=	xorgxrdp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.14
 CATEGORIES=	x11-drivers
 DIST_SUBDIR=	xrdp
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	X.Org driver enabling use through an RDP session with xrdp
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	xauth:x11/xauth
 BUILD_DEPENDS=	nasm:devel/nasm
 
-USES=		autoreconf libtool:build pkgconfig xorg
+USES=		autoreconf libtool:build localbase pkgconfig xorg
 USE_XORG=	xorgproto xorg-server
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	neutrinolabs
 GH_PROJECT=	xrdp:xrdp
 GH_TAGNAME=	v0.9.14:xrdp
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
-CFLAGS+=	-I${LOCALBASE}/include
-LIBS=		-L${LOCALBASE}/lib
 CONFIGURE_ENV=	XRDP_CFLAGS=-I${WRKSRC_xrdp}/common
 
 OPTIONS_DEFINE=	DEBUG DRI3
 OPTIONS_DEFAULT=
 
 DRI3_DESC=	DRI3/Glamor OpenGL Support
 DRI3_CONFIGURE_ENABLE=	glamor
 DRI3_LIB_DEPENDS=	libepoxy.so:graphics/libepoxy
+DRI3_SUB_FILES=		pkg-message
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MDRI3}
-SUB_FILES=	pkg-message
-.endif
-
 post-patch-DEBUG-on:
 	${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e 's|#define LOG_LEVEL [0-9]*|#define LOG_LEVEL 20|'
 
 pre-configure:
 	@cd ${WRKSRC} && ./bootstrap
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/x11-drivers/xorgxrdp/files/pkg-message.in
===================================================================
--- head/x11-drivers/xorgxrdp/files/pkg-message.in	(revision 554001)
+++ head/x11-drivers/xorgxrdp/files/pkg-message.in	(revision 554002)
@@ -1,43 +1,43 @@
 [
 { type: install
   message: <<EOM
 
 xorgxrdp supports hardware acceleration as well as usual xorg-server.
 To configure hardware acceleration, follow the following steps.
 
 1. Install drm-kmod
     # pkg install drm-kmod
 
 2. Configure to load kernel module (either one of the following)
     # sysrc kld_list="/boot/modules/i915kms.ko"
     # sysrc kld_list="/boot/modules/amdgpu.ko"
     # sysrc kld_list="/boot/modules/radeonkms.ko"
 
-3. Ensure users who login via xrdp are member of the "video" group
+3. Ensure users who login via xrdp are members of the "video" group
     # pw groupmod video -m username|| pw groupmod wheel -m username
 
 4. Edit /etc/X11/xrdp/xorg.conf to fit your environment
    "/dev/dri/renderD128" might be different depending on your environment.
 
    Find the following line and change it to the actual path.
     Option "DRMDevice" "/dev/dri/renderD128"
 
-   Chenge "0" to "1" of the following line.
+   Change "0" to "1" of the following line.
     Option "DRI3" "0"
 
 5. Restart your system and login via xrdp
 
 See also the Wiki page for detailed instructions:
   https://wiki.freebsd.org/Graphics#Hardware_Support
 
 
 If hardware acceleration is properly configured, you will see logs like both
 of the following in ~/.local/share/xorg/Xorg.10.log. 10 can be replaced with
 display number.
 
     "glamor X acceleration enabled on Mesa DRI Intel(R) Ivybridge Desktop"
     "rdpScreenInit: rdpDri3Init ok"
 
 EOM
 }
 ]