Date: Sun, 8 Oct 2023 16:32:10 +0000 From: "Sergey A. Osokin" <osa@freebsd.org> To: Dan Langille <dan@langille.org> Cc: dvl <dvl@freebsd.org>, ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 73922d6b363a - main - net-mgmt/librenms: Fix start on FreeBSD 14/nginx Message-ID: <ZSLZir9W5w82iUcE@FreeBSD.org> In-Reply-To: <d1a0e113-ebce-4a80-b203-f8844239cf43@app.fastmail.com> References: <202310071152.397BqxAf037182@gitrepo.freebsd.org> <ZSLCnqP3gTmzxHEr@FreeBSD.org> <d1a0e113-ebce-4a80-b203-f8844239cf43@app.fastmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--Hy9Pof4+YVfCbwXz
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Sun, Oct 08, 2023 at 12:16:59PM -0400, Dan Langille wrote:
> On Sun, Oct 8, 2023, at 10:54 AM, Sergey A. Osokin wrote:
> >> +- base =3D ("/usr/bin/env", "php")
> >> ++ base =3D ("/usr/local/bin/php",)
> >
> > Would that be better to use %%PREFIX%% in a patch and substitute
> > that with a value of the ${LOCALBASE} variable in a post-patch
> > phase?
>=20
> This is a great idea. I know the port is already doing this for other loc=
ations
> in the code. There are other patches which need this adjustment as well.
>=20
> post-patch:
> ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' =
${WRKSRC}/LibreNMS/Validations/Php.php
> + ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' =
${WRKSRC}/LibreNMS/__init__.py
> + ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' =
${WRKSRC}/LibreNMS/wrapper.py
> ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' =
${WRKSRC}/LibreNMS/Util/Version.php
sed(1) supports multiple files as arguments, so I'd prefer to see more
compact version (not tested), i.e.:
${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/LibreNMS/Validations/Php.php \
${WRKSRC}/LibreNMS/__init__.py \
${WRKSRC}/LibreNMS/wrapper.py \
${WRKSRC}/LibreNMS/Util/Version.php \
...
Thank you.
--=20
Sergey A. Osokin
--Hy9Pof4+YVfCbwXz
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQITBAEBCgB9FiEEZTMJYdHlAQrZCsSmOBlAga+KbzQFAmUi2YZfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY1
MzMwOTYxRDFFNTAxMEFEOTBBQzRBNjM4MTk0MDgxQUY4QTZGMzQACgkQOBlAga+K
bzRRfgv/UapAyX2VuaRow5MjV/+6ylawpHCYe9rtjDGmznGtv3nOZGvcC/00YW4X
1pUklV0PP4Nf1ohWaIfzLWUFqW9NngtmujcXHZSiZ4otPo3e6//M8Bfb4XRTjKsM
h8nPHlcUR1Ia49aYBZ9ntLwYv69LhqVMoVXMXSNm9e4YosyDSMBfDtpTM2+VYwD5
DN6aVOhI8rrsc/v9YEMJXGPCU21FSvgJsjmONEOvmN+6KrI7QpK4js2VYEchoFww
NS/rpl9oTo0bJKM+XbsIx37BpH20DxLfQXoaaJ91/bpurNiFpVnW/2XaGL7m2lu8
pZ8OCT/45hxIJXWELTT+Ycbb7TT462SJ7dHOGEi4dLM2FrHrcGKTUZBfNxo3P+Vm
IFnjno3TyUUt0h/IMXcZ4tDARQ9Nq+kDwpPshY8N/sybmhNGCBfjF5SK42OkHEY3
9vDOPY2ahemOlxV46sMuOL4YJ1PhSnYn5FKHqTaJYxkJOM1f9klo7ovoBlOKdFmM
FPlC8HhS
=wa2z
-----END PGP SIGNATURE-----
--Hy9Pof4+YVfCbwXz--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ZSLZir9W5w82iUcE>