From lifanov@mail.lifanov.com  Mon Sep 23 21:20:04 2013
Return-Path: <lifanov@mail.lifanov.com>
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 1129FA25
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 23 Sep 2013 21:20:04 +0000 (UTC)
	(envelope-from lifanov@mail.lifanov.com)
Received: from mail.lifanov.com (mail.lifanov.com [206.125.175.12])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id F3E202A79
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 23 Sep 2013 21:20:03 +0000 (UTC)
Received: by mail.lifanov.com (Postfix, from userid 1001)
	id 2C5EF1A536A; Mon, 23 Sep 2013 21:20:03 +0000 (UTC)
Message-Id: <20130923212003.2C5EF1A536A@mail.lifanov.com>
Date: Mon, 23 Sep 2013 21:20:03 +0000 (UTC)
From: Nikolai Lifanov <lifanov@mail.lifanov.com>
Reply-To: Nikolai Lifanov <lifanov@mail.lifanov.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer] [patch] [stagedir] sysutils/ansible
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         182335
>Category:       ports
>Synopsis:       [maintainer] [patch] [stagedir] sysutils/ansible
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    amdmi3
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 23 21:30:00 UTC 2013
>Closed-Date:    Wed Sep 25 14:09:00 UTC 2013
>Last-Modified:  Wed Sep 25 14:10:00 UTC 2013
>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@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%%
+@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
--- patch.txt ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->amdmi3 
Responsible-Changed-By: amdmi3 
Responsible-Changed-When: Wed Sep 25 04:33:19 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182335 
State-Changed-From-To: open->closed 
State-Changed-By: amdmi3 
State-Changed-When: Wed Sep 25 14:08:59 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182335 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182335: commit references a PR
Date: Wed, 25 Sep 2013 14:09:07 +0000 (UTC)

 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 <lifanov@mail.lifanov.com> (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 <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
  
 
 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
