Update salt from 0.9.5 to 0.10.5.

The new DESCR is taken from the "Introduction to Salt" at
<http://docs.saltstack.org/en/v0.10.5/topics/index.html>.

Here's a copy of the introductory paragraphs from the release notes
for all the intervening versions:

Salt 0.9.6 Release Notes
========================

Salt 0.9.6 is a release targeting a few bugs and changes. This is primarily
targeting an issue found in the names declaration in the state system. But a
few other bugs were also repaired, like missing support for grains in extmods.

Due to a conflict in distribution packaging msgpack will no longer be bundled
with Salt, and is required as a dependency.

Salt 0.9.7 Release Notes
========================

Salt 0.9.7 is here! The latest iteration of Salt brings more features and many
fixes. This release is a great refinement over 0.9.6, adding many conveniences
under the hood, as well as some features that make working with Salt much
better.

A few highlights include the new Job system, refinements to the requisite
system in states, the ``mod_init`` interface for states, external node
classification, search path to managed files in the file state, and refinements
and additions to dynamic module loading.

0.9.7 also introduces the long developed (and oft changed) unit test framework
and the initial unit tests.

Salt 0.9.8 Release Notes
========================

Salt 0.9.8 is a big step forward, with many additions and enhancements, as
well as a number of precursors to advanced future developments.

This version of Salt adds much more power to the command line, making the
old hard timeout issues a thing of the past and adds keyword argument
support. These additions are also available in the salt client api, making
the available api tools much more powerful.

The new pillar system allows for data to be stored on the master and
assigned to minions in a granular way similar to the state system. It also
allows flexibility for users who want to keep data out of their state tree
similar to 'external lookup' functionality in other tools.

A new way to extend requisites was added, the "requisite in" statement.
This makes adding requires or watch statements to external state decs
much easier.

Additions to requisites making them much more powerful have been added as well
as improved error checking for sls files in the state system. A new provider
system has been added to allow for redirecting what modules run in the
background for individual states.

Support for OpenSUSE has been added and support for Solaris has begun
serious development. Windows support has been significantly enhanced as well.

The matcher and target systems have received a great deal of attention. The
default behavior of grain matching has changed slightly to reflect the rest
of salt and the compound matcher system has been refined.

A number of impressive features with keyword arguments have been added to both
the cli and to the state system. This makes states much more powerful and
flexible while maintaining the simple configuration everyone loves.

The new batch size capability allows for executions to be rolled through a
group of targeted minions a percentage or specific number at a time. This
was added to prevent the "thundering herd" problem when targeting large
numbers of minions for things like service restarts or file downloads.

Salt 0.9.9 Release Notes
========================

0.9.9 is out and comes with some serious bug fixes and even more serious
features. This release is the last major feature release before 1.0.0 and
could be considered the 1.0.0 release candidate.

A few updates include more advanced kwargs support, the ability for salt
states to more safely configure a running salt minion, better job directory
management and the new state test interface.

Many new tests have been added as well, including the new minion swarm test
that allows for easier testing of Salt working with large groups of minions.
This means that if you have experienced stability issues with Salt before,
particularly in larger deployments, that these bugs have been tested for,
found, and killed.

Salt 0.10.0 Release Notes
=========================

0.10.0 has arrived! This release comes with MANY bug fixes, and new
capabilities which greatly enhance performance and reliability. This
release is primarily a bug fix release with many new tests and many repaired
bugs. This release also introduces a few new key features which were brought
in primarily to repair bugs and some limitations found in some of the
components of the original architecture.

Salt 0.10.2 Release Notes
=========================

0.10.2 is out! This release comes with enhancements to the pillar interface,
cleaner ways to access the salt-call capabilities in the API, minion data
caching and the event system has been added to salt minions.

There have also been updates to the zeromq functions, many more tests
(thanks to sponsors, the code sprint and many contributors) and a swath
of bug fixes.

Salt 0.10.3 Release Notes
=========================

The latest taste of Salt has come, this release has many fixes and feature
additions. Modifications have been made to make ZeroMQ connections more
reliable, the begining of the ACL system is in place, a new command line
parsing system has been added, dynamic module distribution has become more
environment aware, the new `master_finger` option and many more!

Salt 0.10.4 Release Notes
=========================

Salt 0.10.4 is a monumental release for the Salt team, with two new module
systems, many additions to allow granular access to Salt, improved platform
support and much more.

This release is also exciting because we have been able to shorten the release
cycle back to under a month. We are working hard to keep up the aggressive pace
and look forward to having releases happen more frequently!

This release also includes a serious security fix and all users are very
strongly recommended to upgrade. As usual, upgrade the master first, and then
the minion to ensure that the process is smooth.

Salt 0.10.5 Release Notes
=========================

Salt 0.10.5 is ready, and comes with some great new features. A few more
interfaces have been modularized, like the outputter system. The job cache
system has been made more powerful and can now store and retrieve jobs archived
in external databases. The returner system has been extended to allow minions
to easily retrieve data from a returner interface.

As usual, this is an exciting release, with many noteworthy additions!

5 files changed, 486 insertions, 83 deletions

diff --git a/sysutils/salt/DESCR b/sysutils/salt/DESCR
index 6060d123892..05924204797 100644
--- a/sysutils/salt/DESCR
+++ b/sysutils/salt/DESCR
@@ -1,13 +1,7 @@
-Salt is a powerful remote execution manager that can be used to
-administer servers in a fast and efficient way.
-
-Salt allows commands to be executed across large groups of servers. This
-means systems can be easily managed, but data can also be easily
-gathered. Quick introspection into running systems becomes a reality.
-
-Remote execution is usually used to set up a certain state on a remote
-system. Salt addresses this problem as well, the salt state system uses
-salt state files to define the state a server needs to be in.
-
-Between the remote execution system, and state management Salt addresses
-the backbone of cloud and data center management.
+Salt is a distributed remote execution system used to execute commands
+and query data. It was developed in order to bring the best solutions
+found in the world of remote execution together and make them better,
+faster and more malleable. Salt accomplishes this via its ability to
+handle larger loads of information, and not just dozens, but hundreds,
+or even thousands of individual servers. It handles them quickly and
+through a simple yet manageable interface.
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile
index 1c9582a2076..c6e8ef738e6 100644
--- a/sysutils/salt/Makefile
+++ b/sysutils/salt/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2012/10/23 19:51:22 asau Exp $
+# $NetBSD: Makefile,v 1.10 2012/12/06 08:01:21 apb Exp $
 #
 
-DISTNAME=	salt-0.9.5
-PKGREVISION=	2
+DISTNAME=	salt-0.10.5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cloud.github.com/downloads/saltstack/salt/
 
