diff --git a/net/cpp-pcp-client/Makefile b/net/cpp-pcp-client/Makefile
index 9f3be8e9c934..68f697b14bd3 100644
--- a/net/cpp-pcp-client/Makefile
+++ b/net/cpp-pcp-client/Makefile
@@ -1,27 +1,29 @@
 PORTNAME=	cpp-pcp-client
 PORTVERSION=	1.7.7
 PORTREVISION=	8
 CATEGORIES=	net
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Client libraries for the PCP protocol
 WWW=		https://github.com/puppetlabs/cpp-pcp-client
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN=		fails to build with Boost>=1.87
+DEPRECATED=	Project got archived, broken
+EXPIRATION_DATE=2025-05-08
 
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libleatherman_json_container.so:devel/leatherman
 
 USES=		cmake compiler:c++11-lang ssl
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 GH_ACCOUNT=	puppetlabs
 
 CMAKE_OFF=	ENABLE_CXX_WERROR
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/sysutils/pxp-agent/Makefile b/sysutils/pxp-agent/Makefile
index 73db142ddbbd..5bc6f61f9cd1 100644
--- a/sysutils/pxp-agent/Makefile
+++ b/sysutils/pxp-agent/Makefile
@@ -1,28 +1,31 @@
 PORTNAME=	pxp-agent
 PORTVERSION=	1.15.23
 PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	PCP eXecution Protocol Agent
 WWW=		https://github.com/puppetlabs/pxp-agent
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+DEPRECATED=	Project got archived, dependencies are broken
+EXPIRATION_DATE=2025-05-08
+
 LIB_DEPENDS=	liblibcpp-pcp-client.so:net/cpp-pcp-client \
 		libboost_thread.so:devel/boost-libs \
 		liblibcpp-hocon.so:devel/cpp-hocon \
 		libleatherman_util.so:devel/leatherman
 
 USES=		cmake compiler:c++11-lang shebangfix ssl
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	puppetlabs
 
 CMAKE_OFF=	ENABLE_CXX_WERROR
 LDFLAGS+=	-lthr
 SHEBANG_FILES=	exe/apply_ruby_shim.rb
 ruby_OLD_CMD=	/opt/puppetlabs/puppet/bin/ruby
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-choria-mcorpc-support/Makefile b/sysutils/rubygem-choria-mcorpc-support/Makefile
index 0ad288af8e11..452942a477ac 100644
--- a/sysutils/rubygem-choria-mcorpc-support/Makefile
+++ b/sysutils/rubygem-choria-mcorpc-support/Makefile
@@ -1,22 +1,27 @@
 PORTNAME=	choria-mcorpc-support
 DISTVERSION=	2.26.4
+PORTREVISION=	1
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Ruby support for the Choria Orchestration Server
 WWW=		https://rubygems.org/gems/choria-mcorpc-support
 
 LICENSE=	APACHE20
 
 USES=		gem
 
 RUN_DEPENDS=	choria>=0.20.1:sysutils/choria \
 		rubygem-nats-pure>=0.6<0.8.0:net/rubygem-nats-pure \
 		rubygem-systemu>=2.6.4<3:devel/rubygem-systemu
 
 NO_ARCH=	yes
 
-PLIST_FILES=	bin/mco
+PLIST_FILES=	bin/mco \
+		bin/execution_wrapper
+
+post-install:
+	${INSTALL_SCRIPT} ${FILESDIR}/execution_wrapper.rb ${STAGEDIR}${PRFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-choria-mcorpc-support/files/execution_wrapper.rb b/sysutils/rubygem-choria-mcorpc-support/files/execution_wrapper.rb
new file mode 100755
index 000000000000..a4328577ec69
--- /dev/null
+++ b/sysutils/rubygem-choria-mcorpc-support/files/execution_wrapper.rb
@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+require 'json'
+
+data = JSON.parse(STDIN.read)
+
+in_r, in_w = IO.pipe
+in_w.sync = true
+
+pid = Process.spawn({}, data['executable'], *data['arguments'], { in: in_r, out: data['stdout'], err: data['stderr'] })
+in_w.write(data['input'])
+in_w.close
+
+Process.wait(pid)
+exit_code = $?.exitstatus
+
+File.write(data['exitcode'], exit_code)
+exit(exit_code)
diff --git a/sysutils/rubygem-choria-mcorpc-support/files/patch-lib_mcollective_util_tasks__support.rb b/sysutils/rubygem-choria-mcorpc-support/files/patch-lib_mcollective_util_tasks__support.rb
new file mode 100644
index 000000000000..222ae7516309
--- /dev/null
+++ b/sysutils/rubygem-choria-mcorpc-support/files/patch-lib_mcollective_util_tasks__support.rb
@@ -0,0 +1,10 @@
+--- lib/mcollective/util/tasks_support.rb.orig	2025-03-09 01:41:22 UTC
++++ lib/mcollective/util/tasks_support.rb
+@@ -294,6 +294,7 @@ module MCollective
+ 
+           pid = Process.fork
+           if pid.nil?
++            Process.initgroups(run_as, u.gid)
+             Process.gid = Process.egid = u.gid
+             Process.uid = Process.euid = u.uid
+             ENV.delete_if { |name| name !~ /^LC_/ }