From nobody Sun Oct 08 18:41:45 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 4S3WH63WRXz4wrbC; Sun, 8 Oct 2023 18:42:10 +0000 (UTC) (envelope-from dan@langille.org) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4S3WH60RbTz4G1Q; Sun, 8 Oct 2023 18:42:09 +0000 (UTC) (envelope-from dan@langille.org) Authentication-Results: mx1.freebsd.org; none Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id 3E22132009CE; Sun, 8 Oct 2023 14:42:07 -0400 (EDT) Received: from imap47 ([10.202.2.97]) by compute7.internal (MEProxy); Sun, 08 Oct 2023 14:42:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=langille.org; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm2; t= 1696790526; x=1696876926; bh=D8M9EsXXAEpgvYi3+UTnAJuMxCBtfFPJazl sKyLrwWI=; b=XNhovSI44AYBsLDmzMg6NV0WHHG16v7r0TL2KpZzxjxKuSKYKVx eb+VqFx4TsLSCE1/MexDhRJG8NfQm/J2Hz2FeO8aggVuGsm0qHgv3VZt1TeHl5zF +VgtcBZaYeenJYWG4mX40oyRswZMYJ+vpu47Pzp67aQpjA2BAFs9HPe+c7U0mNfI cdPY5EUZxqBjd6bnuSVO4Z11zrS6Wv1BTMSGzgqwiUBQEOcs0WJhQ7hlaR/LUR0v WMiqACQsnO2z/BR3E/yk7lL60txGGMHSlmzinZksZ8lRu4xMflbQPXLFXmdYW1Xu UtJ+WU42NC2Orms/B2/fxAxEVQLSm1d9B9w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1696790526; x=1696876926; bh=D8M9EsXXAEpgvYi3+UTnAJuMxCBtfFPJazl sKyLrwWI=; b=cqzUygdJC4TDfq2HJOqETpewqkz7TMF5Lq+zu/1AQkect3mKInX O+DIjltFx0nrOg3ddGR/KSkhPbRQxNL2960drVaIlG2JyFOawYwK50YqK0aOnsTK +/skk62AoUMaWMMbRs3N7mycURTfrSOojX2Cf/ArootfUlyQOQ96KI2dEpSLapWy gG8/yKASiMDk2ge+5+PTrWJSt1vcywnBGCCDf34Ztjsg7nfYFU9sALJb7gk/jk2A 6G9797Kq6mvcPJiTzf8JxUMJdzlf/GSOxeMwdPJOwoHe3658yuVDqjP0knasy9xm A2TPQPAfZxntrHwc6JDoX9rYjI+AQUPhNsQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrhedugddufedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvfevufgtgfesthhqredtreerjeenucfhrhhomhepfdff rghnucfnrghnghhilhhlvgdfuceouggrnheslhgrnhhgihhllhgvrdhorhhgqeenucggtf frrghtthgvrhhnpeegueehhfeuleeukeehgefhgfetveeifefgjeefgfevuedutedvgffh feeghfduteenucffohhmrghinhepfhhrvggvsghsugdrohhrghenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegurghnsehlrghnghhilhhlvgdr ohhrgh X-ME-Proxy: Feedback-ID: ifbf9424e:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id 7CF90A60077; Sun, 8 Oct 2023 14:42:06 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.9.0-alpha0-958-g1b1b911df8-fm-20230927.002-g1b1b911d 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 Message-Id: In-Reply-To: <816dffaa-7fbf-4352-96e6-30c715b430a0@freebsd.org> References: <202310071152.397BqxAf037182@gitrepo.freebsd.org> <816dffaa-7fbf-4352-96e6-30c715b430a0@freebsd.org> Date: Sun, 08 Oct 2023 14:41:45 -0400 From: "Dan Langille" To: "Vladimir Druzenko" , "Sergey A. Osokin" 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 Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US] X-Rspamd-Queue-Id: 4S3WH60RbTz4G1Q On Sun, Oct 8, 2023, at 12:47 PM, Vladimir Druzenko wrote: > 08.10.2023 19:32, Sergey A. Osokin =D0=BF=D0=B8=D1=88=D0=B5=D1=82: >> 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? >>> This is a great idea. I know the port is already doing this for othe= r locations >>> in the code. There are other patches which need this adjustment as w= ell. >>> >>> 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. > > ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ > -e ${WRKSRC}/LibreNMS/Validations/Php.php \ > -e ${WRKSRC}/LibreNMS/__init__.py \ > -e ${WRKSRC}/LibreNMS/wrapper.py \ > -e ${WRKSRC}/LibreNMS/Util/Version.php \ See https://cgit.freebsd.org/ports/commit/?id=3D7d8ac44c90242ecd1656ce0c= 5a5c68910afb712b Thank you. --=20 Dan Langille dan@langille.org