From owner-dev-commits-ports-all@freebsd.org Thu May 13 09:45:00 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 16802638953; Thu, 13 May 2021 09:45:00 +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 4FgmwX07XSz4gSY; Thu, 13 May 2021 09:45:00 +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 EB83B1C638; Thu, 13 May 2021 09:44:59 +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 14D9ixHM062946; Thu, 13 May 2021 09:44:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14D9ixOP062945; Thu, 13 May 2021 09:44:59 GMT (envelope-from git) Date: Thu, 13 May 2021 09:44:59 GMT Message-Id: <202105130944.14D9ixOP062945@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: f551b6aff5e2 - main - sysutils/ansible: Clean up the port 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: f551b6aff5e2225fa41fb47a553a356cdf6a217b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 May 2021 09:45:00 -0000 The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=f551b6aff5e2225fa41fb47a553a356cdf6a217b commit f551b6aff5e2225fa41fb47a553a356cdf6a217b Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-05-13 09:32:51 +0000 Commit: Mateusz Piotrowski <0mp@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 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: <