git: 33ac74eacd35 - main - sysutils/ansible-*: Switch to USES=ansibe

[Mateusz Piotrowski]

The branch main has been updated by 0mp:

URL: https://cgit.FreeBSD.org/ports/commit/?id=33ac74eacd3516301fe4b34cc535361cbadc6b88

commit 33ac74eacd3516301fe4b34cc535361cbadc6b88
Author:     Mateusz Piotrowski <0mp at FreeBSD.org>
AuthorDate: 2021-05-17 19:18:08 +0000
Commit:     Mateusz Piotrowski <0mp at FreeBSD.org>
CommitDate: 2021-05-17 19:58:11 +0000

    sysutils/ansible-*: Switch to USES=ansibe
    
    Approved by:    portmgr blanket (infrastructure changes)
---
 sysutils/ansible-iocage/Makefile  | 11 ++++-------
 sysutils/ansible-kld/Makefile     | 11 ++++-------
 sysutils/ansible-sshjail/Makefile | 13 +++++--------
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/sysutils/ansible-iocage/Makefile b/sysutils/ansible-iocage/Makefile
index 4a4347a8b340..28b26faf38ee 100644
--- a/sysutils/ansible-iocage/Makefile
+++ b/sysutils/ansible-iocage/Makefile
@@ -10,9 +10,7 @@ COMMENT=	Ansible module for iocage
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible>0:sysutils/ansible@${PY_FLAVOR}
-
-USES=		python shebangfix
+USES=		ansible:module python shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	fractalcells
 GH_TAGNAME=	0f0b5e6e5df45b653ed8c512207cb4cc2f58f82d
@@ -21,16 +19,15 @@ SHEBANG_FILES=	iocage
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-_ANSIBLE_MOD=	share/${PYTHON_PKGNAMEPREFIX}ansible/plugins/modules
-PLIST_FILES=	${_ANSIBLE_MOD}/iocage
+PLIST_FILES=	${ANSIBLE_MODULESDIR}/iocage
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${_ANSIBLE_MOD}
+	${MKDIR} ${STAGEDIR}${ANSIBLE_MODULESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/iocage \
-		${STAGEDIR}${PREFIX}/${_ANSIBLE_MOD}/iocage
+		${STAGEDIR}${ANSIBLE_MODULESDIR}/iocage
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/ansible-kld/Makefile b/sysutils/ansible-kld/Makefile
index c0809cc76b8f..e458b6bcba47 100644
--- a/sysutils/ansible-kld/Makefile
+++ b/sysutils/ansible-kld/Makefile
@@ -12,9 +12,7 @@ COMMENT?=	Ansible module to load kernel modules or update /boot/loader.conf
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible>0:sysutils/ansible@${PY_FLAVOR}
-
-USES=		python shebangfix
+USES=		ansible:module python shebangfix
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	dlundgren
@@ -26,13 +24,12 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 
 _LIBRARY?=	kld
-_ANSIBLE_MOD=	share/${PYTHON_PKGNAMEPREFIX}ansible/plugins/modules
 
-PLIST_FILES=	${_ANSIBLE_MOD}/${_LIBRARY}
+PLIST_FILES=	${ANSIBLE_MODULESDIR}/${_LIBRARY}
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${_ANSIBLE_MOD}
+	${MKDIR} ${STAGEDIR}${ANSIBLE_MODULESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/library/${_LIBRARY} \
-		${STAGEDIR}${PREFIX}/${_ANSIBLE_MOD}/${_LIBRARY}
+		${STAGEDIR}${ANSIBLE_MODULESDIR}/${_LIBRARY}
 
 .include <bsd.port.mk>
diff --git a/sysutils/ansible-sshjail/Makefile b/sysutils/ansible-sshjail/Makefile
index df39258e830b..44798c93cb14 100644
--- a/sysutils/ansible-sshjail/Makefile
+++ b/sysutils/ansible-sshjail/Makefile
@@ -9,9 +9,8 @@ COMMENT=	Ansible connector for remote jails
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible>0:sysutils/ansible@${PY_FLAVOR}
-
-USES=		python
+USES=		ansible:plugin python
+ANSIBLE_PLUGIN_TYPE=	connection
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	austinhyde
@@ -19,13 +18,11 @@ GH_ACCOUNT=	austinhyde
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-ANSIBLE_MOD=	share/${PYTHON_PKGNAMEPREFIX}ansible/plugins/connection
-
-PLIST_FILES=	${ANSIBLE_MOD}/sshjail.py
+PLIST_FILES=	${ANSIBLE_PLUGINSDIR}/sshjail.py
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${ANSIBLE_MOD}
+	${MKDIR} ${STAGEDIR}/${ANSIBLE_PLUGINSDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/sshjail.py \
-		${STAGEDIR}${PREFIX}/${ANSIBLE_MOD}/sshjail.py
+		${STAGEDIR}/${ANSIBLE_PLUGINSDIR}/sshjail.py
 
 .include <bsd.port.mk>