Index: INSTALL
===================================================================
RCS file: INSTALL
diff -N INSTALL
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ INSTALL	23 Oct 2025 02:40:51 -0000
@@ -0,0 +1,37 @@
+# $NetBSD$
+
+FRR_VTY_GROUP="@FRR_VTY_GROUP@"
+FRR_USER="@FRR_USER@"
+
+message()
+{
+    "${CAT}" << EOM
+===========================================================================
+
+IMPORTANT:
+To complete the installation you need to add the user "${FRR_USER}"
+to the (secondary) group "${FRR_VTY_GROUP}".
+
+===========================================================================
+EOM
+}
+
+case ${STAGE} in
+POST-INSTALL)
+	found="${FALSE}"
+	for group in $("${ID}" -Gn "${FRR_USER}")
+	do
+	    case "${group}" in
+	    "${FRR_VTY_GROUP}")
+		found="${TRUE}"
+		break
+		;;
+	    esac
+	done
+	if ! "${found}"
+	then
+	    #"${USERMOD}" -G "${FRR_VTY_GROUP}" "${FRR_USER}"
+	    message
+	fi
+	;;
+esac
Index: MESSAGE
===================================================================
RCS file: MESSAGE
diff -N MESSAGE
--- MESSAGE	11 Aug 2021 10:09:54 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2021/08/11 10:09:54 kardel Exp $
-
-IMPORTANT:
-To complete the installation you need to add
-the user "${FRR_USER}" to the (secondary) group "${FRR_VTY_GROUP}".
-
-===========================================================================
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/frr/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile	24 Aug 2025 16:36:18 -0000	1.25
+++ Makefile	23 Oct 2025 02:40:51 -0000
@@ -1,19 +1,18 @@
 # $NetBSD: Makefile,v 1.25 2025/08/24 16:36:18 wiz Exp $
 
-GITHUB_PROJECT=	frr
-VERSION=	9.1
-GITHUB_TAG=	frr-${VERSION}
-DISTNAME=	frr-${VERSION}
-PKGREVISION=	8
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GITHUB:=FRRouting/}
-
-MAINTAINER=	kardel@NetBSD.org
-HOMEPAGE=	https://github.com/FRRouting/frr/
-COMMENT=	Frr routing multi protocol suite
-LICENSE=	gnu-gpl-v2
+GITHUB_PROJECT=		frr
+VERSION=		10.4.1
+GITHUB_TAG=		frr-${VERSION}
+DISTNAME=		frr-${VERSION}
+CATEGORIES=		net
+MASTER_SITES=		${MASTER_SITE_GITHUB:=FRRouting/}
+
+MAINTAINER=		kardel@NetBSD.org
+HOMEPAGE=		https://github.com/FRRouting/frr/
+COMMENT=		Frr routing multi protocol suite
+LICENSE=		gnu-gpl-v2
 
-CONFLICTS=	quagga-[0-9]*
+CONFLICTS=		quagga-[0-9]*
 
 WRKSRC=			${WRKDIR}/frr-frr-${VERSION}
 USE_LANGUAGES=		c c++
@@ -26,8 +25,8 @@ BISON_REQD+=		3.3
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
-FRR_GROUP?=	_frr
-FRR_VTY_GROUP?=	frrvty
+FRR_GROUP?=		_frr
+FRR_VTY_GROUP?=		frrvty
 
 FRR_USER?=		_frr
 FRR_CONF_MODE=		0640
@@ -35,35 +34,32 @@ FRR_CONFDIR_MODE=	0755
 FRR_LOG_MODE=		0640
 
 PKG_SYSCONFDIR_PERMS=	${FRR_USER} ${FRR_VTY_GROUP} ${FRR_CONFDIR_MODE}
-PKG_SYSCONFSUBDIR=	frr
 
 PKG_GECOS.${FRR_USER}=	FRRouting User
 PKG_HOME.${FRR_USER}=	/nonexistent
 PKG_SHELL.${FRR_USER}=	/bin/sh
 
-PKG_GROUPS=	${FRR_GROUP} ${FRR_VTY_GROUP}
-PKG_USERS=	${FRR_USER}:${FRR_GROUP}
+PKG_GROUPS=		${FRR_GROUP} ${FRR_VTY_GROUP}
+PKG_USERS=		${FRR_USER}:${FRR_GROUP}
 
-RCD_SUPPLIED=	bgpd ospf6d ospfd ripd ripngd zebra
-RCD_SCRIPTS=	${RCD_SUPPLIED} staticd
+FILES_SUBST+=		FRR_VTY_GROUP=${FRR_VTY_GROUP}
+FILES_SUBST+=		FRR_USER=${FRR_USER}
+
+RCD_SUPPLIED=		bgpd ospf6d ospfd ripd ripngd zebra
+RCD_SCRIPTS=		${RCD_SUPPLIED} staticd
 
 .for f in ${RCD_SUPPLIED}
 RCD_SCRIPT_SRC.${f}=	${WRKSRC}/pkgsrc/${f}.sh
 .endfor
 
