Index: head/x11-servers/xorg-nestserver/Makefile
===================================================================
--- head/x11-servers/xorg-nestserver/Makefile	(revision 452246)
+++ head/x11-servers/xorg-nestserver/Makefile	(revision 452247)
@@ -1,44 +1,43 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xorg-nestserver
 PORTVERSION=	1.19.1
-PORTREVISION=	2
 PORTEPOCH=	2
 
 COMMENT=	Nesting X server from X.Org
 
 LICENSE=	MIT
 
 MASTERDIR=	${.CURDIR}/../xorg-server
 DESCR=		${.CURDIR}/pkg-descr
 DISTINFO_FILE=	${.CURDIR}/distinfo
 PATCHDIR=	${.CURDIR}/files
 
 RUN_DEPENDS=	xkeyboard-config>=2.5:x11/xkeyboard-config
 
 SLAVE_PORT=	yes
 OPTIONS_EXCLUDE=DEVD HAL SUID
 
 USE_XORG=	x11 xext xfont2
 
 CONFIGURE_ARGS+=--enable-xnest --disable-dmx --disable-xephyr --disable-xvfb \
 		--disable-xwayland
 
 PLIST_FILES=	bin/Xnest man/man1/Xnest.1.gz
 
 EXTRA_PATCHES=	${MASTERDIR}/files/patch-CVE-2017-12176 \
 		${MASTERDIR}/files/patch-CVE-2017-12177 \
 		${MASTERDIR}/files/patch-CVE-2017-12178 \
 		${MASTERDIR}/files/patch-CVE-2017-12179 \
 		${MASTERDIR}/files/patch-CVE-2017-12183 \
 		${MASTERDIR}/files/patch-CVE-2017-1218x \
 		${MASTERDIR}/files/patch-CVE-2017-1218y \
 		${MASTERDIR}/files/patch-CVE-2017-13721 \
 		${MASTERDIR}/files/patch-CVE-2017-13723 \
 		${MASTERDIR}/files/patch-os_io.c
 
 do-install:
 	cd ${WRKSRC}/hw/xnest; DESTDIR=${STAGEDIR} ${MAKE} install
 
 .include "${MASTERDIR}/Makefile"
Index: head/x11-servers/xorg-vfbserver/Makefile
===================================================================
--- head/x11-servers/xorg-vfbserver/Makefile	(revision 452246)
+++ head/x11-servers/xorg-vfbserver/Makefile	(revision 452247)
@@ -1,42 +1,41 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xorg-vfbserver
 PORTVERSION=	1.19.1
-PORTREVISION=	2
 PORTEPOCH=	1
 
 COMMENT=	X virtual framebuffer server from X.Org
 
 LICENSE=	MIT
 
 MASTERDIR=	${.CURDIR}/../xorg-server
 DESCR=		${.CURDIR}/pkg-descr
 DISTINFO_FILE=	${.CURDIR}/distinfo
 PATCHDIR=	${.CURDIR}/files
 
 SLAVE_PORT=	yes
 OPTIONS_EXCLUDE=DEVD HAL SUID
 
 USE_XORG=	xfont2
 
 CONFIGURE_ARGS+=--enable-xvfb --disable-dmx --disable-xephyr --disable-xnest \
 		--disable-xwayland
 
 PLIST_FILES=	bin/Xvfb man/man1/Xvfb.1.gz
 
 EXTRA_PATCHES=	${MASTERDIR}/files/patch-CVE-2017-12176 \
 		${MASTERDIR}/files/patch-CVE-2017-12177 \
 		${MASTERDIR}/files/patch-CVE-2017-12178 \
 		${MASTERDIR}/files/patch-CVE-2017-12179 \
 		${MASTERDIR}/files/patch-CVE-2017-12183 \
 		${MASTERDIR}/files/patch-CVE-2017-1218x \
 		${MASTERDIR}/files/patch-CVE-2017-1218y \
 		${MASTERDIR}/files/patch-CVE-2017-13721 \
 		${MASTERDIR}/files/patch-CVE-2017-13723 \
 		${MASTERDIR}/files/patch-os_io.c
 
 do-install:
 	cd ${WRKSRC}/hw/vfb; DESTDIR=${STAGEDIR} ${MAKE} install
 
 .include "${MASTERDIR}/Makefile"
Index: head/x11-servers/xwayland/Makefile
===================================================================
--- head/x11-servers/xwayland/Makefile	(revision 452246)
+++ head/x11-servers/xwayland/Makefile	(revision 452247)
@@ -1,46 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	xwayland
 PORTVERSION=	1.19.1
-PORTREVISION=	2
 
 COMMENT=	X Clients under Wayland
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 		libinput.so:x11/libinput
 
 MASTERDIR=	${.CURDIR}/../xorg-server
 DESCR=		${.CURDIR}/pkg-descr
 DISTINFO_FILE=	${.CURDIR}/distinfo
 PATCHDIR=	${.CURDIR}/files
 
 SLAVE_PORT=	yes
 OPTIONS_EXCLUDE=DEVD HAL SUID
 
 USE_XORG=	x11 xext xfont2
 USE_GL+=	egl gbm
 
 CONFIGURE_ARGS+=	--disable-docs --disable-devel-docs \
 			--enable-xwayland --disable-xorg --disable-xvfb --disable-xnest \
 			--disable-xquartz --disable-xwin
 
 PLIST_FILES=	bin/Xwayland
 
 EXTRA_PATCHES=	${MASTERDIR}/files/patch-CVE-2017-12176 \
 		${MASTERDIR}/files/patch-CVE-2017-12177 \
 		${MASTERDIR}/files/patch-CVE-2017-12178 \
 		${MASTERDIR}/files/patch-CVE-2017-12179 \
 		${MASTERDIR}/files/patch-CVE-2017-12183 \
 		${MASTERDIR}/files/patch-CVE-2017-1218x \
 		${MASTERDIR}/files/patch-CVE-2017-1218y \
 		${MASTERDIR}/files/patch-CVE-2017-13721 \
 		${MASTERDIR}/files/patch-CVE-2017-13723 \
 		${MASTERDIR}/files/patch-os_io.c
 
 do-install:
 	cd ${WRKSRC}/hw/xwayland; DESTDIR=${STAGEDIR} ${MAKE_CMD} install
 
 .include "${MASTERDIR}/Makefile"