Index: head/sysutils/ansible/Makefile
===================================================================
--- head/sysutils/ansible/Makefile	(revision 455206)
+++ head/sysutils/ansible/Makefile	(revision 455207)
@@ -1,62 +1,64 @@
 # Created by: Nikolai Lifanov <lifanov@mail.lifanov.com>
 # $FreeBSD$
 
 PORTNAME=	ansible
 PORTVERSION?=	2.4.2.0
 PORTREVISION?=	0
 CATEGORIES=	sysutils python
 MASTER_SITES=	http://releases.ansible.com/ansible/
 
 MAINTAINER=	lifanov@FreeBSD.org
 COMMENT=	Radically simple IT automation
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
 		${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath \
 		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \
 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
 
+CONFLICTS?=	ansible1-* ansible23-*
+
 EXTRA_PATCHES?=	#
 
 NO_ARCH=	yes
 USES?=		cpe python
 USE_PYTHON=	autoplist distutils
 CPE_VENDOR=	ansibleworks
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
 PLIST_FILES?=	man/man1/ansible-config.1.gz \
 		man/man1/ansible-console.1.gz \
 		man/man1/ansible-doc.1.gz \
 		man/man1/ansible-galaxy.1.gz \
 		man/man1/ansible-inventory.1.gz \
 		man/man1/ansible-playbook.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
 
 post-patch:
 	${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
 		-e 's|/etc/ansible|${ETCDIR}|g' \
 		-e 's|/usr/share/ansible|${DATADIR}|g'
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/docs/man/man1/*.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/ansible.cfg ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/hosts ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/ansible1/Makefile
===================================================================
--- head/sysutils/ansible1/Makefile	(revision 455206)
+++ head/sysutils/ansible1/Makefile	(revision 455207)
@@ -1,34 +1,34 @@
 # Created by: Nikolai Lifanov <lifanov@mail.lifanov.com>
 # $FreeBSD$
 
 PKGNAMESUFFIX=	1
 PORTVERSION=	1.9.6
 PORTREVISION=	1
 
-CONFLICTS=	ansible-*
+CONFLICTS=	ansible-* ansible23-*
 
 MASTERDIR=	${.CURDIR}/../ansible
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2
 
 USES=	cpe python:2 shebangfix
 
 PLIST_FILES=	man/man1/ansible-doc.1.gz \
 		man/man1/ansible-galaxy.1.gz \
 		man/man1/ansible-playbook.1.gz \
 		man/man1/ansible-pull.1.gz \
 		man/man1/ansible-vault.1.gz \
 		man/man1/ansible.1.gz
 
 SHEBANG_FILES=	lib/ansible/runner/action_plugins/synchronize.py
 
 EXTRA_PATCHES=
 
 DEPRECATED=		please upgrade to sysutils/ansible
 EXPIRATION_DATE=	2017-10-01
 
 .include "${MASTERDIR}/Makefile"