-USE_TOOLS+=	bash:run
-REPLACE_BASH=	tools/frr.in tools/*.sh.in
-
-REPLACE_PYTHON=	tools/generate_support_bundle.py tools/frr-reload.py tools/frr_babeltrace.py
+USE_TOOLS+=		bash:run
+REPLACE_BASH=		tools/frr.in tools/*.sh.in
 
-MESSAGE_SUBST+=		FRR_USER=${FRR_USER}
-MESSAGE_SUBST+=		FRR_VTY_GROUP=${FRR_VTY_GROUP}
+REPLACE_PYTHON=		tools/generate_support_bundle.py
+REPLACE_PYTHON+=	tools/frr-reload.py
+REPLACE_PYTHON+=	tools/frr_babeltrace.py
 
-SUBST_CLASSES+=		ids
-SUBST_STAGE.ids=	pre-configure
-SUBST_MESSAGE.ids=	Fixing user/group references.
-SUBST_FILES.ids=	pkgsrc/zebra.sh.in
-SUBST_VARS.ids=		FRR_USER FRR_VTY_GROUP
+PRINT_PLIST_AWK+=	{ sub(/^(info|man|share\/doc)\//, "$${PLIST.doc}&"); }
 
 SUBST_CLASSES+=		workdir
 SUBST_STAGE.workdir=	post-configure
@@ -79,30 +75,25 @@ SUBST_VARS.workdir=
 CFLAGS+=		-DFRR_XREF_NO_NOTE
 .endif
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--enable-user=${FRR_USER}
-CONFIGURE_ARGS+=	--enable-group=${FRR_GROUP}
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/run/frr
+CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
+CONFIGURE_ARGS+=	--enable-user="${FRR_USER}"
+CONFIGURE_ARGS+=	--enable-group="${FRR_GROUP}"
+CONFIGURE_ARGS+=	--localstatedir="${VARBASE}"
 CONFIGURE_ARGS+=	--enable-multipath=64
-CONFIGURE_ARGS+=	--enable-vty-group=${FRR_VTY_GROUP}
-CONFIGURE_ARGS+=	--enable-configfile-mask=${FRR_CONF_MODE}
-CONFIGURE_ARGS+=	--enable-logfile-mask=${FRR_LOG_MODE}
+CONFIGURE_ARGS+=	--enable-vty-group="${FRR_VTY_GROUP}"
+CONFIGURE_ARGS+=	--enable-configfile-mask="${FRR_CONF_MODE}"
+CONFIGURE_ARGS+=	--enable-logfile-mask="${FRR_LOG_MODE}"
 CONFIGURE_ARGS+=	--enable-fpm
 CONFIGURE_ARGS+=	--disable-ospfclient
 CONFIGURE_ARGS+=	--enable-protobuf
 CONFIGURE_ARGS+=	--enable-sharpd
 CONFIGURE_ARGS+=	--with-pkg-git-version
-CONFIGURE_ARGS+=	--with-pkg-extra-version=/${DISTNAME}
+CONFIGURE_ARGS+=	--with-pkg-extra-version="/${DISTNAME}"
 # CONFIGURE_ARGS+=	--enable-address-sanitizer
 CONFIGURE_ARGS+=	--enable-dev-build
-pre-configure:
-	cd ${WRKSRC} && ${SH} bootstrap.sh
 
-#
-# remove dynamically acquired .js files
-#
-post-build:
-	cd ${WRKSRC} && rm -f doc/user/_build/html/_static/jquery-*.js doc/user/_build/html/_static/underscore-*.js
+pre-configure:
+	cd "${WRKSRC}" && "${SH}" bootstrap.sh
 
 .include "../../devel/libyang2/buildlink3.mk"
 .include "../../devel/protobuf-c/buildlink3.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/net/frr/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- PLIST	9 Jan 2024 20:17:41 -0000	1.8
+++ PLIST	23 Oct 2025 02:40:51 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2024/01/09 20:17:41 chopps Exp $
+@comment $NetBSD$
 bin/mtracebis
 bin/vtysh
 include/frr/admin_group.h
@@ -34,13 +34,16 @@ include/frr/freebsd-queue.h
 include/frr/frr_pthread.h
 include/frr/frratomic.h
 include/frr/frrcu.h
+include/frr/frrdistance.h
 include/frr/frrevent.h
 include/frr/frrlua.h
 include/frr/frrscript.h
+include/frr/frrsendmmsg.h
 include/frr/frrstr.h
 include/frr/graph.h
 include/frr/hash.h
 include/frr/hook.h
+include/frr/host_nb.h
 include/frr/iana_afi.h
 include/frr/id_alloc.h
 include/frr/if.h
@@ -54,6 +57,7 @@ include/frr/keychain.h
 include/frr/ldp_sync.h
 include/frr/lib_errors.h
 include/frr/lib_vty.h
+include/frr/libagentx.h
 include/frr/libfrr.h
 include/frr/libfrr_trace.h
 include/frr/libospf.h
@@ -63,12 +67,11 @@ include/frr/log.h
 include/frr/log_vty.h
 include/frr/md5.h
 include/frr/memory.h
-include/frr/mgmt.pb-c.h
 include/frr/mgmt_be_client.h
+include/frr/mgmt_defines.h
 include/frr/mgmt_fe_client.h
 include/frr/mgmt_msg.h
-include/frr/mgmt_pb.h
-include/frr/mgmtd/mgmt_defines.h
+include/frr/mgmt_msg_native.h
 include/frr/mlag.h
 include/frr/module.h
 include/frr/monotime.h
@@ -148,6 +151,7 @@ include/frr/zebra.h
 include/frr/zlog.h
 include/frr/zlog_5424.h
 include/frr/zlog_live.h
+include/frr/zlog_recirculate.h
 include/frr/zlog_targets.h
 ${PLIST.doc}info/frr.info
 lib/frr/modules/bgpd_bmp.la
@@ -159,6 +163,7 @@ lib/libfrr_pb.la
 lib/libfrrcares.la
 lib/libfrrfpm_pb.la
 lib/libmgmt_be_nb.la
+lib/libmlag_pb.la
 ${PLIST.doc}man/man1/frr.1
 ${PLIST.doc}man/man1/vtysh.1
 ${PLIST.doc}man/man8/frr-bfdd.8
@@ -182,6 +187,7 @@ sbin/bfdd
 sbin/bgpd
 sbin/eigrpd
 sbin/fabricd
+sbin/fpm_listener
 sbin/frr
 sbin/frr-reload
 sbin/frr-reload.py
@@ -219,13 +225,16 @@ ${PLIST.doc}share/doc/frr/html/_images/f
 ${PLIST.doc}share/doc/frr/html/_images/pathd_config.png
 ${PLIST.doc}share/doc/frr/html/_images/pathd_general.png
 ${PLIST.doc}share/doc/frr/html/_images/pathd_initiated_multi.png
+${PLIST.doc}share/doc/frr/html/_sources/about.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/affinitymap.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/babeld.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/basic.rst.txt
+${PLIST.doc}share/doc/frr/html/_sources/basics.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/bfd.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/bgp.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/bmp.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/bugs.rst.txt
+${PLIST.doc}share/doc/frr/html/_sources/config-include.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/eigrpd.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/evpn.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/extlog.rst.txt
@@ -236,6 +245,7 @@ ${PLIST.doc}share/doc/frr/html/_sources/
 ${PLIST.doc}share/doc/frr/html/_sources/grpc.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/index.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/installation.rst.txt
+${PLIST.doc}share/doc/frr/html/_sources/introduction.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/ipv6.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/isisd.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/kernel.rst.txt
@@ -245,15 +255,17 @@ ${PLIST.doc}share/doc/frr/html/_sources/
 ${PLIST.doc}share/doc/frr/html/_sources/nhrpd.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/ospf6d.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/ospfd.rst.txt
-${PLIST.doc}share/doc/frr/html/_sources/overview.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/packet-dumps.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/pathd.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/pbr.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/pim.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/pimv6.rst.txt
+${PLIST.doc}share/doc/frr/html/_sources/prior-config-files.rst.txt
+${PLIST.doc}share/doc/frr/html/_sources/protocols.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/ripd.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/ripngd.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/routemap.rst.txt
+${PLIST.doc}share/doc/frr/html/_sources/sbfd.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/scripting.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/setup.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/sharp.rst.txt
@@ -264,14 +276,60 @@ ${PLIST.doc}share/doc/frr/html/_sources/
 ${PLIST.doc}share/doc/frr/html/_sources/vtysh.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/watchfrr.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/zebra.rst.txt
+${PLIST.doc}share/doc/frr/html/_static/_sphinx_javascript_frameworks_compat.js
 ${PLIST.doc}share/doc/frr/html/_static/basic.css
-${PLIST.doc}share/doc/frr/html/_static/classic.css
-${PLIST.doc}share/doc/frr/html/_static/default.css
+${PLIST.doc}share/doc/frr/html/_static/css/badge_only.css
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/Roboto-Slab-Bold.woff
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/Roboto-Slab-Bold.woff2
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/Roboto-Slab-Regular.woff
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/Roboto-Slab-Regular.woff2
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/fontawesome-webfont.eot
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/fontawesome-webfont.svg
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/fontawesome-webfont.ttf
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/fontawesome-webfont.woff
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/fontawesome-webfont.woff2
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/lato-bold-italic.woff
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/lato-bold-italic.woff2
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/lato-bold.woff
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/lato-bold.woff2
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/lato-normal-italic.woff
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/lato-normal-italic.woff2
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/lato-normal.woff
+${PLIST.doc}share/doc/frr/html/_static/css/fonts/lato-normal.woff2
+${PLIST.doc}share/doc/frr/html/_static/css/theme.css
 ${PLIST.doc}share/doc/frr/html/_static/doctools.js
 ${PLIST.doc}share/doc/frr/html/_static/documentation_options.js
 ${PLIST.doc}share/doc/frr/html/_static/file.png
+${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-bold.eot
+${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-bold.ttf
+${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-bold.woff
+${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-bold.woff2
+${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-bolditalic.eot
+${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-bolditalic.ttf
+${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-bolditalic.woff
+${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-bolditalic.woff2
+${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-italic.eot
+${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-italic.ttf
+${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-italic.woff
+${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-italic.woff2
+${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-regular.eot
+${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-regular.ttf
+${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-regular.woff
+${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-regular.woff2
+${PLIST.doc}share/doc/frr/html/_static/fonts/RobotoSlab/roboto-slab-v7-bold.eot
+${PLIST.doc}share/doc/frr/html/_static/fonts/RobotoSlab/roboto-slab-v7-bold.ttf
+${PLIST.doc}share/doc/frr/html/_static/fonts/RobotoSlab/roboto-slab-v7-bold.woff
+${PLIST.doc}share/doc/frr/html/_static/fonts/RobotoSlab/roboto-slab-v7-bold.woff2
+${PLIST.doc}share/doc/frr/html/_static/fonts/RobotoSlab/roboto-slab-v7-regular.eot
+${PLIST.doc}share/doc/frr/html/_static/fonts/RobotoSlab/roboto-slab-v7-regular.ttf
+${PLIST.doc}share/doc/frr/html/_static/fonts/RobotoSlab/roboto-slab-v7-regular.woff
+${PLIST.doc}share/doc/frr/html/_static/fonts/RobotoSlab/roboto-slab-v7-regular.woff2
 ${PLIST.doc}share/doc/frr/html/_static/frr-icon.svg
 ${PLIST.doc}share/doc/frr/html/_static/frr-logo-icon.png
+${PLIST.doc}share/doc/frr/html/_static/jquery.js
+${PLIST.doc}share/doc/frr/html/_static/js/badge_only.js
+${PLIST.doc}share/doc/frr/html/_static/js/theme.js
+${PLIST.doc}share/doc/frr/html/_static/js/versions.js
 ${PLIST.doc}share/doc/frr/html/_static/language_data.js
 ${PLIST.doc}share/doc/frr/html/_static/minus.png
 ${PLIST.doc}share/doc/frr/html/_static/overrides.css
@@ -279,15 +337,17 @@ ${PLIST.doc}share/doc/frr/html/_static/o
 ${PLIST.doc}share/doc/frr/html/_static/plus.png
 ${PLIST.doc}share/doc/frr/html/_static/pygments.css
 ${PLIST.doc}share/doc/frr/html/_static/searchtools.js
-${PLIST.doc}share/doc/frr/html/_static/sidebar.js
 ${PLIST.doc}share/doc/frr/html/_static/sphinx_highlight.js
+${PLIST.doc}share/doc/frr/html/about.html
 ${PLIST.doc}share/doc/frr/html/affinitymap.html
 ${PLIST.doc}share/doc/frr/html/babeld.html
 ${PLIST.doc}share/doc/frr/html/basic.html
+${PLIST.doc}share/doc/frr/html/basics.html
 ${PLIST.doc}share/doc/frr/html/bfd.html
 ${PLIST.doc}share/doc/frr/html/bgp.html
 ${PLIST.doc}share/doc/frr/html/bmp.html
 ${PLIST.doc}share/doc/frr/html/bugs.html
+${PLIST.doc}share/doc/frr/html/config-include.html
 ${PLIST.doc}share/doc/frr/html/eigrpd.html
 ${PLIST.doc}share/doc/frr/html/evpn.html
 ${PLIST.doc}share/doc/frr/html/extlog.html
@@ -299,6 +359,7 @@ ${PLIST.doc}share/doc/frr/html/glossary.
 ${PLIST.doc}share/doc/frr/html/grpc.html
 ${PLIST.doc}share/doc/frr/html/index.html
 ${PLIST.doc}share/doc/frr/html/installation.html
+${PLIST.doc}share/doc/frr/html/introduction.html
 ${PLIST.doc}share/doc/frr/html/ipv6.html
 ${PLIST.doc}share/doc/frr/html/isisd.html
 ${PLIST.doc}share/doc/frr/html/kernel.html
@@ -309,15 +370,17 @@ ${PLIST.doc}share/doc/frr/html/nhrpd.htm
 ${PLIST.doc}share/doc/frr/html/objects.inv
 ${PLIST.doc}share/doc/frr/html/ospf6d.html
 ${PLIST.doc}share/doc/frr/html/ospfd.html
-${PLIST.doc}share/doc/frr/html/overview.html
 ${PLIST.doc}share/doc/frr/html/packet-dumps.html
 ${PLIST.doc}share/doc/frr/html/pathd.html
 ${PLIST.doc}share/doc/frr/html/pbr.html
 ${PLIST.doc}share/doc/frr/html/pim.html
 ${PLIST.doc}share/doc/frr/html/pimv6.html
+${PLIST.doc}share/doc/frr/html/prior-config-files.html
+${PLIST.doc}share/doc/frr/html/protocols.html
 ${PLIST.doc}share/doc/frr/html/ripd.html
 ${PLIST.doc}share/doc/frr/html/ripngd.html
 ${PLIST.doc}share/doc/frr/html/routemap.html
+${PLIST.doc}share/doc/frr/html/sbfd.html
 ${PLIST.doc}share/doc/frr/html/scripting.html
 ${PLIST.doc}share/doc/frr/html/search.html
 ${PLIST.doc}share/doc/frr/html/searchindex.js
@@ -331,6 +394,7 @@ ${PLIST.doc}share/doc/frr/html/vtysh.htm
 ${PLIST.doc}share/doc/frr/html/watchfrr.html
 ${PLIST.doc}share/doc/frr/html/zebra.html
 share/yang/frr-affinity-map.yang
+share/yang/frr-backend.yang
 share/yang/frr-bfdd.yang
 share/yang/frr-bgp-bmp.yang
 share/yang/frr-bgp-common-multiprotocol.yang
@@ -344,9 +408,11 @@ share/yang/frr-bgp-rpki.yang
 share/yang/frr-bgp-types.yang
 share/yang/frr-bgp.yang
 share/yang/frr-deviations-bgp-datacenter.yang
+share/yang/frr-deviations-ietf-key-chain.yang
 share/yang/frr-eigrpd.yang
 share/yang/frr-filter.yang
 share/yang/frr-gmp.yang
+share/yang/frr-host.yang
 share/yang/frr-if-rmap.yang
 share/yang/frr-interface.yang
 share/yang/frr-isisd.yang
@@ -356,6 +422,7 @@ share/yang/frr-ospf-route-map.yang
 share/yang/frr-ospf6-route-map.yang
 share/yang/frr-ospfd.yang
 share/yang/frr-pathd.yang
+share/yang/frr-pim-candidate.yang
 share/yang/frr-pim-rp.yang
 share/yang/frr-pim.yang
 share/yang/frr-ripd.yang
@@ -370,4 +437,9 @@ share/yang/frr-zebra-route-map.yang
 share/yang/frr-zebra.yang
 share/yang/ietf-bgp-types.yang
 share/yang/ietf-interfaces.yang
+share/yang/ietf-key-chain.yang
+share/yang/ietf-netconf-acm.yang
+share/yang/ietf-netconf-with-defaults.yang
+share/yang/ietf-netconf.yang
 share/yang/ietf-routing-types.yang
+share/yang/ietf-srv6-types.yang
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/frr/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo	9 Jan 2024 20:17:41 -0000	1.9
+++ distinfo	23 Oct 2025 02:40:51 -0000
@@ -1,9 +1,17 @@
 $NetBSD: distinfo,v 1.9 2024/01/09 20:17:41 chopps Exp $
 
-BLAKE2s (frr-9.1.tar.gz) = c09d3967700a1a385d2b055d603e5291c6863767581a9115d46c96e40908a296
-SHA512 (frr-9.1.tar.gz) = 77b278a3ea87da9dfd7b87e4f9ae67f08ed0f24809f6dd228d2ab2e2c29e2b3191d59d50fc474e53e159ac6c79c302481b462125d0657889516f07b8e05e8562
-Size (frr-9.1.tar.gz) = 10779477 bytes
+BLAKE2s (frr-10.4.1.tar.gz) = 848f862b071c588c0a32f018ac2982eef5b2e30bc49c4d7f0b980d47898c731b
+SHA512 (frr-10.4.1.tar.gz) = c2903e4ddba0ff484872c0378c64dfbe5a92620d62d918c0a1330302d798ad04b7ce81e10f2dc693b37b8d651ad0c76d3f0a2c57db4c5676ff221610173b10c3
+Size (frr-10.4.1.tar.gz) = 11564121 bytes
 SHA1 (patch-configure.ac) = d10b406ff371ffab7ce8eb63392c856a87300aa3
+SHA1 (patch-lib_elf__py.c) = f719d4542f22a292b2625a19b5f73a2e107bd68b
 SHA1 (patch-lib_frr__pthread.c) = 566b2a54ebbcf79abaae7f39e563b4b83bd8f474
-SHA1 (patch-pkgsrc_zebra.sh.in) = a466eef102995b1627f031986d10b1d1519dc59e
+SHA1 (patch-pkgsrc_bgpd.sh.in) = a86e4ebdb80d3b09b289ed8105aa9a597d9a7b10
+SHA1 (patch-pkgsrc_eigrpd.sh.in) = 3489c90131e07121e837d3fc785f1f381f24d1d5
+SHA1 (patch-pkgsrc_mgmtd.sh.in) = 2ad184fd002f07e3d2c33c80323975542faa0c10
+SHA1 (patch-pkgsrc_ospf6d.sh.in) = 13ecd222d80948eb0faaee8392b881a246e47f8a
+SHA1 (patch-pkgsrc_ospfd.sh.in) = 774b84905d9341294827f5affcc4fddec14f5a37
+SHA1 (patch-pkgsrc_ripd.sh.in) = a4960c0617d39ea9bf58e04eae2a93569fcea6e2
+SHA1 (patch-pkgsrc_ripngd.sh.in) = 296141e055e19cca4201b89c983f9b49ec4babc7
+SHA1 (patch-pkgsrc_zebra.sh.in) = 085796da772ea90b5bb35fb390abdcd0b29bcfbb
 SHA1 (patch-zebra_kernel__socket.c) = 118acf4a3d5424a45d1d1c037f1198f6162f4993
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/frr/options.mk,v
retrieving revision 1.5
diff -u -p -r1.5 options.mk
--- options.mk	9 Oct 2025 07:57:50 -0000	1.5
+++ options.mk	23 Oct 2025 02:40:51 -0000
@@ -14,12 +14,13 @@ PLIST_VARS+=		doc
 ### doc/man support
 ###
 .if !empty(PKG_OPTIONS:Mdoc)
-USE_TOOLS+=		makeinfo
-CONFIGURE_ARGS+=	--enable-doc-html
+USE_TOOLS+=			makeinfo
+CONFIGURE_ARGS+=		--enable-doc-html
 PYTHON_VERSIONS_INCOMPATIBLE=	310 # py-sphinx
-TOOL_DEPENDS+=		${PYPKGPREFIX}-sphinx>=7.0:../../textproc/py-sphinx
-PLIST.doc=		yes
-INFO_FILES=		yes
+TOOL_DEPENDS+=			${PYPKGPREFIX}-sphinx>=8.2:../../textproc/py-sphinx
+TOOL_DEPENDS+=			${PYPKGPREFIX}-sphinx-rtd-theme>=3.0.2:../../textproc/py-sphinx-rtd-theme
+PLIST.doc=			yes
+INFO_FILES=			yes
 .else
-CONFIGURE_ARGS+=	--disable-doc
+CONFIGURE_ARGS+=		--disable-doc
 .endif
Index: files/staticd.sh
===================================================================
RCS file: /cvsroot/pkgsrc/net/frr/files/staticd.sh,v
retrieving revision 1.1
diff -u -p -r1.1 staticd.sh
--- files/staticd.sh	10 Dec 2020 16:43:24 -0000	1.1
+++ files/staticd.sh	23 Oct 2025 02:40:51 -0000
@@ -16,7 +16,7 @@ fi
 
 name="staticd"
 rcvar=$name
-required_files="@PREFIX@/etc/frr/${name}.conf"
+required_files="@PKG_SYSCONFDIR@/frr/${name}.conf"
 command="@PREFIX@/sbin/${name}"
 command_args="-d"
 
Index: patches/patch-lib_elf__py.c
===================================================================
RCS file: patches/patch-lib_elf__py.c
diff -N patches/patch-lib_elf__py.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_elf__py.c	23 Oct 2025 02:40:51 -0000
@@ -0,0 +1,17 @@
+$NetBSD$
+
+POSIX does not define the content of <elf.h>, or require that it exist.
+
+https://github.com/FRRouting/frr/commit/2597c2769606f6c7eafe971a3384c14e6433174b.patch
+
+--- lib/elf_py.c
++++ lib/elf_py.c
+@@ -56,8 +56,6 @@
+ #define _FILE_OFFSET_BITS 32
+ #endif
+ 
+-#include <elf.h>
+-#include <libelf.h>
+ #include <gelf.h>
+ 
+ #include "typesafe.h"
Index: patches/patch-pkgsrc_bgpd.sh.in
===================================================================
RCS file: patches/patch-pkgsrc_bgpd.sh.in
diff -N patches/patch-pkgsrc_bgpd.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-pkgsrc_bgpd.sh.in	23 Oct 2025 02:40:51 -0000
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Use correct configure values.
+
+--- pkgsrc/bgpd.sh.in.orig	2025-08-02 07:08:42.000000000 +0000
++++ pkgsrc/bgpd.sh.in	2025-10-23 01:56:07.562500925 +0000
+@@ -16,12 +16,12 @@
+ 
+ name="bgpd"
+ rcvar=$name
+-required_files="@e_sysconfdir@/${name}.conf"
++required_files="@e_frr_sysconfdir@/${name}.conf"
+ command="@prefix@/sbin/${name}"
+ command_args="-d"
+ 
+ start_precmd="zebra_precmd"
+-socket_dir=@localstatedir@
++socket_dir="@e_frr_runstatedir@"
+ pidfile="${socket_dir}/${name}.pid"
+ 
+ zebra_precmd()
Index: patches/patch-pkgsrc_eigrpd.sh.in
===================================================================
RCS file: patches/patch-pkgsrc_eigrpd.sh.in
diff -N patches/patch-pkgsrc_eigrpd.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-pkgsrc_eigrpd.sh.in	23 Oct 2025 02:40:51 -0000
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Use correct configure values.
+
+--- pkgsrc/eigrpd.sh.in.orig	2025-08-02 07:08:42.000000000 +0000
++++ pkgsrc/eigrpd.sh.in	2025-10-23 01:56:10.951445320 +0000
+@@ -16,12 +16,12 @@
+ 
+ name="eigrpd"
+ rcvar=$name
+-required_files="@e_sysconfdir@/${name}.conf"
++required_files="@e_frr_sysconfdir@/${name}.conf"
+ command="@prefix@/sbin/${name}"
+ command_args="-d"
+ 
+ start_precmd="zebra_precmd"
+-socket_dir=@localstatedir@
++socket_dir="@e_frr_runstatedir@"
+ pidfile="${socket_dir}/${name}.pid"
+ 
+ zebra_precmd()
Index: patches/patch-pkgsrc_mgmtd.sh.in
===================================================================
RCS file: patches/patch-pkgsrc_mgmtd.sh.in
diff -N patches/patch-pkgsrc_mgmtd.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-pkgsrc_mgmtd.sh.in	23 Oct 2025 02:40:51 -0000
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Use correct configure values.
+
+--- pkgsrc/mgmtd.sh.in.orig	2025-08-02 07:08:42.000000000 +0000
++++ pkgsrc/mgmtd.sh.in	2025-10-23 01:56:14.188869207 +0000
+@@ -16,12 +16,12 @@
+ 
+ name="mgmtd"
+ rcvar=$name
+-required_files="@e_sysconfdir@/${name}.conf"
++required_files="@e_frr_sysconfdir@/${name}.conf"
+ command="@prefix@/sbin/${name}"
+ command_args="-d"
+ 
+ start_precmd="zebra_precmd"
+-socket_dir=@localstatedir@
++socket_dir="@e_frr_runstatedir@"
+ pidfile="${socket_dir}/${name}.pid"
+ 
+ zebra_precmd()
Index: patches/patch-pkgsrc_ospf6d.sh.in
===================================================================
RCS file: patches/patch-pkgsrc_ospf6d.sh.in
diff -N patches/patch-pkgsrc_ospf6d.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-pkgsrc_ospf6d.sh.in	23 Oct 2025 02:40:51 -0000
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Use correct configure values.
+
+--- pkgsrc/ospf6d.sh.in.orig	2025-08-02 07:08:42.000000000 +0000
++++ pkgsrc/ospf6d.sh.in	2025-10-23 01:56:16.990957967 +0000
+@@ -16,12 +16,12 @@
+ 
+ name="ospf6d"
+ rcvar=$name
+-required_files="@e_sysconfdir@/${name}.conf"
++required_files="@e_frr_sysconfdir@/${name}.conf"
+ command="@prefix@/sbin/${name}"
+ command_args="-d"
+ 
+ start_precmd="zebra_precmd"
+-socket_dir=@localstatedir@
++socket_dir="@e_frr_runstatedir@"
+ pidfile="${socket_dir}/${name}.pid"
+ 
+ zebra_precmd()
Index: patches/patch-pkgsrc_ospfd.sh.in
===================================================================
RCS file: patches/patch-pkgsrc_ospfd.sh.in
diff -N patches/patch-pkgsrc_ospfd.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-pkgsrc_ospfd.sh.in	23 Oct 2025 02:40:51 -0000
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Use correct configure values.
+
+--- pkgsrc/ospfd.sh.in.orig	2025-08-02 07:08:42.000000000 +0000
++++ pkgsrc/ospfd.sh.in	2025-10-23 01:56:26.516010507 +0000
+@@ -16,12 +16,12 @@
+ 
+ name="ospfd"
+ rcvar=$name
+-required_files="@e_sysconfdir@/${name}.conf"
++required_files="@e_frr_sysconfdir@/${name}.conf"
+ command="@prefix@/sbin/${name}"
+ command_args="-d"
+ 
+ start_precmd="zebra_precmd"
+-socket_dir=@localstatedir@
++socket_dir="@e_frr_runstatedir@"
+ pidfile="${socket_dir}/${name}.pid"
+ 
+ zebra_precmd()
Index: patches/patch-pkgsrc_ripd.sh.in
===================================================================
RCS file: patches/patch-pkgsrc_ripd.sh.in
diff -N patches/patch-pkgsrc_ripd.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-pkgsrc_ripd.sh.in	23 Oct 2025 02:40:51 -0000
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Use correct configure values.
+
+--- pkgsrc/ripd.sh.in.orig	2025-08-02 07:08:42.000000000 +0000
++++ pkgsrc/ripd.sh.in	2025-10-23 01:56:30.213267381 +0000
+@@ -16,12 +16,12 @@
+ 
+ name="ripd"
+ rcvar=$name
+-required_files="@e_sysconfdir@/${name}.conf"
++required_files="@e_frr_sysconfdir@/${name}.conf"
+ command="@prefix@/sbin/${name}"
+ command_args="-d"
+ 
+ start_precmd="zebra_precmd"
+-socket_dir=@localstatedir@
++socket_dir="@e_frr_runstatedir@"
+ pidfile="${socket_dir}/${name}.pid"
+ 
+ zebra_precmd()
Index: patches/patch-pkgsrc_ripngd.sh.in
===================================================================
RCS file: patches/patch-pkgsrc_ripngd.sh.in
diff -N patches/patch-pkgsrc_ripngd.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-pkgsrc_ripngd.sh.in	23 Oct 2025 02:40:51 -0000
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Use correct configure values.
+
+--- pkgsrc/ripngd.sh.in.orig	2025-08-02 07:08:42.000000000 +0000
++++ pkgsrc/ripngd.sh.in	2025-10-23 01:56:33.609044596 +0000
+@@ -16,12 +16,12 @@
+ 
+ name="ripngd"
+ rcvar=$name
+-required_files="@e_sysconfdir@/${name}.conf"
++required_files="@e_frr_sysconfdir@/${name}.conf"
+ command="@prefix@/sbin/${name}"
+ command_args="-d"
+ 
+ start_precmd="zebra_precmd"
+-socket_dir=@localstatedir@
++socket_dir="@e_frr_runstatedir@"
+ pidfile="${socket_dir}/${name}.pid"
+ 
+ zebra_precmd()
Index: patches/patch-pkgsrc_zebra.sh.in
===================================================================
RCS file: /cvsroot/pkgsrc/net/frr/patches/patch-pkgsrc_zebra.sh.in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-pkgsrc_zebra.sh.in
--- patches/patch-pkgsrc_zebra.sh.in	9 Jan 2024 20:17:41 -0000	1.2
+++ patches/patch-pkgsrc_zebra.sh.in	23 Oct 2025 02:40:51 -0000
@@ -1,16 +1,29 @@
 $NetBSD: patch-pkgsrc_zebra.sh.in,v 1.2 2024/01/09 20:17:41 chopps Exp $
 
-	don't hard-code quagga.quagga in chown command in
-	pkgsrc/zebra.sh.in.
+Use correct configure values.
 
---- pkgsrc/zebra.sh.in.orig	2023-11-27 13:45:33.000000000 +0000
-+++ pkgsrc/zebra.sh.in
-@@ -28,7 +28,7 @@ pidfile="${socket_dir}/${name}.pid"
+--- pkgsrc/zebra.sh.in.orig	2025-08-02 07:08:42.000000000 +0000
++++ pkgsrc/zebra.sh.in	2025-10-23 01:56:36.814009973 +0000
+@@ -16,19 +16,19 @@
+ 
+ name="zebra"
+ rcvar=$name
+-required_files="@e_sysconfdir@/${name}.conf"
++required_files="@e_frr_sysconfdir@/${name}.conf"
+ command="@prefix@/sbin/${name}"
+ command_args="-d"
+ 
+ start_precmd="zebra_precmd"
+ stop_postcmd="zebra_postcmd"
+-socket_dir=@localstatedir@
++socket_dir="@e_frr_runstatedir@"
+ pidfile="${socket_dir}/${name}.pid"
+ 
  zebra_precmd()
  {
      mkdir -p "${socket_dir}"
 -    chown quagga.quagga "${socket_dir}"
-+    chown @FRR_USER@.@FRR_VTY_GROUP@ "${socket_dir}"
++    chown "@enable_user@:@enable_vty_group@" "${socket_dir}"
      chmod 750 "${socket_dir}"
      rc_flags="$(
  	set -- $rc_flags