From owner-svn-ports-head@freebsd.org  Wed Mar  7 09:17:33 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B76FEF3DC6B;
 Wed,  7 Mar 2018 09:17:33 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 6E1FC68684;
 Wed,  7 Mar 2018 09:17:33 +0000 (UTC) (envelope-from mat@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 691C51F6F0;
 Wed,  7 Mar 2018 09:17:33 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w279HXUC087940;
 Wed, 7 Mar 2018 09:17:33 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w279HXSn087939;
 Wed, 7 Mar 2018 09:17:33 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201803070917.w279HXSn087939@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Wed, 7 Mar 2018 09:17:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r463782 - head/Mk/Scripts
X-SVN-Group: ports-head
X-SVN-Commit-Author: mat
X-SVN-Commit-Paths: head/Mk/Scripts
X-SVN-Commit-Revision: 463782
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.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Mar 2018 09:17:33 -0000

Author: mat
Date: Wed Mar  7 09:17:33 2018
New Revision: 463782
URL: https://svnweb.freebsd.org/changeset/ports/463782

Log:
  Handle flavors in the proxydeps qa check.
  
  Reviewed by:	bdrewery
  Sponsored by:	Absolight
  Differential Revision:	https://reviews.freebsd.org/D14595

Modified:
  head/Mk/Scripts/qa.sh   (contents, props changed)

Modified: head/Mk/Scripts/qa.sh
==============================================================================
--- head/Mk/Scripts/qa.sh	Wed Mar  7 09:05:54 2018	(r463781)
+++ head/Mk/Scripts/qa.sh	Wed Mar  7 09:17:33 2018	(r463782)
@@ -669,6 +669,13 @@ proxydeps() {
 
 				# If we don't already depend on it, and we don't provide it
 				if ! listcontains ${dep_file_pkg} "${LIB_RUN_DEPENDS} ${PKGORIGIN}"; then
+					# If the package has a flavor, check that the dependency is not on that particular flavor.
+					flavor=$(pkg annotate -q -S "${dep_file_pkg}" flavor)
+					if [ -n "${flavor}" ]; then
+						if listcontains ${dep_file_pkg}@${flavor} "${LIB_RUN_DEPENDS} ${PKGORIGIN}"; then
+							continue
+						fi
+					fi
 					err "${file} is linked to ${dep_file} from ${dep_file_pkg} but it is not declared as a dependency"
 					proxydeps_suggest_uses ${dep_file_pkg} ${dep_file}
 					rc=1