git: b7d1ffb8f542 - main - net/bird3: Fix STATIC option conflict

The branch main has been updated by olivier:

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

commit b7d1ffb8f542570345e5304ef85acd81819db6eb
Author:     Olivier Cochard <olivier@FreeBSD.org>
AuthorDate: 2026-05-11 15:10:39 +0000
Commit:     Olivier Cochard <olivier@FreeBSD.org>
CommitDate: 2026-05-11 15:17:40 +0000

    net/bird3: Fix STATIC option conflict
    
    Remove the STATIC option (static routes) to avoid clashing with the global
    static linking option. Enable static routes by default
    
    Reported by:    ivy
    Sponsored by:   Netflix
---
 net/bird3/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/net/bird3/Makefile b/net/bird3/Makefile
index 071ec5852668..1948d1c6f707 100644
--- a/net/bird3/Makefile
+++ b/net/bird3/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	bird
 DISTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://bird.nic.cz/download/
 PKGNAMESUFFIX=	3
@@ -26,10 +27,10 @@ GROUPS=		birdvty
 
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_MULTI=	RP
+OPTIONS_GROUP=	RP
 RP_DESC=	Routing Protocols
-OPTIONS_MULTI_RP=	BFD BABEL BMP BGP MRT OSPF PIPE RADV RIP RPKI STATIC
-OPTIONS_DEFAULT=	BFD BABEL BGP MRT OSPF PIPE RADV RIP RPKI STATIC
+OPTIONS_GROUP_RP=	BFD BABEL BMP BGP MRT OSPF PIPE RADV RIP RPKI
+OPTIONS_DEFAULT=	BFD BABEL BGP MRT OSPF PIPE RADV RIP RPKI
 
 BFD_DESC=	Bidirectional Forwarding Detection
 BABEL_DESC=	Babel routing protocol
@@ -41,7 +42,6 @@ PIPE_DESC=	PIPE routing
 RADV_DESC=	Router Advertisement
 RIP_DESC=	Routing Information Protocol
 RPKI_DESC=	Resource Public Key Infrastructure
-STATIC_DESC=	Static routing
 
 BFD_VARS=	rt_prot+=bfd
 BABEL_VARS=	rt_prot+=babel
@@ -53,7 +53,8 @@ PIPE_VARS=	rt_prot+=pipe
 RADV_VARS=	rt_prot+=radv
 RIP_VARS=	rt_prot+=rip
 RPKI_VARS=	rt_prot+=rpki
-STATIC_VARS=	rt_prot+=static
+
+RT_PROT+=	static
 
 CONFIGURE_ARGS+=--with-protocols="${RT_PROT}"
 CONFIGURE_ARGS+=--with-sysconfig=bsd-netlink