From 0ac7dd60a582e9f96bc5d3b0d7a20e6004058842 Mon Sep 17 00:00:00 2001
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Wed, 6 Nov 2019 19:02:42 +0000
Subject: [PATCH] Mk/Uses: Add USES+=xorg when including xorg.mk

Add USES+=xorg to the places where MK/Uses/xorg.mk is included from other
files in the Uses infrastructure.  This is done to silence an erroneous
warning about USES=xorg not being set when using USES=gl, motif or xorg-cat,
even when it's included from the framework.

This is a different proposal than what was originally suggested in pr 241627
and https://reviews.freebsd.org/D22210 .

PR:		238988, 241627
Discussed with:	mat
MFH:		2019Q4
Differential Revision:	https://reviews.freebsd.org/D22210
---
 Mk/Uses/gl.mk       | 1 +
 Mk/Uses/motif.mk    | 1 +
 Mk/Uses/xorg-cat.mk | 1 +
 3 files changed, 3 insertions(+)

diff --git a/Mk/Uses/gl.mk b/Mk/Uses/gl.mk
index faad0fa167e3..071fb53bc501 100644
--- a/Mk/Uses/gl.mk
+++ b/Mk/Uses/gl.mk
@@ -47,6 +47,7 @@ LIB_DEPENDS+=	${_GL_${_component}_LIB_DEPENDS}
 
 # We only need USES=xorg if we want USE_XORG modules
 .if defined(USE_XORG) && !empty(USE_XORG)
+USES+=		xorg
 .include "${USESDIR}/xorg.mk"
 .endif
 
diff --git a/Mk/Uses/motif.mk b/Mk/Uses/motif.mk
index 807967ce8601..549f7b53caf2 100644
--- a/Mk/Uses/motif.mk
+++ b/Mk/Uses/motif.mk
@@ -29,6 +29,7 @@ MAKE_ENV+=	MOTIFLIB="${MOTIFLIB}"
 
 # We only need USES=xorg if we want USE_XORG modules
 .if defined(USE_XORG) && !empty(USE_XORG)
+USES+=		xorg
 .include "${USESDIR}/xorg.mk"
 .endif
 
diff --git a/Mk/Uses/xorg-cat.mk b/Mk/Uses/xorg-cat.mk
index 787d7b45d47d..74335beea011 100644
--- a/Mk/Uses/xorg-cat.mk
+++ b/Mk/Uses/xorg-cat.mk
@@ -179,6 +179,7 @@ USE_XORG+=	fontutil
 
 # We only need USES=xorg if we want USE_XORG modules
 .  if defined(USE_XORG) && !empty(USE_XORG)
+USES+=		xorg
 .include "${USESDIR}/xorg.mk"
 .  endif