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,69 +1,70 @@
 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 \
 		https://raw.githubusercontent.com/Checkmk/checkmk/${DISTVERSIONFULL}/:license
 DISTFILES=	${_CHECKMK_AGENT}:agent \
 		README.FreeBSD:doc \
 		COPYING:license
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ivalentine@arizona.edu
 COMMENT=	Checkmk agent to monitor *nix style systems
 WWW=		https://checkmk.com/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	bash:shells/bash \
 		ipmitool:sysutils/ipmitool \
 		statgrab:devel/libstatgrab \
 		wget:ftp/wget
 
 USES=		perl5 python:3.4+ shebangfix
 USE_PERL5=	run
 
 SHEBANG_FILES=	${_CHECKMK_AGENT}
 
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	# none
 EXTRACT_AFTER_ARGS=	${WRKSRC}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 NO_TEST=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PORTNAME=${PORTNAME}
 
 NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/${PORTNAME}
 
 PORTDOCS=	README.FreeBSD
 
 OPTIONS_DEFINE=	DOCS
 
 _CHECKMK_AGENT=		${PORTNAME}.freebsd
 _CHECKMK_LIBDIR=	${PREFIX}/lib/check_mk_agent
 _CHECKMK_CONFDIR=	${PREFIX}/etc/check_mk
 
 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:
 	${INSTALL_SCRIPT} ${WRKSRC}/${_CHECKMK_AGENT} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.FreeBSD \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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
@@ -1,26 +1,26 @@
 --- check_mk_agent.freebsd.orig	2024-08-15 18:32:18 UTC
 +++ check_mk_agent.freebsd
 @@ -117,9 +117,9 @@ set_variable_defaults() {
  #
  
  set_variable_defaults() {
 -    : "${MK_LIBDIR:=/usr/local/lib/check_mk_agent}"
 -    : "${MK_CONFDIR:=/etc/check_mk}"
 -    : "${MK_VARDIR:=/var/lib/check_mk_agent}"
 +    : "${MK_LIBDIR:=%%CHECKMK_LIBDIR%%}"
 +    : "${MK_CONFDIR:=%%CHECKMK_CONFDIR%%}"
 +    : "${MK_VARDIR:=/var/db/check_mk_agent}"
      : "${MK_LOGDIR:=/var/log/check_mk_agent}"
  
      # 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#*"%%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