py-crypto is now a dependency and the package is egg-aware. Update

MASTER_SITES and add pypi to them. Use PREFIX instead of LOCALBASE in one SUBST_CLASS instead of two. ${PKGMANDIR}/man3 is no longer used. Comment patches and delint. From CHANGELOG: 1.6.3 Corrects a regression where handlers were run across all hosts, not just those that triggered the handler. Fixed a bug in which modules did not support properly moving a file atomically when su was in use. Fixed two bugs related to symlinks with directories when using the file module. Fixed a bug related to MySQL master replication syntax. Corrects a regression in the order of variable merging done by the internal runner code. Various other minor bug fixes. 1.6.2 If an improper locale is specified, core modules will now automatically revert to using the 'C' locale. Modules using the fetch_url utility will now obey proxy environment variables. The SSL validation step in fetch_url will likewise obey proxy settings, however only proxies using the http protocol are supported. Fixed multiple bugs in docker module related to version changes upstream. Fixed a bug in the ec2_group module where egress rules were lost when a VPC was specified. Fixed two bugs in the synchronize module: a trailing slash might be lost when calculating relative paths, resulting in an incorrect destination. the sync might use the inventory directory incorrectly instead of the playbook or role directory. Files will now only be chown'd on an atomic move if the src/dest uid/gid do not match. 1.6.1 Fixed a bug in group_by, where systems were being grouped incorrectly. Fixed a bug where file descriptors may leak to a child process when using accelerate. Fixed a bug in apt_repository triggered when python-apt not being installed/available. Fixed a bug in the apache2_module module, where modules were not being disabled correctly. 1.6 Major features/changes: The deprecated legacy variable templating system has been finally removed. Use {{ foo }} always not $foo or ${foo}. Any data file can also be JSON. Use sparingly -- with great power comes great responsibility. Starting file with "{" or "[" denotes JSON. Added 'gathering' param for ansible.cfg to change the default gather_facts policy. Accelerate improvements: multiple users can connect with different keys, when accelerate_multi_key = yes is specified in the ansible.cfg. daemon lifetime is now based on the time from the last activity, not the time from the daemon's launch. ansible-playbook now accepts --force-handlers to run handlers even if tasks result in failures. Added VMWare support with the vsphere_guest module. New Modules: files: replace packaging: cpanm (Perl) packaging: portage packaging: composer (PHP) packaging: homebrew_tap (OS X) packaging: homebrew_cask (OS X) packaging: apt_rpm packaging: layman monitoring: logentries monitoring: rollbar_deployment monitoring: librato_annotation notification: nexmo (SMS) notification: twilio (SMS) notification: slack (Slack.com) notification: typetalk (Typetalk.in) notification: sns (Amazon) system: debconf system: ufw system: locale_gen system: alternatives system: capabilities net_infrastructure: bigip_facts net_infrastructure: dnssimple net_infrastructure: lldp web_infrastructure: apache2_module cloud: digital_ocean_domain cloud: digital_ocean_sshkey cloud: rax_identity cloud: rax_cbs (cloud block storage) cloud: rax_cbs_attachments cloud: ec2_asg (configure autoscaling groups) cloud: ec2_scaling_policy cloud: ec2_metric_alarm cloud: vsphere_guest Other notable changes: example callback plugin added for hipchat added example inventory plugin for vcenter/vsphere added example inventory plugin for doing really trivial inventory from SSH config files libvirt module now supports destroyed and paused as states s3 module can specify metadata security token additions to ec2 modules setup module code moved into module_utils/, facts now accessible by other modules synchronize module sets relative dirs based on inventory or role path misc bugfixes and other parameters the ec2_key module now has wait/wait_timeout parameters added version_compare filter (see docs) added ability for module documentation YAML to utilize shared module snippets for common args apt module now accepts "deb" parameter to install local dpkg files regex_replace filter plugin added added an inventory script for Docker added an inventory script for Abiquo the get_url module now accepts url_username and url_password as parameters, so sites which require authentication no longer need to have them embedded in the url ... to be filled in from changelogs ... 1.5.5 Security fix for vault, to ensure the umask is set to a restrictive mode before creating/editing vault files. Backported apt_repository security fixes relating to filename/mode upon sources list file creation. 1.5.4 Security fix for safe_eval, which further hardens the checking of the evaluation function. Changing order of variable precendence for system facts, to ensure that inventory variables take precedence over any facts that may be set on a host. 1.5.3 Fix validate_certs and run_command errors from previous release Fixes to the git module related to host key checking 1.5.2 Fix module errors in airbrake and apt from previous release 1.5.1 Force command action to not be executed by the shell unless specifically enabled. Validate SSL certs accessed through urllib*. Implement new default cipher class AES256 in ansible-vault. Misc bug fixes. 1.5 Major features/changes: when_foo which was previously deprecated is now removed, use "when:" instead. Code generates appropriate error suggestion. include + with_items which was previously deprecated is now removed, ditto. Use with_nested / with_together, etc. only_if, which is much older than when_foo and was deprecated, is similarly removed. ssh connection plugin is now more efficient if you add 'pipelining=True' in ansible.cfg under [ssh_connection], see example.cfg localhost/127.0.0.1 is not required to be in inventory if referenced, if not in inventory, it does not implicitly appear in the 'all' group. git module has new parameters (accept_hostkey, key_file, ssh_opts) to ease the usage of git and ssh protocols. when using accelerate mode, the daemon will now be restarted when specifying a different remote_user between plays. added no_log: option for tasks. When used, no logging information will be sent to syslog during the module execution. acl module now handles 'default' and allows for either shorthand entry or specific fields per entry section play_hosts is a new magic variable to provide a list of hosts in scope for the current play. ec2 module now accepts 'exact_count' and 'count_tag' as a way to enforce a running number of nodes by tags. all ec2 modules that work with Eucalyptus also now support a 'validate_certs' option, which can be set to 'off' for installations using self-signed certs. Start of new integration test infrastructure (WIP, more details TBD) if repoquery is unavailble, the yum module will automatically attempt to install yum-utils ansible-vault: a framework for encrypting your playbooks and variable files added support for privilege escalation via 'su' into bin/ansible and bin/ansible-playbook and associated keywords 'su', 'su_user', 'su_pass' for tasks/plays New modules: cloud: ec2_elb_lb cloud: ec2_key cloud: ec2_snapshot cloud: rax_dns cloud: rax_dns_record cloud: rax_files cloud: rax_files_objects cloud: rax_keypair cloud: rax_queue cloud: docker_image messaging: rabbitmq_policy system: at utilities: assert Other notable changes (many new module params & bugfixes may not not listed): no_reboot is now defaulted to "no" in the ec2_ami module to ensure filesystem consistency in the resulting AMI. sysctl module overhauled authorized_key module overhauled synchronized module now handles local transport better apt_key module now ignores case on keys zypper_repository now skips on check mode file module now responds to force behavior when dealing with hardlinks new lookup plugin 'csvfile' fixes to allow hash_merge behavior to work with dynamic inventory mysql module will use port argument on dump/import subversion module now ignores locale to better intercept status messages rax api_key argument is no longer logged backwards/forwards compatibility for OpenStack modules, 'quantum' modules grok neutron renaming hosts properly uniqueified if appearing in redundant groups hostname module support added for ScientificLinux ansible-pull can now show live stdout and pass verbosity levels to ansible-playbook ec2 instances can now be stopped or started additional volumes can be created when creating new ec2 instances user module can move a home directory significant enhancement and cleanup of rackspace modules ansible_ssh_private_key_file can be templated docker module updated to support docker-py 0.3.0 various other bug fixes md5 logic improved during sudo operation support for ed25519 keys in authorized_key module ability to set directory permissions during a recursive copy (directory_mode parameter) 1.4.5 fixed issue with permissions being incorrect on fireball/accelerate keys when the umask setting was too loose. 1.4.4 fixed a minor issue with newer versions of pip dropping the "use-mirrors" parameter.
author: rodent <rodent@pkgsrc.org> 2014-06-15 00:15:08 +0000
committer: rodent <rodent@pkgsrc.org> 2014-06-15 00:15:08 +0000
commit: 9b220faf76a7b9629e168809a1b330feb6165ddf (patch)
tree: 2edce319d9413c941a557f4b027ee7766f3253ad /sysutils/ansible
parent: 76b98a060652e92c39049a259995b0c64a668455 (diff)
download: pkgsrc-9b220faf76a7b9629e168809a1b330feb6165ddf.tar.gz
11 files changed, 214 insertions, 266 deletions
diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile
index 8c7d7765c3f..ed87d0cc5dd 100644
--- a/sysutils/ansible/Makefile
+++ b/sysutils/ansible/Makefile
@@ -1,49 +1,48 @@
-# $NetBSD: Makefile,v 1.10 2014/05/09 07:37:18 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2014/06/15 00:15:08 rodent Exp $
 
