git: 006b7e2eda4d - main - sysutils/s6-frontend: fix dependency flavors

The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=006b7e2eda4d91c8fd46159e9cd8b84816625b3e

commit 006b7e2eda4d91c8fd46159e9cd8b84816625b3e
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2026-06-23 20:30:17 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2026-06-26 12:07:55 +0000

    sysutils/s6-frontend: fix dependency flavors
    
    The flavor of dependency sysutils/s6-rc was forgotten, leading to
    confusion during dependency installation in Poudriere.  Add the missing
    flavor and simplify the dependency lists by passing through FLAVOR and
    PKGNAMEPREFIX to the dependencies.
    
    Approved by:    portmgr (build fix blanket)
---
 sysutils/s6-frontend/Makefile | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/sysutils/s6-frontend/Makefile b/sysutils/s6-frontend/Makefile
index 0c048e0af0e8..5c513b03ab29 100644
--- a/sysutils/s6-frontend/Makefile
+++ b/sysutils/s6-frontend/Makefile
@@ -12,25 +12,14 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 FLAVORS=	hier run
 FLAVOR?=	${FLAVORS:[1]}
-.if ${FLAVOR} == run # Follow hier(7)
-BUILD_DEPENDS=	execline>=2.9.8.1:lang/execline \
-		skalibs>=2.14.5.1:devel/skalibs \
-		s6>=2.14.0.1:sysutils/s6 \
-		s6-rc-run>=0.6.0.0:sysutils/s6-rc
-RUN_DEPENDS=	execline>=2.9.8.1:lang/execline \
-		skalibs>=2.14.5.1:devel/skalibs \
-		s6>=2.14.0.1:sysutils/s6 \
-		s6-rc-run>=0.6.0.0:sysutils/s6-rc
-.else
 BUILD_DEPENDS=	execline>=2.9.8.1:lang/execline \
 		skalibs>=2.14.5.1:devel/skalibs \
 		s6>=2.14.0.1:sysutils/s6 \
-		s6-rc>=0.6.0.0:sysutils/s6-rc
+		s6-rc${PKGNAMESUFFIX}>=0.6.0.0:sysutils/s6-rc@${FLAVOR}
 RUN_DEPENDS=	execline>=2.9.8.1:lang/execline \
 		skalibs>=2.14.5.1:devel/skalibs \
 		s6>=2.14.0.1:sysutils/s6 \
-		s6-rc>=0.6.0.0:sysutils/s6-rc
-.endif
+		s6-rc${PKGNAMESUFFIX}>=0.6.0.0:sysutils/s6-rc@${FLAVOR}
 LIB_DEPENDS=	libs6.so:sysutils/s6 \
 		libskarnet.so:devel/skalibs