diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk
index b114a9911633..d893c9895e90 100644
--- a/Mk/Uses/autoreconf.mk
+++ b/Mk/Uses/autoreconf.mk
@@ -56,13 +56,6 @@
 _INCLUDE_USES_AUTORECONF_MK=	yes
 _USES_POST+=	autoreconf
 
-BUILD_DEPENDS+=	autoconf>=2.69:devel/autoconf \
-		automake>=1.16.1:devel/automake
-
-.if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
-BUILD_DEPENDS+=	libtoolize:devel/libtool
-.endif
-
 AUTORECONF?=	${LOCALBASE}/bin/autoreconf
 AUTORECONF_WRKSRC?=	${WRKSRC}
 
@@ -71,6 +64,13 @@ AUTORECONF_WRKSRC?=	${WRKSRC}
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_AUTORECONF_POST_MK)
 _INCLUDE_USES_AUTORECONF_POST_MK=	yes
 
+BUILD_DEPENDS+=	autoconf>=2.69:devel/autoconf \
+		automake>=1.16.1:devel/automake
+
+.if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
+BUILD_DEPENDS+=	libtoolize:devel/libtool
+.endif
+
 .if empty(autoreconf_ARGS)
 _USES_configure+=	470:do-autoreconf
 do-autoreconf:
diff --git a/Mk/Uses/gl.mk b/Mk/Uses/gl.mk
index 4d34c045c977..337566993e93 100644
--- a/Mk/Uses/gl.mk
+++ b/Mk/Uses/gl.mk
@@ -46,5 +46,10 @@ LIB_DEPENDS+=	${_GL_${_component}_LIB_DEPENDS}
 .endif
 .endfor
 
+# We onlu need USES=xorg if we want USE_XORG modules
+.if defined(USE_XORG) && !empty(USE_XORG)
+.include "${USESDIR}/xorg.mk"
+.endif
+
 # _INCLUDE_USES_GL_MK
 .endif
diff --git a/Mk/Uses/motif.mk b/Mk/Uses/motif.mk
index eb0dd5d7ce38..f54fcfe6e7bf 100644
--- a/Mk/Uses/motif.mk
+++ b/Mk/Uses/motif.mk
@@ -27,4 +27,9 @@ LIB_DEPENDS+=		libXm.so.4:x11-toolkits/open-motif
 MOTIFLIB?=	-L${LOCALBASE}/lib -lXm -lXp
 MAKE_ENV+=	MOTIFLIB="${MOTIFLIB}"
 
+# We onlu need USES=xorg if we want USE_XORG modules
+.if defined(USE_XORG) && !empty(USE_XORG)
+.include "${USESDIR}/xorg.mk"
+.endif
+
 .endif
