10 files changed, 107 insertions, 402 deletions

diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index 90bb392f0473..ac79fe94fbd5 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	puppet
-PORTVERSION=	0.22.4
+PORTVERSION=	0.24.4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.reductivelabs.com/downloads/puppet/
 EXTRACT_SUFX=	.tgz
@@ -14,7 +14,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	cherry@trombik.org
 COMMENT=	A configuration management framework written in Ruby
 
-BUILD_DEPENDS=	${RUBY_SITELIBDIR}/facter.rb:${PORTSDIR}/sysutils/facter
+BUILD_DEPENDS=	${RUBY_SITELIBDIR}/facter.rb:${PORTSDIR}/sysutils/facter \
+	portupgrade>0:${PORTSDIR}/ports-mgmt/portupgrade
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CONFLICTS=	puppet-devel-[0-9]*
@@ -22,15 +23,25 @@ CONFLICTS=	puppet-devel-[0-9]*
 NO_BUILD=	yes
 USE_RUBY=	yes
 USE_RC_SUBR=	puppetmasterd puppetd
-
-DOCS=	CHANGELOG TODO README LICENSE COPYING
+DOCS=	CHANGELOG README LICENSE COPYING
+PUPPET_USER:=	puppet
+PUPPET_GROUP:=	${PUPPET_USER}
+PUPPET_RUNDIR:=	/var/run/${PORTNAME}
+SUB_FILES+=	pkg-install pkg-message
+SUB_LIST+=	PUPPET_RUNDIR="${PUPPET_RUNDIR}" \
+			PUPPET_USER="${PUPPET_USER}" \
+			PUPPET_GROUP="${PUPPET_GROUP}"
 
 .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
+		${WRKSRC}/lib/puppet/reference/configuration.rb
+	${REINPLACE_CMD} -e "s|/etc/puppet|${PREFIX}/etc/puppet|" \
+	${WRKSRC}/lib/puppet/defaults.rb
+
+pre-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	cd ${WRKSRC} && \
@@ -41,6 +52,8 @@ do-install:
 .for FILE in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
+.endif
+.if !defined(NOPORTEXAMPLES)
 	${INSTALL} -d ${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
@@ -51,11 +64,31 @@ 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 \
+		--rundir=${PUPPET_RUNDIR} \
 		--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}
