Index: head/sysutils/py-dirsync/Makefile
===================================================================
--- head/sysutils/py-dirsync/Makefile	(revision 451623)
+++ head/sysutils/py-dirsync/Makefile	(revision 451624)
@@ -1,19 +1,21 @@
 # Created by: René Ladan <rene@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	dirsync
 PORTVERSION=	2.2.2
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rene@FreeBSD.org
 COMMENT=	Advanced directory tree synchronisation tool
 
 LICENSE=	MIT
 
+CONFLICT_INSTALL=p5-File-Dirsync
+
 USES=		python zip
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
Index: head/www/py-jsonfield/Makefile
===================================================================
--- head/www/py-jsonfield/Makefile	(revision 451623)
+++ head/www/py-jsonfield/Makefile	(revision 451624)
@@ -1,22 +1,24 @@
 # Created by: René Ladan <rene@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	jsonfield
 PORTVERSION=	2.0.2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rene@FreeBSD.org
 COMMENT=	Reusable JSONField model for Django to store validated JSON
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django110>=0:www/py-django110
 
+CONFLICTS_INSTALL=py*-django-jsonfield
+
 USES=		python
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
 .include <bsd.port.mk>