diff --git a/Mk/Uses/xorg-cat.mk b/Mk/Uses/xorg-cat.mk
new file mode 100644
index 000000000000..ee68dcb1858e
--- /dev/null
+++ b/Mk/Uses/xorg-cat.mk
@@ -0,0 +1,185 @@
+# $FreeBSD$
+# 
+# xorg ports categories and other things needed to build xorg ports.
+# This is intended only for ports of xorg and freedesktop.org applications.
+#
+# Use USES=xorg and USE_XORG to depend on various xorg components.
+#
+# Feature:	xorg-cat
+# Usage:	USES=xorg-cat:category[,buildsystem]
+#
+# 		category is one of:
+# 		* app      Installs applications, no shared libraries.
+# 		* data     Installs only data.
+# 		* doc      no particular notes
+# 		* driver   depends on xorgproto at least
+# 		* font     don't install .pc file
+# 		* lib      various dependencies, install .pc file, needs
+# 		           pathfix
+# 		* proto    install .pc file, needs pathfix, most only needed at
+# 		           build time.
+# 		* util     no particular notes
+# 		* xserver  xorg x servers
+#
+# 		These categories has to match upstream categories.  Don't invent
+# 		your own.
+#
+# 		builsystem is one of:
+# 		* autotools (default)
+# 		* meson (experimental)
+#
+#
+# By defining USE_GITLAB and GL_COMMIT, it is possible to pull code straight
+# from the freedesktop.org gitlab, instead of official release tarballs.
+#
+#.MAINTAINER:	x11@FreeBSD.org
+
+.if !defined(_INCLUDE_USES_XORG_CAT_MK)
+_INCLUDE_USES_XORG_CAT_MK=yes
+
+_XORG_CATEGORIES=	app data doc driver font lib proto util xserver
+_XORG_BUILDSYSTEMS=	autotools meson
+
+_XORG_CAT=		# empty
+_XORG_BUILDSYS=		# empty
+
+.  if empty(xorg-cat_ARGS)
+IGNORE=		no arguments specified to xorg-cat
+.  endif
+
+.  for _arg in ${xorg-cat_ARGS}
+.    if ${_XORG_CATEGORIES:M${_arg}}
+.      if empty(_XORG_CAT)
+_XORG_CAT=	${_arg}
+.      else
+IGNORE=		multipe xorg categories specified via xorg-cat:${xorg-cat_ARGS:ts,}
+.      endif
+.    elif ${_XORG_BUILDSYSTEMS:M${_arg}}
+.      if empty(_XORG_BUILDSYS)
+_XORG_BUILDSYS=	${_arg}
+.      else
+IGNORE=		multipe xorg build systems specified via xorg-cat:${xorg-cat_ARGS:ts,}
+.      endif
+.    else
+IGNORE=		unknown argument specified via xorg-cat:${xorg-cat_ARGS:ts,}
+.    endif
+.  endfor
+
+# Default to the autotools build system
+.  if empty(_XORG_BUILDSYS)
+_XORG_BUILDSYS=		autotools
+.  endif
+
+# Default variables, common to all new modular xorg ports.
+.  if empty(USES:Mtar)
+EXTRACT_SUFX?=		.tar.bz2
+.  endif
+
+DIST_SUBDIR=	xorg/${_XORG_CAT}
+
+.  if ${_XORG_BUILDSYS} == meson
+IGNORE=		meson build not supported yet
+.include "${USESDIR}/meson.mk"
+.  elif ${_XORG_BUILDSYS} == autotools
+GNU_CONFIGURE=		yes
+.  else
+# This should not happen
+IGNORE=		unknown build system specified via xorg-cat:${xorg-cat_ARGS:ts,}
+.  endif
+
+.  if defined(USE_GITLAB)
+# Set up things for fetching from freedesktop.org gitlab.
+# This can be overridden using normal GL_* macros in the ports Makefile.
+# We make a best guess for GL_ACCOUNT and GL_PROJECT.
+GL_SITE?=		https://gitlab.freedesktop.org/xorg
+GL_ACCOUNT?=		${_XORG_CAT}
+GL_PROJECT?=		${PORTNAME:tl}
+.    if ${_XORG_BUILDSYS} == meson
+# set up meson stuff here
+.    else
+# Things from GL doesn't come with pre-generated configure, add dependency on
+# autoreconf and run it, if we're using autotools.
+.include "${USESDIR}/autoreconf.mk"
+.    endif
+.  else
+MASTER_SITES?=		XORG/individual/${_XORG_CAT}
+.  endif
+
+#
+## All xorg ports needs pkgconfig to build, but some ports look for pkgconfig
+## and then continues the build.
+.include "${USESDIR}/pkgconfig.mk"
+
+#
+## All xorg ports needs xorg-macros.
+.  if ${PORTNAME} != xorg-macros
+USE_XORG+=      xorg-macros
+.  endif
+
+.  if ${_XORG_CAT} == app
+# Nothing at the moment
+
+.  elif ${_XORG_CAT} == data
+# Nothing at the moment.
+
+.  elif ${_XORG_CAT} == driver
+USE_XORG+=	xi xorg-server xorgproto
+.    if ${_XORG_BUILDSYS} == meson
+# Put special stuff for meson here
+.    else
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
+libtool_ARGS?=	# empty
+.include "${USESDIR}/libtool.mk"
+INSTALL_TARGET=	install-strip
+.    endif
+
+.  elif ${_XORG_CAT} == font
+FONTNAME?=	${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
+.    if ${_XORG_BUILDSYS} == meson
+# Put special stuff for meson here
+.    else
+CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/share/fonts
+CONFIGURE_ENV+=	FONTROOTDIR=${PREFIX}/share/fonts
+.    endif
+.    if !defined(NOFONT)
+.include "${USESDIR}/fonts.mk"
+BUILD_DEPENDS+=	mkfontscale>=0:x11-fonts/mkfontscale \
+		bdftopcf:x11-fonts/bdftopcf
+PLIST_FILES+=	"@comment ${FONTSDIR}/fonts.dir" \
+		"@comment ${FONTSDIR}/fonts.scale"
+.    endif
+
+.  elif ${_XORG_CAT} == lib
+.include "${USESDIR}/pathfix.mk"
+.    if ${_XORG_BUILDSYS} == meson
+# put meson stuff here
+.    else
+libtool_ARGS?=	# empty
+.include "${USESDIR}/libtool.mk"
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS+=--enable-malloc0returnsnull
+.    endif
+
+.  elif ${_XORG_CAT} == proto
+.include "${USESDIR}/pathfix.mk"
+
+.  elif ${_XORG_CAT} == xserver
+DISTNAME?=	xorg-server-${PORTVERSION}
+.include "${USESDIR}/pathfix.mk"
+.    if ${_XORG_BUILDSYS} == meson
+# put meson stuff here
+.    else
+CONFIGURE_ARGS+=	--with-xkb-path=${LOCALBASE}/share/X11/xkb \
+			--with-fontrootdir=${LOCALBASE}/share/fonts
+.    endif
+LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
+USE_XORG+=	fontutil
+
+.  endif # ${_XORG_CAT} == <category>
+
+# We onlu need USES=xorg if we want USE_XORG modules
+.  if defined(USE_XORG) && !empty(USE_XORG)
+.include "${USESDIR}/xorg.mk"
+.  endif
+
+.endif
diff --git a/Mk/bsd.xorg.mk b/Mk/Uses/xorg.mk
similarity index 52%
rename from Mk/bsd.xorg.mk
rename to Mk/Uses/xorg.mk
index a5621f081386..2a2dea2b8989 100644
--- a/Mk/bsd.xorg.mk
+++ b/Mk/Uses/xorg.mk
@@ -1,171 +1,101 @@
-#-*- tab-width: 4; -*-
-# ex:ts=4
-#
-# bsd.xorg.mk - Support for X.Org ports and dependencies
-#
-# Created by: Florent Thoumie <flz@FreeBSD.org>
-#
-# !!! Here be dragons !!! (yeah, here as well...)
-#
 # $FreeBSD$
 #
-
-.if !defined(_POSTMKINCLUDED) && !defined(Xorg_Pre_Include)
-
-Xorg_Include_MAINTAINER=	x11@FreeBSD.org
-Xorg_Pre_Include=		bsd.xorg.mk
-
-# Some notes:
+# Originally from bsd.xorg.mk
+# Created by: Florent Thoumie <flz@FreeBSD.org>
 #
-# app - Installs applications, no shared libraries.
-# data - Installs only data.
-# doc - no particular notes
-# driver - depends on xorgproto at least
-# font - don't install .pc file
-# lib - various dependencies, install .pc file, needs pathfix
-# proto - install .pc file, needs pathfix, most only needed at build time.
-# xserver - there's only one atm, I guess everything can fit into the port itself
+# Feature:		xorg
+# Usage:		USES=xorg
+# 			USE_XORG=<component>
+#
+# 			Not specifying USE_XORG with USES=xorg is an error.
+#			
+#			Components can be found in the XORG_MODULES list below.
+#
+#
+# If you feel something is missing from the list, please let us know.
+#
+# MAINTAINER:	x11@FreeBSD.org
 
-.if defined(XORG_CAT)
-# Default variables, common to all new modular xorg ports.
-.if !defined(USES) || ! ${USES:Mtar*}
-USES+=		tar:bzip2
+.if !defined(_INCLUDE_USES_XORG_MK)
+_INCLUDE_USES_XORG_MK=		yes
+_USES_POST+=	xorg
 .endif
-GNU_CONFIGURE= 	yes
-# for some reason this makes mkfontscale and others fail in the install target
-#INSTALL_TARGET=	install-strip
-DIST_SUBDIR=	xorg/${XORG_CAT}
 
-MASTER_SITES?=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR?=	individual/${XORG_CAT}
+# Set up things after bsd.port.post.mk.
+# This way ports can add things to USE_XORG even after bsd.port.pre.mk is
+# included.
+.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_XORG_POST_MK)
+_INCLUDE_USES_XORG_POST_MK=	yes
 
