From nobody Sun Oct 08 16:32:10 2023 X-Original-To: dev-commits-ports-all@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 4S3SP64t9vz4wTgB; Sun, 8 Oct 2023 16:32:10 +0000 (UTC) (envelope-from osa@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S3SP64LmZz3SJf; Sun, 8 Oct 2023 16:32:10 +0000 (UTC) (envelope-from osa@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696782730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=d/a67F+cXosHivvikGj0iCANExw7p9e+8l6ItmDxS5o=; b=HwLOhMBoTBBxXP/E5T/S1VA6V3CV0+mw39ZmgTgq9qPaTn3G+gq2KEVw2z+HSrP/Rd0uCi MpGrK7F7Lz1Ww9OXgdqEmOuR6rNpC2X0agcv3JY1a2Rm0AP8xBlxXKyAe1wNyZTua05Fl7 8wgl8M2MUyLAEfcXfaXWPBftavmneA477jFs5nrkvzuFmQ1dDFPSKUvp+S6D3OkEfcGnN4 /r655cndnGG68qFD3hjZccW+a7QNWY3birnQt/zvL1CXfIRskcPAd+e7CQpoP5c1eiylYB J/TBBFimvrb5Wmh0QDuKw0UJats9KDCCMQnNnqAq8jPvVVMSG4hMpm+JQ1vsOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696782730; a=rsa-sha256; cv=none; b=x7GeVan3JQM8TZsRf/dPot8PbjrGrjU28kDOQyyJFVoiCK4D4UkH4g8o6rLFQ53FeY7eJE p2cYCPXd83S5qoDr57qhEi/UPR0YWo0MKlUwkrGdydW3vAlZHJRXN6LQkmyt6bIwu8/yA7 ShNSnjNA5aU8HYpkePdzFoLKf3eKZb9N544eMSNeebMSZXDWkq1I9Z3wEVhghaq5I215f4 Jl7fuCMbZytdj8AIPE2+8mrJ51qdPo/sCQD1ZhRmCnLbTAw+DpDIll2kbVR4nmmlnlcdzI f9/NzGBk+noWqVV/ko+WBld0+ztxvJQMlxEmaCekS5shN4kd+rlwHTyJkiLLnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696782730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=d/a67F+cXosHivvikGj0iCANExw7p9e+8l6ItmDxS5o=; b=TApQid7Aj4dBPfA5GGQ7sm7ZtXjnHD03Vt+QRL1bdvsjTofkna4VZwH7E4iMBMqYXnH0WP 2CvfVSgxi4YvQtjnswpwV8z+TsLK/Nltyg7vJVBZVJH/+tnHiX1A7EQ8tcJJita+B5KxqH L8hFJmPUkFkCigXqwq2b2mJxTqZ5O4cXQSjtmqJZlM3kqZhtaxmDDjNC7VzgIHwbRwv4EY iGmGlzLBtz1/zAiUmfGII6FNoczG9STnF87Q6j/wnSb4d63aKB/IsQ6nrst4pEaCgvFtfI Hm1sbQf+XjTYmhdnq1D3+yA5/OPc0C9Rdzif+hJyWKG0g+CIyLuA2JgtF5UtjQ== Received: by freefall.freebsd.org (Postfix, from userid 975) id 861E74072; Sun, 8 Oct 2023 16:32:10 +0000 (UTC) Date: Sun, 8 Oct 2023 16:32:10 +0000 From: "Sergey A. Osokin" To: Dan Langille Cc: dvl , 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: References: <202310071152.397BqxAf037182@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Hy9Pof4+YVfCbwXz" Content-Disposition: inline In-Reply-To: --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--