ports/182335: [maintainer] [patch] [stagedir] sysutils/ansible

[Nikolai Lifanov]

>Number:         182335
>Category:       ports
>Synopsis:       [maintainer] [patch] [stagedir] sysutils/ansible
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 23 21:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Nikolai Lifanov
>Release:        FreeBSD 9.1-RELEASE-p7 amd64
>Organization:
>Environment:
System: FreeBSD mail.lifanov.com 9.1-RELEASE-p7 FreeBSD 9.1-RELEASE-p7 #0: Mon Sep 9 21:34:37 UTC 2013 root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64

>Description:
	Please update sysutils/ansible with STAGEDIR support.

	This also includes a slightly re-worded pkg-message.
>How-To-Repeat:
	See the attached patch.

>Fix:

--- patch.txt begins here ---
Index: sysutils/ansible/Makefile
===================================================================
--- sysutils/ansible/Makefile	(revision 328048)
+++ sysutils/ansible/Makefile	(working copy)
@@ -30,10 +30,7 @@
 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 @@
 .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
 
Index: sysutils/ansible/files/pkg-message.in
===================================================================
--- sysutils/ansible/files/pkg-message.in	(revision 328048)
+++ sysutils/ansible/files/pkg-message.in	(working copy)
@@ -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.
Index: sysutils/ansible/pkg-plist
===================================================================
--- sysutils/ansible/pkg-plist	(revision 328048)
+++ sysutils/ansible/pkg-plist	(working copy)
@@ -2,6 +2,10 @@
 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 @@
 %%DATADIR%%/web_infrastructure/django_manage
 %%DATADIR%%/web_infrastructure/htpasswd
 %%DATADIR%%/web_infrastructure/supervisorctl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ansible.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hosts
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/playbooks/README.md
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/playbooks
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+ at dirrm %%DATADIR%%/web_infrastructure
+ at dirrm %%DATADIR%%/utilities
+ at dirrm %%DATADIR%%/system
+ at dirrm %%DATADIR%%/source_control
+ at dirrm %%DATADIR%%/packaging
+ at dirrm %%DATADIR%%/notification
+ at dirrm %%DATADIR%%/network
+ at dirrm %%DATADIR%%/net_infrastructure
+ at dirrm %%DATADIR%%/monitoring
+ at dirrm %%DATADIR%%/messaging
+ at dirrm %%DATADIR%%/inventory
+ at dirrm %%DATADIR%%/internal
+ at dirrm %%DATADIR%%/files
+ at dirrm %%DATADIR%%/database
+ at dirrm %%DATADIR%%/commands
 @dirrm %%DATADIR%%/cloud
- at dirrm %%DATADIR%%/commands
- at dirrm %%DATADIR%%/database
- at dirrm %%DATADIR%%/files
- at dirrm %%DATADIR%%/internal
- at dirrm %%DATADIR%%/inventory
- at dirrm %%DATADIR%%/messaging
- at dirrm %%DATADIR%%/monitoring
- at dirrm %%DATADIR%%/net_infrastructure
- at dirrm %%DATADIR%%/network
- at dirrm %%DATADIR%%/notification
- at dirrm %%DATADIR%%/packaging
- at dirrm %%DATADIR%%/source_control
- at dirrm %%DATADIR%%/system
- at dirrm %%DATADIR%%/utilities
- at dirrm %%DATADIR%%/web_infrastructure
 @dirrm %%DATADIR%%
- at dirrm %%PYTHON_SITELIBDIR%%/ansible/callback_plugins
+ at dirrm %%PYTHON_SITELIBDIR%%/ansible/utils
+ at dirrm %%PYTHON_SITELIBDIR%%/ansible/runner/lookup_plugins
+ at dirrm %%PYTHON_SITELIBDIR%%/ansible/runner/filter_plugins
+ at dirrm %%PYTHON_SITELIBDIR%%/ansible/runner/connection_plugins
+ at dirrm %%PYTHON_SITELIBDIR%%/ansible/runner/action_plugins
+ at dirrm %%PYTHON_SITELIBDIR%%/ansible/runner
+ at dirrm %%PYTHON_SITELIBDIR%%/ansible/playbook
 @dirrm %%PYTHON_SITELIBDIR%%/ansible/inventory/vars_plugins
 @dirrm %%PYTHON_SITELIBDIR%%/ansible/inventory
- at dirrm %%PYTHON_SITELIBDIR%%/ansible/playbook
- at dirrm %%PYTHON_SITELIBDIR%%/ansible/runner/action_plugins
- at dirrm %%PYTHON_SITELIBDIR%%/ansible/runner/connection_plugins
- at dirrm %%PYTHON_SITELIBDIR%%/ansible/runner/filter_plugins
- at dirrm %%PYTHON_SITELIBDIR%%/ansible/runner/lookup_plugins
- at dirrm %%PYTHON_SITELIBDIR%%/ansible/runner
- at dirrm %%PYTHON_SITELIBDIR%%/ansible/utils
+ at dirrm %%PYTHON_SITELIBDIR%%/ansible/callback_plugins
 @dirrm %%PYTHON_SITELIBDIR%%/ansible
--- patch.txt ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: