After some discussion with ansible folks, don't replace the interpreter

in modules (the files in ${WRKSRC}/library), as they're treated as
data and not scripts - the right thing to do is to set
"ansible_python_interpreter" in the configuration.

Also, install example files in ${PREFIX}/share/examples/ansible.

2 files changed, 58 insertions, 4 deletions

diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile
index 8039adcde80..07ddd4db425 100644
--- a/sysutils/ansible/Makefile
+++ b/sysutils/ansible/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/02/26 17:42:59 riz Exp $
+# $NetBSD: Makefile,v 1.3 2013/02/26 20:11:02 riz Exp $
 #
 
 DISTNAME=	ansible-1.0
@@ -10,11 +10,11 @@ HOMEPAGE=	http://ansible.cc/
 COMMENT=	SSH-based configuration management, deployment, and task execution system
 LICENSE=	gnu-gpl-v3
 
+EGDIR=		${PREFIX}/share/examples/ansible
+
 #USE_LANGUAGES=	# none
 USE_TOOLS+=	gmake
 
-REPLACE_PYTHON+=library/*
-
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	docs/man/man1/ansible-playbook.1
@@ -49,6 +49,9 @@ DEPENDS+=		${PYPKGPREFIX}-paramiko-[0-9]*:../../security/py-paramiko
 DEPENDS+=		${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man3
+INSTALLATION_DIRS+=	${PKG_SYSCONFDIR}/ansible ${EGDIR}/playbooks
+
+CHECK_INTERPRETER_SKIP=	share/ansible/*
 
 pre-install:
 	find ${WRKSRC} -name \*.orig -exec rm {} \;
@@ -60,6 +63,20 @@ post-install:
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/docs/man/man3/* \
 	    ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/
+.for f in ansible.cfg hosts
+	${INSTALL_DATA} ${WRKSRC}/examples/$f \
+	    ${DESTDIR}/${EGDIR}
+.endfor
+	${INSTALL_DATA_DIR} ${DESTDIR}/${EGDIR}/playbooks
+	for f in ${WRKSRC}/examples/playbooks/*.yml; do \
+		${INSTALL_DATA} $$f ${DESTDIR}/${EGDIR}/playbooks; \
+	done
+.for f in filter_plugins handlers tasks templates vars
+	${INSTALL_DATA_DIR} ${DESTDIR}/${EGDIR}/playbooks/$f
+	for g in ${WRKSRC}/examples/playbooks/$f/*; do \
+	    ${INSTALL_DATA} $$g ${DESTDIR}/${EGDIR}/playbooks/$f; \
+	done
+.endfor
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
diff --git a/sysutils/ansible/PLIST b/sysutils/ansible/PLIST
index b5a13dcba3f..cb5d156737e 100644
--- a/sysutils/ansible/PLIST
+++ b/sysutils/ansible/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/02/26 17:42:59 riz Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/02/26 20:11:02 riz Exp $
 bin/ansible
 bin/ansible-doc
 bin/ansible-playbook
@@ -295,3 +295,40 @@ share/ansible/user
 share/ansible/virt
 share/ansible/wait_for
 share/ansible/yum
+share/examples/ansible/ansible.cfg
+share/examples/ansible/hosts
+share/examples/ansible/playbooks/ansible_pull.yml
+share/examples/ansible/playbooks/batch_size_control.yml
+share/examples/ansible/playbooks/conditionals_part1.yml
+share/examples/ansible/playbooks/conditionals_part2.yml
+share/examples/ansible/playbooks/conditionals_part3.yml
+share/examples/ansible/playbooks/custom_filters.yml
+share/examples/ansible/playbooks/delegation.yml
+share/examples/ansible/playbooks/file_secontext.yml
+share/examples/ansible/playbooks/filter_plugins/custom_plugins.py
+share/examples/ansible/playbooks/get_url.yml
+share/examples/ansible/playbooks/group_by.yml
+share/examples/ansible/playbooks/group_commands.yml
+share/examples/ansible/playbooks/handlers/handlers.yml
+share/examples/ansible/playbooks/intermediate_example.yml
+share/examples/ansible/playbooks/intro_example.yml
+share/examples/ansible/playbooks/loop_plugins.yml
+share/examples/ansible/playbooks/loop_with_items.yml
+share/examples/ansible/playbooks/mysql.yml
+share/examples/ansible/playbooks/nested_playbooks.yml
+share/examples/ansible/playbooks/postgresql.yml
+share/examples/ansible/playbooks/prompts.yml
+share/examples/ansible/playbooks/register_logic.yml
+share/examples/ansible/playbooks/selective_file_sources.yml
+share/examples/ansible/playbooks/tags.yml
+share/examples/ansible/playbooks/tasks/base.yml
+share/examples/ansible/playbooks/templates/custom-filters.j2
+share/examples/ansible/playbooks/templates/etc_cron.d_ansible-pull.j2
+share/examples/ansible/playbooks/templates/etc_logrotate.d_ansible-pull.j2
+share/examples/ansible/playbooks/templates/foo.j2
+share/examples/ansible/playbooks/templates/hostvars.j2
+share/examples/ansible/playbooks/user_commands.yml
+share/examples/ansible/playbooks/vars/CentOS.yml
+share/examples/ansible/playbooks/vars/defaults.yml
+share/examples/ansible/playbooks/vars/external_vars.yml
+@pkgdir etc/ansible