Date: Mon, 17 May 2021 14:58:20 GMT From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c79d85333a9a - main - sysutils/ansible: Switch to USES=ansible Message-ID: <202105171458.14HEwKv2045365@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk> + +# Make sure that we override the unique DATADIR and ETCDIR set +# by the implicit USES=uniquefiles. +DATADIR= ${ANSIBLE_DATADIR} +ETCDIR= ${ANSIBLE_ETCDIR}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105171458.14HEwKv2045365>