Attachment 136978 Details for Bug 182335 – patch.txt

patch.txt

patch.txt (text/plain), 4.69 KB, created by Nikolai Lifanov on 2013-09-23 22:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolai Lifanov

Created: 2013-09-23 22:30:00 UTC

Size: 4.69 KB

patch

obsolete

>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%%
>+@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%%/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
>-@dirrm %%DATADIR%%/web_infrastructure
> @dirrm %%DATADIR%%
>-@dirrm %%PYTHON_SITELIBDIR%%/ansible/callback_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/playbook
> @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/runner/lookup_plugins
>-@dirrm %%PYTHON_SITELIBDIR%%/ansible/runner
>-@dirrm %%PYTHON_SITELIBDIR%%/ansible/utils
>+@dirrm %%PYTHON_SITELIBDIR%%/ansible/callback_plugins
> @dirrm %%PYTHON_SITELIBDIR%%/ansible

Actions: View

Attachments on bug 182335: 136978