git: fd7b3642ab89 - main - sysutils/ansible: Sort variables

[Mateusz Piotrowski]

The branch main has been updated by 0mp:

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

commit fd7b3642ab89b46a438882c2db7a206af8d410f8
Author:     Mateusz Piotrowski <0mp at FreeBSD.org>
AuthorDate: 2021-05-05 09:03:44 +0000
Commit:     Mateusz Piotrowski <0mp at 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