git: f551b6aff5e2 - main - sysutils/ansible: Clean up the port

Mateusz Piotrowski 0mp at FreeBSD.org
Thu May 13 09:45:00 UTC 2021


The branch main has been updated by 0mp:

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

commit f551b6aff5e2225fa41fb47a553a356cdf6a217b
Author:     Mateusz Piotrowski <0mp at FreeBSD.org>
AuthorDate: 2021-05-13 09:32:51 +0000
Commit:     Mateusz Piotrowski <0mp at FreeBSD.org>
CommitDate: 2021-05-13 09:45:00 +0000

    sysutils/ansible: Clean up the port
    
    These parts of the port are no longer needed.
    
    - The dependencies are all provided by sysutils/py-ansible-base.
    - USES=gmake was only necessary for the test target.
    - pkg-message is gone as this port no longer installs any examples.
---
 sysutils/ansible/Makefile             | 22 +++-------------------
 sysutils/ansible/files/pkg-message.in | 14 --------------
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile
index a54f8968c5c0..492dfbd1d2e7 100644
--- a/sysutils/ansible/Makefile
+++ b/sysutils/ansible/Makefile
@@ -10,15 +10,9 @@ COMMENT=	Radically simple IT automation
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible-base>0:sysutils/py-ansible-base@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
-
-USES=		cpe gmake python:3.6+ shebangfix
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible-base>0:sysutils/py-ansible-base@${PY_FLAVOR}
+
+USES=		cpe python:3.6+ shebangfix
 CPE_VENDOR=	redhat
 USE_PYTHON=	autoplist concurrent distutils
 
@@ -32,8 +26,6 @@ SHEBANG_GLOB=	*.py *.sh
 CONFLICTS_INSTALL=	${_ANSIBLE_PACKAGES:N${PKGBASE}-*}
 
 NO_ARCH=	yes
-SUB_FILES=	pkg-message
-SUB_LIST=	PYTHON_PKGNAMEPREFIX=${PYTHON_PKGNAMEPREFIX}
 
 _ANSIBLE_VERSIONS=	1 2 23 24 25 26 27 28
 _ANSIBLE_PACKAGES=	${PYTHON_PKGNAMEPREFIX}ansible-*
@@ -41,18 +33,10 @@ _ANSIBLE_PACKAGES=	${PYTHON_PKGNAMEPREFIX}ansible-*
 _ANSIBLE_PACKAGES+=	${PYTHON_PKGNAMEPREFIX}ansible${version}-*
 .endfor
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
 post-patch:
 	${FIND} ${WRKSRC} -type f -exec grep --null -El '(/etc/ansible|/usr/share/ansible)' | ${XARGS} -0 ${REINPLACE_CMD} \
 		-e 's|/etc/ansible|${ETCDIR:S/${PY_FLAVOR}-//}|g' \
 		-e 's|/usr/share/ansible|${DATADIR}|g'
 	${FIND} ${WRKSRC} -type f -name "*.bak" -delete
 
-post-stage:
-	${FIND} ${STAGEDIR}${PREFIX}/bin -type l -name ansible-\* -lname ansible \
-		-execdir ${RLN} ansible-${PYTHON_VER} {} \;
-# python autoplist doesn't add this file in plist
-	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ansible_test/_data/injector/ansible-inventory
-
 .include <bsd.port.mk>
diff --git a/sysutils/ansible/files/pkg-message.in b/sysutils/ansible/files/pkg-message.in
deleted file mode 100644
index 3c6f3c49ae6e..000000000000
--- a/sysutils/ansible/files/pkg-message.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-{
-message: <<EOD
-To use Ansible, you need at least a host database.
-If you installed examples, you will have a sample
-inventory and a sample configuration file:
-
-  %%EXAMPLESDIR%%/hosts
-  %%EXAMPLESDIR%%/ansible.cfg
-
-EOD
-type: install
-}
-]


More information about the dev-commits-ports-all mailing list