- Complete repocopy of sysutils/puppet-devel and apply patch.

PR:		ports/116007
Submitted by:	Tomoyuki Sakurai <cherry@trombik.org> (maintainer)

6 files changed, 68 insertions, 318 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index a1fdd940607..0a394347108 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -530,6 +530,7 @@
     SUBDIR += pstack
     SUBDIR += pstree
     SUBDIR += puppet
+    SUBDIR += puppet-devel
     SUBDIR += pv
     SUBDIR += pwd_unmkdb
     SUBDIR += pwg
diff --git a/sysutils/puppet-devel/Makefile b/sysutils/puppet-devel/Makefile
index 40640d2fd66..e66cc23d248 100644
--- a/sysutils/puppet-devel/Makefile
+++ b/sysutils/puppet-devel/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	puppet
-PORTVERSION=	0.22.4
+PORTVERSION=	0.23.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.reductivelabs.com/downloads/puppet/
+PKGNAMESUFFIX=	-devel
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	cherry@trombik.org
@@ -17,16 +18,19 @@ COMMENT=	A configuration management framework written in Ruby
 BUILD_DEPENDS=	${RUBY_SITELIBDIR}/facter.rb:${PORTSDIR}/sysutils/facter
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+CONFLICTS=	puppet-[0-9]*
+
 NO_BUILD=	yes
 USE_RUBY=	yes
 USE_RC_SUBR=	puppetmasterd puppetd
 
-DOCS=	CHANGELOG TODO README LICENSE COPYING
+DOCS=	CHANGELOG README LICENSE COPYING
 
 .include <bsd.port.pre.mk>
 
 post-patch:
