diff options
| author | R. Christian McDonald <rcm@rcm.sh> | 2023-11-14 21:43:11 +0000 |
|---|---|---|
| committer | Olivier Cochard <olivier@FreeBSD.org> | 2023-11-16 10:39:30 +0000 |
| commit | 84962599a83eff316bcc34cd0665d2ffeb8500b5 (patch) | |
| tree | b02eb4500555ebd49089c47015124c465a1b39bc | |
| parent | ccda09a58f00ce1c8ac39a73e2e383d1dbeca81a (diff) | |
| download | ports-84962599a83eff316bcc34cd0665d2ffeb8500b5.tar.gz ports-84962599a83eff316bcc34cd0665d2ffeb8500b5.zip | |
net/frr[89]: fix frr-reload finding frr-reload.py
PR: 275095
Sponsored by: Rubicon Communications, LLC ("Netgate")
| -rw-r--r-- | net/frr8/Makefile | 9 | ||||
| -rw-r--r-- | 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 |