+.if !defined(NOPORTEXAMPLES)
+	@${FIND} ${EXAMPLESDIR} -type f | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+.endif
+.if !defined(NOPORTDOCS)
+	@${FIND} ${DOCSDIR} -type f | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${DOCSDIR} -type d | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+.endif
+	@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/puppet/distinfo b/sysutils/puppet/distinfo
index 17430843c4e3..cc34c21598f9 100644
--- a/sysutils/puppet/distinfo
+++ b/sysutils/puppet/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.24.4.tgz) = 9658624ed3745e8954772b3fbfdcc438
+SHA256 (puppet-0.24.4.tgz) = 0d54f6db7cf1210d123264bcb35b07b36837ebc12a4f2bd01aee6127836adfb9
+SIZE (puppet-0.24.4.tgz) = 652572
diff --git a/sysutils/puppet/files/patch-define_batch b/sysutils/puppet/files/patch-define_batch
deleted file mode 100644
index e97ffddaa161..000000000000
--- a/sysutils/puppet/files/patch-define_batch
+++ /dev/null
@@ -1,13 +0,0 @@
-always define PATCH. without it, puppetd hangs when upgrading INTERACTIVE port.
-http://reductivelabs.com/trac/puppet/ticket/624
---- lib/puppet/provider/package/ports.rb.orig	Tue May  8 14:55:34 2007
-+++ lib/puppet/provider/package/ports.rb	Tue May  8 14:55:57 2007
-@@ -19,7 +19,7 @@
-         # -p: create a package
-         # -N: install if the package is missing, otherwise upgrade
-         # -P: prefer binary packages
--        cmd = %w{-p -N -P} << @model[:name]
-+        cmd = %w{-p -N -P -M BATCH=yes} << @model[:name]
- 
-         output = portupgrade(*cmd)
-         if output =~ /\*\* No such /
diff --git a/sysutils/puppet/files/patch-old_rcd_support b/sysutils/puppet/files/patch-old_rcd_support
deleted file mode 100644
index fb8d928d2f7e..000000000000
--- a/sysutils/puppet/files/patch-old_rcd_support
+++ /dev/null
@@ -1,25 +0,0 @@
-Support both /etc/rc.d/daemon and /etc/rc.d/daemon.sh
-http://reductivelabs.com/trac/puppet/ticket/572
-
---- lib/puppet/provider/service/init.rb.orig	Mon Apr  2 17:52:00 2007
-+++ lib/puppet/provider/service/init.rb	Mon Apr  2 18:01:50 2007
-@@ -114,6 +114,19 @@
-             # if we've gotten this far, we found a valid script
-             return fqname
-         }
-+        @model[:path].each { |path|
-+            fqname_sh = File.join(path,"#{name}.sh")
-+            begin
-+                stat = File.stat(fqname_sh) 
-+            rescue
-+                # should probably rescue specific errors...
-+                self.debug("Could not find %s.sh in %s" % [name,path])
-+                next
-+            end
-+
-+            # if we've gotten this far, we found a valid script
-+            return fqname_sh
-+        }
-         raise Puppet::Error, "Could not find init script for '%s'" % name
-     end
- 
diff --git a/sysutils/puppet/files/patch-package-name-with-dash b/sysutils/puppet/files/patch-package-name-with-dash
deleted file mode 100644
index 93b60bc6dfa0..000000000000
--- a/sysutils/puppet/files/patch-package-name-with-dash
+++ /dev/null
@@ -1,13 +0,0 @@
-support package that contains '-' in its name, like syslog-ng
-http://reductivelabs.com/trac/puppet/ticket/628
---- lib/puppet/provider/package/ports.rb.orig       Wed May  9 17:12:39 2007
-+++ lib/puppet/provider/package/ports.rb    Wed May  9 17:13:57 2007
-@@ -47,7 +47,7 @@
-         match = $2
-         info = $3
-
--        unless pkgstuff =~ /^(\w+)-([0-9].+)$/
-+        unless pkgstuff =~ /^(\S+)-([^-\s]+)$/
-             raise Puppet::PackageError,
-                 "Could not match package info '%s'" % pkgstuff
-         end
diff --git a/sysutils/puppet/files/pkg-install.in b/sysutils/puppet/files/pkg-install.in
new file mode 100644
index 000000000000..9abe03a0e148
--- /dev/null
+++ b/sysutils/puppet/files/pkg-install.in
@@ -0,0 +1,42 @@
+#!/bin/sh
+# $FreeBSD$
+PATH="/bin:/sbin:/usr/bin:/usr/sbin"
+
+PUPPET_USER=%%PUPPET_USER%%
+PUPPET_GROUP=%%PUPPET_GROUP%%
+UID=814
+GID=$UID
+
+RUNDIR=%%PUPPET_RUNDIR%%
+
+PW="pw"
+CHOWN="chown"
+INSTALL_DIR="install -d -o ${PUPPET_USER} -g ${PUPPET_GROUP} -m 0755"
+
+if [ "$2" = "PRE-INSTALL" ]; then
+
+	if ! ${PW} groupshow ${PUPPET_GROUP} 2>/dev/null 1>&2; then
+		if ${PW} groupadd ${PUPPET_GROUP} -g $GID; then
+			echo "=> Added group \"${PUPPET_GROUP}\"."
+		else
+			echo "=> Adding group \"${PUPPET_GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if ! ${PW} usershow ${PUPPET_USER} 2>/dev/null 1>&2; then
+		if ${PW} useradd ${PUPPET_USER} -u $UID -g ${PUPPET_GROUP} -h - \
+			-s "/sbin/nologin" -d "/nonexistent" \
+            -c "Puppet Daemon"; then
+			echo "=> Added user \"${PUPPET_USER}\"."
+		else
+			echo "=> Adding user \"${PUPPET_USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+elif [ "$2" = "POST-INSTALL" ]; then
+	${INSTALL_DIR} ${RUNDIR}
+fi
+
+exit 0
diff --git a/sysutils/puppet/files/pkg-message.in b/sysutils/puppet/files/pkg-message.in
new file mode 100644
index 000000000000..6f90cbeecc9e
--- /dev/null
+++ b/sysutils/puppet/files/pkg-message.in
@@ -0,0 +1,11 @@
+To enable puppetd and/or puppetmasterd, add:
+
+puppetd_enable="YES"
+puppetmasterd_enable="YES"
+
+to /etc/rc.conf
+
+Indivisual config files such as %%PREFIX%%/etc/puppetmasterd.conf are
+deprecated. Use a single file, %%PREFIX%%/puppet/puppet.conf.
+
+Now the default PID directory is %%PUPPET_RUNDIR%%.
diff --git a/sysutils/puppet/files/puppetd.in b/sysutils/puppet/files/puppetd.in
index 897da3ccf415..e417ae6bd8f7 100644
--- a/sysutils/puppet/files/puppetd.in
+++ b/sysutils/puppet/files/puppetd.in
@@ -19,9 +19,8 @@ command_interpreter="%%PREFIX%%/bin/ruby18"
 
 load_rc_config "$name"
 : ${puppetd_enable="NO"}
