Index: head/x11/libXevie/Makefile
===================================================================
--- head/x11/libXevie/Makefile	(revision 511361)
+++ head/x11/libXevie/Makefile	(revision 511362)
@@ -1,16 +1,19 @@
 # $FreeBSD$
 
 PORTNAME=	libXevie
 PORTVERSION=	1.0.3
 PORTREVISION=	5
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	The Xevie library
 
+DEPRECATED=	Deprecated upstream
+EXPIRATION_DATE=2019-10-01
+
 LICENSE=	MIT
 
 XORG_CAT=	lib
 USE_XORG=	x11 xext xorgproto
 
 .include <bsd.port.mk>
Index: head/x11/liboldX/Makefile
===================================================================
--- head/x11/liboldX/Makefile	(revision 511361)
+++ head/x11/liboldX/Makefile	(revision 511362)
@@ -1,14 +1,17 @@
 # $FreeBSD$
 
 PORTNAME=	liboldX
 PORTVERSION=	1.0.1
 PORTREVISION=	3
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Old X library
 
+DEPRECATED=	Deprecated upstream
+EXPIRATION_DATE=2019-10-01
+
 XORG_CAT=	lib
 USE_XORG=	x11
 
 .include <bsd.port.mk>
Index: head/x11/libxkbui/Makefile
===================================================================
--- head/x11/libxkbui/Makefile	(revision 511361)
+++ head/x11/libxkbui/Makefile	(revision 511362)
@@ -1,14 +1,17 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libxkbui
 PORTVERSION=	1.0.2
 PORTREVISION=	6
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	The xkbui library
 
+DEPRECATED=     Deprecated upstream
+EXPIRATION_DATE=2019-10-01
+
 XORG_CAT=	lib
 USE_XORG=	x11 xt xkbfile xorgproto
 .include <bsd.port.mk>
Index: head/x11/xorg-libraries/Makefile
===================================================================
--- head/x11/xorg-libraries/Makefile	(revision 511361)
+++ head/x11/xorg-libraries/Makefile	(revision 511362)
@@ -1,55 +1,51 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xorg-libraries
 PORTVERSION=	7.7
 PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org libraries meta-port
 
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dmx.pc:x11/libdmx \
 		${LOCALBASE}/libdata/pkgconfig/fontenc.pc:x11-fonts/libfontenc \
 		${LOCALBASE}/libdata/pkgconfig/ice.pc:x11/libICE \
 		${LOCALBASE}/libdata/pkgconfig/libfs.pc:x11-fonts/libFS \
-		${LOCALBASE}/libdata/pkgconfig/oldx.pc:x11/liboldX \
 		${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:x11/pixman \
 		${LOCALBASE}/libdata/pkgconfig/sm.pc:x11/libSM \
 		${LOCALBASE}/libdata/pkgconfig/x11.pc:x11/libX11 \
 		${LOCALBASE}/libdata/pkgconfig/xau.pc:x11/libXau \
 		${LOCALBASE}/libdata/pkgconfig/xaw7.pc:x11-toolkits/libXaw \
 		${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:x11/libXcomposite \
 		${LOCALBASE}/libdata/pkgconfig/xcursor.pc:x11/libXcursor \
 		${LOCALBASE}/libdata/pkgconfig/xdamage.pc:x11/libXdamage \
 		${LOCALBASE}/libdata/pkgconfig/xdmcp.pc:x11/libXdmcp \
-		${LOCALBASE}/libdata/pkgconfig/xevie.pc:x11/libXevie \
 		${LOCALBASE}/libdata/pkgconfig/xext.pc:x11/libXext \
 		${LOCALBASE}/libdata/pkgconfig/xfixes.pc:x11/libXfixes \
 		${LOCALBASE}/libdata/pkgconfig/xfont.pc:x11-fonts/libXfont \
-		${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:x11-fonts/libXfontcache \
 		${LOCALBASE}/libdata/pkgconfig/xft.pc:x11-fonts/libXft \
 		${LOCALBASE}/libdata/pkgconfig/xi.pc:x11/libXi \
 		${LOCALBASE}/libdata/pkgconfig/xinerama.pc:x11/libXinerama \
 		${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:x11/libxkbfile \
-		${LOCALBASE}/libdata/pkgconfig/xkbui.pc:x11/libxkbui \
 		${LOCALBASE}/libdata/pkgconfig/xmu.pc:x11-toolkits/libXmu \
 		${LOCALBASE}/libdata/pkgconfig/xp.pc:x11/libXp \
 		${LOCALBASE}/libdata/pkgconfig/xpm.pc:x11/libXpm \
 		${LOCALBASE}/libdata/pkgconfig/xrandr.pc:x11/libXrandr \
 		${LOCALBASE}/libdata/pkgconfig/xrender.pc:x11/libXrender \
 		${LOCALBASE}/libdata/pkgconfig/xres.pc:x11/libXres \
 		${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:x11/libXScrnSaver \
 		${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \
 		${LOCALBASE}/libdata/pkgconfig/xtrans.pc:x11/xtrans \
 		${LOCALBASE}/libdata/pkgconfig/xtrap.pc:x11/libXTrap \
 		${LOCALBASE}/libdata/pkgconfig/xtst.pc:x11/libXtst \
 		${LOCALBASE}/libdata/pkgconfig/xv.pc:x11/libXv \
 		${LOCALBASE}/libdata/pkgconfig/xvmc.pc:x11/libXvMC \
 		${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:x11/libXxf86dga \
 		${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:x11/libXxf86misc \
 		${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:x11/libXxf86vm
 
 USES=		metaport
 
 .include <bsd.port.mk>
Index: head/x11-fonts/libXfontcache/Makefile
===================================================================
--- head/x11-fonts/libXfontcache/Makefile	(revision 511361)
+++ head/x11-fonts/libXfontcache/Makefile	(revision 511362)
@@ -1,14 +1,17 @@
 # $FreeBSD$
 
 PORTNAME=	libXfontcache
 PORTVERSION=	1.0.5
 PORTREVISION=	5
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	The Xfontcache library
 
+DEPRECATED=	Deprecated upstream
+EXPIRATION_DATE=2019-10-15
+
 XORG_CAT=	lib
 USE_XORG=	x11 xext xorgproto
 
 .include <bsd.port.mk>