git: 2261b08593f1 - main - sysutils/beats9{1,2}: Fix make makesum

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Wed, 23 Sep 2026 10:57:00 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2261b08593f1be1b2cc43e2d2bfba3f4514001a6

commit 2261b08593f1be1b2cc43e2d2bfba3f4514001a6
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-09-23 10:51:39 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-09-23 10:51:39 +0000

    sysutils/beats9{1,2}: Fix make makesum
    
    The same I did in sysutils/beats9{3,4,5} earlier.
    
    Approved by:    blanket
    Sponsored by:   UNIS Labs
---
 sysutils/beats91/Makefile | 17 ++++++++++++-----
 sysutils/beats92/Makefile | 17 ++++++++++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/sysutils/beats91/Makefile b/sysutils/beats91/Makefile
index 95cb9fff2339..b0146848108e 100644
--- a/sysutils/beats91/Makefile
+++ b/sysutils/beats91/Makefile
@@ -34,15 +34,13 @@ PORTSCOUT=	limit:^${DISTVERSION:R:S|.|\.|}\.
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		AUDITBEAT FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
-.ifmake makesum || makeplist || distclean
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
-.else
 OPTIONS_DEFAULT=	FILEBEAT HEARTBEAT METRICBEAT
-.endif
+OPTIONS_MULTI=		BEATS
+OPTIONS_MULTI_BEATS=	AUDITBEAT FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
 OPTIONS_SUB=		yes
 
 AUDITBEAT_DESC=			Auditbeat
+BEATS_DESC=			Beats modules
 FILEBEAT_DESC=			Filebeat
 HEARTBEAT_DESC=			Heartbeat
 METRICBEAT_DESC=		Metricbeat
@@ -74,6 +72,15 @@ LOCAL_MASTER_SITES=		LOCAL/vvd/elastic
 
 .include <bsd.port.options.mk>
 
+.ifmake makesum || makeplist || distclean
+.  for O in ${OPTIONS_MULTI_BEATS}
+.    if !${PORT_OPTIONS:M${O}}
+MASTER_SITES+=	${${O}_MASTER_SITES}
+DISTFILES+=	${${O}_DISTFILES}
+.    endif
+.  endfor
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e "s|%%BEATSVERSION%%|v${DISTVERSION}|g" ${WRKSRC}/dev-tools/mage/settings.go
 .for BEATMOD in ${GO_TARGET:S,^./,,g}
diff --git a/sysutils/beats92/Makefile b/sysutils/beats92/Makefile
index dea143ca10f2..b7148e76b753 100644
--- a/sysutils/beats92/Makefile
+++ b/sysutils/beats92/Makefile
@@ -34,15 +34,13 @@ PORTSCOUT=	limit:^${DISTVERSION:R:S|.|\.|}\.
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		AUDITBEAT FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
-.ifmake makesum || makeplist || distclean
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
-.else
 OPTIONS_DEFAULT=	FILEBEAT HEARTBEAT METRICBEAT
-.endif
+OPTIONS_MULTI=		BEATS
+OPTIONS_MULTI_BEATS=	AUDITBEAT FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
 OPTIONS_SUB=		yes
 
 AUDITBEAT_DESC=			Auditbeat
+BEATS_DESC=			Beats modules
 FILEBEAT_DESC=			Filebeat
 HEARTBEAT_DESC=			Heartbeat
 METRICBEAT_DESC=		Metricbeat
@@ -74,6 +72,15 @@ LOCAL_MASTER_SITES=		LOCAL/vvd/elastic
 
 .include <bsd.port.options.mk>
 
+.ifmake makesum || makeplist || distclean
+.  for O in ${OPTIONS_MULTI_BEATS}
+.    if !${PORT_OPTIONS:M${O}}
+MASTER_SITES+=	${${O}_MASTER_SITES}
+DISTFILES+=	${${O}_DISTFILES}
+.    endif
+.  endfor
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e "s|%%BEATSVERSION%%|v${DISTVERSION}|g" ${WRKSRC}/dev-tools/mage/settings.go
 .for BEATMOD in ${GO_TARGET:S,^./,,g}