svn commit: r455207 - in head/sysutils: ansible ansible1

[Nikolai Lifanov]

Author: lifanov
Date: Thu Nov 30 15:35:31 2017
New Revision: 455207
URL: https://svnweb.freebsd.org/changeset/ports/455207

Log:
  update conflicts after addition of sysutils/ansible23

Modified:
  head/sysutils/ansible/Makefile
  head/sysutils/ansible1/Makefile

Modified: head/sysutils/ansible/Makefile
==============================================================================
--- head/sysutils/ansible/Makefile	Thu Nov 30 15:33:46 2017	(r455206)
+++ head/sysutils/ansible/Makefile	Thu Nov 30 15:35:31 2017	(r455207)
@@ -20,6 +20,8 @@ RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py
 		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
 
+CONFLICTS?=	ansible1-* ansible23-*
+
 EXTRA_PATCHES?=	#
 
 NO_ARCH=	yes

Modified: head/sysutils/ansible1/Makefile
==============================================================================
--- head/sysutils/ansible1/Makefile	Thu Nov 30 15:33:46 2017	(r455206)
+++ head/sysutils/ansible1/Makefile	Thu Nov 30 15:35:31 2017	(r455207)
@@ -5,7 +5,7 @@ PKGNAMESUFFIX=	1
 PORTVERSION=	1.9.6
 PORTREVISION=	1
 
-CONFLICTS=	ansible-*
+CONFLICTS=	ansible-* ansible23-*
 
 MASTERDIR=	${.CURDIR}/../ansible
 DISTINFO_FILE=	${.CURDIR}/distinfo