Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D3EE6852F9 for ; Sun, 28 May 2023 16:03:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id VeR9ohExUjSo for ; Sun, 28 May 2023 16:03:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3195A84E7F for ; Sun, 28 May 2023 16:03:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2AA19FA87; Sun, 28 May 2023 16:03:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168528982416200" MIME-Version: 1.0 Date: Sun, 28 May 2023 16:03:44 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/net/frr To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230528160344.2AA19FA87@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_168528982416200 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sun May 28 16:03:44 UTC 2023 Modified Files: pkgsrc/net/frr: Makefile PLIST options.mk Log Message: frr: depend on latest py-sphinx and fix PLIST for it Bump PKREVISION To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/frr/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/frr/PLIST cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/frr/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168528982416200 Content-Disposition: inline Content-Length: 3191 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/frr/Makefile diff -u pkgsrc/net/frr/Makefile:1.13 pkgsrc/net/frr/Makefile:1.14 --- pkgsrc/net/frr/Makefile:1.13 Tue Nov 15 09:25:07 2022 +++ pkgsrc/net/frr/Makefile Sun May 28 16:03:43 2023 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.13 2022/11/15 09:25:07 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2023/05/28 16:03:43 wiz Exp $ GITHUB_PROJECT= frr VERSION= 8.2.2 GITHUB_TAG= frr-${VERSION} DISTNAME= frr-${VERSION} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=FRRouting/} @@ -21,7 +21,7 @@ USE_TOOLS+= gmake perl bash pkg-config USE_LIBTOOL= YES GNU_CONFIGURE= yes BUILD_DEFS= VARBASE -BISON_REQD= 3.3 +BISON_REQD+= 3.3 .include "../../mk/bsd.prefs.mk" .include "options.mk" Index: pkgsrc/net/frr/PLIST diff -u pkgsrc/net/frr/PLIST:1.6 pkgsrc/net/frr/PLIST:1.7 --- pkgsrc/net/frr/PLIST:1.6 Tue Nov 15 09:25:07 2022 +++ pkgsrc/net/frr/PLIST Sun May 28 16:03:43 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2022/11/15 09:25:07 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2023/05/28 16:03:43 wiz Exp $ bin/mtracebis bin/vtysh include/frr/agg_table.h @@ -237,7 +237,6 @@ ${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 @@ -246,7 +245,6 @@ ${PLIST.doc}share/doc/frr/html/_static/d ${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 -${PLIST.doc}share/doc/frr/html/_static/jquery.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 @@ -256,7 +254,6 @@ ${PLIST.doc}share/doc/frr/html/_static/p ${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/_static/underscore.js ${PLIST.doc}share/doc/frr/html/babeld.html ${PLIST.doc}share/doc/frr/html/basic.html ${PLIST.doc}share/doc/frr/html/bfd.html Index: pkgsrc/net/frr/options.mk diff -u pkgsrc/net/frr/options.mk:1.1 pkgsrc/net/frr/options.mk:1.2 --- pkgsrc/net/frr/options.mk:1.1 Thu Dec 10 16:43:24 2020 +++ pkgsrc/net/frr/options.mk Sun May 28 16:03:43 2023 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2020/12/10 16:43:24 kardel Exp $ +# $NetBSD: options.mk,v 1.2 2023/05/28 16:03:43 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 CONFIGURE_ARGS+= --infodir=${PREFIX}/info -TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx>=2.4.4:../../textproc/py-sphinx +TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx>=7.0:../../textproc/py-sphinx PLIST.doc= yes INFO_FILES= yes .else --_----------=_168528982416200--