From 653dab23f731621508f3dbaf2c5c110aa67c53f0 Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 6 Jul 2020 11:10:16 +0000
Subject: [PATCH] Fix overlays when using flavors.

Move FLAVOR processing before the overlays processing so that flavors
can be used with overlays.

PR:		247741
Submitted by:	mikael
---
 Mk/Scripts/do-depends.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Mk/Scripts/do-depends.sh b/Mk/Scripts/do-depends.sh
index c0ef748ce81c..2185faebe6dd 100644
--- a/Mk/Scripts/do-depends.sh
+++ b/Mk/Scripts/do-depends.sh
@@ -123,6 +123,14 @@ for _line in ${dp_RAWDEPENDS} ; do
 		continue
 	fi
 
+	case "${origin}" in
+	*@*/*) ;; # Ignore @ in the path which would not be a flavor
+	*@*)
+		export FLAVOR="${origin##*@}"
+		origin=${origin%@*}
+		;;
+	esac
+
 	case "${origin}" in
 	/*) ;;
 	*)
@@ -135,13 +143,6 @@ for _line in ${dp_RAWDEPENDS} ; do
 		origin="${orig}"
 		;;
 	esac
-	case "${origin}" in
-	*@*/*) ;; # Ignore @ in the path which would not be a flavor
-	*@*)
-		export FLAVOR="${origin##*@}"
-		origin=${origin%@*}
-		;;
-	esac
 
 	depends_args="${dp_DEPENDS_ARGS}"
 	target=${dp_DEPENDS_TARGET}