Date: Thu, 22 Aug 2024 17:50:03 +0000 From: "Valentine, Ian - (ivalentine)" <ivalentine@arizona.edu> To: Mateusz Piotrowski <0mp@FreeBSD.org>, Zsolt Udvari <uzsolt@freebsd.org> Cc: "ports-committers@freebsd.org" <ports-committers@FreeBSD.org>, "dev-commits-ports-all@freebsd.org" <dev-commits-ports-all@FreeBSD.org>, "dev-commits-ports-main@freebsd.org" <dev-commits-ports-main@FreeBSD.org> Subject: RE: [EXT] Re: git: 61d4ddfb22cf - main - net-mgmt/check_mk_agent: update to 2.3.0p12 Message-ID: <PH0PR19MB7519D79C83E31662B268837ACF8F2@PH0PR19MB7519.namprd19.prod.outlook.com> In-Reply-To: <1CCBB8CC-3B9E-44DB-A5E9-F4A7550678C2@FreeBSD.org> References: <202408202032.47KKWevD053317@gitrepo.freebsd.org> <1CCBB8CC-3B9E-44DB-A5E9-F4A7550678C2@FreeBSD.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] Hi Mateusz, Thanks for catching that, I see my mistake now. I've attached a patch that fixes that and bumps PORTREVISION. Should I send it in through Bugzilla as well? Regards, Ian From: Mateusz Piotrowski <0mp@FreeBSD.org> Sent: Thursday, August 22, 2024 1:53 AM To: Zsolt Udvari <uzsolt@freebsd.org>; Valentine, Ian - (ivalentine) <ivalentine@arizona.edu> Cc: ports-committers@freebsd.org; dev-commits-ports-all@freebsd.org; dev-commits-ports-main@freebsd.org Subject: [EXT] Re: git: 61d4ddfb22cf - main - net-mgmt/check_mk_agent: update to 2.3.0p12 External Email Hey! > On 20. Aug 2024, at 22:32, Zsolt Udvari <uzsolt@freebsd.org> wrote: > > The branch main has been updated by uzsolt: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=61d4ddfb22cf8e9e3048887938550dabeb985b51 > > commit 61d4ddfb22cf8e9e3048887938550dabeb985b51 > Author: Ian Valentine <ivalentine@arizona.edu> > AuthorDate: 2024-08-20 20:27:35 +0000 > Commit: Zsolt Udvari <uzsolt@FreeBSD.org> > CommitDate: 2024-08-20 20:32:23 +0000 > > 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(-) > > 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"}" != "${PATH}" ] || PATH="${PATH}:/usr/local/bin" > - [ "${PATH#*"/usr/local/sbin"}" != "${PATH}" ] || PATH="${PATH}:/usr/local/sbin" > -+ [ "${PATH#*"%%LOCALBASE%%/bin"}" != "${PATH}" ] || PATH="${PATH}:%%LOCALBASE%%/bin" > -+ [ "${PATH#*"%%LOCALBASE%%/sbin"}" != "${PATH}" ] || PATH="${PATH}:%%LOCALBASE%%/sbin" > ++ [ "${PATH#*"%%PREFIX%%/bin"}" != "${PATH}" ] || PATH="${PATH}:%%PREFIX%%/bin" > ++ [ "${PATH#*"%%PREFIX%%/sbin"}" != "${PATH}" ] || PATH="${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 [-- Attachment #2 --] From 0f5482a29c14fb1da6e048b3df4d8d1a9e0b53e4 Mon Sep 17 00:00:00 2001 From: Ian Valentine <ivalentine@arizona.edu> Date: Thu, 22 Aug 2024 10:35:09 -0700 Subject: [PATCH] net-mgmt/check_mk_agent: revert incorrect LOCALBASE/PREFIX swap --- net-mgmt/check_mk_agent/Makefile | 3 ++- net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/net-mgmt/check_mk_agent/Makefile b/net-mgmt/check_mk_agent/Makefile index 7d2e7cf89..da8238f35 100644 --- a/net-mgmt/check_mk_agent/Makefile +++ b/net-mgmt/check_mk_agent/Makefile @@ -1,6 +1,7 @@ PORTNAME= check_mk_agent DISTVERSIONPREFIX= v DISTVERSION= 2.3.0p12 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= https://raw.githubusercontent.com/Checkmk/checkmk/${DISTVERSIONFULL}/agents/:agent \ https://raw.githubusercontent.com/Checkmk/checkmk/${DISTVERSIONFULL}/doc/agents/:doc \ @@ -54,7 +55,7 @@ post-patch: @${REINPLACE_CMD} \ -e 's|%%CHECKMK_LIBDIR%%|${_CHECKMK_LIBDIR}|' \ -e 's|%%CHECKMK_CONFDIR%%|${_CHECKMK_CONFDIR}|' \ - -e 's|%%PREFIX%%|${PREFIX}|g' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/${_CHECKMK_AGENT} do-install: diff --git a/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd b/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd index b772f38e4..09e7ebd94 100644 --- a/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd +++ b/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd @@ -19,8 +19,8 @@ # eventually each the 128k size limit for the environment and become a zombie process. See execve manpage. - [ "${PATH#*"/usr/local/bin"}" != "${PATH}" ] || PATH="${PATH}:/usr/local/bin" - [ "${PATH#*"/usr/local/sbin"}" != "${PATH}" ] || PATH="${PATH}:/usr/local/sbin" -+ [ "${PATH#*"%%PREFIX%%/bin"}" != "${PATH}" ] || PATH="${PATH}:%%PREFIX%%/bin" -+ [ "${PATH#*"%%PREFIX%%/sbin"}" != "${PATH}" ] || PATH="${PATH}:%%PREFIX%%/sbin" ++ [ "${PATH#*"%%LOCALBASE%%/bin"}" != "${PATH}" ] || PATH="${PATH}:%%LOCALBASE%%/bin" ++ [ "${PATH#*"%%LOCALBASE%%/sbin"}" != "${PATH}" ] || PATH="${PATH}:%%LOCALBASE%%/sbin" [ -d "/var/qmail/bin" ] && { [ "${PATH#*"/var/qmail/bin"}" != "${PATH}" ] || PATH="${PATH}:/var/qmail/bin"; } # All executables in PLUGINSDIR will simply be executed and their -- 2.45.2help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?PH0PR19MB7519D79C83E31662B268837ACF8F2>