-: ${puppetd_confdir="%%PREFIX%%/etc/puppet"}
-: ${puppetd_pid="/var/run/${name}.pid"}
-: ${puppetd_flags="--confdir $puppetd_confdir --rundir /var/run"}
+: ${puppetd_pid="%%PUPPET_RUNDIR%%/${name}.pid"}
+: ${puppetd_flags="--rundir %%PUPPET_RUNDIR%%"}
 pidfile="$puppetd_pid"
 
 run_rc_command "$1"
diff --git a/sysutils/puppet/files/puppetmasterd.in b/sysutils/puppet/files/puppetmasterd.in
index cdb817faf448..3afb97663a24 100644
--- a/sysutils/puppet/files/puppetmasterd.in
+++ b/sysutils/puppet/files/puppetmasterd.in
@@ -9,7 +9,7 @@
 #
 # puppetmasterd_enable="YES"
 # puppetmasterd_confdir:	Set to %%PREFIX%%/etc/puppet by default
-# puppetmasterd_flags:		Set to --confdir $puppetmasterd_confdir --rundir /var/run" by default
+# puppetmasterd_flags:		Set to "--pidfile ${puppetmasterd_pid}" by default
 #
 
 . %%RC_SUBR%%
@@ -38,8 +38,8 @@ puppetmasterd_checkconfig() {
 load_rc_config "$name"
 : ${puppetmasterd_enable="NO"}
 : ${puppetmasterd_confdir="%%PREFIX%%/etc/puppet"}
-: ${puppetmasterd_pid="/var/run/${name}.pid"}
-: ${puppetmasterd_flags="--confdir $puppetmasterd_confdir --rundir /var/run"}
+: ${puppetmasterd_pid="%%PUPPET_RUNDIR%%/${name}.pid"}
+: ${puppetmasterd_flags="--pidfile ${puppetmasterd_pid}"}
 pidfile="$puppetmasterd_pid"
 
 run_rc_command "$1"
diff --git a/sysutils/puppet/pkg-plist b/sysutils/puppet/pkg-plist
index f2dd8c608fe1..8751c5fdf14d 100644
--- a/sysutils/puppet/pkg-plist
+++ b/sysutils/puppet/pkg-plist
@@ -1,343 +1,14 @@
 @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
-%%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/puppetmasterd.conf
-%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/namespaceauth.conf
-%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/tagmail.conf
-%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/otherfile
-%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/configfile
-%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/debian-passwd
-%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/debian-syslog.conf
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/allatonce
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/head
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/selectors
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/execs
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/nodes
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/mac_automount.pp
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/filerecursion
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/components
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/file.bl
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/groups
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/functions
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/fileparsing
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/svncommit
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/filedefaults
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/simpletests
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/assignments
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/relationships
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/importing
-%%PORTDOCS%%%%EXAMPLESDIR%%/code/one
-%%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
-%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
-etc/puppet/puppetmasterd.conf-dist
+bin/ralsh
+etc/puppet/puppet.conf-dist
 @dirrmtry etc/puppet/ssl
 @dirrmtry etc/puppet/manifests
 @dirrmtry etc/puppet
+@dirrmtry /var/run/puppet