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 @@ -1,40 +1,37 @@ PORTNAME= ansible-iocage DISTVERSION= g20200327 PORTEPOCH= 1 CATEGORIES= sysutils PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= lcook@FreeBSD.org 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 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} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} \ ${STAGEDIR}${DOCSDIR} .include 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 @@ -1,38 +1,35 @@ PORTNAME= ansible DISTVERSION= g20200803 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= sysutils PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= -${_LIBRARY} MAINTAINER= lcook@FreeBSD.org 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 GH_PROJECT= ansible-freebsd-modules GH_TAGNAME= 537984b53018e36c2511132c3c66ac762f8b36dd SHEBANG_FILES= library/${_LIBRARY} 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 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 @@ -1,31 +1,28 @@ PORTNAME= ansible-sshjail DISTVERSIONPREFIX= v DISTVERSION= 1.1.0-30 DISTVERSIONSUFFIX= -g981674f CATEGORIES= sysutils MAINTAINER= madpilot@FreeBSD.org 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 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