-	${RM} ${WRKSRC}/bin/*.orig || true
+	${REINPLACE_CMD} -e "s|/etc/puppet|${PREFIX}/etc/puppet|" \
+		${WRKSRC}/lib/puppet/configuration.rb
 
 do-install:
 	cd ${WRKSRC} && \
@@ -47,11 +51,17 @@ post-install:
 .for DIR in ssl manifests
 	${INSTALL} -d ${PREFIX}/etc/${PORTNAME}/${DIR}
 .endfor
-	${RUBY} ${PREFIX}/bin/puppetmasterd \
+	${RUBY} -I ${RUBY_SITELIBDIR} ${PREFIX}/bin/puppetmasterd \
 		--confdir=${PREFIX}/etc/${PORTNAME} \
 		--rundir=/var/run \
 		--genconfig | \
 		${SED} -e 's/genconfig = true/# genconfig = false/' \
-		> ${PREFIX}/etc/${PORTNAME}/puppetmasterd.conf-dist
+		> ${PREFIX}/etc/${PORTNAME}/puppet.conf-dist
+	@${ECHO} ${RUBY_SITELIBDIR}/puppet.rb | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type f | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/puppet-devel/distinfo b/sysutils/puppet-devel/distinfo
index 17430843c4e..872b8252b70 100644
--- a/sysutils/puppet-devel/distinfo
+++ b/sysutils/puppet-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (puppet-0.22.4.tgz) = 9bb853104f2616c7f2c8fa4e2f39b537
-SHA256 (puppet-0.22.4.tgz) = 7b26b50711c89ca1e1c12967a363c6f0bc6c04ddcd741358f74c107d04352042
-SIZE (puppet-0.22.4.tgz) = 642077
+MD5 (puppet-0.23.2.tgz) = 496373ce2a7affbb639f85bcff38da0b
+SHA256 (puppet-0.23.2.tgz) = eb80e4d4adeb174c2ec5198f73d581f9a77cb07a2cae15114b9b11b13021bfa8
+SIZE (puppet-0.23.2.tgz) = 698593
diff --git a/sysutils/puppet-devel/files/patch-optional-p-P b/sysutils/puppet-devel/files/patch-optional-p-P
new file mode 100644
index 00000000000..91316ab0564
--- /dev/null
+++ b/sysutils/puppet-devel/files/patch-optional-p-P
@@ -0,0 +1,15 @@
+--- lib/puppet/provider/package/ports.rb.orig	Tue Aug  7 21:52:46 2007
++++ lib/puppet/provider/package/ports.rb	Tue Aug  7 21:53:49 2007
+@@ -17,11 +17,9 @@
+     end
+ 
+     def install
+-        # -p: create a package
+         # -N: install if the package is missing, otherwise upgrade
+-        # -P: prefer binary packages
+         # -M: yes, we're a batch, so don't ask any questions
+-        cmd = %w{-p -N -P  -M BATCH=yes} << @resource[:name]
++        cmd = %w{-N -M BATCH=yes} << @resource[:name]
+ 
+         output = portupgrade(*cmd)
+         if output =~ /\*\* No such /
diff --git a/sysutils/puppet-devel/pkg-descr b/sysutils/puppet-devel/pkg-descr
index d635504435d..df0ca5b4e1a 100644
--- a/sysutils/puppet-devel/pkg-descr
+++ b/sysutils/puppet-devel/pkg-descr
@@ -4,4 +4,11 @@ elements normally aggregated in different files, like users, cron jobs, and
 hosts, along with obviously discrete elements like packages, services, and
 files.
 
-WWW:	http://www.reductivelabs.com/projects/puppet/
+This is a developement version of sysutils/puppet. Use this if you'd like to
+give the latest release a try. Do NOT use in production environment.
+
+What makes it stable depends on comments from developers, such as
+http://reductivelabs.com/trac/puppet/wiki/DownloadingPuppet and feedback from
+users.
+
+WWW:	http://reductivelabs.com/trac/puppet
diff --git a/sysutils/puppet-devel/pkg-plist b/sysutils/puppet-devel/pkg-plist
index f2dd8c608fe..8576364541b 100644
--- a/sysutils/puppet-devel/pkg-plist
+++ b/sysutils/puppet-devel/pkg-plist
@@ -1,343 +1,60 @@
 @comment $FreeBSD$
+bin/filebucket
 bin/puppetd
 bin/puppetca
 bin/puppet
 bin/puppetdoc
 bin/puppetrun
 bin/puppetmasterd
-%%RUBY_SITELIBDIR%%/puppet.rb
-%%RUBY_SITELIBDIR%%/puppet/propertychange.rb
-%%RUBY_SITELIBDIR%%/puppet/transportable.rb
-%%RUBY_SITELIBDIR%%/puppet/provider.rb
-%%RUBY_SITELIBDIR%%/puppet/configuration.rb
-%%RUBY_SITELIBDIR%%/puppet/modules.rb
-%%RUBY_SITELIBDIR%%/puppet/error.rb
-%%RUBY_SITELIBDIR%%/puppet/parameter.rb
-%%RUBY_SITELIBDIR%%/puppet/daemon.rb
-%%RUBY_SITELIBDIR%%/puppet/transaction.rb
-%%RUBY_SITELIBDIR%%/puppet/rails.rb
-%%RUBY_SITELIBDIR%%/puppet/pgraph.rb
-%%RUBY_SITELIBDIR%%/puppet/dsl.rb
-%%RUBY_SITELIBDIR%%/puppet/relationship.rb
-%%RUBY_SITELIBDIR%%/puppet/event.rb
-%%RUBY_SITELIBDIR%%/puppet/sslcertificates.rb
-%%RUBY_SITELIBDIR%%/puppet/type.rb
-%%RUBY_SITELIBDIR%%/puppet/util.rb
-%%RUBY_SITELIBDIR%%/puppet/element.rb
-%%RUBY_SITELIBDIR%%/puppet/type/parsedtype.rb
-%%RUBY_SITELIBDIR%%/puppet/type/cron.rb
-%%RUBY_SITELIBDIR%%/puppet/type/sshkey.rb
-%%RUBY_SITELIBDIR%%/puppet/type/property.rb
-%%RUBY_SITELIBDIR%%/puppet/type/resources.rb
-%%RUBY_SITELIBDIR%%/puppet/type/component.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfilebucket.rb
-%%RUBY_SITELIBDIR%%/puppet/type/group.rb
-%%RUBY_SITELIBDIR%%/puppet/type/notify.rb
-%%RUBY_SITELIBDIR%%/puppet/type/zone.rb
-%%RUBY_SITELIBDIR%%/puppet/type/tidy.rb
-%%RUBY_SITELIBDIR%%/puppet/type/exec.rb
-%%RUBY_SITELIBDIR%%/puppet/type/mount.rb
-%%RUBY_SITELIBDIR%%/puppet/type/yumrepo.rb
-%%RUBY_SITELIBDIR%%/puppet/type/service.rb
-%%RUBY_SITELIBDIR%%/puppet/type/user.rb
-%%RUBY_SITELIBDIR%%/puppet/type/host.rb
-%%RUBY_SITELIBDIR%%/puppet/type/schedule.rb
-%%RUBY_SITELIBDIR%%/puppet/type/package.rb
-%%RUBY_SITELIBDIR%%/puppet/type/port.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/target.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/group.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/content.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/checksum.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/mode.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/source.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/type.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/ensure.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/owner.rb
-%%RUBY_SITELIBDIR%%/puppet/util/warnings.rb
-%%RUBY_SITELIBDIR%%/puppet/util/execution.rb
-%%RUBY_SITELIBDIR%%/puppet/util/graph.rb
-%%RUBY_SITELIBDIR%%/puppet/util/autoload.rb
-%%RUBY_SITELIBDIR%%/puppet/util/docs.rb
-%%RUBY_SITELIBDIR%%/puppet/util/config.rb
-%%RUBY_SITELIBDIR%%/puppet/util/loadedfile.rb
-%%RUBY_SITELIBDIR%%/puppet/util/pidlock.rb
-%%RUBY_SITELIBDIR%%/puppet/util/inifile.rb
-%%RUBY_SITELIBDIR%%/puppet/util/posix.rb
-%%RUBY_SITELIBDIR%%/puppet/util/filetype.rb
-%%RUBY_SITELIBDIR%%/puppet/util/log.rb
-%%RUBY_SITELIBDIR%%/puppet/util/methodhelper.rb
-%%RUBY_SITELIBDIR%%/puppet/util/logging.rb
-%%RUBY_SITELIBDIR%%/puppet/util/storage.rb
-%%RUBY_SITELIBDIR%%/puppet/util/fileparsing.rb
-%%RUBY_SITELIBDIR%%/puppet/util/subclass_loader.rb
-%%RUBY_SITELIBDIR%%/puppet/util/variables.rb
-%%RUBY_SITELIBDIR%%/puppet/util/metaid.rb
-%%RUBY_SITELIBDIR%%/puppet/util/package.rb
-%%RUBY_SITELIBDIR%%/puppet/util/classgen.rb
-%%RUBY_SITELIBDIR%%/puppet/util/plist.rb
-%%RUBY_SITELIBDIR%%/puppet/util/feature.rb
-%%RUBY_SITELIBDIR%%/puppet/util/errors.rb
-%%RUBY_SITELIBDIR%%/puppet/util/metric.rb
-%%RUBY_SITELIBDIR%%/puppet/util/provider_features.rb
-%%RUBY_SITELIBDIR%%/puppet/util/suidmanager.rb
-%%RUBY_SITELIBDIR%%/puppet/util/plist/parser.rb
-%%RUBY_SITELIBDIR%%/puppet/util/plist/generator.rb
-%%RUBY_SITELIBDIR%%/puppet/util/rails/collection_merger.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr.rb
-%%RUBY_SITELIBDIR%%/puppet/external/lock.rb
-%%RUBY_SITELIBDIR%%/puppet/external/event-loop.rb
-%%RUBY_SITELIBDIR%%/puppet/external/base64.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/rdot.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/graph.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/common.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/edge.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/undirected_graph.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/labels.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/comparability.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/graph_api.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/strong_components.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/dot.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/digraph_distance.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/search.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/base.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/digraph.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/maximum_flow.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/biconnected.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/adjacency_graph.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/import.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/chinese_postman.rb
-%%RUBY_SITELIBDIR%%/puppet/external/event-loop/better-definers.rb
-%%RUBY_SITELIBDIR%%/puppet/external/event-loop/event-loop.rb
-%%RUBY_SITELIBDIR%%/puppet/external/event-loop/signal-system.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/providers.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/evaluation.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/manager.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/tags.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/attributes.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/closure.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/schedules.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/instances.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/metaparams.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/container.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/relationships.rb
-%%RUBY_SITELIBDIR%%/puppet/reports/tagmail.rb
-%%RUBY_SITELIBDIR%%/puppet/reports/rrdgraph.rb
-%%RUBY_SITELIBDIR%%/puppet/reports/log.rb
-%%RUBY_SITELIBDIR%%/puppet/reports/store.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/source_file.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/resource.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/fact_name.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/fact_value.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/param_name.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/host.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/param_value.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/puppet_class.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/external/tagging/tag.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/external/tagging/tagging.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/external/tagging/acts_as_taggable.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/external/tagging/init.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/database/schema.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/database/001_add_indexes.rb
-%%RUBY_SITELIBDIR%%/puppet/feature/base.rb
-%%RUBY_SITELIBDIR%%/puppet/feature/rails.rb
-%%RUBY_SITELIBDIR%%/puppet/network/authconfig.rb
-%%RUBY_SITELIBDIR%%/puppet/network/client_request.rb
-%%RUBY_SITELIBDIR%%/puppet/network/authorization.rb
-%%RUBY_SITELIBDIR%%/puppet/network/server.rb
-%%RUBY_SITELIBDIR%%/puppet/network/rights.rb
-%%RUBY_SITELIBDIR%%/puppet/network/handler.rb
-%%RUBY_SITELIBDIR%%/puppet/network/client.rb
-%%RUBY_SITELIBDIR%%/puppet/network/authstore.rb
-%%RUBY_SITELIBDIR%%/puppet/network/client/ca.rb
-%%RUBY_SITELIBDIR%%/puppet/network/client/resource.rb
-%%RUBY_SITELIBDIR%%/puppet/network/client/report.rb
-%%RUBY_SITELIBDIR%%/puppet/network/client/logger.rb
-%%RUBY_SITELIBDIR%%/puppet/network/client/file.rb
-%%RUBY_SITELIBDIR%%/puppet/network/client/master.rb
-%%RUBY_SITELIBDIR%%/puppet/network/client/runner.rb
-%%RUBY_SITELIBDIR%%/puppet/network/client/dipper.rb
-%%RUBY_SITELIBDIR%%/puppet/network/client/status.rb
-%%RUBY_SITELIBDIR%%/puppet/network/client/proxy.rb
-%%RUBY_SITELIBDIR%%/puppet/network/handler/fileserver.rb
-%%RUBY_SITELIBDIR%%/puppet/network/handler/ca.rb
-%%RUBY_SITELIBDIR%%/puppet/network/handler/resource.rb
-%%RUBY_SITELIBDIR%%/puppet/network/handler/report.rb
-%%RUBY_SITELIBDIR%%/puppet/network/handler/logger.rb
-%%RUBY_SITELIBDIR%%/puppet/network/handler/master.rb
-%%RUBY_SITELIBDIR%%/puppet/network/handler/filebucket.rb
-%%RUBY_SITELIBDIR%%/puppet/network/handler/runner.rb
-%%RUBY_SITELIBDIR%%/puppet/network/handler/status.rb
-%%RUBY_SITELIBDIR%%/puppet/network/server/mongrel.rb
-%%RUBY_SITELIBDIR%%/puppet/network/server/webrick.rb
-%%RUBY_SITELIBDIR%%/puppet/network/xmlrpc/processor.rb
-%%RUBY_SITELIBDIR%%/puppet/network/xmlrpc/server.rb
-%%RUBY_SITELIBDIR%%/puppet/network/xmlrpc/webrick_servlet.rb
-%%RUBY_SITELIBDIR%%/puppet/network/xmlrpc/client.rb
-%%RUBY_SITELIBDIR%%/puppet/sslcertificates/ca.rb
-%%RUBY_SITELIBDIR%%/puppet/sslcertificates/inventory.rb
-%%RUBY_SITELIBDIR%%/puppet/sslcertificates/certificate.rb
-%%RUBY_SITELIBDIR%%/puppet/sslcertificates/support.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/parser.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/functions.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/collector.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/resource.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/scope.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/lexer.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/interpreter.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/templatewrapper.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/resourceref.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/resourceparam.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/hostclass.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/leaf.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/astarray.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/component.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/resourceoverride.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/function.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/else.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/vardef.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/selector.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/caseopt.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/collection.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/casestatement.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/node.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/ifstatement.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/resourcedefaults.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/tag.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/collexpr.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/branch.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/resourcedef.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/resource/param.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/resource/reference.rb
-%%RUBY_SITELIBDIR%%/puppet/transaction/report.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/nameservice.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/mount.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/parsedfile.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/cron/crontab.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/host/parsed.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/host/netinfo.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/port/parsed.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/user/pw.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/user/useradd.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/user/netinfo.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/zone/solaris.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/group/pw.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/group/netinfo.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/group/groupadd.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/mount/parsed.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/mount/netinfo.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/service/debian.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/service/redhat.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/service/smf.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/service/gentoo.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/service/base.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/service/init.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/nameservice/pw.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/nameservice/objectadd.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/nameservice/netinfo.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/sshkey/parsed.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/up2date.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/portage.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/dpkg.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/pkgdmg.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/freebsd.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/sunfreeware.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/ports.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/apt.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/aptrpm.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/apple.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/gem.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/aptitude.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/rpm.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/darwinport.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/sun.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/yum.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/rug.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/openbsd.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/blastwave.rb
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/cron
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/network/xmlrpc
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/network/server
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/network/handler
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/network/client
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/network
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/util/rails
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/util/plist
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/util
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/type/pfile
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/type
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/transaction
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/sslcertificates
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/reports
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/rails/external/tagging
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/rails/external
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/rails/database
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/rails
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/zone
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/user
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/sshkey
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/service
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/port
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/package
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/nameservice
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/mount
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/host
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/group
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/parser/resource
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/parser/ast
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/parser
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/metatype
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/feature
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/external/gratr
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/external/event-loop
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/external
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet
+bin/ralsh
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/root/bin/sleeper
-%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/init.d/sleeper
-%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/puppetd.conf
-%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/fileserver.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/tagmail.conf
 %%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/puppetmasterd.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/puppetd.conf
 %%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/namespaceauth.conf
-%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/tagmail.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/fileserver.conf
 %%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/otherfile
-%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/configfile
-%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/debian-passwd
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/init.d/sleeper
 %%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/debian-syslog.conf
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/allatonce
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/head
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/debian-passwd
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/configfile
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/bin/sleeper
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/svncommit
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/simpletests
 %%PORTDOCS%%%%EXAMPLESDIR%%/code/selectors
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/execs
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/relationships
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/one
 %%PORTDOCS%%%%EXAMPLESDIR%%/code/nodes
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/mac_pkgdmg.pp
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/mac_netinfo.pp
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/mac_dscl_revert.pp
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/mac_dscl.pp
 %%PORTDOCS%%%%EXAMPLESDIR%%/code/mac_automount.pp
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/filerecursion
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/components
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/file.bl
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/importing
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/head
 %%PORTDOCS%%%%EXAMPLESDIR%%/code/groups
 %%PORTDOCS%%%%EXAMPLESDIR%%/code/functions
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/filerecursion
 %%PORTDOCS%%%%EXAMPLESDIR%%/code/fileparsing
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/svncommit
 %%PORTDOCS%%%%EXAMPLESDIR%%/code/filedefaults
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/simpletests
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/file.bl
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/execs
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/components
 %%PORTDOCS%%%%EXAMPLESDIR%%/code/assignments
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/relationships
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/importing
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/one
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/allatonce
 %%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root/bin
 %%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root/etc/init.d
 %%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root/etc/puppet
 %%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root/etc
 %%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/code/modules
 %%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/code
 %%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
-etc/puppet/puppetmasterd.conf-dist
+etc/puppet/puppet.conf-dist
 @dirrmtry etc/puppet/ssl
 @dirrmtry etc/puppet/manifests
 @dirrmtry etc/puppet