4 files changed, 87 insertions, 326 deletions

diff --git a/sysutils/mcollective/Makefile b/sysutils/mcollective/Makefile
index 003d39cb2e6c..9e2614baf7cc 100644
--- a/sysutils/mcollective/Makefile
+++ b/sysutils/mcollective/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mcollective
-PORTVERSION=	2.5.3
+PORTVERSION=	2.8.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/${PORTNAME}/
 
@@ -16,6 +16,8 @@ USE_RUBY=	yes
 USE_RC_SUBR=	mcollectived
 
 RUBY_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 ""
@@ -39,20 +41,9 @@ do-patch:
 	    ${WRKSRC}/etc/client.cfg.dist
 
 do-install:
-	@(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_SITELIBDIR})
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	@(cd ${WRKSRC}/plugins/mcollective && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
-
-.for script in ${SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${script} ${STAGEDIR}${PREFIX}/bin/
+	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
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/mcollectived ${STAGEDIR}${PREFIX}/sbin/mcollectived
-
-	${MKDIR} ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${WRKSRC}/etc/client.cfg.dist ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${WRKSRC}/etc/server.cfg.dist ${STAGEDIR}${ETCDIR}
-
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/sysutils/mcollective/distinfo b/sysutils/mcollective/distinfo
index e32b4a746452..920fa331cf60 100644
--- a/sysutils/mcollective/distinfo
+++ b/sysutils/mcollective/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mcollective-2.5.3.tar.gz) = 6ba69d9d58ca59628e997b6bb602c5884cabd0ea201e859e0863c303f1d64fda
-SIZE (mcollective-2.5.3.tar.gz) = 903498
+SHA256 (mcollective-2.8.2.tar.gz) = 03e23d8e79ccee6394f0dd31456fb56c3ae4ca2891027062377a2aaa5b5c5fe9
+SIZE (mcollective-2.8.2.tar.gz) = 720217
diff --git a/sysutils/mcollective/pkg-descr b/sysutils/mcollective/pkg-descr
index 5f8819927c9e..1375807def58 100644
--- a/sysutils/mcollective/pkg-descr
+++ b/sysutils/mcollective/pkg-descr
@@ -1,4 +1,4 @@
 The Marionette Collective 
 A modern scalable datacenter orchestration framework
 
-WWW: http://marionette-collective.org/
+WWW: http://docs.puppetlabs.com/mcollective/
diff --git a/sysutils/mcollective/pkg-plist b/sysutils/mcollective/pkg-plist
index 4d34528d1760..39b77f377d0c 100644
--- a/sysutils/mcollective/pkg-plist
+++ b/sysutils/mcollective/pkg-plist
@@ -1,225 +1,60 @@
-bin/mco
 sbin/mcollectived
-%%DATADIR%%/agent/discovery.rb
-%%DATADIR%%/agent/rpcutil.ddl
-%%DATADIR%%/agent/rpcutil.rb
-%%DATADIR%%/aggregate/average.rb
-%%DATADIR%%/aggregate/average.ddl
-%%DATADIR%%/aggregate/sum.rb
-%%DATADIR%%/aggregate/sum.ddl
-%%DATADIR%%/aggregate/summary.rb
-%%DATADIR%%/aggregate/summary.ddl
-%%DATADIR%%/application/completion.rb
-%%DATADIR%%/application/facts.rb
-%%DATADIR%%/application/find.rb
-%%DATADIR%%/application/help.rb
-%%DATADIR%%/application/inventory.rb
-%%DATADIR%%/application/ping.rb
-%%DATADIR%%/application/plugin.rb
-%%DATADIR%%/application/rpc.rb
-%%DATADIR%%/audit/logfile.rb
-%%DATADIR%%/connector/activemq.rb
-%%DATADIR%%/connector/rabbitmq.rb
-%%DATADIR%%/data/agent_data.ddl
-%%DATADIR%%/data/agent_data.rb
-%%DATADIR%%/data/fstat_data.ddl
-%%DATADIR%%/data/fstat_data.rb
-%%DATADIR%%/discovery/flatfile.ddl
-%%DATADIR%%/discovery/flatfile.rb
-%%DATADIR%%/discovery/mc.ddl
-%%DATADIR%%/discovery/mc.rb
-%%DATADIR%%/discovery/stdin.ddl
-%%DATADIR%%/discovery/stdin.rb
-%%DATADIR%%/facts/yaml_facts.rb
-%%DATADIR%%/pluginpackager/debpackage_packager.rb
-%%DATADIR%%/pluginpackager/ospackage_packager.rb
-%%DATADIR%%/pluginpackager/modulepackage_packager.rb
-%%DATADIR%%/pluginpackager/rpmpackage_packager.rb
-%%DATADIR%%/pluginpackager/templates/debian/Makefile.erb
-%%DATADIR%%/pluginpackager/templates/debian/changelog.erb
-%%DATADIR%%/pluginpackager/templates/debian/compat.erb
-%%DATADIR%%/pluginpackager/templates/debian/control.erb
-%%DATADIR%%/pluginpackager/templates/debian/copyright.erb
-%%DATADIR%%/pluginpackager/templates/debian/rules.erb
-%%DATADIR%%/pluginpackager/templates/redhat/rpm_spec.erb
-%%DATADIR%%/pluginpackager/templates/module/_manifest.pp.erb
-%%DATADIR%%/pluginpackager/templates/module/Modulefile.erb
-%%DATADIR%%/pluginpackager/templates/module/README.md.erb
-%%DATADIR%%/registration/agentlist.rb
-%%DATADIR%%/security/aes_security.rb
-%%DATADIR%%/security/psk.rb
-%%DATADIR%%/security/ssl.rb
-%%DATADIR%%/validator/array_validator.ddl
-%%DATADIR%%/validator/typecheck_validator.ddl
-%%DATADIR%%/validator/ipv4address_validator.ddl
-%%DATADIR%%/validator/shellsafe_validator.rb
-%%DATADIR%%/validator/ipv6address_validator.ddl
-%%DATADIR%%/validator/shellsafe_validator.ddl
-%%DATADIR%%/validator/length_validator.rb
-%%DATADIR%%/validator/ipv4address_validator.rb
-%%DATADIR%%/validator/ipv6address_validator.rb
-%%DATADIR%%/validator/length_validator.ddl
-%%DATADIR%%/validator/regex_validator.rb
-%%DATADIR%%/validator/regex_validator.ddl
-%%DATADIR%%/validator/array_validator.rb
-%%DATADIR%%/validator/typecheck_validator.rb
-%%ETCDIR%%/client.cfg.dist
-%%ETCDIR%%/server.cfg.dist
-%%PORTDOCS%%%%DOCSDIR%%/Array.html
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.html
-%%PORTDOCS%%%%DOCSDIR%%/Dir.html
-%%PORTDOCS%%%%DOCSDIR%%/Gemfile.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Agent.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Agents.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Aggregate.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Aggregate/Base.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Aggregate/Result.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Aggregate/Result/Base.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Aggregate/Result/CollectionResult.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Aggregate/Result/NumericResult.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Application.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Applications.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/BackoffSuggestion.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Cache.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Client.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Config.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Connector.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Connector/Base.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/DDL.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/DDL/AgentDDL.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/DDL/Base.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/DDL/DataDDL.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/DDL/DiscoveryDDL.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/DDL/ValidatorDDL.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/DDLValidationError.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Data.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Data/Base.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Data/Result.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Discovery.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Facts.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Facts/Base.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Generators.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Generators/AgentGenerator.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Generators/Base.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Generators/DataGenerator.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/InvalidRPCData.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Log.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Logger.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Logger/Base.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Logger/Console_logger.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Logger/File_logger.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Logger/Syslog_logger.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Matcher.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Matcher/Parser.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Matcher/Scanner.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Message.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/MessageNotReceived.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/MissingRPCData.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/MsgDoesNotMatchRequestID.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/MsgTTLExpired.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/NotTargettedAtUs.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Optionparser.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/PluginManager.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/PluginPackager.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/PluginPackager/AgentDefinition.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/PluginPackager/StandardDefinition.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/RPC.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/RPC/ActionRunner.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/RPC/Agent.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/RPC/Audit.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/RPC/Client.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/RPC/Helpers.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/RPC/Progress.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/RPC/Reply.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/RPC/Request.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/RPC/Result.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/RPC/Stats.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/RPCAborted.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/RPCError.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Registration.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Registration/Base.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Runner.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/RunnerStats.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/SSL.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Security.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Security/Base.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/SecurityValidationFailed.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Shell.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/UnexpectedMessageType.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/UnixDaemon.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/UnknownRPCAction.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/UnknownRPCError.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Util.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/Validator.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/ValidatorError.html
-%%PORTDOCS%%%%DOCSDIR%%/MCollective/WindowsDaemon.html
-%%PORTDOCS%%%%DOCSDIR%%/Object.html
-%%PORTDOCS%%%%DOCSDIR%%/README.html
-%%PORTDOCS%%%%DOCSDIR%%/Rakefile.html
-%%PORTDOCS%%%%DOCSDIR%%/String.html
-%%PORTDOCS%%%%DOCSDIR%%/Symbol.html
-%%PORTDOCS%%%%DOCSDIR%%/created.rid
-%%PORTDOCS%%%%DOCSDIR%%/doc/created_rid.html
-%%PORTDOCS%%%%DOCSDIR%%/etc/ssl/PLACEHOLDER.html
-%%PORTDOCS%%%%DOCSDIR%%/etc/ssl/clients/PLACEHOLDER.html
-%%PORTDOCS%%%%DOCSDIR%%/etc/client_cfg_dist.html
-%%PORTDOCS%%%%DOCSDIR%%/etc/server_cfg_dist.html
-%%PORTDOCS%%%%DOCSDIR%%/etc/facts_yaml_dist.html
-%%PORTDOCS%%%%DOCSDIR%%/images/add.png
-%%PORTDOCS%%%%DOCSDIR%%/images/arrow_up.png
-%%PORTDOCS%%%%DOCSDIR%%/images/brick.png
-%%PORTDOCS%%%%DOCSDIR%%/images/brick_link.png
-%%PORTDOCS%%%%DOCSDIR%%/images/bug.png
-%%PORTDOCS%%%%DOCSDIR%%/images/bullet_black.png
-%%PORTDOCS%%%%DOCSDIR%%/images/bullet_toggle_minus.png
-%%PORTDOCS%%%%DOCSDIR%%/images/bullet_toggle_plus.png
-%%PORTDOCS%%%%DOCSDIR%%/images/date.png
-%%PORTDOCS%%%%DOCSDIR%%/images/delete.png
-%%PORTDOCS%%%%DOCSDIR%%/images/find.png
-%%PORTDOCS%%%%DOCSDIR%%/images/loadingAnimation.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/macFFBgHack.png
-%%PORTDOCS%%%%DOCSDIR%%/images/package.png
-%%PORTDOCS%%%%DOCSDIR%%/images/page_green.png
-%%PORTDOCS%%%%DOCSDIR%%/images/page_white_text.png
-%%PORTDOCS%%%%DOCSDIR%%/images/page_white_width.png
-%%PORTDOCS%%%%DOCSDIR%%/images/plugin.png
-%%PORTDOCS%%%%DOCSDIR%%/images/ruby.png
-%%PORTDOCS%%%%DOCSDIR%%/images/tag_blue.png
-%%PORTDOCS%%%%DOCSDIR%%/images/tag_green.png
-%%PORTDOCS%%%%DOCSDIR%%/images/transparent.png
-%%PORTDOCS%%%%DOCSDIR%%/images/wrench.png
-%%PORTDOCS%%%%DOCSDIR%%/images/wrench_orange.png
-%%PORTDOCS%%%%DOCSDIR%%/images/zoom.png
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/js/darkfish.js
-%%PORTDOCS%%%%DOCSDIR%%/js/jquery.js
-%%PORTDOCS%%%%DOCSDIR%%/js/navigation.js
-%%PORTDOCS%%%%DOCSDIR%%/js/search.js
-%%PORTDOCS%%%%DOCSDIR%%/js/search_index.js
-%%PORTDOCS%%%%DOCSDIR%%/js/searcher.js
-%%PORTDOCS%%%%DOCSDIR%%/rdoc.css
-%%PORTDOCS%%%%DOCSDIR%%/table_of_contents.html
-%%PORTDOCS%%%%DOCSDIR%%/mcollective_init.html
-%%PORTDOCS%%%%DOCSDIR%%/GetoptLong.html
+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/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
@@ -228,9 +63,16 @@ sbin/mcollectived
 %%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
@@ -254,8 +96,23 @@ sbin/mcollectived
 %%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
@@ -271,116 +128,30 @@ sbin/mcollectived
 %%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/json/CHANGES
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/COPYING
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/COPYING-json-jruby
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/GPL
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/Gemfile
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/README-json-jruby.markdown
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/README.rdoc
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/Rakefile
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/TODO
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/VERSION
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/bin/edit_json.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/bin/prettify_json.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/data/example.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/data/index.html
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/data/prototype.js
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/ext/json/ext/generator/extconf.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/ext/json/ext/generator/generator.c
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/ext/json/ext/generator/generator.h
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/ext/json/ext/parser/extconf.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/ext/json/ext/parser/parser.c
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/ext/json/ext/parser/parser.h
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/ext/json/ext/parser/parser.rl
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/install.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/java/lib/bytelist-1.0.6.jar
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/java/lib/jcodings.jar
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/java/src/json/ext/ByteListTranscoder.java
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/java/src/json/ext/Generator.java
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/java/src/json/ext/GeneratorMethods.java
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/java/src/json/ext/GeneratorService.java
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/java/src/json/ext/GeneratorState.java
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/java/src/json/ext/OptionsReader.java
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/java/src/json/ext/Parser.java
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/java/src/json/ext/Parser.rl
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/java/src/json/ext/ParserService.java
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/java/src/json/ext/RuntimeInfo.java
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/java/src/json/ext/StringDecoder.java
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/java/src/json/ext/StringEncoder.java
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/java/src/json/ext/Utils.java
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/json-java.gemspec
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/json.gemspec
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/json_pure.gemspec
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/Array.xpm
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/FalseClass.xpm
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/Hash.xpm
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/Key.xpm
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/NilClass.xpm
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/Numeric.xpm
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/String.xpm
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/TrueClass.xpm
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/add/complex.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/add/core.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/add/rational.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/common.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/editor.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/ext.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/json.xpm
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/pure.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/pure/generator.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/pure/parser.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/version.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail1.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail10.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail11.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail12.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail13.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail14.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail18.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail19.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail2.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail20.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail21.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail22.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail23.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail24.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail25.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail27.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail28.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail3.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail4.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail5.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail6.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail7.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail8.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/fail9.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/pass1.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/pass15.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/pass16.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/pass17.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/pass2.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/pass26.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/fixtures/pass3.json
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/setup_variant.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/test_json.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/test_json_addition.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/test_json_encoding.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/test_json_fixtures.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/test_json_generate.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/test_json_string_matching.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tests/test_json_unicode.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tools/fuzz.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/json/tools/server.rb
-%%RUBY_SITELIBDIR%%/mcollective/vendor/load_json.rb
 %%RUBY_SITELIBDIR%%/mcollective/vendor/load_systemu.rb
 %%RUBY_SITELIBDIR%%/mcollective/vendor/require_vendored.rb
 %%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/LICENSE
@@ -396,5 +167,4 @@ sbin/mcollectived
 %%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/samples/f.rb
 %%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/systemu.gemspec
 %%RUBY_SITELIBDIR%%/mcollective/windows_daemon.rb
-@dir %%RUBY_SITELIBDIR%%/mcollective/vendor/json/lib/json/ext
-@dir %%RUBY_SITELIBDIR%%/mcollective/vendor/json/diagrams
+@dir %%DATADIR%%