7 files changed, 1 insertions, 282 deletions

diff --git a/MOVED b/MOVED
index a990e3802312..68dfc2180d9a 100644
--- a/MOVED
+++ b/MOVED
@@ -7697,3 +7697,4 @@ sysutils/mcollective-service-common||2023-06-30|Has expired: Depends on broken s
 sysutils/mcollective-puppet-common||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mcollective-nettest-common||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mnrpes||2023-06-30|Has expired: Depends on broken sysutils/mcollective
+sysutils/mcollective||2023-06-30|Has expired: Broken with all supported Ruby versions
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 89db157689a8..450b7353188c 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -731,7 +731,6 @@
     SUBDIR += mbgtools
     SUBDIR += mcelog
     SUBDIR += mcfly
-    SUBDIR += mcollective
     SUBDIR += mcron
     SUBDIR += mcweject
     SUBDIR += mdf2iso
diff --git a/sysutils/mcollective/Makefile b/sysutils/mcollective/Makefile
deleted file mode 100644
index c5d100c06ca4..000000000000
--- a/sysutils/mcollective/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-PORTNAME=	mcollective
-PORTVERSION=	2.12.5
-CATEGORIES=	sysutils
-MASTER_SITES=	https://downloads.puppetlabs.com/${PORTNAME}/
-
-MAINTAINER=	puppet@FreeBSD.org
-COMMENT=	Modern scalable datacenter orchestration framework
-WWW=		http://docs.puppetlabs.com/mcollective/
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-DEPRECATED=	Broken with all supported Ruby versions
-EXPIRATION_DATE=	2023-06-30
-BROKEN_RUBY30=	yes
-BROKEN_RUBY31=	yes
-BROKEN_RUBY32=	yes
-BROKEN_RUBY33=	yes
-
-RUN_DEPENDS=	rubygem-stomp>=0:devel/rubygem-stomp
-
-USES=		cpe ruby shebangfix
-CPE_VENDOR=	puppet
-NO_BUILD=	yes
-USE_RC_SUBR=	mcollectived
-
-SHEBANG_FILES=	bin/mcollectived bin/mco
-CFG_FILES=	client.cfg data-help.erb discovery-help.erb facts.yaml \
-		metadata-help.erb rpc-help.erb server.cfg
-
-# don't make .bak files
-REINPLACE_ARGS=	-i ""
-
-SCRIPTS=	mco
-
-SUB_LIST+=	RUBY=${RUBY}
-
-OPTIONS_DEFINE=	DOCS
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|/etc/mcollective|${ETCDIR}|" \
-	    ${WRKSRC}/bin/mcollectived \
-		${WRKSRC}/etc/server.cfg.dist \
-		${WRKSRC}/etc/client.cfg.dist \
-		${WRKSRC}/lib/mcollective/config.rb \
-		${WRKSRC}/lib/mcollective/util.rb \
-		${WRKSRC}/lib/mcollective/rpc.rb
-	@${REINPLACE_CMD} -e "s|/usr/libexec/mcollective|${PREFIX}/share|" \
-	    ${WRKSRC}/etc/server.cfg.dist \
-	    ${WRKSRC}/etc/client.cfg.dist
-
-do-install:
-	cd ${WRKSRC} ; ${RUBY} install.rb --destdir=${STAGEDIR} --configdir=${ETCDIR} --plugindir=${DATADIR}
-.for cfg in ${CFG_FILES}
-	${MV} ${STAGEDIR}${ETCDIR}/${cfg} ${STAGEDIR}${ETCDIR}/${cfg}.sample
-.endfor
-
-.include <bsd.port.mk>
diff --git a/sysutils/mcollective/distinfo b/sysutils/mcollective/distinfo
deleted file mode 100644
index 702b53b5dfc6..000000000000
--- a/sysutils/mcollective/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1571417222
-SHA256 (mcollective-2.12.5.tar.gz) = c82830cb902d48f2133f2cea7bf8444d82c6002f7fb67131eb54d3526d9ca2ce
-SIZE (mcollective-2.12.5.tar.gz) = 936470
diff --git a/sysutils/mcollective/files/mcollectived.in b/sysutils/mcollective/files/mcollectived.in
deleted file mode 100644
index b460ddfaaa4d..000000000000
--- a/sysutils/mcollective/files/mcollectived.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mcollectived
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# mcollectived_enable (bool):	Set to NO by default.
-#				Set it to YES to enable mcollectived.
-# mcollectived_flags (str):	Set as needed.  Empty by default.
-
-. /etc/rc.subr
-
-name="mcollectived"
-rcvar=mcollectived_enable
-
-load_rc_config "${name}"
-
-: ${mcollectived_enable="NO"}
-
-pidfile="/var/run/${name}.pid"
-command="%%PREFIX%%/sbin/${name}"
-command_args="-p $pidfile"
-command_interpreter=%%RUBY%%
-
-PATH="${PATH}:/usr/local/bin"
-
-# An UTF-8 locale is required
-: LC_ALL=${LC_ALL:=C.UTF-8}
-case $LC_ALL in
-    *.UTF-8)
-	;;
-    *.*)
-	LC_ALL="${LC_ALL%.*}.UTF-8"
-	;;
-    *)
-	LC_ALL=C.UTF-8
-	;;
-esac
-export LC_ALL
-
-run_rc_command "$1"
diff --git a/sysutils/mcollective/pkg-descr b/sysutils/mcollective/pkg-descr
deleted file mode 100644
index b270db59b106..000000000000
--- a/sysutils/mcollective/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-The Marionette Collective
-A modern scalable datacenter orchestration framework
diff --git a/sysutils/mcollective/pkg-plist b/sysutils/mcollective/pkg-plist
deleted file mode 100644
index 5447262f929a..000000000000
--- a/sysutils/mcollective/pkg-plist
+++ /dev/null
@@ -1,174 +0,0 @@
-sbin/mcollectived
-bin/mco
-@sample %%ETCDIR%%/client.cfg.sample
-@sample %%ETCDIR%%/data-help.erb.sample
-@sample %%ETCDIR%%/discovery-help.erb.sample
-@sample %%ETCDIR%%/facts.yaml.sample
-@sample %%ETCDIR%%/metadata-help.erb.sample
-@sample %%ETCDIR%%/rpc-help.erb.sample
-@sample %%ETCDIR%%/server.cfg.sample
-%%RUBY_SITELIBDIR%%/mcollective.rb
-%%RUBY_SITELIBDIR%%/mcollective/agent.rb
-%%RUBY_SITELIBDIR%%/mcollective/agent/discovery.rb
-%%RUBY_SITELIBDIR%%/mcollective/agent/rpcutil.ddl
-%%RUBY_SITELIBDIR%%/mcollective/agent/rpcutil.rb
-%%RUBY_SITELIBDIR%%/mcollective/agents.rb
-%%RUBY_SITELIBDIR%%/mcollective/aggregate.rb
-%%RUBY_SITELIBDIR%%/mcollective/aggregate/average.ddl
-%%RUBY_SITELIBDIR%%/mcollective/aggregate/average.rb
-%%RUBY_SITELIBDIR%%/mcollective/aggregate/base.rb
-%%RUBY_SITELIBDIR%%/mcollective/aggregate/result.rb
-%%RUBY_SITELIBDIR%%/mcollective/aggregate/result/base.rb
-%%RUBY_SITELIBDIR%%/mcollective/aggregate/result/collection_result.rb
-%%RUBY_SITELIBDIR%%/mcollective/aggregate/result/numeric_result.rb
-%%RUBY_SITELIBDIR%%/mcollective/aggregate/sum.ddl
-%%RUBY_SITELIBDIR%%/mcollective/aggregate/sum.rb
-%%RUBY_SITELIBDIR%%/mcollective/aggregate/summary.ddl
-%%RUBY_SITELIBDIR%%/mcollective/aggregate/summary.rb
-%%RUBY_SITELIBDIR%%/mcollective/application.rb
-%%RUBY_SITELIBDIR%%/mcollective/application/completion.rb
-%%RUBY_SITELIBDIR%%/mcollective/application/describe_filter.rb
-%%RUBY_SITELIBDIR%%/mcollective/application/facts.rb
-%%RUBY_SITELIBDIR%%/mcollective/application/find.rb
-%%RUBY_SITELIBDIR%%/mcollective/application/help.rb
-%%RUBY_SITELIBDIR%%/mcollective/application/inventory.rb
-%%RUBY_SITELIBDIR%%/mcollective/application/ping.rb
-%%RUBY_SITELIBDIR%%/mcollective/application/plugin.rb
-%%RUBY_SITELIBDIR%%/mcollective/application/rpc.rb
-%%RUBY_SITELIBDIR%%/mcollective/applications.rb
-%%RUBY_SITELIBDIR%%/mcollective/audit/logfile.rb
-%%RUBY_SITELIBDIR%%/mcollective/cache.rb
-%%RUBY_SITELIBDIR%%/mcollective/client.rb
-%%RUBY_SITELIBDIR%%/mcollective/config.rb
-%%RUBY_SITELIBDIR%%/mcollective/connector.rb
-%%RUBY_SITELIBDIR%%/mcollective/connector/activemq.ddl
-%%RUBY_SITELIBDIR%%/mcollective/connector/activemq.rb
-%%RUBY_SITELIBDIR%%/mcollective/connector/base.rb
-%%RUBY_SITELIBDIR%%/mcollective/connector/rabbitmq.ddl
-%%RUBY_SITELIBDIR%%/mcollective/connector/rabbitmq.rb
-%%RUBY_SITELIBDIR%%/mcollective/data.rb
-%%RUBY_SITELIBDIR%%/mcollective/data/agent_data.ddl
-%%RUBY_SITELIBDIR%%/mcollective/data/agent_data.rb
-%%RUBY_SITELIBDIR%%/mcollective/data/base.rb
-%%RUBY_SITELIBDIR%%/mcollective/data/collective_data.ddl
-%%RUBY_SITELIBDIR%%/mcollective/data/collective_data.rb
-%%RUBY_SITELIBDIR%%/mcollective/data/fact_data.ddl
-%%RUBY_SITELIBDIR%%/mcollective/data/fact_data.rb
-%%RUBY_SITELIBDIR%%/mcollective/data/fstat_data.ddl
-%%RUBY_SITELIBDIR%%/mcollective/data/fstat_data.rb
-%%RUBY_SITELIBDIR%%/mcollective/data/result.rb
-%%RUBY_SITELIBDIR%%/mcollective/ddl.rb
-%%RUBY_SITELIBDIR%%/mcollective/ddl/agentddl.rb
-%%RUBY_SITELIBDIR%%/mcollective/ddl/base.rb
-%%RUBY_SITELIBDIR%%/mcollective/ddl/dataddl.rb
-%%RUBY_SITELIBDIR%%/mcollective/ddl/discoveryddl.rb
-%%RUBY_SITELIBDIR%%/mcollective/ddl/validatorddl.rb
-%%RUBY_SITELIBDIR%%/mcollective/discovery.rb
-%%RUBY_SITELIBDIR%%/mcollective/discovery/flatfile.ddl
-%%RUBY_SITELIBDIR%%/mcollective/discovery/flatfile.rb
-%%RUBY_SITELIBDIR%%/mcollective/discovery/mc.ddl
-%%RUBY_SITELIBDIR%%/mcollective/discovery/mc.rb
-%%RUBY_SITELIBDIR%%/mcollective/discovery/stdin.ddl
-%%RUBY_SITELIBDIR%%/mcollective/discovery/stdin.rb
-%%RUBY_SITELIBDIR%%/mcollective/exceptions.rb
-%%RUBY_SITELIBDIR%%/mcollective/facts.rb
-%%RUBY_SITELIBDIR%%/mcollective/facts/base.rb
-%%RUBY_SITELIBDIR%%/mcollective/facts/yaml_facts.rb
-%%RUBY_SITELIBDIR%%/mcollective/generators.rb
-%%RUBY_SITELIBDIR%%/mcollective/generators/agent_generator.rb
-%%RUBY_SITELIBDIR%%/mcollective/generators/base.rb
-%%RUBY_SITELIBDIR%%/mcollective/generators/data_generator.rb
-%%RUBY_SITELIBDIR%%/mcollective/generators/templates/action_snippet.erb
-%%RUBY_SITELIBDIR%%/mcollective/generators/templates/data_input_snippet.erb
-%%RUBY_SITELIBDIR%%/mcollective/generators/templates/ddl.erb
-%%RUBY_SITELIBDIR%%/mcollective/generators/templates/plugin.erb
-%%RUBY_SITELIBDIR%%/mcollective/log.rb
-%%RUBY_SITELIBDIR%%/mcollective/logger.rb
-%%RUBY_SITELIBDIR%%/mcollective/logger/base.rb
-%%RUBY_SITELIBDIR%%/mcollective/logger/console_logger.rb
-%%RUBY_SITELIBDIR%%/mcollective/logger/file_logger.rb
-%%RUBY_SITELIBDIR%%/mcollective/logger/syslog_logger.rb
-%%RUBY_SITELIBDIR%%/mcollective/matcher.rb
-%%RUBY_SITELIBDIR%%/mcollective/matcher/parser.rb
-%%RUBY_SITELIBDIR%%/mcollective/matcher/scanner.rb
-%%RUBY_SITELIBDIR%%/mcollective/message.rb
-%%RUBY_SITELIBDIR%%/mcollective/monkey_patches.rb
-%%RUBY_SITELIBDIR%%/mcollective/optionparser.rb
-%%RUBY_SITELIBDIR%%/mcollective/pluginmanager.rb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager.rb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager/agent_definition.rb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager/debpackage_packager.rb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager/modulepackage_packager.rb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager/ospackage_packager.rb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager/rpmpackage_packager.rb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager/standard_definition.rb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager/templates/debian/Makefile.erb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager/templates/debian/changelog.erb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager/templates/debian/compat.erb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager/templates/debian/control.erb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager/templates/debian/copyright.erb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager/templates/debian/rules.erb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager/templates/module/Modulefile.erb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager/templates/module/README.md.erb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager/templates/module/_manifest.pp.erb
-%%RUBY_SITELIBDIR%%/mcollective/pluginpackager/templates/redhat/rpm_spec.erb
-%%RUBY_SITELIBDIR%%/mcollective/registration.rb
-%%RUBY_SITELIBDIR%%/mcollective/registration/agentlist.rb
-%%RUBY_SITELIBDIR%%/mcollective/registration/base.rb
-%%RUBY_SITELIBDIR%%/mcollective/rpc.rb
-%%RUBY_SITELIBDIR%%/mcollective/rpc/actionrunner.rb
-%%RUBY_SITELIBDIR%%/mcollective/rpc/agent.rb
-%%RUBY_SITELIBDIR%%/mcollective/rpc/audit.rb
-%%RUBY_SITELIBDIR%%/mcollective/rpc/client.rb
-%%RUBY_SITELIBDIR%%/mcollective/rpc/helpers.rb
-%%RUBY_SITELIBDIR%%/mcollective/rpc/progress.rb
-%%RUBY_SITELIBDIR%%/mcollective/rpc/reply.rb
-%%RUBY_SITELIBDIR%%/mcollective/rpc/request.rb
-%%RUBY_SITELIBDIR%%/mcollective/rpc/result.rb
-%%RUBY_SITELIBDIR%%/mcollective/rpc/stats.rb
-%%RUBY_SITELIBDIR%%/mcollective/runner.rb
-%%RUBY_SITELIBDIR%%/mcollective/runnerstats.rb
-%%RUBY_SITELIBDIR%%/mcollective/security.rb
-%%RUBY_SITELIBDIR%%/mcollective/security/aes_security.rb
-%%RUBY_SITELIBDIR%%/mcollective/security/base.rb
-%%RUBY_SITELIBDIR%%/mcollective/security/psk.rb
-%%RUBY_SITELIBDIR%%/mcollective/security/ssl.rb
-%%RUBY_SITELIBDIR%%/mcollective/shell.rb
-%%RUBY_SITELIBDIR%%/mcollective/ssl.rb
-%%RUBY_SITELIBDIR%%/mcollective/unix_daemon.rb
-%%RUBY_SITELIBDIR%%/mcollective/util.rb
-%%RUBY_SITELIBDIR%%/mcollective/validator.rb
-%%RUBY_SITELIBDIR%%/mcollective/validator/array_validator.ddl
-%%RUBY_SITELIBDIR%%/mcollective/validator/array_validator.rb
-%%RUBY_SITELIBDIR%%/mcollective/validator/ipv4address_validator.ddl
-%%RUBY_SITELIBDIR%%/mcollective/validator/ipv4address_validator.rb
-%%RUBY_SITELIBDIR%%/mcollective/validator/ipv6address_validator.ddl
-%%RUBY_SITELIBDIR%%/mcollective/validator/ipv6address_validator.rb
-%%RUBY_SITELIBDIR%%/mcollective/validator/length_validator.ddl
-%%RUBY_SITELIBDIR%%/mcollective/validator/length_validator.rb
-%%RUBY_SITELIBDIR%%/mcollective/validator/regex_validator.ddl
-%%RUBY_SITELIBDIR%%/mcollective/validator/regex_validator.rb
-%%RUBY_SITELIBDIR%%/mcollective/validator/shellsafe_validator.ddl
-%%RUBY_SITELIBDIR%%/mcollective/validator/shellsafe_validator.rb
-%%RUBY_SITELIBDIR%%/mcollective/validator/typecheck_validator.ddl
-%%RUBY_SITELIBDIR%%/mcollective/validator/typecheck_validator.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/load_systemu.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/require_vendored.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/BSDL
-%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/LICENSE
-%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/README
-%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/README.erb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/Rakefile
-%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/lib/systemu.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/samples/a.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/samples/b.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/samples/c.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/samples/d.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/samples/e.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/samples/f.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/systemu.gemspec
-%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/test/systemu_test.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/test/testing.rb
-%%RUBY_SITELIBDIR%%/mcollective/windows_daemon.rb
-@dir %%DATADIR%%