-DISTNAME=	ansible-1.4.1
+DISTNAME=	ansible-1.6.3
+#PKGNAME=	${PYPKGPREFIX}-${DISTNAME} # XXX: for when package is py3x-ready
 CATEGORIES=	sysutils
-MASTER_SITES=	http://ansibleworks.com/releases/
+MASTER_SITES=	http://releases.ansible.com/ansible/
+MASTER_SITES+=	https://pypi.python.org/packages/source/a/ansible/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ansibleworks.com/
 COMMENT=	SSH-based configuration management, deployment, and task execution
 LICENSE=	gnu-gpl-v3
 
-EGDIR=		${PREFIX}/share/examples/ansible
+DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
+DEPENDS+=	${PYPKGPREFIX}-paramiko-[0-9]*:../../security/py-paramiko
+DEPENDS+=	${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
+DEPENDS+=	${PYPKGPREFIX}-crypto>=2.6:../../security/py-crypto
 
-#USE_LANGUAGES=	# none
 USE_TOOLS+=	gmake
+EGDIR=		${PREFIX}/share/examples/ansible
 
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-configure
-SUBST_FILES.prefix+=	examples/ansible.cfg
-SUBST_FILES.prefix+=	lib/ansible/constants.py
+SUBST_FILES.prefix+=	examples/ansible.cfg lib/ansible/callbacks.py
+SUBST_FILES.prefix+=	lib/ansible/constants.py library/packaging/pkgin
+SUBST_MESSAGE.prefix=	Fixing PREFIX path.
 SUBST_SED.prefix=	-e "s,@PREFIX@,${PREFIX},"
 SUBST_SED.prefix+=	-e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},"
 
-SUBST_CLASSES+=		localbase
-SUBST_STAGE.localbase=	pre-configure
-SUBST_FILES.localbase=	\
-			lib/ansible/callbacks.py \
-			library/packaging/pkgin \
-			library/system/setup
-SUBST_SED.localbase=	-e "s,@LOCALBASE@,${LOCALBASE},"
-
 SUBST_CLASSES+=		pythonbin
 SUBST_STAGE.pythonbin=	pre-configure
 SUBST_FILES.pythonbin=	Makefile
-SUBST_FILES.pythonbin=	-e "s,@PYTHONBIN@,${PYTHONBIN},"
+SUBST_MESSAGE.pythonbin=	Fixing path to PYTHONBIN.
+SUBST_SED.pythonbin=	-e "s,PYTHON=python,PYTHON=${PYTHONBIN},"
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-paramiko
 
-MANPAGES=	ansible-doc.1 ansible-pull.1 ansible-playbook.1 ansible.1
+REPLACE_PYTHON+=	lib/ansible/runner/action_plugins/synchronize.py
+REPLACE_PYTHON+=	lib/ansible/utils/module_docs.py
 
