svn commit: r463782 - head/Mk/Scripts

[Mathieu Arnold]

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