diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index eafad0ae9c25..aff10bd2fe7b 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -1,4 +1,3 @@ -# Created by: Nikolai Lifanov # $FreeBSD$ PORTNAME= ansible @@ -20,7 +19,7 @@ RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} -CONFLICTS?= ansible1-* ansible23-* +CONFLICTS?= ansible1-* ansible23-* ansible24-* EXTRA_PATCHES?= # diff --git a/sysutils/ansible1/Makefile b/sysutils/ansible1/Makefile index e1fbf91e2469..be97ce0ffe21 100644 --- a/sysutils/ansible1/Makefile +++ b/sysutils/ansible1/Makefile @@ -1,11 +1,10 @@ -# Created by: Nikolai Lifanov # $FreeBSD$ PKGNAMESUFFIX= 1 PORTVERSION= 1.9.6 PORTREVISION= 2 -CONFLICTS= ansible-* ansible23-* +CONFLICTS= ansible-* ansible23-* ansible24-* MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo diff --git a/sysutils/ansible23/Makefile b/sysutils/ansible23/Makefile index 75eebb21b717..fafa5cdb69b7 100644 --- a/sysutils/ansible23/Makefile +++ b/sysutils/ansible23/Makefile @@ -1,10 +1,9 @@ -# Created by: Nikolai Lifanov # $FreeBSD$ PORTVERSION= 2.3.2.0 PKGNAMESUFFIX= 23 -CONFLICTS= ansible-* ansible1-* +CONFLICTS= ansible-* ansible1-* ansible24-* MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo