git: 073b0aa8a430 - main - overlay: allow to load -overlay.mk files for each USES

[Baptiste Daroussin]

The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=073b0aa8a4304190cd1727cee1393d39fd520a8b

commit 073b0aa8a4304190cd1727cee1393d39fd520a8b
Author:     Baptiste Daroussin <bapt at FreeBSD.org>
AuthorDate: 2021-05-07 08:26:52 +0000
Commit:     Baptiste Daroussin <bapt at FreeBSD.org>
CommitDate: 2021-05-10 16:47:04 +0000

    overlay: allow to load -overlay.mk files for each USES
    
    This will be done before the loading of the actual USES, it allows one
    to keep using the USES from the ports tree, and still provide additional
    features in the overlay
---
 Mk/bsd.port.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 13785ff0f234..49dcd31afbba 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1464,6 +1464,9 @@ ${_f}_ARGS:=	${f:C/^[^\:]*(\:|\$)//:S/,/ /g}
 .for f in ${USES}
 .undef _usefound
 .for udir in ${OVERLAYS:C,$,/Mk/Uses,} ${USESDIR}
+# always include all overlay files found in each overlay 
+_overlayfile=	${udir}/${f:C/\:.*//}-overlay.mk
+.sinclude "${_overlayfile}
 _usefile=	${udir}/${f:C/\:.*//}.mk
 .if exists(${_usefile}) && !defined(_usefound)
 _usefound=