From owner-svn-ports-all@FreeBSD.ORG Wed Sep 25 14:08:59 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C8673976; Wed, 25 Sep 2013 14:08:59 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A60A3286E; Wed, 25 Sep 2013 14:08:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8PE8xvE009512; Wed, 25 Sep 2013 14:08:59 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8PE8xHC009509; Wed, 25 Sep 2013 14:08:59 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201309251408.r8PE8xHC009509@svn.freebsd.org> From: Dmitry Marakasov Date: Wed, 25 Sep 2013 14:08:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328294 - in head/sysutils/ansible: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Sep 2013 14:08:59 -0000 Author: amdmi3 Date: Wed Sep 25 14:08:58 2013 New Revision: 328294 URL: http://svnweb.freebsd.org/changeset/ports/328294 Log: - Support staging - Reword pkg-message PR: 182335 Submitted by: Nikolai Lifanov (maintainer) Modified: head/sysutils/ansible/Makefile head/sysutils/ansible/files/pkg-message.in head/sysutils/ansible/pkg-plist Modified: head/sysutils/ansible/Makefile ============================================================================== --- head/sysutils/ansible/Makefile Wed Sep 25 14:03:58 2013 (r328293) +++ head/sysutils/ansible/Makefile Wed Sep 25 14:08:58 2013 (r328294) @@ -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 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 Modified: head/sysutils/ansible/files/pkg-message.in ============================================================================== --- head/sysutils/ansible/files/pkg-message.in Wed Sep 25 14:03:58 2013 (r328293) +++ head/sysutils/ansible/files/pkg-message.in Wed Sep 25 14:08:58 2013 (r328294) @@ -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. Modified: head/sysutils/ansible/pkg-plist ============================================================================== --- head/sysutils/ansible/pkg-plist Wed Sep 25 14:03:58 2013 (r328293) +++ head/sysutils/ansible/pkg-plist Wed Sep 25 14:08:58 2013 (r328294) @@ -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