sysutils/ansible*: Clean up CONFLICTS

freebsd · May 5, 2021 · 730c13e · 730c13e
1 parent 1f8516f
commit 730c13e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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