* Matt Dainty <m...@bodgit-n-scarper.com> [2011-12-19 11:31:54]:
> * Stuart Henderson <s...@spacehopper.org> [2011-12-19 11:16:10]:
> > On 2011-12-18, Matt Dainty <m...@bodgit-n-scarper.com> wrote:
> > > Attached is a new port for sysutils/ruby-mcollective. It has a
> > > dependency on the devel/ruby-systemu port I posted. I noticed the
> > > puppet and facter ports are prefixed with ruby- so I made this port the
> > > same. Part of the patch phase removes the bundled systemu and json gems
> > > so it should just fall back to use the system-wide ones.
> >
> > sysutils/mcollective already exists (actually it's a newer version
> > than the port you included).
>
> I must be going blind, I swear I went through CVS to make sure it
> definitely didn't exist beforehand.
>
> It looks like this is based on the devel branch rather than stable which
> is what I based my port on. I'll see if I can merge in some of my changes
> to stop it shipping it's own bundled gems for json and systemu.
Based on me being a numpty, I've instead attached a diff for the
existing mcollective port with the following changes:
* Add dependencies on the ruby-json and new ruby-systemu ports
* Remove the bundled json and systemu gems
* Also patch the client.cfg.dist file in the same way as server.cfg.dist
* Remove the cleanup of the subst_cmd bits due to...
* Altering the example files to be installed sans .dist suffix
* Adjust the PLIST to not include the now-removed gems, install the
renamed example files with @sample amd also install the rc.d script
Tested on amd64.
Matt
Index: mcollective/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/mcollective/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- mcollective/Makefile 20 Sep 2011 14:03:20 -0000 1.1
+++ mcollective/Makefile 20 Dec 2011 00:35:23 -0000
@@ -5,6 +5,7 @@
COMMENT= framework for server orchestration/parallel job execution
DISTNAME= mcollective-1.3.0
+REVISION= 0
CATEGORIES= sysutils
@@ -18,7 +19,9 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-RUN_DEPENDS= net/ruby-stomp
+RUN_DEPENDS= net/ruby-stomp \
+ converters/ruby-json \
+ devel/ruby-systemu
NO_BUILD= Yes
NO_REGRESS= Yes
@@ -31,10 +34,11 @@
MAKE_FILE=ext/Makefile
post-configure:
- ${SUBST_CMD} ${WRKSRC}/etc/server.cfg.dist
-
-# Prevent patch/subst_cmd leftovers from ending up in PLIST
-pre-install:
- rm ${WRKSRC}/etc/server.cfg.dist.*
+.for i in json systemu
+ @rm -rf ${WRKSRC}/lib/mcollective/vendor/${i}/ \
+ ${WRKSRC}/lib/mcollective/vendor/load_${i}.rb
+.endfor
+ ${SUBST_CMD} ${WRKSRC}/etc/server.cfg.dist \
+ ${WRKSRC}/etc/client.cfg.dist
.include <bsd.port.mk>
Index: mcollective/patches/patch-etc_client_cfg_dist
===================================================================
RCS file: mcollective/patches/patch-etc_client_cfg_dist
diff -N mcollective/patches/patch-etc_client_cfg_dist
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mcollective/patches/patch-etc_client_cfg_dist 20 Dec 2011 00:35:23
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- etc/client.cfg.dist.orig Fri Dec 16 09:26:51 2011
++++ etc/client.cfg.dist Fri Dec 16 09:27:45 2011
+@@ -1,7 +1,7 @@
+ topicprefix = /topic/
+ main_collective = mcollective
+ collectives = mcollective
+-libdir = /usr/libexec/mcollective
++libdir = ${TRUEPREFIX}/share/mcollective/plugins
+ logfile = /dev/null
+ loglevel = info
+
Index: mcollective/patches/patch-ext_Makefile
===================================================================
RCS file: /cvs/ports/sysutils/mcollective/patches/patch-ext_Makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-ext_Makefile
--- mcollective/patches/patch-ext_Makefile 20 Sep 2011 14:03:20 -0000
1.1
+++ mcollective/patches/patch-ext_Makefile 20 Dec 2011 00:35:23 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-ext_Makefile,v 1.1 2011/09/20 14:03:20 uwe Exp $
---- ext/Makefile.orig Wed Jun 8 20:57:44 2011
-+++ ext/Makefile Mon Sep 12 01:24:45 2011
+--- ext/Makefile.orig Wed Jun 8 19:57:44 2011
++++ ext/Makefile Fri Dec 16 09:32:27 2011
@@ -1,7 +1,5 @@
#!/usr/bin/make -f
@@ -9,7 +9,7 @@
build:
clean:
-@@ -9,36 +7,34 @@ clean:
+@@ -9,36 +7,37 @@ clean:
install: install-bin install-lib install-conf install-plugins install-doc
install-bin:
@@ -38,9 +38,12 @@
- rm $(DESTDIR)/etc/mcollective/ssl/PLACEHOLDER
- rm $(DESTDIR)/etc/mcollective/ssl/clients/PLACEHOLDER
+ install -d $(PREFIX)/share/examples/mcollective/
-+ cp -R etc/* $(PREFIX)/share/examples/mcollective/
-+ rm $(PREFIX)/share/examples/mcollective/ssl/PLACEHOLDER
-+ rm $(PREFIX)/share/examples/mcollective/ssl/clients/PLACEHOLDER
++ install -d $(PREFIX)/share/examples/mcollective/plugin.d
++ install -d $(PREFIX)/share/examples/mcollective/ssl/clients
++ cp etc/client.cfg.dist $(PREFIX)/share/examples/mcollective/client.cfg
++ cp etc/server.cfg.dist $(PREFIX)/share/examples/mcollective/server.cfg
++ cp etc/facts.yaml.dist $(PREFIX)/share/examples/mcollective/facts.yaml
++ cp etc/rpc-help.erb $(PREFIX)/share/examples/mcollective
install-plugins:
- install -d $(DESTDIR)/usr/share/mcollective/
Index: mcollective/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/mcollective/pkg/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- mcollective/pkg/PLIST 20 Sep 2011 14:03:20 -0000 1.1
+++ mcollective/pkg/PLIST 20 Dec 2011 00:35:23 -0000
@@ -50,189 +50,7 @@
lib/ruby/${MODRUBY_LIBREV}/mcollective/util.rb
lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/
lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/.gitignore
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/CHANGES
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/COPYING
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/COPYING-json-jruby
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/GPL
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/README
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/README-json-jruby.markdown
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/Rakefile
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/TODO
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/VERSION
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/.keep
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast-autocorrelation.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/data/.keep
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/generator2_benchmark.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/generator_benchmark.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/ohai.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/ohai.ruby
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/parser2_benchmark.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/benchmarks/parser_benchmark.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/bin/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/bin/edit_json.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/bin/prettify_json.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/data/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/data/example.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/data/index.html
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/data/prototype.js
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/diagrams/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/diagrams/.keep
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/ext/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/ext/json/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/ext/json/ext/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/ext/json/ext/generator/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/ext/json/ext/generator/extconf.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/ext/json/ext/generator/generator.c
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/ext/json/ext/generator/generator.h
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/ext/json/ext/parser/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/ext/json/ext/parser/extconf.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/ext/json/ext/parser/parser.c
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/ext/json/ext/parser/parser.h
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/ext/json/ext/parser/parser.rl
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/install.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/lib/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/lib/bytelist-1.0.6.jar
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/lib/jcodings.jar
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/src/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/src/json/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/src/json/ext/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/src/json/ext/ByteListTranscoder.java
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/src/json/ext/Generator.java
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/src/json/ext/GeneratorMethods.java
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/src/json/ext/GeneratorService.java
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/src/json/ext/GeneratorState.java
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/src/json/ext/OptionsReader.java
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/src/json/ext/Parser.java
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/src/json/ext/Parser.rl
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/src/json/ext/ParserService.java
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/src/json/ext/RuntimeInfo.java
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/src/json/ext/StringDecoder.java
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/src/json/ext/StringEncoder.java
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/java/src/json/ext/Utils.java
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/json-java.gemspec
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/Array.xpm
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/FalseClass.xpm
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/Hash.xpm
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/Key.xpm
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/NilClass.xpm
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/Numeric.xpm
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/String.xpm
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/TrueClass.xpm
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/add/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/add/core.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/add/rails.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/common.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/editor.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/ext/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/ext.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/ext/.keep
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/json.xpm
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/pure/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/pure.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/pure/generator.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/pure/parser.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/lib/json/version.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail1.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail10.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail11.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail12.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail13.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail14.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail18.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail19.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail2.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail20.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail21.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail22.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail23.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail24.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail25.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail27.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail28.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail3.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail4.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail5.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail6.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail7.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail8.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/fail9.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/pass1.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/pass15.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/pass16.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/pass17.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/pass2.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/pass26.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/fixtures/pass3.json
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/setup_variant.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/test_json.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/test_json_addition.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/test_json_encoding.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/test_json_fixtures.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/test_json_generate.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/test_json_string_matching.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tests/test_json_unicode.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tools/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tools/fuzz.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/json/tools/server.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/load_json.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/load_systemu.rb
lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/require_vendored.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/systemu/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/systemu/LICENSE
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/systemu/README
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/systemu/README.erb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/systemu/Rakefile
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/systemu/lib/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/systemu/lib/systemu.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/systemu/samples/
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/systemu/samples/a.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/systemu/samples/b.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/systemu/samples/c.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/systemu/samples/d.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/systemu/samples/e.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/systemu/samples/f.rb
-lib/ruby/${MODRUBY_LIBREV}/mcollective/vendor/systemu/systemu.gemspec
sbin/mc-call-agent
sbin/mc-controller
sbin/mc-facts
@@ -454,12 +272,21 @@
share/doc/mcollective/index.html
share/doc/mcollective/rdoc-style.css
share/examples/mcollective/
-share/examples/mcollective/client.cfg.dist
-share/examples/mcollective/facts.yaml.dist
+@sample ${SYSCONFDIR}/mcollective/
+share/examples/mcollective/client.cfg
+@sample ${SYSCONFDIR}/mcollective/client.cfg
+share/examples/mcollective/facts.yaml
+@sample ${SYSCONFDIR}/mcollective/facts.yaml
share/examples/mcollective/rpc-help.erb
-share/examples/mcollective/server.cfg.dist
+@sample ${SYSCONFDIR}/mcollective/rpc-help.erb
+share/examples/mcollective/server.cfg
+@sample ${SYSCONFDIR}/mcollective/server.cfg
+share/examples/mcollective/plugin.d/
share/examples/mcollective/ssl/
share/examples/mcollective/ssl/clients/
+@sample ${SYSCONFDIR}/mcollective/plugin.d/
+@sample ${SYSCONFDIR}/mcollective/ssl/
+@sample ${SYSCONFDIR}/mcollective/ssl/clients/
share/mcollective/
share/mcollective/plugins/
share/mcollective/plugins/mcollective/
@@ -487,3 +314,4 @@
share/mcollective/plugins/mcollective/security/aes_security.rb
share/mcollective/plugins/mcollective/security/psk.rb
share/mcollective/plugins/mcollective/security/ssl.rb
+@rcscript ${RCDIR}/mcollectived
