CVS commit: pkgsrc/net/frr

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jan  3 16:26:24 UTC 2026

Modified Files:
        pkgsrc/net/frr: Makefile PLIST options.mk

Log Message:
frr: fix PLIST for latest sphinx

depend on it, simplify PLIST regen


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/frr/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/frr/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/frr/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/frr/Makefile
diff -u pkgsrc/net/frr/Makefile:1.26 pkgsrc/net/frr/Makefile:1.27
--- pkgsrc/net/frr/Makefile:1.26        Thu Oct 23 20:38:43 2025
+++ pkgsrc/net/frr/Makefile     Sat Jan  3 16:26:23 2026
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2025/10/23 20:38:43 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2026/01/03 16:26:23 wiz Exp $
 
-GITHUB_PROJECT=        frr
-VERSION=       9.1
-GITHUB_TAG=    frr-${VERSION}
-DISTNAME=      frr-${VERSION}
-PKGREVISION=   9
+DISTNAME=      frr-9.1
+PKGREVISION=   10
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=FRRouting/}
+GITHUB_TAG=    frr-${PKGVERSION_NOREV}
 
 MAINTAINER=    kardel%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/FRRouting/frr/
@@ -15,7 +13,7 @@ LICENSE=      gnu-gpl-v2
 
 CONFLICTS=     quagga-[0-9]*
 
-WRKSRC=                        ${WRKDIR}/frr-frr-${VERSION}
+WRKSRC=                        ${WRKDIR}/frr-${DISTNAME}
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake perl bash pkg-config autoconf automake autoreconf bison
 USE_LIBTOOL=           YES
@@ -56,6 +54,8 @@ REPLACE_BASH= tools/frr.in tools/*.sh.in
 
 REPLACE_PYTHON=        tools/generate_support_bundle.py tools/frr-reload.py tools/frr_babeltrace.py
 
+PRINT_PLIST_AWK+=      /^(man|info|share\/doc)/ { $$0 = "$${PLIST.doc}" $$0 }
+
 MESSAGE_SUBST+=                FRR_USER=${FRR_USER}
 MESSAGE_SUBST+=                FRR_VTY_GROUP=${FRR_VTY_GROUP}
 

Index: pkgsrc/net/frr/PLIST
diff -u pkgsrc/net/frr/PLIST:1.8 pkgsrc/net/frr/PLIST:1.9
--- pkgsrc/net/frr/PLIST:1.8    Tue Jan  9 20:17:41 2024
+++ pkgsrc/net/frr/PLIST        Sat Jan  3 16:26:23 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2024/01/09 20:17:41 chopps Exp $
+@comment $NetBSD: PLIST,v 1.9 2026/01/03 16:26:23 wiz Exp $
 bin/mtracebis
 bin/vtysh
 include/frr/admin_group.h
@@ -264,11 +264,13 @@ ${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/base-stemmer.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/doctools.js
 ${PLIST.doc}share/doc/frr/html/_static/documentation_options.js
+${PLIST.doc}share/doc/frr/html/_static/english-stemmer.js
 ${PLIST.doc}share/doc/frr/html/_static/file.png
 ${PLIST.doc}share/doc/frr/html/_static/frr-icon.svg
 ${PLIST.doc}share/doc/frr/html/_static/frr-logo-icon.png

Index: pkgsrc/net/frr/options.mk
diff -u pkgsrc/net/frr/options.mk:1.5 pkgsrc/net/frr/options.mk:1.6
--- pkgsrc/net/frr/options.mk:1.5       Thu Oct  9 07:57:50 2025
+++ pkgsrc/net/frr/options.mk   Sat Jan  3 16:26:23 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2025/10/09 07:57:50 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2026/01/03 16:26:23 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.frr
 PKG_SUPPORTED_OPTIONS= doc
@@ -17,7 +17,7 @@ PLIST_VARS+=          doc
 USE_TOOLS+=            makeinfo
 CONFIGURE_ARGS+=       --enable-doc-html
 PYTHON_VERSIONS_INCOMPATIBLE=  310 # py-sphinx
-TOOL_DEPENDS+=         ${PYPKGPREFIX}-sphinx>=7.0:../../textproc/py-sphinx
+TOOL_DEPENDS+=         ${PYPKGPREFIX}-sphinx>=9:../../textproc/py-sphinx
 PLIST.doc=             yes
 INFO_FILES=            yes
 .else