Index: head/x11/xorg-apps/Makefile
===================================================================
--- head/x11/xorg-apps/Makefile	(revision 511351)
+++ head/x11/xorg-apps/Makefile	(revision 511352)
@@ -1,49 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	xorg-apps
 PORTVERSION=	7.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org apps meta-port
 
 COMPONENTS=	appres bitmap xf86dga:dga iceauth luit \
 		x11-fonts/mkfontscale:mkfontscale sessreg \
 		setxkbmap smproxy x11perf xauth xbacklight xcalc \
 		xcmsdb xconsole xcursorgen xdpyinfo xdriinfo xev xgamma xgc \
 		xhost xinput xkbcomp xkbevd xkbutils:xkbvleds xkill \
 		xlsatoms xlsclients xmodmap xpr xprop xrandr xrdb \
-		xrefresh xset xsetmode xsetroot xvinfo xwd xwininfo \
+		xrefresh xset xsetroot xvinfo xwd xwininfo \
 		xwud xmessage
 
 # These three are added for convenience purposes only.
 COMPONENTS+=	x11-wm/twm:twm x11-clocks/xclock:xclock xinit xterm
 
 USES=	metaport
 
 .for comp in ${COMPONENTS}
 OPTIONS_DEFINE+=	${comp:C/:.*//:C/.*\///:tu}
 OPTIONS_DEFAULT+=	${comp:C/:.*//:C/.*\///:tu}
 ${comp:C/:.*//:C/.*\///:tu}_DESC=	Install ${comp:C/:.*//:C/.*\///} application
 .endfor
 
 .include <bsd.port.options.mk>
 
 .for comp in ${COMPONENTS}
 . if ${PORT_OPTIONS:M${comp:C/:.*//:C/.*\///:tu}}
 .  if ${comp:M*\:*}==""
 port=${comp}
 check=${comp:C/.*\///} # doesn't work
 .  else
 port=${comp:C/:.*//}
 check=${comp:C/.*://}
 .  endif
 .  if ${port:M*/*}==""
 port:=x11/${port}
 .  endif
 RUN_DEPENDS:=	${RUN_DEPENDS} ${check}:${port}
 . endif
 .endfor
 
 .include <bsd.port.mk>
Index: head/x11/xprehashprinterlist/Makefile
===================================================================
--- head/x11/xprehashprinterlist/Makefile	(revision 511351)
+++ head/x11/xprehashprinterlist/Makefile	(revision 511352)
@@ -1,15 +1,18 @@
 # $FreeBSD$
 
 PORTNAME=	xprehashprinterlist
 PORTVERSION=	1.0.1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Recomputes the list of available printers
 
+DEPRECATED=	Deprecated upstream
+EXPIRATION_DATE=2019-10-15
+
 XORG_CAT=	app
 USE_XORG=	xp x11
 
 PLIST_FILES=	bin/xprehashprinterlist man/man1/xprehashprinterlist.1.gz
 
 .include <bsd.port.mk>
Index: head/x11/xrx/Makefile
===================================================================
--- head/x11/xrx/Makefile	(revision 511351)
+++ head/x11/xrx/Makefile	(revision 511352)
@@ -1,20 +1,23 @@
 # $FreeBSD$
 
 PORTNAME=	xrx
 PORTVERSION=	1.0.4
 PORTREVISION=	5
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	RX helper program
 
+DEPRECATED=	Deprecated upstream
+EXPIRATION_DATE=2019-10-15
+
 XORG_CAT=	app
 USE_XORG=	x11 xt xext xtrans xorgproto xau xaw ice
 USES=		libtool
 USE_LDCONFIG=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|mozilla-plugin|disabled-libxul-plugin|g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: head/x11/xsetmode/Makefile
===================================================================
--- head/x11/xsetmode/Makefile	(revision 511351)
+++ head/x11/xsetmode/Makefile	(revision 511352)
@@ -1,15 +1,18 @@
 # $FreeBSD$
 
 PORTNAME=	xsetmode
 PORTVERSION=	1.0.0
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Set the mode for an X Input Device
 
+DEPRECATED=     Deprecated upstream
+EXPIRATION_DATE=2019-10-15
+
 XORG_CAT=	app
 USE_XORG=	xi x11
 
 PLIST_FILES=	bin/xsetmode man/man1/xsetmode.1.gz
 
 .include <bsd.port.mk>
Index: head/x11/xsetpointer/Makefile
===================================================================
--- head/x11/xsetpointer/Makefile	(revision 511351)
+++ head/x11/xsetpointer/Makefile	(revision 511352)
@@ -1,15 +1,18 @@
 # $FreeBSD$
 
 PORTNAME=	xsetpointer
 PORTVERSION=	1.0.1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Set an X Input device as the main pointer
 
+DEPRECATED=	Deprecated upstream
+EXPIRATION_DATE=2019-10-15
+
 XORG_CAT=	app
 USE_XORG=	xi x11
 
 PLIST_FILES=	bin/xsetpointer man/man1/xsetpointer.1.gz
 
 .include <bsd.port.mk>