@@ -16,26 +15,42 @@ SUBST_STAGE.fix-paths=	post-patch
 SUBST_MESSAGE.fix-paths=Fixing directory paths.
 SUBST_FILES.fix-paths+=	conf/*
 SUBST_FILES.fix-paths+=	doc/man/*
-SUBST_FILES.fix-paths+=	salt/__init__.py
-SUBST_FILES.fix-paths+=	salt/cli/__init__.py
 SUBST_FILES.fix-paths+=	salt/client.py
 SUBST_FILES.fix-paths+=	salt/config.py
 SUBST_FILES.fix-paths+=	salt/modules/mysql.py
+SUBST_FILES.fix-paths+=	salt/modules/postgres.py
+SUBST_FILES.fix-paths+=	salt/modules/tls.py
+SUBST_FILES.fix-paths+=	salt/utils/parsers.py
 SUBST_SED.fix-paths+=	-e "s|/etc/salt|${PKG_SYSCONFDIR}|g"
 
 PKG_SYSCONFSUBDIR=	salt
 
 EGDIR=		${PREFIX}/share/examples/salt
-CONF_FILES+=	${EGDIR}/master ${PKG_SYSCONFDIR}/master
-CONF_FILES+=	${EGDIR}/minion ${PKG_SYSCONFDIR}/minion
+INSTALLATION_DIRS+= ${EGDIR}
+CONF_FILES+=	${EGDIR}/master.template ${PKG_SYSCONFDIR}/master
+CONF_FILES+=	${EGDIR}/minion.template ${PKG_SYSCONFDIR}/minion
 
 RCD_SCRIPTS+=	salt_master salt_minion
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/conf/master.template ${DESTDIR}${EGDIR}/
+	${INSTALL_DATA} ${WRKSRC}/conf/minion.template ${DESTDIR}${EGDIR}/
+
+# Dependencies are documented at
+# http://docs.saltstack.org/en/latest/topics/installation/index.html#dependencies
+# Jinja2 is documented as an optional dependency, but it's small so we
+# include it unconditionally.
+#
+# There's also an optional dependency on gcc, for Cython support, but
+# we don't bother with that here.
+#
 .include "../../lang/python/distutils.mk"
 DEPENDS+= zeromq>=2.1.9:../../net/zeromq
 DEPENDS+= ${PYPKGPREFIX}-zmq>=2.1.9:../../net/py-zmq
 DEPENDS+= ${PYPKGPREFIX}-m2crypto-[0-9]*:../../security/py-m2crypto
 DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto
+DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
 DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
+DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/salt/PLIST b/sysutils/salt/PLIST
index f8a48c6c480..3db136d2e43 100644
--- a/sysutils/salt/PLIST
+++ b/sysutils/salt/PLIST
@@ -1,20 +1,32 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/08 20:21:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/12/06 08:01:21 apb Exp $
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/salt/__init__.py
 ${PYSITELIB}/salt/__init__.pyc
 ${PYSITELIB}/salt/__init__.pyo
+${PYSITELIB}/salt/_compat.py
+${PYSITELIB}/salt/_compat.pyc
+${PYSITELIB}/salt/_compat.pyo
+${PYSITELIB}/salt/auth/__init__.py
+${PYSITELIB}/salt/auth/__init__.pyc
+${PYSITELIB}/salt/auth/__init__.pyo
+${PYSITELIB}/salt/auth/ldap.py
+${PYSITELIB}/salt/auth/ldap.pyc
+${PYSITELIB}/salt/auth/ldap.pyo
+${PYSITELIB}/salt/auth/pam.py
+${PYSITELIB}/salt/auth/pam.pyc
+${PYSITELIB}/salt/auth/pam.pyo
 ${PYSITELIB}/salt/cli/__init__.py
 ${PYSITELIB}/salt/cli/__init__.pyc
 ${PYSITELIB}/salt/cli/__init__.pyo
+${PYSITELIB}/salt/cli/batch.py
+${PYSITELIB}/salt/cli/batch.pyc
+${PYSITELIB}/salt/cli/batch.pyo
 ${PYSITELIB}/salt/cli/caller.py
 ${PYSITELIB}/salt/cli/caller.pyc
 ${PYSITELIB}/salt/cli/caller.pyo
 ${PYSITELIB}/salt/cli/cp.py
 ${PYSITELIB}/salt/cli/cp.pyc
 ${PYSITELIB}/salt/cli/cp.pyo
-${PYSITELIB}/salt/cli/key.py
-${PYSITELIB}/salt/cli/key.pyc
-${PYSITELIB}/salt/cli/key.pyo
 ${PYSITELIB}/salt/client.py
 ${PYSITELIB}/salt/client.pyc
 ${PYSITELIB}/salt/client.pyo
@@ -30,12 +42,24 @@ ${PYSITELIB}/salt/exceptions.pyo
 ${PYSITELIB}/salt/ext/__init__.py
 ${PYSITELIB}/salt/ext/__init__.pyc
 ${PYSITELIB}/salt/ext/__init__.pyo
+${PYSITELIB}/salt/fileclient.py
+${PYSITELIB}/salt/fileclient.pyc
+${PYSITELIB}/salt/fileclient.pyo
 ${PYSITELIB}/salt/grains/__init__.py
 ${PYSITELIB}/salt/grains/__init__.pyc
 ${PYSITELIB}/salt/grains/__init__.pyo
 ${PYSITELIB}/salt/grains/core.py
 ${PYSITELIB}/salt/grains/core.pyc
 ${PYSITELIB}/salt/grains/core.pyo
+${PYSITELIB}/salt/grains/extra.py
+${PYSITELIB}/salt/grains/extra.pyc
+${PYSITELIB}/salt/grains/extra.pyo
+${PYSITELIB}/salt/grains/opts.py
+${PYSITELIB}/salt/grains/opts.pyc
+${PYSITELIB}/salt/grains/opts.pyo
+${PYSITELIB}/salt/key.py
+${PYSITELIB}/salt/key.pyc
+${PYSITELIB}/salt/key.pyo
 ${PYSITELIB}/salt/loader.py
 ${PYSITELIB}/salt/loader.pyc
 ${PYSITELIB}/salt/loader.pyo
@@ -51,6 +75,9 @@ ${PYSITELIB}/salt/minion.pyo
 ${PYSITELIB}/salt/modules/__init__.py
 ${PYSITELIB}/salt/modules/__init__.pyc
 ${PYSITELIB}/salt/modules/__init__.pyo
+${PYSITELIB}/salt/modules/aliases.py
+${PYSITELIB}/salt/modules/aliases.pyc
+${PYSITELIB}/salt/modules/aliases.pyo
 ${PYSITELIB}/salt/modules/apache.py
 ${PYSITELIB}/salt/modules/apache.pyc
 ${PYSITELIB}/salt/modules/apache.pyo
@@ -60,61 +87,135 @@ ${PYSITELIB}/salt/modules/apt.pyo
 ${PYSITELIB}/salt/modules/archive.py
 ${PYSITELIB}/salt/modules/archive.pyc
 ${PYSITELIB}/salt/modules/archive.pyo
+${PYSITELIB}/salt/modules/at.py
+${PYSITELIB}/salt/modules/at.pyc
+${PYSITELIB}/salt/modules/at.pyo
+${PYSITELIB}/salt/modules/augeas_cfg.py
+${PYSITELIB}/salt/modules/augeas_cfg.pyc
+${PYSITELIB}/salt/modules/augeas_cfg.pyo
+${PYSITELIB}/salt/modules/bluez.py
+${PYSITELIB}/salt/modules/bluez.pyc
+${PYSITELIB}/salt/modules/bluez.pyo
+${PYSITELIB}/salt/modules/brew.py
+${PYSITELIB}/salt/modules/brew.pyc
+${PYSITELIB}/salt/modules/brew.pyo
 ${PYSITELIB}/salt/modules/butterkvm.py
 ${PYSITELIB}/salt/modules/butterkvm.pyc
 ${PYSITELIB}/salt/modules/butterkvm.pyo
+${PYSITELIB}/salt/modules/cassandra.py
+${PYSITELIB}/salt/modules/cassandra.pyc
+${PYSITELIB}/salt/modules/cassandra.pyo
 ${PYSITELIB}/salt/modules/cluster.py
 ${PYSITELIB}/salt/modules/cluster.pyc
 ${PYSITELIB}/salt/modules/cluster.pyo
-${PYSITELIB}/salt/modules/cmd.py
-${PYSITELIB}/salt/modules/cmd.pyc
-${PYSITELIB}/salt/modules/cmd.pyo
+${PYSITELIB}/salt/modules/cmdmod.py
+${PYSITELIB}/salt/modules/cmdmod.pyc
+${PYSITELIB}/salt/modules/cmdmod.pyo
+${PYSITELIB}/salt/modules/config.py
+${PYSITELIB}/salt/modules/config.pyc
+${PYSITELIB}/salt/modules/config.pyo
 ${PYSITELIB}/salt/modules/cp.py
 ${PYSITELIB}/salt/modules/cp.pyc
 ${PYSITELIB}/salt/modules/cp.pyo
 ${PYSITELIB}/salt/modules/cron.py
 ${PYSITELIB}/salt/modules/cron.pyc
 ${PYSITELIB}/salt/modules/cron.pyo
-${PYSITELIB}/salt/modules/cytest.pyx
+${PYSITELIB}/salt/modules/daemontools.py
+${PYSITELIB}/salt/modules/daemontools.pyc
+${PYSITELIB}/salt/modules/daemontools.pyo
 ${PYSITELIB}/salt/modules/data.py
 ${PYSITELIB}/salt/modules/data.pyc
 ${PYSITELIB}/salt/modules/data.pyo
+${PYSITELIB}/salt/modules/debconfmod.py
+${PYSITELIB}/salt/modules/debconfmod.pyc
+${PYSITELIB}/salt/modules/debconfmod.pyo
+${PYSITELIB}/salt/modules/debian_service.py
+${PYSITELIB}/salt/modules/debian_service.pyc
+${PYSITELIB}/salt/modules/debian_service.pyo
 ${PYSITELIB}/salt/modules/disk.py
 ${PYSITELIB}/salt/modules/disk.pyc
 ${PYSITELIB}/salt/modules/disk.pyo
+${PYSITELIB}/salt/modules/djangomod.py
+${PYSITELIB}/salt/modules/djangomod.pyc
+${PYSITELIB}/salt/modules/djangomod.pyo
 ${PYSITELIB}/salt/modules/ebuild.py
 ${PYSITELIB}/salt/modules/ebuild.pyc
 ${PYSITELIB}/salt/modules/ebuild.pyo
+${PYSITELIB}/salt/modules/event.py
+${PYSITELIB}/salt/modules/event.pyc
+${PYSITELIB}/salt/modules/event.pyo
 ${PYSITELIB}/salt/modules/file.py
 ${PYSITELIB}/salt/modules/file.pyc
 ${PYSITELIB}/salt/modules/file.pyo
+${PYSITELIB}/salt/modules/freebsd_sysctl.py
+${PYSITELIB}/salt/modules/freebsd_sysctl.pyc
+${PYSITELIB}/salt/modules/freebsd_sysctl.pyo
+${PYSITELIB}/salt/modules/freebsdjail.py
+${PYSITELIB}/salt/modules/freebsdjail.pyc
+${PYSITELIB}/salt/modules/freebsdjail.pyo
 ${PYSITELIB}/salt/modules/freebsdkmod.py
 ${PYSITELIB}/salt/modules/freebsdkmod.pyc
 ${PYSITELIB}/salt/modules/freebsdkmod.pyo
 ${PYSITELIB}/salt/modules/freebsdpkg.py
 ${PYSITELIB}/salt/modules/freebsdpkg.pyc
 ${PYSITELIB}/salt/modules/freebsdpkg.pyo
+${PYSITELIB}/salt/modules/freebsdservice.py
+${PYSITELIB}/salt/modules/freebsdservice.pyc
+${PYSITELIB}/salt/modules/freebsdservice.pyo
+${PYSITELIB}/salt/modules/gem.py
+${PYSITELIB}/salt/modules/gem.pyc
+${PYSITELIB}/salt/modules/gem.pyo
 ${PYSITELIB}/salt/modules/gentoo_service.py
 ${PYSITELIB}/salt/modules/gentoo_service.pyc
 ${PYSITELIB}/salt/modules/gentoo_service.pyo
+${PYSITELIB}/salt/modules/git.py
+${PYSITELIB}/salt/modules/git.pyc
+${PYSITELIB}/salt/modules/git.pyo
+${PYSITELIB}/salt/modules/glance.py
+${PYSITELIB}/salt/modules/glance.pyc
+${PYSITELIB}/salt/modules/glance.pyo
 ${PYSITELIB}/salt/modules/grains.py
 ${PYSITELIB}/salt/modules/grains.pyc
 ${PYSITELIB}/salt/modules/grains.pyo
 ${PYSITELIB}/salt/modules/groupadd.py
 ${PYSITELIB}/salt/modules/groupadd.pyc
 ${PYSITELIB}/salt/modules/groupadd.pyo
+${PYSITELIB}/salt/modules/grub.py
+${PYSITELIB}/salt/modules/grub.pyc
+${PYSITELIB}/salt/modules/grub.pyo
+${PYSITELIB}/salt/modules/hg.py
+${PYSITELIB}/salt/modules/hg.pyc
+${PYSITELIB}/salt/modules/hg.pyo
 ${PYSITELIB}/salt/modules/hosts.py
 ${PYSITELIB}/salt/modules/hosts.pyc
 ${PYSITELIB}/salt/modules/hosts.pyo
+${PYSITELIB}/salt/modules/keystone.py
+${PYSITELIB}/salt/modules/keystone.pyc
+${PYSITELIB}/salt/modules/keystone.pyo
 ${PYSITELIB}/salt/modules/kmod.py
 ${PYSITELIB}/salt/modules/kmod.pyc
 ${PYSITELIB}/salt/modules/kmod.pyo
+${PYSITELIB}/salt/modules/kvm_hyper.py
+${PYSITELIB}/salt/modules/kvm_hyper.pyc
+${PYSITELIB}/salt/modules/kvm_hyper.pyo
+${PYSITELIB}/salt/modules/launchctl.py
+${PYSITELIB}/salt/modules/launchctl.pyc
+${PYSITELIB}/salt/modules/launchctl.pyo
+${PYSITELIB}/salt/modules/ldapmod.py
+${PYSITELIB}/salt/modules/ldapmod.pyc
+${PYSITELIB}/salt/modules/ldapmod.pyo
 ${PYSITELIB}/salt/modules/linux_sysctl.py
 ${PYSITELIB}/salt/modules/linux_sysctl.pyc
 ${PYSITELIB}/salt/modules/linux_sysctl.pyo
 ${PYSITELIB}/salt/modules/mdadm.py
 ${PYSITELIB}/salt/modules/mdadm.pyc
 ${PYSITELIB}/salt/modules/mdadm.pyo
+${PYSITELIB}/salt/modules/mongodb.py
+${PYSITELIB}/salt/modules/mongodb.pyc
+${PYSITELIB}/salt/modules/mongodb.pyo
+${PYSITELIB}/salt/modules/monit.py
+${PYSITELIB}/salt/modules/monit.pyc
+${PYSITELIB}/salt/modules/monit.pyo
 ${PYSITELIB}/salt/modules/moosefs.py
 ${PYSITELIB}/salt/modules/moosefs.pyc
 ${PYSITELIB}/salt/modules/moosefs.pyo
@@ -127,12 +228,48 @@ ${PYSITELIB}/salt/modules/mysql.pyo
 ${PYSITELIB}/salt/modules/network.py
 ${PYSITELIB}/salt/modules/network.pyc
 ${PYSITELIB}/salt/modules/network.pyo
+${PYSITELIB}/salt/modules/nginx.py
+${PYSITELIB}/salt/modules/nginx.pyc
+${PYSITELIB}/salt/modules/nginx.pyo
+${PYSITELIB}/salt/modules/nova.py
+${PYSITELIB}/salt/modules/nova.pyc
+${PYSITELIB}/salt/modules/nova.pyo
+${PYSITELIB}/salt/modules/nzbget.py
+${PYSITELIB}/salt/modules/nzbget.pyc
+${PYSITELIB}/salt/modules/nzbget.pyo
+${PYSITELIB}/salt/modules/openbsdpkg.py
+${PYSITELIB}/salt/modules/openbsdpkg.pyc
+${PYSITELIB}/salt/modules/openbsdpkg.pyo
+${PYSITELIB}/salt/modules/openbsdservice.py
+${PYSITELIB}/salt/modules/openbsdservice.pyc
+${PYSITELIB}/salt/modules/openbsdservice.pyo
+${PYSITELIB}/salt/modules/osxdesktop.py
+${PYSITELIB}/salt/modules/osxdesktop.pyc
+${PYSITELIB}/salt/modules/osxdesktop.pyo
 ${PYSITELIB}/salt/modules/pacman.py
 ${PYSITELIB}/salt/modules/pacman.pyc
 ${PYSITELIB}/salt/modules/pacman.pyo
+${PYSITELIB}/salt/modules/pecl.py
+${PYSITELIB}/salt/modules/pecl.pyc
+${PYSITELIB}/salt/modules/pecl.pyo
+${PYSITELIB}/salt/modules/pillar.py
+${PYSITELIB}/salt/modules/pillar.pyc
+${PYSITELIB}/salt/modules/pillar.pyo
 ${PYSITELIB}/salt/modules/pip.py
 ${PYSITELIB}/salt/modules/pip.pyc
 ${PYSITELIB}/salt/modules/pip.pyo
+${PYSITELIB}/salt/modules/pkgng.py
+${PYSITELIB}/salt/modules/pkgng.pyc
+${PYSITELIB}/salt/modules/pkgng.pyo
+${PYSITELIB}/salt/modules/pkgutil.py
+${PYSITELIB}/salt/modules/pkgutil.pyc
+${PYSITELIB}/salt/modules/pkgutil.pyo
+${PYSITELIB}/salt/modules/postgres.py
+${PYSITELIB}/salt/modules/postgres.pyc
+${PYSITELIB}/salt/modules/postgres.pyo
+${PYSITELIB}/salt/modules/poudriere.py
+${PYSITELIB}/salt/modules/poudriere.pyc
+${PYSITELIB}/salt/modules/poudriere.pyo
 ${PYSITELIB}/salt/modules/ps.py
 ${PYSITELIB}/salt/modules/ps.pyc
 ${PYSITELIB}/salt/modules/ps.pyo
@@ -148,9 +285,28 @@ ${PYSITELIB}/salt/modules/pw_group.pyo
 ${PYSITELIB}/salt/modules/pw_user.py
 ${PYSITELIB}/salt/modules/pw_user.pyc
 ${PYSITELIB}/salt/modules/pw_user.pyo
+${PYSITELIB}/salt/modules/rabbitmq.py
+${PYSITELIB}/salt/modules/rabbitmq.pyc
+${PYSITELIB}/salt/modules/rabbitmq.pyo
+${PYSITELIB}/salt/modules/reg.py
+${PYSITELIB}/salt/modules/reg.pyc
+${PYSITELIB}/salt/modules/reg.pyo
+${PYSITELIB}/salt/modules/ret.py
+${PYSITELIB}/salt/modules/ret.pyc
+${PYSITELIB}/salt/modules/ret.pyo
+${PYSITELIB}/salt/modules/rh_ip.py
+${PYSITELIB}/salt/modules/rh_ip.pyc
+${PYSITELIB}/salt/modules/rh_ip.pyo
+${PYSITELIB}/salt/modules/rh_ip/conf.jinja
+${PYSITELIB}/salt/modules/rh_ip/network.jinja
+${PYSITELIB}/salt/modules/rh_ip/rh5_eth.jinja
+${PYSITELIB}/salt/modules/rh_ip/rh6_eth.jinja
 ${PYSITELIB}/salt/modules/rh_service.py
 ${PYSITELIB}/salt/modules/rh_service.pyc
 ${PYSITELIB}/salt/modules/rh_service.pyo
+${PYSITELIB}/salt/modules/rvm.py
+${PYSITELIB}/salt/modules/rvm.pyc
+${PYSITELIB}/salt/modules/rvm.pyo
 ${PYSITELIB}/salt/modules/saltutil.py
 ${PYSITELIB}/salt/modules/saltutil.pyc
 ${PYSITELIB}/salt/modules/saltutil.pyo
@@ -163,9 +319,27 @@ ${PYSITELIB}/salt/modules/service.pyo
 ${PYSITELIB}/salt/modules/shadow.py
 ${PYSITELIB}/salt/modules/shadow.pyc
 ${PYSITELIB}/salt/modules/shadow.pyo
+${PYSITELIB}/salt/modules/smf.py
+${PYSITELIB}/salt/modules/smf.pyc
+${PYSITELIB}/salt/modules/smf.pyo
+${PYSITELIB}/salt/modules/solaris_group.py
+${PYSITELIB}/salt/modules/solaris_group.pyc
+${PYSITELIB}/salt/modules/solaris_group.pyo
+${PYSITELIB}/salt/modules/solaris_shadow.py
+${PYSITELIB}/salt/modules/solaris_shadow.pyc
+${PYSITELIB}/salt/modules/solaris_shadow.pyo
+${PYSITELIB}/salt/modules/solaris_user.py
+${PYSITELIB}/salt/modules/solaris_user.pyc
+${PYSITELIB}/salt/modules/solaris_user.pyo
+${PYSITELIB}/salt/modules/solarispkg.py
+${PYSITELIB}/salt/modules/solarispkg.pyc
+${PYSITELIB}/salt/modules/solarispkg.pyo
 ${PYSITELIB}/salt/modules/solr.py
 ${PYSITELIB}/salt/modules/solr.pyc
 ${PYSITELIB}/salt/modules/solr.pyo
+${PYSITELIB}/salt/modules/sqlite3.py
+${PYSITELIB}/salt/modules/sqlite3.pyc
+${PYSITELIB}/salt/modules/sqlite3.pyo
 ${PYSITELIB}/salt/modules/ssh.py
 ${PYSITELIB}/salt/modules/ssh.pyc
 ${PYSITELIB}/salt/modules/ssh.pyo
@@ -175,15 +349,27 @@ ${PYSITELIB}/salt/modules/state.pyo
 ${PYSITELIB}/salt/modules/status.py
 ${PYSITELIB}/salt/modules/status.pyc
 ${PYSITELIB}/salt/modules/status.pyo
+${PYSITELIB}/salt/modules/supervisord.py
+${PYSITELIB}/salt/modules/supervisord.pyc
+${PYSITELIB}/salt/modules/supervisord.pyo
+${PYSITELIB}/salt/modules/svn.py
+${PYSITELIB}/salt/modules/svn.pyc
+${PYSITELIB}/salt/modules/svn.pyo
 ${PYSITELIB}/salt/modules/systemd.py
 ${PYSITELIB}/salt/modules/systemd.pyc
 ${PYSITELIB}/salt/modules/systemd.pyo
 ${PYSITELIB}/salt/modules/test.py
 ${PYSITELIB}/salt/modules/test.pyc
 ${PYSITELIB}/salt/modules/test.pyo
+${PYSITELIB}/salt/modules/tls.py
+${PYSITELIB}/salt/modules/tls.pyc
+${PYSITELIB}/salt/modules/tls.pyo
 ${PYSITELIB}/salt/modules/tomcat.py
 ${PYSITELIB}/salt/modules/tomcat.pyc
 ${PYSITELIB}/salt/modules/tomcat.pyo
+${PYSITELIB}/salt/modules/upstart.py
+${PYSITELIB}/salt/modules/upstart.pyc
+${PYSITELIB}/salt/modules/upstart.pyo
 ${PYSITELIB}/salt/modules/useradd.py
 ${PYSITELIB}/salt/modules/useradd.pyc
 ${PYSITELIB}/salt/modules/useradd.pyo
@@ -196,9 +382,24 @@ ${PYSITELIB}/salt/modules/virtualenv.pyo
 ${PYSITELIB}/salt/modules/win_disk.py
 ${PYSITELIB}/salt/modules/win_disk.pyc
 ${PYSITELIB}/salt/modules/win_disk.pyo
+${PYSITELIB}/salt/modules/win_file.py
+${PYSITELIB}/salt/modules/win_file.pyc
+${PYSITELIB}/salt/modules/win_file.pyo
+${PYSITELIB}/salt/modules/win_groupadd.py
+${PYSITELIB}/salt/modules/win_groupadd.pyc
+${PYSITELIB}/salt/modules/win_groupadd.pyo
+${PYSITELIB}/salt/modules/win_network.py
+${PYSITELIB}/salt/modules/win_network.pyc
+${PYSITELIB}/salt/modules/win_network.pyo
+${PYSITELIB}/salt/modules/win_pkg.py
+${PYSITELIB}/salt/modules/win_pkg.pyc
+${PYSITELIB}/salt/modules/win_pkg.pyo
 ${PYSITELIB}/salt/modules/win_service.py
 ${PYSITELIB}/salt/modules/win_service.pyc
 ${PYSITELIB}/salt/modules/win_service.pyo
+${PYSITELIB}/salt/modules/win_shadow.py
+${PYSITELIB}/salt/modules/win_shadow.pyc
+${PYSITELIB}/salt/modules/win_shadow.pyo
 ${PYSITELIB}/salt/modules/win_useradd.py
 ${PYSITELIB}/salt/modules/win_useradd.pyc
 ${PYSITELIB}/salt/modules/win_useradd.pyo
@@ -208,37 +409,81 @@ ${PYSITELIB}/salt/modules/yumpkg.pyo
 ${PYSITELIB}/salt/modules/yumpkg5.py
 ${PYSITELIB}/salt/modules/yumpkg5.pyc
 ${PYSITELIB}/salt/modules/yumpkg5.pyo
-${PYSITELIB}/salt/msgpack/__init__.py
-${PYSITELIB}/salt/msgpack/__init__.pyc
-${PYSITELIB}/salt/msgpack/__init__.pyo
-${PYSITELIB}/salt/msgpack/__version__.py
-${PYSITELIB}/salt/msgpack/__version__.pyc
-${PYSITELIB}/salt/msgpack/__version__.pyo
-${PYSITELIB}/salt/msgpack/_msgpack.so
-${PYSITELIB}/salt/output.py
-${PYSITELIB}/salt/output.pyc
-${PYSITELIB}/salt/output.pyo
+${PYSITELIB}/salt/modules/zpool.py
+${PYSITELIB}/salt/modules/zpool.pyc
+${PYSITELIB}/salt/modules/zpool.pyo
+${PYSITELIB}/salt/modules/zypper.py
+${PYSITELIB}/salt/modules/zypper.pyc
+${PYSITELIB}/salt/modules/zypper.pyo
+${PYSITELIB}/salt/output/__init__.py
+${PYSITELIB}/salt/output/__init__.pyc
+${PYSITELIB}/salt/output/__init__.pyo
+${PYSITELIB}/salt/output/highstate.py
+${PYSITELIB}/salt/output/highstate.pyc
+${PYSITELIB}/salt/output/highstate.pyo
+${PYSITELIB}/salt/output/json_out.py
+${PYSITELIB}/salt/output/json_out.pyc
+${PYSITELIB}/salt/output/json_out.pyo
+${PYSITELIB}/salt/output/key.py
+${PYSITELIB}/salt/output/key.pyc
+${PYSITELIB}/salt/output/key.pyo
+${PYSITELIB}/salt/output/pprint_out.py
+${PYSITELIB}/salt/output/pprint_out.pyc
+${PYSITELIB}/salt/output/pprint_out.pyo
+${PYSITELIB}/salt/output/raw.py
+${PYSITELIB}/salt/output/raw.pyc
+${PYSITELIB}/salt/output/raw.pyo
+${PYSITELIB}/salt/output/txt.py
+${PYSITELIB}/salt/output/txt.pyc
+${PYSITELIB}/salt/output/txt.pyo
+${PYSITELIB}/salt/output/yaml_out.py
+${PYSITELIB}/salt/output/yaml_out.pyc
+${PYSITELIB}/salt/output/yaml_out.pyo
 ${PYSITELIB}/salt/payload.py
 ${PYSITELIB}/salt/payload.pyc
 ${PYSITELIB}/salt/payload.pyo
+${PYSITELIB}/salt/pillar/__init__.py
+${PYSITELIB}/salt/pillar/__init__.pyc
+${PYSITELIB}/salt/pillar/__init__.pyo
+${PYSITELIB}/salt/pillar/cmd_json.py
+${PYSITELIB}/salt/pillar/cmd_json.pyc
+${PYSITELIB}/salt/pillar/cmd_json.pyo
+${PYSITELIB}/salt/pillar/cmd_yaml.py
+${PYSITELIB}/salt/pillar/cmd_yaml.pyc
+${PYSITELIB}/salt/pillar/cmd_yaml.pyo
+${PYSITELIB}/salt/pillar/hiera.py
+${PYSITELIB}/salt/pillar/hiera.pyc
+${PYSITELIB}/salt/pillar/hiera.pyo
+${PYSITELIB}/salt/pillar/mongo.py
+${PYSITELIB}/salt/pillar/mongo.pyc
+${PYSITELIB}/salt/pillar/mongo.pyo
+${PYSITELIB}/salt/pillar/pillar_ldap.py
+${PYSITELIB}/salt/pillar/pillar_ldap.pyc
+${PYSITELIB}/salt/pillar/pillar_ldap.pyo
 ${PYSITELIB}/salt/renderers/__init__.py
 ${PYSITELIB}/salt/renderers/__init__.pyc
 ${PYSITELIB}/salt/renderers/__init__.pyo
-${PYSITELIB}/salt/renderers/json_jinja.py
-${PYSITELIB}/salt/renderers/json_jinja.pyc
-${PYSITELIB}/salt/renderers/json_jinja.pyo
-${PYSITELIB}/salt/renderers/json_mako.py
-${PYSITELIB}/salt/renderers/json_mako.pyc
-${PYSITELIB}/salt/renderers/json_mako.pyo
+${PYSITELIB}/salt/renderers/jinja.py
+${PYSITELIB}/salt/renderers/jinja.pyc
+${PYSITELIB}/salt/renderers/jinja.pyo
+${PYSITELIB}/salt/renderers/json.py
+${PYSITELIB}/salt/renderers/json.pyc
+${PYSITELIB}/salt/renderers/json.pyo
+${PYSITELIB}/salt/renderers/mako.py
+${PYSITELIB}/salt/renderers/mako.pyc
+${PYSITELIB}/salt/renderers/mako.pyo
 ${PYSITELIB}/salt/renderers/py.py
 ${PYSITELIB}/salt/renderers/py.pyc
 ${PYSITELIB}/salt/renderers/py.pyo
-${PYSITELIB}/salt/renderers/yaml_jinja.py
-${PYSITELIB}/salt/renderers/yaml_jinja.pyc
-${PYSITELIB}/salt/renderers/yaml_jinja.pyo
-${PYSITELIB}/salt/renderers/yaml_mako.py
-${PYSITELIB}/salt/renderers/yaml_mako.pyc
-${PYSITELIB}/salt/renderers/yaml_mako.pyo
+${PYSITELIB}/salt/renderers/stateconf.py
+${PYSITELIB}/salt/renderers/stateconf.pyc
+${PYSITELIB}/salt/renderers/stateconf.pyo
+${PYSITELIB}/salt/renderers/wempy.py
+${PYSITELIB}/salt/renderers/wempy.pyc
+${PYSITELIB}/salt/renderers/wempy.pyo
+${PYSITELIB}/salt/renderers/yaml.py
+${PYSITELIB}/salt/renderers/yaml.pyc
+${PYSITELIB}/salt/renderers/yaml.pyo
 ${PYSITELIB}/salt/returners/__init__.py
 ${PYSITELIB}/salt/returners/__init__.pyc
 ${PYSITELIB}/salt/returners/__init__.pyo
@@ -248,27 +493,48 @@ ${PYSITELIB}/salt/returners/cassandra_return.pyo
 ${PYSITELIB}/salt/returners/local.py
 ${PYSITELIB}/salt/returners/local.pyc
 ${PYSITELIB}/salt/returners/local.pyo
+${PYSITELIB}/salt/returners/mongo_future_return.py
+${PYSITELIB}/salt/returners/mongo_future_return.pyc
+${PYSITELIB}/salt/returners/mongo_future_return.pyo
 ${PYSITELIB}/salt/returners/mongo_return.py
 ${PYSITELIB}/salt/returners/mongo_return.pyc
 ${PYSITELIB}/salt/returners/mongo_return.pyo
 ${PYSITELIB}/salt/returners/redis_return.py
 ${PYSITELIB}/salt/returners/redis_return.pyc
 ${PYSITELIB}/salt/returners/redis_return.pyo
+${PYSITELIB}/salt/returners/syslog_return.py
+${PYSITELIB}/salt/returners/syslog_return.pyc
+${PYSITELIB}/salt/returners/syslog_return.pyo
 ${PYSITELIB}/salt/runner.py
 ${PYSITELIB}/salt/runner.pyc
 ${PYSITELIB}/salt/runner.pyo
 ${PYSITELIB}/salt/runners/__init__.py
 ${PYSITELIB}/salt/runners/__init__.pyc
 ${PYSITELIB}/salt/runners/__init__.pyo
+${PYSITELIB}/salt/runners/jobs.py
+${PYSITELIB}/salt/runners/jobs.pyc
+${PYSITELIB}/salt/runners/jobs.pyo
+${PYSITELIB}/salt/runners/launchd.py
+${PYSITELIB}/salt/runners/launchd.pyc
+${PYSITELIB}/salt/runners/launchd.pyo
 ${PYSITELIB}/salt/runners/manage.py
 ${PYSITELIB}/salt/runners/manage.pyc
 ${PYSITELIB}/salt/runners/manage.pyo
+${PYSITELIB}/salt/runners/network.py
+${PYSITELIB}/salt/runners/network.pyc
+${PYSITELIB}/salt/runners/network.pyo
+${PYSITELIB}/salt/scripts.py
+${PYSITELIB}/salt/scripts.pyc
+${PYSITELIB}/salt/scripts.pyo
 ${PYSITELIB}/salt/state.py
 ${PYSITELIB}/salt/state.pyc
 ${PYSITELIB}/salt/state.pyo
 ${PYSITELIB}/salt/states/__init__.py
 ${PYSITELIB}/salt/states/__init__.pyc
 ${PYSITELIB}/salt/states/__init__.pyo
+${PYSITELIB}/salt/states/alias.py
+${PYSITELIB}/salt/states/alias.pyc
+${PYSITELIB}/salt/states/alias.pyo
 ${PYSITELIB}/salt/states/cmd.py
 ${PYSITELIB}/salt/states/cmd.pyc
 ${PYSITELIB}/salt/states/cmd.pyo
@@ -278,33 +544,96 @@ ${PYSITELIB}/salt/states/cron.pyo
 ${PYSITELIB}/salt/states/file.py
 ${PYSITELIB}/salt/states/file.pyc
 ${PYSITELIB}/salt/states/file.pyo
+${PYSITELIB}/salt/states/gem.py
+${PYSITELIB}/salt/states/gem.pyc
+${PYSITELIB}/salt/states/gem.pyo
+${PYSITELIB}/salt/states/git.py
+${PYSITELIB}/salt/states/git.pyc
+${PYSITELIB}/salt/states/git.pyo
 ${PYSITELIB}/salt/states/group.py
 ${PYSITELIB}/salt/states/group.pyc
 ${PYSITELIB}/salt/states/group.pyo
+${PYSITELIB}/salt/states/hg.py
+${PYSITELIB}/salt/states/hg.pyc
+${PYSITELIB}/salt/states/hg.pyo
 ${PYSITELIB}/salt/states/host.py
 ${PYSITELIB}/salt/states/host.pyc
 ${PYSITELIB}/salt/states/host.pyo
 ${PYSITELIB}/salt/states/kmod.py
 ${PYSITELIB}/salt/states/kmod.pyc
 ${PYSITELIB}/salt/states/kmod.pyo
+${PYSITELIB}/salt/states/module.py
+${PYSITELIB}/salt/states/module.pyc
+${PYSITELIB}/salt/states/module.pyo
+${PYSITELIB}/salt/states/mongodb_database.py
+${PYSITELIB}/salt/states/mongodb_database.pyc
+${PYSITELIB}/salt/states/mongodb_database.pyo
+${PYSITELIB}/salt/states/mongodb_user.py
+${PYSITELIB}/salt/states/mongodb_user.pyc
+${PYSITELIB}/salt/states/mongodb_user.pyo
 ${PYSITELIB}/salt/states/mount.py
 ${PYSITELIB}/salt/states/mount.pyc
 ${PYSITELIB}/salt/states/mount.pyo
 ${PYSITELIB}/salt/states/mysql_database.py
 ${PYSITELIB}/salt/states/mysql_database.pyc
 ${PYSITELIB}/salt/states/mysql_database.pyo
+${PYSITELIB}/salt/states/mysql_grants.py
+${PYSITELIB}/salt/states/mysql_grants.pyc
+${PYSITELIB}/salt/states/mysql_grants.pyo
 ${PYSITELIB}/salt/states/mysql_user.py
 ${PYSITELIB}/salt/states/mysql_user.pyc
 ${PYSITELIB}/salt/states/mysql_user.pyo
+${PYSITELIB}/salt/states/network.py
+${PYSITELIB}/salt/states/network.pyc
+${PYSITELIB}/salt/states/network.pyo
+${PYSITELIB}/salt/states/pecl.py
+${PYSITELIB}/salt/states/pecl.pyc
+${PYSITELIB}/salt/states/pecl.pyo
+${PYSITELIB}/salt/states/pip.py
+${PYSITELIB}/salt/states/pip.pyc
+${PYSITELIB}/salt/states/pip.pyo
 ${PYSITELIB}/salt/states/pkg.py
 ${PYSITELIB}/salt/states/pkg.pyc
 ${PYSITELIB}/salt/states/pkg.pyo
+${PYSITELIB}/salt/states/pkgng.py
+${PYSITELIB}/salt/states/pkgng.pyc
+${PYSITELIB}/salt/states/pkgng.pyo
+${PYSITELIB}/salt/states/postgres_database.py
+${PYSITELIB}/salt/states/postgres_database.pyc
+${PYSITELIB}/salt/states/postgres_database.pyo
+${PYSITELIB}/salt/states/postgres_user.py
+${PYSITELIB}/salt/states/postgres_user.pyc
+${PYSITELIB}/salt/states/postgres_user.pyo
+${PYSITELIB}/salt/states/rabbitmq_user.py
+${PYSITELIB}/salt/states/rabbitmq_user.pyc
+${PYSITELIB}/salt/states/rabbitmq_user.pyo
+${PYSITELIB}/salt/states/rabbitmq_vhost.py
+${PYSITELIB}/salt/states/rabbitmq_vhost.pyc
+${PYSITELIB}/salt/states/rabbitmq_vhost.pyo
+${PYSITELIB}/salt/states/rvm.py
+${PYSITELIB}/salt/states/rvm.pyc
+${PYSITELIB}/salt/states/rvm.pyo
+${PYSITELIB}/salt/states/selinux.py
+${PYSITELIB}/salt/states/selinux.pyc
+${PYSITELIB}/salt/states/selinux.pyo
 ${PYSITELIB}/salt/states/service.py
 ${PYSITELIB}/salt/states/service.pyc
 ${PYSITELIB}/salt/states/service.pyo
 ${PYSITELIB}/salt/states/ssh_auth.py
 ${PYSITELIB}/salt/states/ssh_auth.pyc
 ${PYSITELIB}/salt/states/ssh_auth.pyo
+${PYSITELIB}/salt/states/ssh_known_hosts.py
+${PYSITELIB}/salt/states/ssh_known_hosts.pyc
+${PYSITELIB}/salt/states/ssh_known_hosts.pyo
+${PYSITELIB}/salt/states/stateconf.py
+${PYSITELIB}/salt/states/stateconf.pyc
+${PYSITELIB}/salt/states/stateconf.pyo
+${PYSITELIB}/salt/states/supervisord.py
+${PYSITELIB}/salt/states/supervisord.pyc
+${PYSITELIB}/salt/states/supervisord.pyo
+${PYSITELIB}/salt/states/svn.py
+${PYSITELIB}/salt/states/svn.pyc
+${PYSITELIB}/salt/states/svn.pyo
 ${PYSITELIB}/salt/states/sysctl.py
 ${PYSITELIB}/salt/states/sysctl.pyc
 ${PYSITELIB}/salt/states/sysctl.pyo
@@ -314,27 +643,90 @@ ${PYSITELIB}/salt/states/user.pyo
 ${PYSITELIB}/salt/states/virtualenv.py
 ${PYSITELIB}/salt/states/virtualenv.pyc
 ${PYSITELIB}/salt/states/virtualenv.pyo
+${PYSITELIB}/salt/template.py
+${PYSITELIB}/salt/template.pyc
+${PYSITELIB}/salt/template.pyo
+${PYSITELIB}/salt/tops/__init__.py
+${PYSITELIB}/salt/tops/__init__.pyc
+${PYSITELIB}/salt/tops/__init__.pyo
+${PYSITELIB}/salt/tops/ext_nodes.py
+${PYSITELIB}/salt/tops/ext_nodes.pyc
+${PYSITELIB}/salt/tops/ext_nodes.pyo
 ${PYSITELIB}/salt/utils/__init__.py
 ${PYSITELIB}/salt/utils/__init__.pyc
 ${PYSITELIB}/salt/utils/__init__.pyo
+${PYSITELIB}/salt/utils/atomicfile.py
+${PYSITELIB}/salt/utils/atomicfile.pyc
+${PYSITELIB}/salt/utils/atomicfile.pyo
+${PYSITELIB}/salt/utils/debug.py
+${PYSITELIB}/salt/utils/debug.pyc
+${PYSITELIB}/salt/utils/debug.pyo
+${PYSITELIB}/salt/utils/dictupdate.py
+${PYSITELIB}/salt/utils/dictupdate.pyc
+${PYSITELIB}/salt/utils/dictupdate.pyo
+${PYSITELIB}/salt/utils/event.py
+${PYSITELIB}/salt/utils/event.pyc
+${PYSITELIB}/salt/utils/event.pyo
+${PYSITELIB}/salt/utils/filebuffer.py
+${PYSITELIB}/salt/utils/filebuffer.pyc
+${PYSITELIB}/salt/utils/filebuffer.pyo
 ${PYSITELIB}/salt/utils/find.py
 ${PYSITELIB}/salt/utils/find.pyc
 ${PYSITELIB}/salt/utils/find.pyo
+${PYSITELIB}/salt/utils/gzip_util.py
+${PYSITELIB}/salt/utils/gzip_util.pyc
+${PYSITELIB}/salt/utils/gzip_util.pyo
 ${PYSITELIB}/salt/utils/jinja.py
 ${PYSITELIB}/salt/utils/jinja.pyc
 ${PYSITELIB}/salt/utils/jinja.pyo
+${PYSITELIB}/salt/utils/mako.py
+${PYSITELIB}/salt/utils/mako.pyc
+${PYSITELIB}/salt/utils/mako.pyo
+${PYSITELIB}/salt/utils/minions.py
+${PYSITELIB}/salt/utils/minions.pyc
+${PYSITELIB}/salt/utils/minions.pyo
+${PYSITELIB}/salt/utils/parsers.py
+${PYSITELIB}/salt/utils/parsers.pyc
+${PYSITELIB}/salt/utils/parsers.pyo
+${PYSITELIB}/salt/utils/process.py
+${PYSITELIB}/salt/utils/process.pyc
+${PYSITELIB}/salt/utils/process.pyo
 ${PYSITELIB}/salt/utils/saltminionservice.py
 ${PYSITELIB}/salt/utils/saltminionservice.pyc
 ${PYSITELIB}/salt/utils/saltminionservice.pyo
+${PYSITELIB}/salt/utils/socket_util.py
+${PYSITELIB}/salt/utils/socket_util.pyc
+${PYSITELIB}/salt/utils/socket_util.pyo
+${PYSITELIB}/salt/utils/templates.py
+${PYSITELIB}/salt/utils/templates.pyc
+${PYSITELIB}/salt/utils/templates.pyo
 ${PYSITELIB}/salt/utils/verify.py
 ${PYSITELIB}/salt/utils/verify.pyc
 ${PYSITELIB}/salt/utils/verify.pyo
 ${PYSITELIB}/salt/utils/winservice.py
 ${PYSITELIB}/salt/utils/winservice.pyc
 ${PYSITELIB}/salt/utils/winservice.pyo
+${PYSITELIB}/salt/utils/yaml.py
+${PYSITELIB}/salt/utils/yaml.pyc
+${PYSITELIB}/salt/utils/yaml.pyo
 ${PYSITELIB}/salt/version.py
 ${PYSITELIB}/salt/version.pyc
 ${PYSITELIB}/salt/version.pyo
+${PYSITELIB}/salt/wheel/__init__.py
+${PYSITELIB}/salt/wheel/__init__.pyc
+${PYSITELIB}/salt/wheel/__init__.pyo
+${PYSITELIB}/salt/wheel/config.py
+${PYSITELIB}/salt/wheel/config.pyc
+${PYSITELIB}/salt/wheel/config.pyo
+${PYSITELIB}/salt/wheel/file_roots.py
+${PYSITELIB}/salt/wheel/file_roots.pyc
+${PYSITELIB}/salt/wheel/file_roots.pyo
+${PYSITELIB}/salt/wheel/key.py
+${PYSITELIB}/salt/wheel/key.pyc
+${PYSITELIB}/salt/wheel/key.pyo
+${PYSITELIB}/salt/wheel/pillar_roots.py
+${PYSITELIB}/salt/wheel/pillar_roots.pyc
+${PYSITELIB}/salt/wheel/pillar_roots.pyo
 bin/salt
 bin/salt-call
 bin/salt-cp
@@ -345,8 +737,8 @@ bin/salt-run
 bin/salt-syndic
 share/examples/rc.d/salt_master
 share/examples/rc.d/salt_minion
-share/examples/salt/master
-share/examples/salt/minion
+share/examples/salt/master.template
+share/examples/salt/minion.template
 ${PKGMANDIR}/man1/salt-call.1
 ${PKGMANDIR}/man1/salt-cp.1
 ${PKGMANDIR}/man1/salt-key.1
diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo
index bf080800818..8fbe4567fa7 100644
--- a/sysutils/salt/distinfo
+++ b/sysutils/salt/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2012/01/21 20:26:58 apb Exp $
+$NetBSD: distinfo,v 1.2 2012/12/06 08:01:21 apb Exp $
 
-SHA1 (salt-0.9.5.tar.gz) = b7540d8e6f20b8bcd125de108b39ef6971c38ee4
-RMD160 (salt-0.9.5.tar.gz) = beee5128226939f422cdb423614eedf4258fb463
-Size (salt-0.9.5.tar.gz) = 252878 bytes
-SHA1 (patch-setup.py) = 09599d9c5c8fada0d2ddcb3b93066a0d925f81a7
+SHA1 (salt-0.10.5.tar.gz) = 42796c7299e0000c250af2b3164fa77ef4f5e460
+RMD160 (salt-0.10.5.tar.gz) = a5de72481b458a2eb909a249e52e2edc354c2a61
+Size (salt-0.10.5.tar.gz) = 793582 bytes
+SHA1 (patch-setup.py) = b9b6c9ef19ad72caa65c1439ae73d40832f35977
diff --git a/sysutils/salt/patches/patch-setup.py b/sysutils/salt/patches/patch-setup.py
index 614d7c595a4..a2b2c9f27d0 100644
--- a/sysutils/salt/patches/patch-setup.py
+++ b/sysutils/salt/patches/patch-setup.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.1 2012/01/21 20:26:58 apb Exp $
+$NetBSD: patch-setup.py,v 1.2 2012/12/06 08:01:21 apb Exp $
 
 * Remove unused example_path and template_path;
 * Set etc_path to the directory where configfiles will be
@@ -7,9 +7,9 @@ $NetBSD: patch-setup.py,v 1.1 2012/01/21 20:26:58 apb Exp $
   via the CONFIG_FILES setting in the pkgsrc Makefile.
 * Install man pages in PKGMANDIR, not PREFIX/share/man.
 
---- setup.py.orig	2012-01-15 22:10:25.000000000 +0000
+--- setup.py.orig	2012-11-15 01:20:54.000000000 +0000
 +++ setup.py
-@@ -47,13 +47,14 @@ DESC = ('Portable, distributed, remote e
+@@ -87,13 +87,15 @@ DESC = ('Portable, distributed, remote e
          'configuration management system')
  mod_path = os.path.join(get_python_lib(), 'salt/modules')
  doc_path = os.path.join(PREFIX, 'share/doc', NAME + '-' + VER)
@@ -18,32 +18,34 @@ $NetBSD: patch-setup.py,v 1.1 2012/01/21 20:26:58 apb Exp $
  
 -if 'SYSCONFDIR' in os.environ:
 -    etc_path = os.environ['SYSCONFDIR']
-+# for pkgsrc, install etc files in PREFIX/share/examples
-+etc_path = os.path.join(PREFIX, 'share/examples')
-+
++# For pkgsrc:
++# * Do not define example_path, template_path, or etc_path; they are not used.
++# * man_path should be set to PKGMANDIR, defaulting to PREFIX/share/man.
++#
 +if 'PKGMANDIR' in os.environ:
 +    man_path = os.environ['PKGMANDIR']
  else:
 -    etc_path = os.path.join(os.path.dirname(PREFIX), 'etc')
 +    man_path = os.path.join(os.path.dirname(PREFIX), 'share/man')
  
- # take care of extension modules.
- if have_cython:
-@@ -125,7 +126,7 @@ setup(
-                     ['conf/master',
-                      'conf/minion',
-                     ]),
--                ('share/man/man1',
-+                (os.path.join(man_path, 'man1'),
-                     ['doc/man/salt-master.1',
-                      'doc/man/salt-key.1',
-                      'doc/man/salt.1',
-@@ -135,7 +136,7 @@ setup(
-                      'doc/man/salt-run.1',
-                      'doc/man/salt-minion.1',
-                     ]),
--                ('share/man/man7',
-+                (os.path.join(man_path, 'man7'),
-                     ['doc/man/salt.7',
-                     ]),
-                 (mod_path,
+ libraries = ['ws2_32'] if sys.platform == 'win32' else []
+ 
+@@ -141,7 +143,7 @@ setup_kwargs = {'name': NAME,
+                              'salt.utils',
+                              ],
+                 'package_data': {'salt.modules': ['rh_ip/*.jinja']},
+-                'data_files': [('share/man/man1',
++                'data_files': [(os.path.join(man_path, 'man1'),
+                                 ['doc/man/salt-master.1',
+                                  'doc/man/salt-key.1',
+                                  'doc/man/salt.1',
+@@ -151,7 +153,8 @@ setup_kwargs = {'name': NAME,
+                                  'doc/man/salt-run.1',
+                                  'doc/man/salt-minion.1',
+                                  ]),
+-                               ('share/man/man7', ['doc/man/salt.7']),
++                               (os.path.join(man_path, 'man7'),
++                                ['doc/man/salt.7']),
+                                ],
+                 'install_requires': requirements,
+                 # The dynamic module loading in salt.modules makes this