From owner-svn-ports-head@freebsd.org  Mon Jul  6 11:10:16 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
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 EFF72364386;
 Mon,  6 Jul 2020 11:10:16 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 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 4B0jXS657xz3dr5;
 Mon,  6 Jul 2020 11:10:16 +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 B5BE21D58B;
 Mon,  6 Jul 2020 11:10:16 +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 066BAGrC084498;
 Mon, 6 Jul 2020 11:10:16 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 066BAGrI084497;
 Mon, 6 Jul 2020 11:10:16 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <202007061110.066BAGrI084497@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: Mon, 6 Jul 2020 11:10:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r541336 - head/Mk/Scripts
X-SVN-Group: ports-head
X-SVN-Commit-Author: mat
X-SVN-Commit-Paths: head/Mk/Scripts
X-SVN-Commit-Revision: 541336
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.33
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: Mon, 06 Jul 2020 11:10:17 -0000

Author: mat
Date: Mon Jul  6 11:10:16 2020
New Revision: 541336
URL: https://svnweb.freebsd.org/changeset/ports/541336

Log:
  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

Modified:
  head/Mk/Scripts/do-depends.sh   (contents, props changed)

Modified: head/Mk/Scripts/do-depends.sh
==============================================================================
--- head/Mk/Scripts/do-depends.sh	Mon Jul  6 10:51:46 2020	(r541335)
+++ head/Mk/Scripts/do-depends.sh	Mon Jul  6 11:10:16 2020	(r541336)
@@ -124,6 +124,14 @@ for _line in ${dp_RAWDEPENDS} ; do
 	fi
 
 	case "${origin}" in
+	*@*/*) ;; # Ignore @ in the path which would not be a flavor
+	*@*)
+		export FLAVOR="${origin##*@}"
+		origin=${origin%@*}
+		;;
+	esac
+
+	case "${origin}" in
 	/*) ;;
 	*)
 		for overlay in ${dp_OVERLAYS} ${PORTSDIR}; do
@@ -133,13 +141,6 @@ for _line in ${dp_RAWDEPENDS} ; do
 			fi
 		done
 		origin="${orig}"
-		;;
-	esac
-	case "${origin}" in
-	*@*/*) ;; # Ignore @ in the path which would not be a flavor
-	*@*)
-		export FLAVOR="${origin##*@}"
-		origin=${origin%@*}
 		;;
 	esac