git: 7f1c837a4c84 - main - net-mgmt/check_mk_agent: revert incorrect LOCALBASE/PREFIX swap
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 22 Aug 2024 18:13:14 UTC
The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f1c837a4c84c57504b9939665018d4aabd965f3 commit 7f1c837a4c84c57504b9939665018d4aabd965f3 Author: Ian Valentine <ivalentine@arizona.edu> AuthorDate: 2024-08-22 18:05:37 +0000 Commit: Zsolt Udvari <uzsolt@FreeBSD.org> CommitDate: 2024-08-22 18:13:02 +0000 net-mgmt/check_mk_agent: revert incorrect LOCALBASE/PREFIX swap The incorrect swap is in commit 61d4ddfb22cf8e9e3048887938550dabeb985b51. Reported by: 0mp (email) Approved by: submitter is maintainer --- 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 7d2e7cf89031..da8238f35b23 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 b772f38e4d8e..09e7ebd944c3 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