From e93ccf55fbf189d29604079027df541b3801b469 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 7 May 2021 10:26:52 +0200
Subject: [PATCH] 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=
-- 
2.31.1