3 files changed, 42 insertions, 37 deletions

diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile
index 3f49c66d4053..7652237ce859 100644
--- a/sysutils/ansible/Makefile
+++ b/sysutils/ansible/Makefile
@@ -30,10 +30,7 @@ USES=		shebangfix
 SHEBANG_FILES=	${WRKSRC}/library/*/*
 
 SUB_FILES=	pkg-message
-PORTEXAMPLES=	*
-MAN1=	ansible-doc.1 ansible-playbook.1 ansible-pull.1 ansible.1
 
-NO_STAGE=	yes
 post-patch-script:
 	@${REINPLACE_CMD} -e "s|/etc/ansible|${ETCDIR}|" \
 		${WRKSRC}/docs/man/man1/ansible-playbook.1 \
@@ -57,14 +54,15 @@ pre-install-script:
 .include <bsd.port.options.mk>
 
 post-install:
-	@${MKDIR} ${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/docs/man/man1/,} \
-		${MAN1PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/man/man1/*.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${RM} ${WRKSRC}/examples/*.bak
 	(cd ${WRKSRC}/examples/ && \
-		${COPYTREE_SHARE} \* ${EXAMPLESDIR})
+		${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
 	@${CAT} ${PKGMESSAGE}
 .endif
 
diff --git a/sysutils/ansible/files/pkg-message.in b/sysutils/ansible/files/pkg-message.in
index c86c177f19b1..9f26363a7e50 100644
--- a/sysutils/ansible/files/pkg-message.in
+++ b/sysutils/ansible/files/pkg-message.in
@@ -1,13 +1,11 @@
 
-To use ansible, you need at least a host database.
-You can find a sample host database file in
+To use Ansible, you need at least a host database.
+If you installed examples, you will have a sample
+host database and a sample configuration file: 
 
   %%EXAMPLESDIR%%/hosts
-
-You can also find a sample configuration file in
-
   %%EXAMPLESDIR%%/ansible.cfg
 
-Ansible 1.3.0, includes "accelerate" mode, which is
+Ansible 1.3.0+, includes "accelerate" mode, which is
 faster and has fewer dependencies than "fireball" mode.
 To use it, install security/py-keyczar.
diff --git a/sysutils/ansible/pkg-plist b/sysutils/ansible/pkg-plist
index 9d89dab49607..d7b9d6848ba4 100644
--- a/sysutils/ansible/pkg-plist
+++ b/sysutils/ansible/pkg-plist
@@ -2,6 +2,10 @@ bin/ansible
 bin/ansible-doc
 bin/ansible-playbook
 bin/ansible-pull
+man/man1/ansible-doc.1.gz
+man/man1/ansible-playbook.1.gz
+man/man1/ansible-pull.1.gz
+man/man1/ansible.1.gz
 %%PYTHON_SITELIBDIR%%/ansible/__init__.py
 %%PYTHON_SITELIBDIR%%/ansible/__init__.pyc
 %%PYTHON_SITELIBDIR%%/ansible/__init__.pyo
@@ -348,31 +352,36 @@ bin/ansible-pull
 %%DATADIR%%/web_infrastructure/django_manage
 %%DATADIR%%/web_infrastructure/htpasswd
 %%DATADIR%%/web_infrastructure/supervisorctl
-@dirrm %%DATADIR%%/cloud
-@dirrm %%DATADIR%%/commands
-@dirrm %%DATADIR%%/database
-@dirrm %%DATADIR%%/files
-@dirrm %%DATADIR%%/internal
-@dirrm %%DATADIR%%/inventory
-@dirrm %%DATADIR%%/messaging
-@dirrm %%DATADIR%%/monitoring
-@dirrm %%DATADIR%%/net_infrastructure
-@dirrm %%DATADIR%%/network
-@dirrm %%DATADIR%%/notification
-@dirrm %%DATADIR%%/packaging
-@dirrm %%DATADIR%%/source_control
-@dirrm %%DATADIR%%/system
-@dirrm %%DATADIR%%/utilities
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ansible.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hosts
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/playbooks/README.md
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/playbooks
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%/web_infrastructure
+@dirrm %%DATADIR%%/utilities
+@dirrm %%DATADIR%%/system
+@dirrm %%DATADIR%%/source_control
+@dirrm %%DATADIR%%/packaging
+@dirrm %%DATADIR%%/notification
+@dirrm %%DATADIR%%/network
+@dirrm %%DATADIR%%/net_infrastructure
+@dirrm %%DATADIR%%/monitoring
+@dirrm %%DATADIR%%/messaging
+@dirrm %%DATADIR%%/inventory
+@dirrm %%DATADIR%%/internal
+@dirrm %%DATADIR%%/files
+@dirrm %%DATADIR%%/database
+@dirrm %%DATADIR%%/commands
+@dirrm %%DATADIR%%/cloud
 @dirrm %%DATADIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/ansible/callback_plugins
-@dirrm %%PYTHON_SITELIBDIR%%/ansible/inventory/vars_plugins
-@dirrm %%PYTHON_SITELIBDIR%%/ansible/inventory
-@dirrm %%PYTHON_SITELIBDIR%%/ansible/playbook
-@dirrm %%PYTHON_SITELIBDIR%%/ansible/runner/action_plugins
-@dirrm %%PYTHON_SITELIBDIR%%/ansible/runner/connection_plugins
-@dirrm %%PYTHON_SITELIBDIR%%/ansible/runner/filter_plugins
+@dirrm %%PYTHON_SITELIBDIR%%/ansible/utils
 @dirrm %%PYTHON_SITELIBDIR%%/ansible/runner/lookup_plugins
+@dirrm %%PYTHON_SITELIBDIR%%/ansible/runner/filter_plugins
+@dirrm %%PYTHON_SITELIBDIR%%/ansible/runner/connection_plugins
+@dirrm %%PYTHON_SITELIBDIR%%/ansible/runner/action_plugins
 @dirrm %%PYTHON_SITELIBDIR%%/ansible/runner
-@dirrm %%PYTHON_SITELIBDIR%%/ansible/utils
+@dirrm %%PYTHON_SITELIBDIR%%/ansible/playbook
+@dirrm %%PYTHON_SITELIBDIR%%/ansible/inventory/vars_plugins
+@dirrm %%PYTHON_SITELIBDIR%%/ansible/inventory
+@dirrm %%PYTHON_SITELIBDIR%%/ansible/callback_plugins
 @dirrm %%PYTHON_SITELIBDIR%%/ansible