From owner-svn-ports-head@freebsd.org Wed Nov 6 19:02:43 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DFDFE1BD6DE; Wed, 6 Nov 2019 19:02:43 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 477bWl5ggvz4W1r; Wed, 6 Nov 2019 19:02:43 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A639A199E; Wed, 6 Nov 2019 19:02:43 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA6J2haF031990; Wed, 6 Nov 2019 19:02:43 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA6J2hV6031987; Wed, 6 Nov 2019 19:02:43 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201911061902.xA6J2hV6031987@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Wed, 6 Nov 2019 19:02:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516921 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 516921 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Nov 2019 19:02:43 -0000 Author: zeising Date: Wed Nov 6 19:02:42 2019 New Revision: 516921 URL: https://svnweb.freebsd.org/changeset/ports/516921 Log: 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 Modified: head/Mk/Uses/gl.mk head/Mk/Uses/motif.mk head/Mk/Uses/xorg-cat.mk Modified: head/Mk/Uses/gl.mk ============================================================================== --- head/Mk/Uses/gl.mk Wed Nov 6 18:58:04 2019 (r516920) +++ head/Mk/Uses/gl.mk Wed Nov 6 19:02:42 2019 (r516921) @@ -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 Modified: head/Mk/Uses/motif.mk ============================================================================== --- head/Mk/Uses/motif.mk Wed Nov 6 18:58:04 2019 (r516920) +++ head/Mk/Uses/motif.mk Wed Nov 6 19:02:42 2019 (r516921) @@ -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 Modified: head/Mk/Uses/xorg-cat.mk ============================================================================== --- head/Mk/Uses/xorg-cat.mk Wed Nov 6 18:58:04 2019 (r516920) +++ head/Mk/Uses/xorg-cat.mk Wed Nov 6 19:02:42 2019 (r516921) @@ -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