From nobody Thu Nov 16 10:40:11 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SWGkz23L5z50Tht; Thu, 16 Nov 2023 10:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SWGkz1Vz2z4LqK; Thu, 16 Nov 2023 10:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700131211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YGc2bPLH5jrGw78u+IaOBJubojxK8cKW9YX6zyxFvZU=; b=I4UUbOU9W7GSXqhObr+JTZCj2p1+BEinuTY7yVxQMe4o2B7Gq4oAh/D3cCIKSeKa7tpHAy N+8QttjrTRpX6M5eXHw0UDTpYLBjZmoMfIbJfQJpz+qgma+vlmvPGV1Xt1hp/oXQipw0Tk Z7ZpqcDRFzc7iOktA1ijT7qP9B4h1jT+GPRSvlmrMxTYjDuGl1Rg1Gh2AHlzvcaYncd0rP jd5coKG06T6De1LGMl4pFi48edQ+8AdKOBe1illjHhB9CxU76J0kejOv7Xxg5qFNlwzWY7 pQ5QydQkB/PELY8MDQg+BhYOgnxObMjdmR4XI6Ot0yYKg7LRAkL5TOB3jBRP0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700131211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YGc2bPLH5jrGw78u+IaOBJubojxK8cKW9YX6zyxFvZU=; b=K0csx1zWgDqzm8Z/fNVRHpvuwITONem6qKyy+HXhMA2pzC06kD6L61HqAu/6ixTE15vkkh vw/4rqCbEMA3mA+QHFsbFUIOeMePT+uEljujOsq9GSbaHwW10fK8jCPpCCubu61jKN/ENo LFb+EdcTjblEmvTOfKOhveK8zoAxuHW9RQ2AD3vEHksnMfLa5FKEmJS6AaCHgCnaPXCJEd LhKv+BrOyholTMcXbvAPqtwr0iaXEAr8CJyukgxD/VnuxEIo0okojm11a8hy+YBSFlNs3L uxRXwm/L1hNBNUxnTJfsCYE9Tne7gHRWuHQx5pI9uKxZm4rH4HhumIDKQO4IXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700131211; a=rsa-sha256; cv=none; b=WZjZkZ09tQn83h7sSQR7tcYg0xClkgzSsCqksbvrR4Q2ZhAT6lYWOfsQfdLwCJSVB5WY8k PzQyW1ZkCKKfnRmNqegueJml6kRPu1dCIeyaT/uhyDhSmGOOo/JyryFVZUYKOOAY+q8AwG aCsK77AHlJJmngne5fGfb1ny9H0e7Q9KrwM9RaIs6vRN35a8w3LfHfHijkvM+x3QZDZGj8 NW7b9XbtoWlY/ufaJa9OYObxB0RpGt2TwVCt4zRwtFYrAnoQhC06YQ8i3dcI0NozUIkJ12 Rj/c/7GCkiy9Ygf+P3npyaTxM4fdveIllTS8k4GdCeGmj9pnh3+cHQuBPg/ZnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SWGkz0YVFzxBx; Thu, 16 Nov 2023 10:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AGAeBnB023487; Thu, 16 Nov 2023 10:40:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AGAeBKX023480; Thu, 16 Nov 2023 10:40:11 GMT (envelope-from git) Date: Thu, 16 Nov 2023 10:40:11 GMT Message-Id: <202311161040.3AGAeBKX023480@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: 84962599a83e - main - net/frr[89]: fix frr-reload finding frr-reload.py List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84962599a83eff316bcc34cd0665d2ffeb8500b5 Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=84962599a83eff316bcc34cd0665d2ffeb8500b5 commit 84962599a83eff316bcc34cd0665d2ffeb8500b5 Author: R. Christian McDonald AuthorDate: 2023-11-14 21:43:11 +0000 Commit: Olivier Cochard CommitDate: 2023-11-16 10:39:30 +0000 net/frr[89]: fix frr-reload finding frr-reload.py PR: 275095 Sponsored by: Rubicon Communications, LLC ("Netgate") --- net/frr8/Makefile | 9 ++++----- net/frr9/Makefile | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/net/frr8/Makefile b/net/frr8/Makefile index a6b7d239c06b..51801974e9a7 100644 --- a/net/frr8/Makefile +++ b/net/frr8/Makefile @@ -1,7 +1,7 @@ PORTNAME= frr PORTVERSION= 8.5.3 DISTVERSIONPREFIX= frr- -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net .if defined(PYTHONTOOLS) PKGNAMESUFFIX= 8-pythontools @@ -25,15 +25,14 @@ USES= python:run shebangfix post-patch: @${REINPLACE_CMD} -e 's|/etc/frr|${ETCDIR}|g' \ -e 's|/usr/bin|${PREFIX}/bin|g' \ - -e 's|/usr/local/bin/tail|${TAIL}|g' \ ${WRKSRC}/tools/frr-reload.py @${REINPLACE_CMD} -e 's|/etc/frr|${ETCDIR}|g' \ ${WRKSRC}/tools/generate_support_bundle.py do-install: ${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/tools/frr-reload.py ${STAGEDIR}/${PREFIX}/sbin/ - ${INSTALL_SCRIPT} ${WRKSRC}/tools/generate_support_bundle.py ${STAGEDIR}/${PREFIX}/sbin/ + ${INSTALL_SCRIPT} ${WRKSRC}/tools/frr-reload.py ${STAGEDIR}${PREFIX}/sbin/ + ${INSTALL_SCRIPT} ${WRKSRC}/tools/generate_support_bundle.py ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_DATA} ${WRKSRC}/tools/etc/frr/support_bundle_commands.conf ${STAGEDIR}${ETCDIR}/ .else @@ -135,7 +134,7 @@ SHEBANG_FILES= yang/embedmodel.py post-patch: @${REINPLACE_CMD} -e 's|/etc/frr|${ETCDIR}|g' \ - -e 's|/usr/lib/|${PREFIX}/lib/|g' \ + -e 's|/usr/lib/frr|${PREFIX}/sbin|g' \ -e 's|frr-pythontools|frr8-pythontools|g' \ ${WRKSRC}/tools/frr-reload diff --git a/net/frr9/Makefile b/net/frr9/Makefile index 81376628b6bd..ccafc549c3ec 100644 --- a/net/frr9/Makefile +++ b/net/frr9/Makefile @@ -1,6 +1,7 @@ PORTNAME= frr PORTVERSION= 9.0.1 DISTVERSIONPREFIX= frr- +PORTREVISION= 1 CATEGORIES= net .if defined(PYTHONTOOLS) PKGNAMESUFFIX= 9-pythontools @@ -24,15 +25,14 @@ USES= python:run shebangfix post-patch: @${REINPLACE_CMD} -e 's|/etc/frr|${ETCDIR}|g' \ -e 's|/usr/bin|${PREFIX}/bin|g' \ - -e 's|/usr/local/bin/tail|${TAIL}|g' \ ${WRKSRC}/tools/frr-reload.py @${REINPLACE_CMD} -e 's|/etc/frr|${ETCDIR}|g' \ ${WRKSRC}/tools/generate_support_bundle.py do-install: ${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/tools/frr-reload.py ${STAGEDIR}/${PREFIX}/sbin/ - ${INSTALL_SCRIPT} ${WRKSRC}/tools/generate_support_bundle.py ${STAGEDIR}/${PREFIX}/sbin/ + ${INSTALL_SCRIPT} ${WRKSRC}/tools/frr-reload.py ${STAGEDIR}${PREFIX}/sbin/ + ${INSTALL_SCRIPT} ${WRKSRC}/tools/generate_support_bundle.py ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_DATA} ${WRKSRC}/tools/etc/frr/support_bundle_commands.conf ${STAGEDIR}${ETCDIR}/ .else @@ -135,7 +135,7 @@ SHEBANG_FILES= yang/embedmodel.py post-patch: @${REINPLACE_CMD} -e 's|/etc/frr|${ETCDIR}|g' \ - -e 's|/usr/lib/|${PREFIX}/lib/|g' \ + -e 's|/usr/lib/frr|${PREFIX}/sbin|g' \ -e 's|frr-pythontools|frr9-pythontools|g' \ ${WRKSRC}/tools/frr-reload