From owner-dev-commits-ports-main@freebsd.org Mon May 17 14:58:21 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1492964AC30; Mon, 17 May 2021 14:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FkMhF00RCz3jC7; Mon, 17 May 2021 14:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D8A686286; Mon, 17 May 2021 14:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14HEwKXa045366; Mon, 17 May 2021 14:58:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14HEwKv2045365; Mon, 17 May 2021 14:58:20 GMT (envelope-from git) Date: Mon, 17 May 2021 14:58:20 GMT Message-Id: <202105171458.14HEwKv2045365@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: c79d85333a9a - main - sysutils/ansible: Switch to USES=ansible MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c79d85333a9a9891b040fcd9ccb6fd5c6e271299 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2021 14:58:21 -0000 The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=c79d85333a9a9891b040fcd9ccb6fd5c6e271299 commit c79d85333a9a9891b040fcd9ccb6fd5c6e271299 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-05-17 14:31:41 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-05-17 14:58:19 +0000 sysutils/ansible: Switch to USES=ansible --- sysutils/ansible/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index ea0df08d9a5d..392148684466 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ansible-base>0:sysutils/py-ansible-base@${PY_FLAVOR} -USES= cpe python:3.6+ shebangfix +USES= ansible:env cpe python:3.6+ shebangfix CPE_VENDOR= redhat USE_PYTHON= autoplist concurrent distutils @@ -39,8 +39,13 @@ _ANSIBLE_PACKAGES+= ${PYTHON_PKGNAMEPREFIX}ansible${version}-* post-patch: ${FIND} ${WRKSRC} -type f -exec ${GREP} --null -El '(/etc/ansible|/usr/share/ansible)' {} + | ${XARGS} -n 500 -0 ${REINPLACE_CMD} \ - -e 's|/etc/ansible|${ETCDIR:S/${PY_FLAVOR}-//}|g' \ + -e 's|/etc/ansible|${ETCDIR}|g' \ -e 's|/usr/share/ansible|${DATADIR}|g' ${FIND} ${WRKSRC} -type f -name "*.bak" -delete .include + +# Make sure that we override the unique DATADIR and ETCDIR set +# by the implicit USES=uniquefiles. +DATADIR= ${ANSIBLE_DATADIR} +ETCDIR= ${ANSIBLE_ETCDIR}