From owner-dev-commits-ports-main@freebsd.org Wed May 5 12:02:49 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 EBAC963C779; Wed, 5 May 2021 12:02:49 +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 4FZwMF6F7Jz3nRB; Wed, 5 May 2021 12:02:49 +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 C984F24924; Wed, 5 May 2021 12:02:49 +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 145C2nYe025590; Wed, 5 May 2021 12:02:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 145C2nWZ025589; Wed, 5 May 2021 12:02:49 GMT (envelope-from git) Date: Wed, 5 May 2021 12:02:49 GMT Message-Id: <202105051202.145C2nWZ025589@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: fd7b3642ab89 - main - sysutils/ansible: Sort variables 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: fd7b3642ab89b46a438882c2db7a206af8d410f8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2021 12:02:50 -0000 The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd7b3642ab89b46a438882c2db7a206af8d410f8 commit fd7b3642ab89b46a438882c2db7a206af8d410f8 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-05-05 09:03:44 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-05-05 12:01:57 +0000 sysutils/ansible: Sort variables --- sysutils/ansible/Makefile | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index ac96e3cc470a..0fca725e9a61 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -26,21 +26,9 @@ TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} -CONFLICTS?= ansible1-* \ - ansible23-* \ - ansible24-* \ - ansible25-* \ - ansible27-* \ - ansible26-* \ - ansible27-* \ - ansible28-* - -EXTRA_PATCHES?= - -NO_ARCH= yes USES?= cpe python:3.6+ shebangfix -USE_PYTHON= distutils autoplist concurrent CPE_VENDOR= ansibleworks +USE_PYTHON= distutils autoplist concurrent SHEBANG_FILES?= \ test/lib/ansible_test/_data/injector/python.py \ @@ -73,9 +61,22 @@ SHEBANG_FILES?= \ test/lib/ansible_test/_data/sanity/compile/compile.py \ test/lib/ansible_test/_data/sanity/validate-modules/main.py +CONFLICTS?= ansible1-* \ + ansible23-* \ + ansible24-* \ + ansible25-* \ + ansible27-* \ + ansible26-* \ + ansible27-* \ + ansible28-* + +EXTRA_PATCHES?= +NO_ARCH= yes SUB_FILES= pkg-message SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} +TEST_WRKSRC= ${WRKSRC}/test + PLIST_FILES?= man/man1/ansible-config.1.gz \ man/man1/ansible-console.1.gz \ man/man1/ansible-doc.1.gz \ @@ -85,7 +86,6 @@ PLIST_FILES?= man/man1/ansible-config.1.gz \ man/man1/ansible-pull.1.gz \ man/man1/ansible-vault.1.gz \ man/man1/ansible.1.gz - PORTEXAMPLES= ansible.cfg hosts OPTIONS_DEFINE= DOCS EXAMPLES @@ -112,8 +112,6 @@ post-stage: # python autoplist doesn't add this file in plist ${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ansible_test/_data/injector/ansible-inventory -TEST_WRKSRC=${WRKSRC}/test - do-test: # ${PYTHON_CMD} ${TEST_WRKSRC}/runner/ansible-test sanity --python ${PYTHON_VER} -v ${RM} ${TEST_WRKSRC}/units/modules/net_tools/test_nmcli.py # not conditional/doesn't work with nose