Date: Wed, 5 May 2021 12:33:16 GMT From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 730c13e87ed4 - main - sysutils/ansible*: Clean up CONFLICTS Message-ID: <202105051233.145CXGRl064916@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=730c13e87ed4e749162865f51e2d3a0541ab628d commit 730c13e87ed4e749162865f51e2d3a0541ab628d Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-05-05 12:20:17 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-05-05 12:21:06 +0000 sysutils/ansible*: Clean up CONFLICTS --- sysutils/ansible/Makefile | 11 ++++++++--- sysutils/ansible27/Makefile | 10 +--------- sysutils/ansible28/Makefile | 9 +-------- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index 348d3ea482b7..e8e58264cbcc 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -1,6 +1,6 @@ PORTNAME= ansible PORTVERSION?= 2.9.7 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= sysutils python MASTER_SITES= http://releases.ansible.com/ansible/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -68,8 +68,7 @@ TEST_ARGS= VERSION=${PORTVERSION} \ TEST_ENV= PYTHON_VERSION=${PYTHON_VER} TEST_TARGET= tests -CONFLICTS?= ansible1-* ansible23-* ansible24-* ansible25-* ansible26-* \ - ansible27-* ansible28-* +CONFLICTS_INSTALL= ${_ANSIBLE_PACKAGES:N${PKGBASE}-*} EXTRA_PATCHES?= NO_ARCH= yes @@ -87,6 +86,12 @@ PLIST_FILES?= man/man1/ansible-config.1.gz \ man/man1/ansible.1.gz PORTEXAMPLES= ansible.cfg hosts +_ANSIBLE_VERSIONS= 1 23 24 25 26 27 28 +_ANSIBLE_PACKAGES= ${PYTHON_PKGNAMEPREFIX}ansible-* +.for version in ${_ANSIBLE_VERSIONS} +_ANSIBLE_PACKAGES+= ${PYTHON_PKGNAMEPREFIX}ansible${version}-* +.endfor + OPTIONS_DEFINE= DOCS EXAMPLES post-patch: diff --git a/sysutils/ansible27/Makefile b/sysutils/ansible27/Makefile index 4b4d92804d54..f506142684f3 100644 --- a/sysutils/ansible27/Makefile +++ b/sysutils/ansible27/Makefile @@ -1,15 +1,7 @@ PORTVERSION= 2.7.17 -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= 27 -CONFLICTS= ansible-* \ - ansible1-* \ - ansible23-* \ - ansible24-* \ - ansible25-* \ - ansible26-* \ - ansible28-* - MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo diff --git a/sysutils/ansible28/Makefile b/sysutils/ansible28/Makefile index cc9372c216ec..4b293430c3ad 100644 --- a/sysutils/ansible28/Makefile +++ b/sysutils/ansible28/Makefile @@ -1,14 +1,7 @@ PORTVERSION= 2.8.11 +PORTREVISION= 1 PKGNAMESUFFIX= 28 -CONFLICTS= ansible-* \ - ansible1-* \ - ansible23-* \ - ansible24-* \ - ansible25-* \ - ansible26-* \ - ansible27-* - MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105051233.145CXGRl064916>