-DEPENDS+=		${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
-DEPENDS+=		${PYPKGPREFIX}-paramiko-[0-9]*:../../security/py-paramiko
-DEPENDS+=		${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
+MANPAGES=	ansible-doc.1 ansible-pull.1 ansible-galaxy.1 ansible-vault.1
+MANPAGES+=	ansible-playbook.1 ansible.1
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man3
-INSTALLATION_DIRS+=	${PKG_SYSCONFDIR}/ansible ${EGDIR}/playbooks
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKG_SYSCONFDIR}/ansible
+INSTALLATION_DIRS+=	${EGDIR}/playbooks
 
 CHECK_INTERPRETER_SKIP=	share/ansible/*
 
@@ -55,13 +54,10 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/man/man1/${f} \
 	    ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/docs/man/man3/* \
-	    ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/
 .for f in ansible.cfg hosts
-	${INSTALL_DATA} ${WRKSRC}/examples/${f} \
-	    ${DESTDIR}/${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${DESTDIR}/${EGDIR}
 .endfor
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ansible/PLIST b/sysutils/ansible/PLIST
index 6c69028c660..2496ec5fa18 100644
--- a/sysutils/ansible/PLIST
+++ b/sysutils/ansible/PLIST
@@ -1,9 +1,15 @@
-@comment $NetBSD: PLIST,v 1.5 2013/12/02 22:54:46 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/06/15 00:15:08 rodent Exp $
 bin/ansible
 bin/ansible-doc
+bin/ansible-galaxy
 bin/ansible-playbook
 bin/ansible-pull
-${PYSITELIB}/${EGG_FILE}
+bin/ansible-vault
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/ansible/__init__.py
 ${PYSITELIB}/ansible/__init__.pyc
 ${PYSITELIB}/ansible/__init__.pyo
@@ -64,6 +70,24 @@ ${PYSITELIB}/ansible/module_utils/basic.pyo
 ${PYSITELIB}/ansible/module_utils/ec2.py
 ${PYSITELIB}/ansible/module_utils/ec2.pyc
 ${PYSITELIB}/ansible/module_utils/ec2.pyo
+${PYSITELIB}/ansible/module_utils/facts.py
+${PYSITELIB}/ansible/module_utils/facts.pyc
+${PYSITELIB}/ansible/module_utils/facts.pyo
+${PYSITELIB}/ansible/module_utils/gce.py
+${PYSITELIB}/ansible/module_utils/gce.pyc
+${PYSITELIB}/ansible/module_utils/gce.pyo
+${PYSITELIB}/ansible/module_utils/known_hosts.py
+${PYSITELIB}/ansible/module_utils/known_hosts.pyc
+${PYSITELIB}/ansible/module_utils/known_hosts.pyo
+${PYSITELIB}/ansible/module_utils/rax.py
+${PYSITELIB}/ansible/module_utils/rax.pyc
+${PYSITELIB}/ansible/module_utils/rax.pyo
+${PYSITELIB}/ansible/module_utils/redhat.py
+${PYSITELIB}/ansible/module_utils/redhat.pyc
+${PYSITELIB}/ansible/module_utils/redhat.pyo
+${PYSITELIB}/ansible/module_utils/urls.py
+${PYSITELIB}/ansible/module_utils/urls.pyc
+${PYSITELIB}/ansible/module_utils/urls.pyo
 ${PYSITELIB}/ansible/playbook/__init__.py
 ${PYSITELIB}/ansible/playbook/__init__.pyc
 ${PYSITELIB}/ansible/playbook/__init__.pyo
@@ -85,6 +109,9 @@ ${PYSITELIB}/ansible/runner/action_plugins/add_host.pyo
 ${PYSITELIB}/ansible/runner/action_plugins/assemble.py
 ${PYSITELIB}/ansible/runner/action_plugins/assemble.pyc
 ${PYSITELIB}/ansible/runner/action_plugins/assemble.pyo
+${PYSITELIB}/ansible/runner/action_plugins/assert.py
+${PYSITELIB}/ansible/runner/action_plugins/assert.pyc
+${PYSITELIB}/ansible/runner/action_plugins/assert.pyo
 ${PYSITELIB}/ansible/runner/action_plugins/async.py
 ${PYSITELIB}/ansible/runner/action_plugins/async.pyc
 ${PYSITELIB}/ansible/runner/action_plugins/async.pyo
@@ -151,6 +178,9 @@ ${PYSITELIB}/ansible/runner/connection_plugins/funcd.pyo
 ${PYSITELIB}/ansible/runner/connection_plugins/jail.py
 ${PYSITELIB}/ansible/runner/connection_plugins/jail.pyc
 ${PYSITELIB}/ansible/runner/connection_plugins/jail.pyo
+${PYSITELIB}/ansible/runner/connection_plugins/libvirt_lxc.py
+${PYSITELIB}/ansible/runner/connection_plugins/libvirt_lxc.pyc
+${PYSITELIB}/ansible/runner/connection_plugins/libvirt_lxc.pyo
 ${PYSITELIB}/ansible/runner/connection_plugins/local.py
 ${PYSITELIB}/ansible/runner/connection_plugins/local.pyc
 ${PYSITELIB}/ansible/runner/connection_plugins/local.pyo
@@ -169,6 +199,12 @@ ${PYSITELIB}/ansible/runner/filter_plugins/core.pyo
 ${PYSITELIB}/ansible/runner/lookup_plugins/__init__.py
 ${PYSITELIB}/ansible/runner/lookup_plugins/__init__.pyc
 ${PYSITELIB}/ansible/runner/lookup_plugins/__init__.pyo
+${PYSITELIB}/ansible/runner/lookup_plugins/csvfile.py
+${PYSITELIB}/ansible/runner/lookup_plugins/csvfile.pyc
+${PYSITELIB}/ansible/runner/lookup_plugins/csvfile.pyo
+${PYSITELIB}/ansible/runner/lookup_plugins/dict.py
+${PYSITELIB}/ansible/runner/lookup_plugins/dict.pyc
+${PYSITELIB}/ansible/runner/lookup_plugins/dict.pyo
 ${PYSITELIB}/ansible/runner/lookup_plugins/dnstxt.py
 ${PYSITELIB}/ansible/runner/lookup_plugins/dnstxt.pyc
 ${PYSITELIB}/ansible/runner/lookup_plugins/dnstxt.pyo
@@ -238,200 +274,65 @@ ${PYSITELIB}/ansible/runner/return_data.pyo
 ${PYSITELIB}/ansible/utils/__init__.py
 ${PYSITELIB}/ansible/utils/__init__.pyc
 ${PYSITELIB}/ansible/utils/__init__.pyo
+${PYSITELIB}/ansible/utils/cmd_functions.py
+${PYSITELIB}/ansible/utils/cmd_functions.pyc
+${PYSITELIB}/ansible/utils/cmd_functions.pyo
+${PYSITELIB}/ansible/utils/display_functions.py
+${PYSITELIB}/ansible/utils/display_functions.pyc
+${PYSITELIB}/ansible/utils/display_functions.pyo
 ${PYSITELIB}/ansible/utils/module_docs.py
 ${PYSITELIB}/ansible/utils/module_docs.pyc
 ${PYSITELIB}/ansible/utils/module_docs.pyo
+${PYSITELIB}/ansible/utils/module_docs_fragments/__init__.py
+${PYSITELIB}/ansible/utils/module_docs_fragments/__init__.pyc
+${PYSITELIB}/ansible/utils/module_docs_fragments/__init__.pyo
+${PYSITELIB}/ansible/utils/module_docs_fragments/aws.py
+${PYSITELIB}/ansible/utils/module_docs_fragments/aws.pyc
+${PYSITELIB}/ansible/utils/module_docs_fragments/aws.pyo
+${PYSITELIB}/ansible/utils/module_docs_fragments/files.py
+${PYSITELIB}/ansible/utils/module_docs_fragments/files.pyc
+${PYSITELIB}/ansible/utils/module_docs_fragments/files.pyo
+${PYSITELIB}/ansible/utils/module_docs_fragments/rackspace.py
+${PYSITELIB}/ansible/utils/module_docs_fragments/rackspace.pyc
+${PYSITELIB}/ansible/utils/module_docs_fragments/rackspace.pyo
 ${PYSITELIB}/ansible/utils/plugins.py
 ${PYSITELIB}/ansible/utils/plugins.pyc
 ${PYSITELIB}/ansible/utils/plugins.pyo
+${PYSITELIB}/ansible/utils/string_functions.py
+${PYSITELIB}/ansible/utils/string_functions.pyc
+${PYSITELIB}/ansible/utils/string_functions.pyo
 ${PYSITELIB}/ansible/utils/template.py
 ${PYSITELIB}/ansible/utils/template.pyc
 ${PYSITELIB}/ansible/utils/template.pyo
+${PYSITELIB}/ansible/utils/vault.py
+${PYSITELIB}/ansible/utils/vault.pyc
+${PYSITELIB}/ansible/utils/vault.pyo
 man/man1/ansible-doc.1
+man/man1/ansible-galaxy.1
 man/man1/ansible-playbook.1
 man/man1/ansible-pull.1
+man/man1/ansible-vault.1
 man/man1/ansible.1
-man/man3/ansible.accelerate.3
-man/man3/ansible.acl.3
-man/man3/ansible.add_host.3
-man/man3/ansible.airbrake_deployment.3
-man/man3/ansible.apt.3
-man/man3/ansible.apt_key.3
-man/man3/ansible.apt_repository.3
-man/man3/ansible.arista_interface.3
-man/man3/ansible.arista_l2interface.3
-man/man3/ansible.arista_lag.3
-man/man3/ansible.arista_vlan.3
-man/man3/ansible.assemble.3
-man/man3/ansible.async_status.3
-man/man3/ansible.authorized_key.3
-man/man3/ansible.bigip_monitor_http.3
-man/man3/ansible.bigip_monitor_tcp.3
-man/man3/ansible.bigip_node.3
-man/man3/ansible.bigip_pool.3
-man/man3/ansible.bigip_pool_member.3
-man/man3/ansible.boundary_meter.3
-man/man3/ansible.bzr.3
-man/man3/ansible.campfire.3
-man/man3/ansible.cloudformation.3
-man/man3/ansible.command.3
-man/man3/ansible.copy.3
-man/man3/ansible.cron.3
-man/man3/ansible.datadog_event.3
-man/man3/ansible.debug.3
-man/man3/ansible.digital_ocean.3
-man/man3/ansible.django_manage.3
-man/man3/ansible.dnsmadeeasy.3
-man/man3/ansible.docker.3
-man/man3/ansible.easy_install.3
-man/man3/ansible.ec2.3
-man/man3/ansible.ec2_ami.3
-man/man3/ansible.ec2_eip.3
-man/man3/ansible.ec2_elb.3
-man/man3/ansible.ec2_facts.3
-man/man3/ansible.ec2_group.3
-man/man3/ansible.ec2_tag.3
-man/man3/ansible.ec2_vol.3
-man/man3/ansible.ec2_vpc.3
-man/man3/ansible.ejabberd_user.3
-man/man3/ansible.elasticache.3
-man/man3/ansible.facter.3
-man/man3/ansible.fail.3
-man/man3/ansible.fetch.3
-man/man3/ansible.file.3
-man/man3/ansible.filesystem.3
-man/man3/ansible.fireball.3
-man/man3/ansible.firewalld.3
-man/man3/ansible.flowdock.3
-man/man3/ansible.gc_storage.3
-man/man3/ansible.gce.3
-man/man3/ansible.gce_lb.3
-man/man3/ansible.gce_net.3
-man/man3/ansible.gce_pd.3
-man/man3/ansible.gem.3
-man/man3/ansible.get_url.3
-man/man3/ansible.git.3
-man/man3/ansible.github_hooks.3
-man/man3/ansible.glance_image.3
-man/man3/ansible.group.3
-man/man3/ansible.group_by.3
-man/man3/ansible.grove.3
-man/man3/ansible.hg.3
-man/man3/ansible.hipchat.3
-man/man3/ansible.homebrew.3
-man/man3/ansible.hostname.3
-man/man3/ansible.htpasswd.3
-man/man3/ansible.include_vars.3
-man/man3/ansible.ini_file.3
-man/man3/ansible.irc.3
-man/man3/ansible.jabber.3
-man/man3/ansible.jboss.3
-man/man3/ansible.kernel_blacklist.3
-man/man3/ansible.keystone_user.3
-man/man3/ansible.lineinfile.3
-man/man3/ansible.linode.3
-man/man3/ansible.lvg.3
-man/man3/ansible.lvol.3
-man/man3/ansible.macports.3
-man/man3/ansible.mail.3
-man/man3/ansible.modprobe.3
-man/man3/ansible.mongodb_user.3
-man/man3/ansible.monit.3
-man/man3/ansible.mount.3
-man/man3/ansible.mqtt.3
-man/man3/ansible.mysql_db.3
-man/man3/ansible.mysql_replication.3
-man/man3/ansible.mysql_user.3
-man/man3/ansible.mysql_variables.3
-man/man3/ansible.nagios.3
-man/man3/ansible.netscaler.3
-man/man3/ansible.newrelic_deployment.3
-man/man3/ansible.nova_compute.3
-man/man3/ansible.nova_keypair.3
-man/man3/ansible.npm.3
-man/man3/ansible.ohai.3
-man/man3/ansible.open_iscsi.3
-man/man3/ansible.openbsd_pkg.3
-man/man3/ansible.openvswitch_bridge.3
-man/man3/ansible.openvswitch_port.3
-man/man3/ansible.opkg.3
-man/man3/ansible.osx_say.3
-man/man3/ansible.ovirt.3
-man/man3/ansible.pacman.3
-man/man3/ansible.pagerduty.3
-man/man3/ansible.pause.3
-man/man3/ansible.ping.3
-man/man3/ansible.pingdom.3
-man/man3/ansible.pip.3
-man/man3/ansible.pkgin.3
-man/man3/ansible.pkgng.3
-man/man3/ansible.pkgutil.3
-man/man3/ansible.portinstall.3
-man/man3/ansible.postgresql_db.3
-man/man3/ansible.postgresql_privs.3
-man/man3/ansible.postgresql_user.3
-man/man3/ansible.quantum_floating_ip.3
-man/man3/ansible.quantum_floating_ip_associate.3
-man/man3/ansible.quantum_network.3
-man/man3/ansible.quantum_router.3
-man/man3/ansible.quantum_router_gateway.3
-man/man3/ansible.quantum_router_interface.3
-man/man3/ansible.quantum_subnet.3
-man/man3/ansible.rabbitmq_parameter.3
-man/man3/ansible.rabbitmq_plugin.3
-man/man3/ansible.rabbitmq_user.3
-man/man3/ansible.rabbitmq_vhost.3
-man/man3/ansible.raw.3
-man/man3/ansible.rax.3
-man/man3/ansible.rax_clb.3
-man/man3/ansible.rax_clb_nodes.3
-man/man3/ansible.rax_facts.3
-man/man3/ansible.rax_network.3
-man/man3/ansible.rds.3
-man/man3/ansible.redhat_subscription.3
-man/man3/ansible.redis.3
-man/man3/ansible.rhn_channel.3
-man/man3/ansible.rhn_register.3
-man/man3/ansible.riak.3
-man/man3/ansible.route53.3
-man/man3/ansible.rpm_key.3
-man/man3/ansible.s3.3
-man/man3/ansible.script.3
-man/man3/ansible.seboolean.3
-man/man3/ansible.selinux.3
-man/man3/ansible.service.3
-man/man3/ansible.set_fact.3
-man/man3/ansible.setup.3
-man/man3/ansible.shell.3
-man/man3/ansible.slurp.3
-man/man3/ansible.stat.3
-man/man3/ansible.subversion.3
-man/man3/ansible.supervisorctl.3
-man/man3/ansible.svr4pkg.3
-man/man3/ansible.swdepot.3
-man/man3/ansible.synchronize.3
-man/man3/ansible.sysctl.3
-man/man3/ansible.template.3
-man/man3/ansible.unarchive.3
-man/man3/ansible.uri.3
-man/man3/ansible.urpmi.3
-man/man3/ansible.user.3
-man/man3/ansible.virt.3
-man/man3/ansible.wait_for.3
-man/man3/ansible.xattr.3
-man/man3/ansible.yum.3
-man/man3/ansible.zfs.3
-man/man3/ansible.zypper.3
-man/man3/ansible.zypper_repository.3
 share/ansible/cloud/cloudformation
 share/ansible/cloud/digital_ocean
+share/ansible/cloud/digital_ocean_domain
+share/ansible/cloud/digital_ocean_sshkey
 share/ansible/cloud/docker
+share/ansible/cloud/docker_image
 share/ansible/cloud/ec2
 share/ansible/cloud/ec2_ami
+share/ansible/cloud/ec2_ami_search
+share/ansible/cloud/ec2_asg
 share/ansible/cloud/ec2_eip
 share/ansible/cloud/ec2_elb
+share/ansible/cloud/ec2_elb_lb
 share/ansible/cloud/ec2_facts
 share/ansible/cloud/ec2_group
+share/ansible/cloud/ec2_key
+share/ansible/cloud/ec2_lc
+share/ansible/cloud/ec2_metric_alarm
+share/ansible/cloud/ec2_scaling_policy
+share/ansible/cloud/ec2_snapshot
 share/ansible/cloud/ec2_tag
 share/ansible/cloud/ec2_vol
 share/ansible/cloud/ec2_vpc
@@ -455,14 +356,26 @@ share/ansible/cloud/quantum_router_gateway
 share/ansible/cloud/quantum_router_interface
 share/ansible/cloud/quantum_subnet
 share/ansible/cloud/rax
+share/ansible/cloud/rax_cbs
+share/ansible/cloud/rax_cbs_attachments
 share/ansible/cloud/rax_clb
 share/ansible/cloud/rax_clb_nodes
+share/ansible/cloud/rax_dns
+share/ansible/cloud/rax_dns_record
 share/ansible/cloud/rax_facts
+share/ansible/cloud/rax_files
+share/ansible/cloud/rax_files_objects
+share/ansible/cloud/rax_identity
+share/ansible/cloud/rax_keypair
 share/ansible/cloud/rax_network
+share/ansible/cloud/rax_queue
 share/ansible/cloud/rds
+share/ansible/cloud/rds_param_group
+share/ansible/cloud/rds_subnet_group
 share/ansible/cloud/route53
 share/ansible/cloud/s3
 share/ansible/cloud/virt
+share/ansible/cloud/vsphere_guest
 share/ansible/commands/command
 share/ansible/commands/raw
 share/ansible/commands/script
@@ -484,6 +397,7 @@ share/ansible/files/fetch
 share/ansible/files/file
 share/ansible/files/ini_file
 share/ansible/files/lineinfile
+share/ansible/files/replace
 share/ansible/files/stat
 share/ansible/files/synchronize
 share/ansible/files/template
@@ -495,26 +409,33 @@ share/ansible/inventory/add_host
 share/ansible/inventory/group_by
 share/ansible/messaging/rabbitmq_parameter
 share/ansible/messaging/rabbitmq_plugin
+share/ansible/messaging/rabbitmq_policy
 share/ansible/messaging/rabbitmq_user
 share/ansible/messaging/rabbitmq_vhost
 share/ansible/monitoring/airbrake_deployment
 share/ansible/monitoring/boundary_meter
 share/ansible/monitoring/datadog_event
+share/ansible/monitoring/librato_annotation
+share/ansible/monitoring/logentries
 share/ansible/monitoring/monit
 share/ansible/monitoring/nagios
 share/ansible/monitoring/newrelic_deployment
 share/ansible/monitoring/pagerduty
 share/ansible/monitoring/pingdom
+share/ansible/monitoring/rollbar_deployment
 share/ansible/net_infrastructure/arista_interface
 share/ansible/net_infrastructure/arista_l2interface
 share/ansible/net_infrastructure/arista_lag
 share/ansible/net_infrastructure/arista_vlan
+share/ansible/net_infrastructure/bigip_facts
 share/ansible/net_infrastructure/bigip_monitor_http
 share/ansible/net_infrastructure/bigip_monitor_tcp
 share/ansible/net_infrastructure/bigip_node
 share/ansible/net_infrastructure/bigip_pool
 share/ansible/net_infrastructure/bigip_pool_member
+share/ansible/net_infrastructure/dnsimple
 share/ansible/net_infrastructure/dnsmadeeasy
+share/ansible/net_infrastructure/lldp
 share/ansible/net_infrastructure/netscaler
 share/ansible/net_infrastructure/openvswitch_bridge
 share/ansible/net_infrastructure/openvswitch_port
@@ -529,13 +450,25 @@ share/ansible/notification/irc
 share/ansible/notification/jabber
 share/ansible/notification/mail
 share/ansible/notification/mqtt
+share/ansible/notification/nexmo
 share/ansible/notification/osx_say
+share/ansible/notification/slack
+share/ansible/notification/sns
+share/ansible/notification/stackdriver
+share/ansible/notification/twilio
+share/ansible/notification/typetalk
 share/ansible/packaging/apt
 share/ansible/packaging/apt_key
 share/ansible/packaging/apt_repository
+share/ansible/packaging/apt_rpm
+share/ansible/packaging/composer
+share/ansible/packaging/cpanm
 share/ansible/packaging/easy_install
 share/ansible/packaging/gem
 share/ansible/packaging/homebrew
+share/ansible/packaging/homebrew_cask
+share/ansible/packaging/homebrew_tap
+share/ansible/packaging/layman
 share/ansible/packaging/macports
 share/ansible/packaging/npm
 share/ansible/packaging/openbsd_pkg
@@ -545,6 +478,7 @@ share/ansible/packaging/pip
 share/ansible/packaging/pkgin
 share/ansible/packaging/pkgng
 share/ansible/packaging/pkgutil
+share/ansible/packaging/portage
 share/ansible/packaging/portinstall
 share/ansible/packaging/redhat_subscription
 share/ansible/packaging/rhn_channel
@@ -561,14 +495,19 @@ share/ansible/source_control/git
 share/ansible/source_control/github_hooks
 share/ansible/source_control/hg
 share/ansible/source_control/subversion
+share/ansible/system/alternatives
+share/ansible/system/at
 share/ansible/system/authorized_key
+share/ansible/system/capabilities
 share/ansible/system/cron
+share/ansible/system/debconf
 share/ansible/system/facter
 share/ansible/system/filesystem
 share/ansible/system/firewalld
 share/ansible/system/group
 share/ansible/system/hostname
 share/ansible/system/kernel_blacklist
+share/ansible/system/locale_gen
 share/ansible/system/lvg
 share/ansible/system/lvol
 share/ansible/system/modprobe
@@ -581,9 +520,11 @@ share/ansible/system/selinux
 share/ansible/system/service
 share/ansible/system/setup
 share/ansible/system/sysctl
+share/ansible/system/ufw
 share/ansible/system/user
 share/ansible/system/zfs
 share/ansible/utilities/accelerate
+share/ansible/utilities/assert
 share/ansible/utilities/debug
 share/ansible/utilities/fail
 share/ansible/utilities/fireball
@@ -591,11 +532,14 @@ share/ansible/utilities/include_vars
 share/ansible/utilities/pause
 share/ansible/utilities/set_fact
 share/ansible/utilities/wait_for
+share/ansible/web_infrastructure/apache2_module
 share/ansible/web_infrastructure/django_manage
 share/ansible/web_infrastructure/ejabberd_user
 share/ansible/web_infrastructure/htpasswd
 share/ansible/web_infrastructure/jboss
+share/ansible/web_infrastructure/jira
 share/ansible/web_infrastructure/supervisorctl
 share/examples/ansible/ansible.cfg
 share/examples/ansible/hosts
+@pkgdir share/examples/ansible/playbooks
 @pkgdir etc/ansible
diff --git a/sysutils/ansible/distinfo b/sysutils/ansible/distinfo
index cd0b6c77f5d..9d83509ccc8 100644
--- a/sysutils/ansible/distinfo
+++ b/sysutils/ansible/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.5 2013/12/02 22:54:46 hubertf Exp $
+$NetBSD: distinfo,v 1.6 2014/06/15 00:15:08 rodent Exp $
 
-SHA1 (ansible-1.4.1.tar.gz) = 670fda6b9c4869820d80c6e873604ec759dfa03c
-RMD160 (ansible-1.4.1.tar.gz) = c1d2248244d6799e8ea79e5bfb3e96579c066594
-Size (ansible-1.4.1.tar.gz) = 571296 bytes
-SHA1 (patch-examples_ansible.cfg) = 2a2e3841735df3bddeb6e569e2fdc659ae305053
-SHA1 (patch-lib_ansible_callbacks.py) = bbede537853ab35f31727b72cda41835c7700074
-SHA1 (patch-lib_ansible_constants.py) = eb9379937555b28f8b0f7932d54042432197c59d
-SHA1 (patch-library-system-ping) = 74f4df32948d9a52998420a01f38828dd00c31b6
-SHA1 (patch-library_database_riak) = 7efb167fd9a0e2bd9c7ac5fad3b426c1aa6d5272
-SHA1 (patch-library_monitoring_nagios) = a677946b5c83bab4c3fa3c8d078b28d8abdd7030
-SHA1 (patch-library_packaging_pkgin) = 247f583e3be5cd28462cd274d640ac44652fac50
-SHA1 (patch-library_system_setup) = d87259d0585f750b8f7baf43cc4254138bbbcf72
+SHA1 (ansible-1.6.3.tar.gz) = 9cac9de1357460a9692c015735c899519c85d0da
+RMD160 (ansible-1.6.3.tar.gz) = 00f30fc21a4064c5ae1c6136443bf63aca99fce7
+Size (ansible-1.6.3.tar.gz) = 650061 bytes
+SHA1 (patch-examples_ansible.cfg) = 8951c1da381130e3de5178e858edabdd919868b5
+SHA1 (patch-lib_ansible_callbacks.py) = e712d8215221ff11920039aa8ed4efd4d6e5fae6
+SHA1 (patch-lib_ansible_constants.py) = d31157e1616d4ddc4982b7ede059fcca3118763e
+SHA1 (patch-library-system-ping) = 4b2c1fd8f9844f11cfbe0ba975f7bca7eb88079b
+SHA1 (patch-library_database_riak) = e78fa264f03353ee25c1b358fd4daa90fe27fd44
+SHA1 (patch-library_monitoring_nagios) = 4c101d9c16d7f29a4557c29a2870cfb6bd3ab537
+SHA1 (patch-library_packaging_pkgin) = f235023fbad90c01f24cc33903b781a193611334
+SHA1 (patch-library_system_setup) = ed003c6bd067e61c696316827992f3510c6f4ed8
diff --git a/sysutils/ansible/patches/patch-examples_ansible.cfg b/sysutils/ansible/patches/patch-examples_ansible.cfg
index 2fc1287a141..80cc2203193 100644
--- a/sysutils/ansible/patches/patch-examples_ansible.cfg
+++ b/sysutils/ansible/patches/patch-examples_ansible.cfg
@@ -1,13 +1,16 @@
-$NetBSD: patch-examples_ansible.cfg,v 1.2 2013/12/02 22:54:46 hubertf Exp $
+$NetBSD: patch-examples_ansible.cfg,v 1.3 2014/06/15 00:15:08 rodent Exp $
 
---- examples/ansible.cfg.orig	2013-11-19 19:12:32.000000000 +0000
+Fix hardcoded paths to be replaced with SUBST framework.
+
+--- examples/ansible.cfg.orig	2014-06-09 21:23:31.000000000 +0000
 +++ examples/ansible.cfg
-@@ -4,14 +4,14 @@
+@@ -4,15 +4,15 @@
  # nearly all parameters can be overridden in ansible-playbook 
- # or with command line flags. ansible will read ~/.ansible.cfg, 
- # ansible.cfg in the current working directory or
--# /etc/ansible/ansible.cfg, whichever it finds first
-+# @PKG_SYSCONFDIR@/ansible/ansible.cfg, whichever it finds first
+ # or with command line flags. ansible will read ANSIBLE_CONFIG,
+ # ansible.cfg in the current working directory, .ansible.cfg in
+-# the home directory or /etc/ansible/ansible.cfg, whichever it
++# the home directory or @PKG_SYSCONFDIR@/ansible/ansible.cfg, whichever it
+ # finds first
  
  [defaults]
  
@@ -20,10 +23,10 @@ $NetBSD: patch-examples_ansible.cfg,v 1.2 2013/12/02 22:54:46 hubertf Exp $
  remote_tmp     = $HOME/.ansible/tmp
  pattern        = *
  forks          = 5
-@@ -87,12 +87,12 @@ ansible_managed = Ansible managed: {file
- #error_on_undefined_vars = False
+@@ -103,12 +103,12 @@ ansible_managed = Ansible managed: {file
+ #deprecation_warnings = True
  
- # set plugin path directories here, seperate with colons
+ # set plugin path directories here, separate with colons
 -action_plugins     = /usr/share/ansible_plugins/action_plugins
 -callback_plugins   = /usr/share/ansible_plugins/callback_plugins
 -connection_plugins = /usr/share/ansible_plugins/connection_plugins
diff --git a/sysutils/ansible/patches/patch-lib_ansible_callbacks.py b/sysutils/ansible/patches/patch-lib_ansible_callbacks.py
index 221de065b1f..013541586f2 100644
--- a/sysutils/ansible/patches/patch-lib_ansible_callbacks.py
+++ b/sysutils/ansible/patches/patch-lib_ansible_callbacks.py
@@ -1,16 +1,18 @@
-$NetBSD: patch-lib_ansible_callbacks.py,v 1.3 2013/12/02 22:54:46 hubertf Exp $
+$NetBSD: patch-lib_ansible_callbacks.py,v 1.4 2014/06/15 00:15:08 rodent Exp $
 
---- lib/ansible/callbacks.py.orig	2013-11-19 19:12:32.000000000 +0000
+Fix hardcoded paths to be replaced with SUBST framework.
+
+--- lib/ansible/callbacks.py.orig	2014-06-09 21:23:31.000000000 +0000
 +++ lib/ansible/callbacks.py
 @@ -55,9 +55,9 @@ def get_cowsay_info():
          cowsay = "/usr/bin/cowsay"
      elif os.path.exists("/usr/games/cowsay"):
          cowsay = "/usr/games/cowsay"
 -    elif os.path.exists("/usr/local/bin/cowsay"):
-+    elif os.path.exists("@LOCALBASE@/bin/cowsay"):
++    elif os.path.exists("@PREFIX@/bin/cowsay"):
          # BSD path for cowsay
 -        cowsay = "/usr/local/bin/cowsay"
-+        cowsay = "@LOCALBASE@/bin/cowsay"
++        cowsay = "@PREFIX@/bin/cowsay"
      elif os.path.exists("/opt/local/bin/cowsay"):
          # MacPorts path for cowsay
          cowsay = "/opt/local/bin/cowsay"
diff --git a/sysutils/ansible/patches/patch-lib_ansible_constants.py b/sysutils/ansible/patches/patch-lib_ansible_constants.py
index 546544cf2be..d6608594f80 100644
--- a/sysutils/ansible/patches/patch-lib_ansible_constants.py
+++ b/sysutils/ansible/patches/patch-lib_ansible_constants.py
@@ -1,17 +1,19 @@
-$NetBSD: patch-lib_ansible_constants.py,v 1.4 2013/12/02 22:54:46 hubertf Exp $
+$NetBSD: patch-lib_ansible_constants.py,v 1.5 2014/06/15 00:15:08 rodent Exp $
 
---- lib/ansible/constants.py.orig	2013-11-19 19:12:32.000000000 +0000
+Fix hardcoded paths to be replaced with SUBST framework.
+
+--- lib/ansible/constants.py.orig	2014-06-09 21:23:31.000000000 +0000
 +++ lib/ansible/constants.py
-@@ -59,7 +59,7 @@ def load_config_file():
-     p = ConfigParser.ConfigParser()
+@@ -65,7 +65,7 @@ def load_config_file():
+         path0 = os.path.expanduser(path0)
      path1 = os.getcwd() + "/ansible.cfg"
-     path2 = os.path.expanduser(os.environ.get('ANSIBLE_CONFIG', "~/.ansible.cfg"))
+     path2 = os.path.expanduser("~/.ansible.cfg")
 -    path3 = "/etc/ansible/ansible.cfg"
 +    path3 = "@PKG_SYSCONFDIR@/ansible/ansible.cfg"
  
-     if os.path.exists(path1):
-         p.read(path1)
-@@ -88,7 +88,7 @@ if getattr(sys, "real_prefix", None):
+     for path in [path0, path1, path2, path3]:
+         if path is not None and os.path.exists(path):
+@@ -90,7 +90,7 @@ if getattr(sys, "real_prefix", None):
      # in a virtualenv
      DIST_MODULE_PATH = os.path.join(sys.prefix, 'share/ansible/')
  else:
@@ -19,19 +21,19 @@ $NetBSD: patch-lib_ansible_constants.py,v 1.4 2013/12/02 22:54:46 hubertf Exp $
 +    DIST_MODULE_PATH = '@PREFIX@/share/ansible/'
  
  # check all of these extensions when looking for yaml files for things like
- # group variables
-@@ -98,7 +98,7 @@ YAML_FILENAME_EXTENSIONS = [ "", ".yml",
+ # group variables -- really anything we can load
+@@ -100,7 +100,7 @@ YAML_FILENAME_EXTENSIONS = [ "", ".yml",
  DEFAULTS='defaults'
  
  # configurable things
 -DEFAULT_HOST_LIST         = shell_expand_path(get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', '/etc/ansible/hosts'))
 +DEFAULT_HOST_LIST         = shell_expand_path(get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', '@PKG_SYSCONFDIR@/ansible/hosts'))
  DEFAULT_MODULE_PATH       = get_config(p, DEFAULTS, 'library',          'ANSIBLE_LIBRARY',          DIST_MODULE_PATH)
- DEFAULT_ROLES_PATH        = get_config(p, DEFAULTS, 'roles_path',       'ANSIBLE_ROLES_PATH',       None)
+ DEFAULT_ROLES_PATH        = get_config(p, DEFAULTS, 'roles_path',       'ANSIBLE_ROLES_PATH',       '/etc/ansible/roles')
  DEFAULT_REMOTE_TMP        = shell_expand_path(get_config(p, DEFAULTS, 'remote_tmp',       'ANSIBLE_REMOTE_TEMP',      '$HOME/.ansible/tmp'))
-@@ -128,12 +128,12 @@ DEFAULT_LEGACY_PLAYBOOK_VARIABLES = get_
- DEFAULT_JINJA2_EXTENSIONS = get_config(p, DEFAULTS, 'jinja2_extensions', 'ANSIBLE_JINJA2_EXTENSIONS', None)
- DEFAULT_EXECUTABLE        = get_config(p, DEFAULTS, 'executable', 'ANSIBLE_EXECUTABLE', '/bin/sh')
+@@ -136,12 +136,12 @@ DEFAULT_SU_USER = get_config(p, DEFAULTS
+ DEFAULT_ASK_SU_PASS = get_config(p, DEFAULTS, 'ask_su_pass', 'ANSIBLE_ASK_SU_PASS', False, boolean=True)
+ DEFAULT_GATHERING = get_config(p, DEFAULTS, 'gathering', 'ANSIBLE_GATHERING', 'implicit').lower()
  
 -DEFAULT_ACTION_PLUGIN_PATH     = get_config(p, DEFAULTS, 'action_plugins',     'ANSIBLE_ACTION_PLUGINS', '/usr/share/ansible_plugins/action_plugins')
 -DEFAULT_CALLBACK_PLUGIN_PATH   = get_config(p, DEFAULTS, 'callback_plugins',   'ANSIBLE_CALLBACK_PLUGINS', '/usr/share/ansible_plugins/callback_plugins')
@@ -47,4 +49,4 @@ $NetBSD: patch-lib_ansible_constants.py,v 1.4 2013/12/02 22:54:46 hubertf Exp $
 +DEFAULT_FILTER_PLUGIN_PATH     = get_config(p, DEFAULTS, 'filter_plugins',     'ANSIBLE_FILTER_PLUGINS', '@PREFIX@/share/ansible_plugins/filter_plugins')
  DEFAULT_LOG_PATH               = shell_expand_path(get_config(p, DEFAULTS, 'log_path',           'ANSIBLE_LOG_PATH', ''))
  
- ANSIBLE_NOCOLOR                = get_config(p, DEFAULTS, 'nocolor', 'ANSIBLE_NOCOLOR', None, boolean=True)
+ ANSIBLE_FORCE_COLOR            = get_config(p, DEFAULTS, 'force_color', 'ANSIBLE_FORCE_COLOR', None, boolean=True)
diff --git a/sysutils/ansible/patches/patch-library-system-ping b/sysutils/ansible/patches/patch-library-system-ping
index 709a10d7d9e..eadcd7a5174 100644
--- a/sysutils/ansible/patches/patch-library-system-ping
+++ b/sysutils/ansible/patches/patch-library-system-ping
@@ -1,6 +1,8 @@
-$NetBSD: patch-library-system-ping,v 1.1 2013/12/02 22:54:46 hubertf Exp $
+$NetBSD: patch-library-system-ping,v 1.2 2014/06/15 00:15:08 rodent Exp $
 
---- library/system/ping.orig	2013-11-19 19:12:32.000000000 +0000
+Fix hardcoded paths to be replaced with SUBST framework.
+
+--- library/system/ping.orig	2014-06-09 21:23:31.000000000 +0000
 +++ library/system/ping
 @@ -27,7 +27,7 @@ short_description: Try to connect to hos
  description:
diff --git a/sysutils/ansible/patches/patch-library_database_riak b/sysutils/ansible/patches/patch-library_database_riak
index bc03fa3f0c2..8b1ac7ace31 100644
--- a/sysutils/ansible/patches/patch-library_database_riak
+++ b/sysutils/ansible/patches/patch-library_database_riak
@@ -1,8 +1,10 @@
-$NetBSD: patch-library_database_riak,v 1.1 2013/12/02 22:54:46 hubertf Exp $
+$NetBSD: patch-library_database_riak,v 1.2 2014/06/15 00:15:08 rodent Exp $
 
---- library/database/riak.orig	2013-09-13 20:37:23.000000000 +0000
+Fix hardcoded paths to be replaced with SUBST framework.
+
+--- library/database/riak.orig	2014-06-09 21:23:31.000000000 +0000
 +++ library/database/riak
-@@ -110,7 +110,7 @@ def main():
+@@ -118,7 +118,7 @@ def main():
          argument_spec=dict(
          command=dict(required=False, default=None, choices=[
                      'ping', 'kv_test', 'join', 'plan', 'commit']),
diff --git a/sysutils/ansible/patches/patch-library_monitoring_nagios b/sysutils/ansible/patches/patch-library_monitoring_nagios
index 9769b563755..b1da9279af0 100644
--- a/sysutils/ansible/patches/patch-library_monitoring_nagios
+++ b/sysutils/ansible/patches/patch-library_monitoring_nagios
@@ -1,6 +1,8 @@
-$NetBSD: patch-library_monitoring_nagios,v 1.1 2013/12/02 22:54:46 hubertf Exp $
+$NetBSD: patch-library_monitoring_nagios,v 1.2 2014/06/15 00:15:08 rodent Exp $
 
---- library/monitoring/nagios.orig	2013-08-22 02:50:24.000000000 +0000
+Fix hardcoded paths to be replaced with SUBST framework.
+
+--- library/monitoring/nagios.orig	2014-06-09 21:23:31.000000000 +0000
 +++ library/monitoring/nagios
 @@ -125,6 +125,8 @@ import os.path
  
diff --git a/sysutils/ansible/patches/patch-library_packaging_pkgin b/sysutils/ansible/patches/patch-library_packaging_pkgin
index b5f5d36a5ff..907b3a15086 100644
--- a/sysutils/ansible/patches/patch-library_packaging_pkgin
+++ b/sysutils/ansible/patches/patch-library_packaging_pkgin
@@ -1,13 +1,15 @@
-$NetBSD: patch-library_packaging_pkgin,v 1.1 2013/12/02 22:54:46 hubertf Exp $
+$NetBSD: patch-library_packaging_pkgin,v 1.2 2014/06/15 00:15:08 rodent Exp $
 
---- library//packaging/pkgin.orig	2013-08-22 02:50:24.000000000 +0000
-+++ library//packaging/pkgin
+Fix hardcoded paths to be replaced with SUBST framework.
+
+--- library/packaging/pkgin.orig	2014-06-09 21:23:31.000000000 +0000
++++ library/packaging/pkgin
 @@ -150,7 +150,7 @@ def main():
                  state        = dict(default="present", choices=["present","absent"]),
                  name         = dict(aliases=["pkg"], required=True)))
  
 -    pkgin_path = module.get_bin_path('pkgin', True, ['/opt/local/bin'])
-+    pkgin_path = module.get_bin_path('pkgin', True, ['@LOCALBASE@/bin'])
++    pkgin_path = module.get_bin_path('pkgin', True, ['@PREFIX@/bin'])
  
      p = module.params
  
diff --git a/sysutils/ansible/patches/patch-library_system_setup b/sysutils/ansible/patches/patch-library_system_setup
index b3ced979fe8..66e821f0c8d 100644
--- a/sysutils/ansible/patches/patch-library_system_setup
+++ b/sysutils/ansible/patches/patch-library_system_setup
@@ -1,22 +1,15 @@
-$NetBSD: patch-library_system_setup,v 1.1 2013/12/02 22:54:46 hubertf Exp $
+$NetBSD: patch-library_system_setup,v 1.2 2014/06/15 00:15:08 rodent Exp $
 
---- library/system/setup.orig	2013-11-19 19:12:32.000000000 +0000
+Fix hardcoded paths to be replaced with SUBST framework.
+
+--- library/system/setup.orig	2014-06-09 21:23:31.000000000 +0000
 +++ library/system/setup
-@@ -58,7 +58,7 @@ options:
+@@ -42,7 +42,7 @@ options:
  description:
       - This module is automatically called by playbooks to gather useful
         variables about remote hosts that can be used in playbooks. It can also be
 -       executed directly by C(/usr/bin/ansible) to check what variables are
-+       executed directly by C(@LOCALBASE@/bin/ansible) to check what variables are
++       executed directly by C(@PREFIX@/bin/ansible) to check what variables are
         available to a host. Ansible provides many I(facts) about the system,
         automatically.
  notes:
-@@ -129,7 +129,7 @@ class Facts(object):
-                  { 'path' : '/usr/sbin/urpmi',      'name' : 'urpmi' },
-                  { 'path' : '/usr/bin/pacman',      'name' : 'pacman' },
-                  { 'path' : '/bin/opkg',            'name' : 'opkg' },
--                 { 'path' : '/opt/local/bin/pkgin', 'name' : 'pkgin' },
-+                 { 'path' : '@LOCALBASE@/bin/pkgin', 'name' : 'pkgin' },
-                  { 'path' : '/opt/local/bin/port',  'name' : 'macports' },
-                  { 'path' : '/sbin/apk',            'name' : 'apk' },
-                  { 'path' : '/usr/sbin/pkg',        'name' : 'pkgng' },
author	rodent <rodent@pkgsrc.org>	2014-06-15 00:15:08 +0000
committer	rodent <rodent@pkgsrc.org>	2014-06-15 00:15:08 +0000
commit	9b220faf76a7b9629e168809a1b330feb6165ddf (patch)
tree	2edce319d9413c941a557f4b027ee7766f3253ad /sysutils/ansible
parent	76b98a060652e92c39049a259995b0c64a668455 (diff)
download	pkgsrc-9b220faf76a7b9629e168809a1b330feb6165ddf.tar.gz