-# All xorg ports needs pkgconfig to build, but some ports look for pkgconfig and
-# then continues the build.
-USES+=		pkgconfig
-
-# All xorg ports needs xorg-macros.
-. if ${PORTNAME} != xorg-macros
-USE_XORG+=      xorg-macros
-. endif
-
-. if ${XORG_CAT} == "app"
-# Nothing at the moment
-. endif
-
-. if ${XORG_CAT} == "data"
-# Nothing at the moment.
-. endif
-
-. if ${XORG_CAT} == "driver"
-USE_XORG+=	xorg-server xorgproto xi
-CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
-USES+=		libtool
-INSTALL_TARGET=	install-strip
-. endif
-
-. if ${XORG_CAT} == "font"
-FONTNAME?=	${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
-CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/share/fonts
-CONFIGURE_ENV+=	FONTROOTDIR=${PREFIX}/share/fonts
-.    if !defined(NOFONT)
-USES+=	fonts
-BUILD_DEPENDS+=	mkfontscale>=0:x11-fonts/mkfontscale \
-				bdftopcf:x11-fonts/bdftopcf
-PLIST_FILES+=	"@comment ${FONTSDIR}/fonts.dir" \
-				"@comment ${FONTSDIR}/fonts.scale"
-.    endif
+.  if !empty(xorg_ARGS)
+IGNORE=		USES=xorg takes no arguments
 .  endif
 
-. if ${XORG_CAT} == "lib"
-USES+=		pathfix libtool
-USE_LDCONFIG=	yes
-CONFIGURE_ARGS+=--enable-malloc0returnsnull
-. endif
+.  if !defined(USE_XORG)
+IGNORE=		need to specify xorg modules with USE_XORG
+.  endif
 
-. if ${XORG_CAT} == "proto"
-USES+=	pathfix
-. endif
-
-. if ${XORG_CAT} == "xserver"
-DISTFILES?=	xorg-server-${PORTVERSION}.tar.bz2
-WRKSRC=		${WRKDIR}/xorg-server-${PORTVERSION}
-USES+=	pathfix
-CONFIGURE_ARGS+=	--with-xkb-path=${LOCALBASE}/share/X11/xkb \
-					--with-fontrootdir=${LOCALBASE}/share/fonts
-
-LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
-USE_XORG+=	fontutil:build
-. endif
-
-.endif
-
-.endif
-
-.if defined(_POSTMKINCLUDED) && !defined(Xorg_Post_Include)
-
-Xorg_Post_Include=		bsd.xorg.mk
+# List of xorg modules
+XORG_MODULES=	dmx \
+		fontenc \
+		fontutil \
+		ice \
+		libfs \
+		oldx \
+		pciaccess \
+		pixman \
+		sm \
+		x11 \
+		xau \
+		xaw \
+		xaw6 \
+		xaw7 \
+		xbitmaps \
+		xcb \
+		xcomposite \
+		xcursor \
+		xdamage \
+		xdmcp \
+		xevie \
+		xext \
+		xfixes \
+		xfont \
+		xfont2 \
+		xfontcache \
+		xft \
+		xi \
+		xinerama \
+		xkbfile \
+		xkbui \
+		xmu \
+		xmuu \
+		xorg-macros \
+		xorg-server \
+		xorgproto \
+		xp \
+		xpm \
+		xprintapputil \
+		xprintutil \
+		xrandr \
+		xrender \
+		xres \
+		xscrnsaver \
+		xshmfence \
+		xt \
+		xtrans \
+		xtrap \
+		xtst \
+		xv \
+		xvmc \
+		xxf86dga \
+		xxf86misc \
+		xxf86vm
 
 # Register all xorg .pc files here.
 # foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS.
-
-XORG_MODULES=	dmx \
-				fontenc \
-				fontutil \
-				ice \
-				libfs \
-				oldx \
-				pciaccess \
-				pixman \
-				sm \
-				x11 \
-				xau \
-				xaw \
-				xaw6 \
-				xaw7 \
-				xbitmaps \
-				xcb \
-				xcomposite \
-				xcursor \
-				xdamage \
-				xdmcp \
-				xevie \
-				xext \
-				xfixes \
-				xfont \
-				xfont2 \
-				xfontcache \
-				xft \
-				xi \
-				xinerama \
-				xkbfile \
-				xkbui \
-				xmu \
-				xmuu \
-				xorg-macros \
-				xorg-server \
-				xorgproto \
-				xp \
-				xpm \
-				xprintapputil \
-				xprintutil \
-				xrandr \
-				xrender \
-				xres \
-				xscrnsaver \
-				xshmfence \
-				xt \
-				xtrans \
-				xtrap \
-				xtst \
-				xv \
-				xvmc \
-				xxf86dga \
-				xxf86misc \
-				xxf86vm
-
 dmx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/dmx.pc:x11/libdmx
 fontenc_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/fontenc.pc:x11-fonts/libfontenc
-fontutil_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util
+fontutil_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util
 ice_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/ice.pc:x11/libICE
 libfs_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/libfs.pc:x11-fonts/libFS
 oldx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/oldx.pc:x11/liboldX
@@ -198,7 +128,7 @@ xmu_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xmu.pc:x11-toolkits/libXmu
 xmuu_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xmuu.pc:x11-toolkits/libXmu
 xorg-macros_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:devel/xorg-macros
 xorg-server_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-server.pc:x11-servers/xorg-server
-xorgproto_BUILD_DEPENDS=		xorgproto>=0:x11/xorgproto
+xorgproto_BUILD_DEPENDS=	xorgproto>=0:x11/xorgproto
 xp_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xp.pc:x11/libXp
 xpm_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xpm.pc:x11/libXpm
 xprintapputil_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:x11/libXprintAppUtil
@@ -218,22 +148,27 @@ xxf86dga_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:x11/libXxf86
 xxf86misc_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:x11/libXxf86misc
 xxf86vm_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:x11/libXxf86vm
 
-.for _module in ${USE_XORG:M*\:both:C/\:.*//g}
-. if ${XORG_MODULES:M${_module}} == ""
-IGNORE=				requires unknown xorg module (${_module})
-. endif
-RUN_DEPENDS+=			${${_module}_BUILD_DEPENDS}
-.endfor
+# Add explicit X options to avoid problems with false positives in configure
+.  if defined(GNU_CONFIGURE)
+CONFIGURE_ARGS+=--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
+.  endif
 
-.for _module in ${USE_XORG:C/\:.*//g}
-. if ${XORG_MODULES:M${_module}} == ""
-IGNORE=				requires unknown xorg module (${_module})
-. endif
-LIB_PC_DEPENDS+=		${${_module}_LIB_PC_DEPENDS}
-BUILD_DEPENDS+=			${${_module}_BUILD_DEPENDS}
-.endfor
+.  for _module in ${USE_XORG:M*\:both:C/\:.*//g}
+.    if ${XORG_MODULES:M${_module}} == ""
+IGNORE=		requires unknown xorg module (${_module})
+.    endif
+RUN_DEPENDS+=	${${_module}_BUILD_DEPENDS}
+.  endfor
 
-RUN_DEPENDS+=			${LIB_PC_DEPENDS}
-BUILD_DEPENDS+=			${LIB_PC_DEPENDS}
+.  for _module in ${USE_XORG:C/\:both$//g}
+.    if ${XORG_MODULES:M${_module}} == ""
+IGNORE=		requires unknown xorg module (${_module})
+.    endif
+LIB_PC_DEPENDS+=${${_module}_LIB_PC_DEPENDS}
+BUILD_DEPENDS+=	${${_module}_BUILD_DEPENDS}
+.  endfor
+
+RUN_DEPENDS+=	${LIB_PC_DEPENDS}
+BUILD_DEPENDS+=	${LIB_PC_DEPENDS}
 
 .endif
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 5cdc0051e2ca..52e2325925f4 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -396,9 +396,6 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  Implies NO_LICENSES_INSTALL=yes, NO_MTREE=yes, and causes
 #				  Linux ldconfig to be used when USE_LDCONFIG is defined.
 ##
-# USE_XORG			- Set to a list of X.org module dependencies.
-#				  Implies inclusion of bsd.xorg.mk.
-##
 # USE_TEX			- A list of the TeX dependencies the port has.
 #
 ##
@@ -1331,10 +1328,6 @@ DISTNAME?=	${PORTNAME}-${DISTVERSIONFULL}
 
 INDEXFILE?=		INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}
 
-.if defined(USE_XORG) || defined(XORG_CAT)
-.include "${PORTSDIR}/Mk/bsd.xorg.mk"
-.endif
-
 PACKAGES?=		${PORTSDIR}/packages
 TEMPLATES?=		${PORTSDIR}/Templates
 KEYWORDS?=		${PORTSDIR}/Keywords
@@ -1352,6 +1345,18 @@ PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg
 .include "${PORTSDIR}/Mk/bsd.local.mk"
 .endif
 
+.if defined(USE_XORG) && (!defined(USES) || !${USES:Mxorg})
+DEV_WARNING+=		"Using USE_XORG alone is deprecated, please use USES=xorg"
+USES+=	xorg
+.endif
+
+.if defined(XORG_CAT)
+DEV_WARNING+=		"Using XORG_CAT is deprecated, please use USES=xorg-cat:category"
+.if !defined(USES) || !${USES:Mxorg-cat*}
+USES+=	xorg-cat:${XORG_CAT}
+.endif
+.endif
+
 .if defined(USE_PHP) && (!defined(USES) || ( defined(USES) && !${USES:Mphp*} ))
 DEV_WARNING+=		"Using USE_PHP alone is deprecated, please use USES=php"
 USES+=	php
@@ -1914,8 +1919,9 @@ _FORCE_POST_PATTERNS=	rmdir kldxref mkfontscale mkfontdir fc-cache \
 .include "${PORTSDIR}/Mk/bsd.local.mk"
 .endif
 
-.if defined(USE_XORG) || defined(XORG_CAT)
-.include "${PORTSDIR}/Mk/bsd.xorg.mk"
+.if defined(USE_XORG) && (!defined(USES) || ( defined(USES) && !${USES:Mxorg} ))
+DEV_WARNING+=	"Using USE_XORG alone is deprecated, please use USES=xorg"
+_USES_POST+=	xorg
 .endif
 
 .if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER1)
@@ -1968,13 +1974,6 @@ CONFIGURE_ENV+=	LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
 MAKE_ENV+=		LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
 .endif
 
-.if defined(USE_XORG)
-# Add explicit X options to avoid problems with false positives in configure
-.if defined(GNU_CONFIGURE)
-CONFIGURE_ARGS+=--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
-.endif
-.endif
-
 # Macro for doing in-place file editing using regexps
 REINPLACE_ARGS?=	-i.bak
 REINPLACE_CMD?=	${SED} ${REINPLACE_ARGS}
diff --git a/multimedia/gstreamer1-vaapi/Makefile b/multimedia/gstreamer1-vaapi/Makefile
index 801ae98f9224..6453d6ddb248 100644
--- a/multimedia/gstreamer1-vaapi/Makefile
+++ b/multimedia/gstreamer1-vaapi/Makefile
@@ -18,12 +18,12 @@ LIB_DEPENDS=	libva.so:multimedia/libva
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		compiler:c11 gettext-runtime gmake gnome libtool \
-		pkgconfig tar:xz
+		pkgconfig tar:xz xorg
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20
 USE_GSTREAMER1=	bad gl
 USE_GL=		gl
-USE_XORG=	x11 xrandr xrender xorgproto:build
+USE_XORG=	x11 xrandr xrender xorgproto
 
 OPTIONS_DEFINE=	DRM WAYLAND
 
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index 0fb1a85e00b6..a2cfac4e9aaa 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -4,8 +4,6 @@
 PORTNAME=	xf86-video-intel
 PORTVERSION=	2.99.917.20181203
 CATEGORIES=	x11-drivers
-MASTER_SITES=	http://cgit.freedesktop.org/xorg/${XORG_CAT}/${PORTNAME}/snapshot/
-DISTNAME=	${PORTNAME}-${COMMIT_ID}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Driver for Intel integrated graphics chipsets
@@ -13,21 +11,19 @@ COMMENT=	Driver for Intel integrated graphics chipsets
 LICENSE=	MIT	# various
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libxcb-util.so:x11/xcb-util \
-		libdrm.so:graphics/libdrm
-
-COMMIT_ID=	e5ff8e1828f97891c819c919d7115c6e18b2eb1f
-
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Intel integrated GPU only exists in Intel x86 processors/chipsets
 
+LIB_DEPENDS=	libxcb-util.so:x11/xcb-util \
+		libdrm.so:graphics/libdrm
+
+USES=		cpe xorg xorg-cat:driver
+USE_GITLAB=	yes
+GL_COMMIT=	e5ff8e1828f97891c819c919d7115c6e18b2eb1f
 USE_GL=		gl
-
-USE_LDCONFIG=	yes
-XORG_CAT=	driver
 USE_XORG=	pciaccess pixman x11 xcb xext xrender xv xvmc
+USE_LDCONFIG=	yes
 
-USES+=		cpe autoreconf
 CPE_VENDOR=	x
 
 OPTIONS_SINGLE=	ACCEL
diff --git a/x11-drivers/xf86-video-intel/distinfo b/x11-drivers/xf86-video-intel/distinfo
index cf690c5b8e04..d1ed106cd013 100644
--- a/x11-drivers/xf86-video-intel/distinfo
+++ b/x11-drivers/xf86-video-intel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1543827685
-SHA256 (xorg/driver/xf86-video-intel-e5ff8e1828f97891c819c919d7115c6e18b2eb1f.tar.bz2) = 11b7e70c6efecad6540eda24c7370b47597f92dea9b24ca031d83b89eb6a8337
-SIZE (xorg/driver/xf86-video-intel-e5ff8e1828f97891c819c919d7115c6e18b2eb1f.tar.bz2) = 1247314
+TIMESTAMP = 1561472772
+SHA256 (xorg/driver/driver-xf86-video-intel-e5ff8e1828f97891c819c919d7115c6e18b2eb1f_GL0.tar.gz) = cbb6a10695b9e8b41fef1bafe5c4d9ddf710acb1ccba8e141378493bacda982e
+SIZE (xorg/driver/driver-xf86-video-intel-e5ff8e1828f97891c819c919d7115c6e18b2eb1f_GL0.tar.gz) = 1693563
diff --git a/x11/xscope/Makefile b/x11/xscope/Makefile
index 485f673670e5..d88583a0a5d6 100644
--- a/x11/xscope/Makefile
+++ b/x11/xscope/Makefile
@@ -4,14 +4,13 @@ PORTNAME=	xscope
 PORTVERSION=	1.4.1
 PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	XORG/individual/${XORG_CAT}/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Window Protocol Viewer
 
 LICENSE=	MIT
 
-XORG_CAT=	app
+USES=		xorg xorg-cat:app
 USE_XORG=	xorgproto x11 xext
 
 PLIST_FILES=	bin/xscope man/man1/xscope.1.gz