From nobody Thu Aug 22 08:53:07 2024 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 4WqH6X4rbhz5SSSW; Thu, 22 Aug 2024 08:53:24 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WqH6W5RDCz47TK; Thu, 22 Aug 2024 08:53:23 +0000 (UTC) (envelope-from mpp302@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of mpp302@gmail.com designates 209.85.208.174 as permitted sender) smtp.mailfrom=mpp302@gmail.com Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2f3ce5bc7b4so4391951fa.2; Thu, 22 Aug 2024 01:53:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724316802; x=1724921602; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p27Em6C/WT49XuTd249nBsokqac9f9xYWEvE2mqC6s4=; b=fATCb1OE/MmDLug9aGVs1GI56b1/9b6RNL7LD5lPPhplAhbD2c9XBRb/LDo6tYQWAB sW9EVvFdPY3FWTE5rH01j/Y15P03Ykx0HS6QG95yEAwHSGwD+jD+shIJAtm/KPg5UWbG 0rKKFZe39F7sl6srA8RSsugx3AXkNNfd6rYXNOCjsEhJuLGzHrM5nc+NiHzM+p5R8u9d 7U66Zbe1lT5p5kULDrH6xbXxXjKcQqbodnxPH2WH3JCdnGyGPs2F2LoIdV820IXYGfB4 qRlPdYJlU78uL3Izeh6r6J3K1dXbSU0OuYJKqhXX+WIbr0bv84vzlJGgRE6dXkPZXoy1 BuGA== X-Forwarded-Encrypted: i=1; AJvYcCVewexMXqteUZkAfTcmolh3EDGK/SBzSWq9C0BM1n7bsc0jFnTbC2iKUuhNQG6YwsB8wmoxWfVnPTMMiw4q2KCmOvnf8uI=@freebsd.org, AJvYcCXbsz+Rg/7gDo1y/wjVr62ek1lfz7MveuciF7GCtOb4F7Y0IfDnXy4xAYoiIAF2NQ9ceredyWK9IcF5w0HNEZ6lM5HnniBGAQ==@freebsd.org X-Gm-Message-State: AOJu0YzkSjz10LCkG7apAyLROq69imN9pLDlhiTS0t2r+P/de1XocBWa QgsVYCv1WtcyXS4pkDwH3f23ZAS/CSTFwwwX3mW38a9q5pY1IS2D+7yHVQ== X-Google-Smtp-Source: AGHT+IHMk5ek04hS6SNwA8BfY4PndE/Pad1i92ylS4jRhFySqmO/2Mxakvig8TW8Z6D00/rfpJ7agg== X-Received: by 2002:a05:6512:2815:b0:52e:764b:b20d with SMTP id 2adb3069b0e04-533485c04cemr3106011e87.28.1724316801282; Thu, 22 Aug 2024 01:53:21 -0700 (PDT) Received: from smtpclient.apple ([2a02:a31a:c3b0:8a00:6de5:1f0c:cd27:8566]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5334ea5d9e6sm164963e87.226.2024.08.22.01.53.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Aug 2024 01:53:20 -0700 (PDT) Content-Type: text/plain; charset=us-ascii 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.600.62\)) Subject: Re: git: 61d4ddfb22cf - main - net-mgmt/check_mk_agent: update to 2.3.0p12 From: Mateusz Piotrowski <0mp@FreeBSD.org> In-Reply-To: <202408202032.47KKWevD053317@gitrepo.freebsd.org> Date: Thu, 22 Aug 2024 10:53:07 +0200 Cc: "ports-committers@freebsd.org" , "dev-commits-ports-all@freebsd.org" , "dev-commits-ports-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <1CCBB8CC-3B9E-44DB-A5E9-F4A7550678C2@FreeBSD.org> References: <202408202032.47KKWevD053317@gitrepo.freebsd.org> To: Zsolt Udvari , "Valentine, Ian - (ivalentine)" X-Mailer: Apple Mail (2.3774.600.62) X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.53 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.63)[-0.632]; FORGED_SENDER(0.30)[0mp@FreeBSD.org,mpp302@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; RCVD_TLS_LAST(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.174:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[0mp@FreeBSD.org,mpp302@gmail.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-ports-all@freebsd.org,dev-commits-ports-main@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; R_DKIM_NA(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.174:from]; APPLE_MAILER_COMMON(0.00)[]; RCPT_COUNT_FIVE(0.00)[5] X-Rspamd-Queue-Id: 4WqH6W5RDCz47TK Hey! > On 20. Aug 2024, at 22:32, Zsolt Udvari wrote: >=20 > The branch main has been updated by uzsolt: >=20 > URL: = https://cgit.FreeBSD.org/ports/commit/?id=3D61d4ddfb22cf8e9e3048887938550d= abeb985b51 >=20 > commit 61d4ddfb22cf8e9e3048887938550dabeb985b51 > Author: Ian Valentine > AuthorDate: 2024-08-20 20:27:35 +0000 > Commit: Zsolt Udvari > CommitDate: 2024-08-20 20:32:23 +0000 >=20 > net-mgmt/check_mk_agent: update to 2.3.0p12 [...] > Switch to PREFIX (from LOCALBASE). [...] > --- > net-mgmt/check_mk_agent/Makefile | 21 = ++++++++++++--------- > net-mgmt/check_mk_agent/distinfo | 14 = +++++++------- > .../files/patch-check__mk__agent.freebsd | 14 = ++++++++------ > net-mgmt/check_mk_agent/files/pkg-message.in | 4 +--- > 4 files changed, 28 insertions(+), 25 deletions(-) >=20 > diff --git a/net-mgmt/check_mk_agent/Makefile = b/net-mgmt/check_mk_agent/Makefile > index aec345b5c61b..7d2e7cf89031 100644 > --- a/net-mgmt/check_mk_agent/Makefile > +++ b/net-mgmt/check_mk_agent/Makefile [...] > post-patch: > @${REINPLACE_CMD} \ > -e 's|%%CHECKMK_LIBDIR%%|${_CHECKMK_LIBDIR}|' \ > -e 's|%%CHECKMK_CONFDIR%%|${_CHECKMK_CONFDIR}|' \ > - -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ > + -e 's|%%PREFIX%%|${PREFIX}|g' \ > ${WRKSRC}/${_CHECKMK_AGENT} [...] > diff --git a/net-mgmt/check_mk_agent/distinfo = b/net-mgmt/check_mk_agent/distinfo > index 93c84aaa2b46..807877b24a33 100644 > --- a/net-mgmt/check_mk_agent/distinfo > +++ b/net-mgmt/check_mk_agent/distinfo > -@@ -126,8 +126,8 @@ preamble_1() { > + # some 'booleans' > +@@ -138,8 +138,8 @@ preamble_1() { > # Make sure locally installed binaries are found > # Only add binaries if they are not already in the path! If you = append to path in a loop the process will > # eventually each the 128k size limit for the environment and = become a zombie process. See execve manpage. > - [ "${PATH#*"/usr/local/bin"}" !=3D "${PATH}" ] || = PATH=3D"${PATH}:/usr/local/bin" > - [ "${PATH#*"/usr/local/sbin"}" !=3D "${PATH}" ] || = PATH=3D"${PATH}:/usr/local/sbin" > -+ [ "${PATH#*"%%LOCALBASE%%/bin"}" !=3D "${PATH}" ] || = PATH=3D"${PATH}:%%LOCALBASE%%/bin" > -+ [ "${PATH#*"%%LOCALBASE%%/sbin"}" !=3D "${PATH}" ] || = PATH=3D"${PATH}:%%LOCALBASE%%/sbin" > ++ [ "${PATH#*"%%PREFIX%%/bin"}" !=3D "${PATH}" ] || = PATH=3D"${PATH}:%%PREFIX%%/bin" > ++ [ "${PATH#*"%%PREFIX%%/sbin"}" !=3D "${PATH}" ] || = PATH=3D"${PATH}:%%PREFIX%%/sbin" LOCALBASE was the right variable. PREFIX is where you install the port. = LOCALBASE is where you look for the port's dependencies were installed. Best regards, Mateusz Piotrowski=