Index: head/www/py-tornado/Makefile
===================================================================
--- head/www/py-tornado/Makefile	(revision 527580)
+++ head/www/py-tornado/Makefile	(revision 527581)
@@ -1,38 +1,39 @@
 # Created by: Guixing Bai <khsing.cn@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	tornado
 PORTVERSION=	5.1.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python Web Server from FriendFeed
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PY_FUTURES}
 
-CONFLICTS=	py[0-9]*-tornado[46]-*
-
 USES=		python
 USE_PYTHON=	autoplist distutils
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}tornado4 \
+			${PYTHON_PKGNAMEPREFIX}tornado6
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3400
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${PY_FLAVOR}
 .endif
 
 .if ${PYTHON_REL} < 3500
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports_abc>=0.4:devel/py-backports_abc@${PY_FLAVOR}
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/tornado/speedups.so
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m tornado.test.runtests
 
 .include <bsd.port.post.mk>