From owner-svn-ports-head@freebsd.org  Mon Oct  9 17:03:02 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2311BE3677A;
 Mon,  9 Oct 2017 17:03:02 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B248B6EEEA;
 Mon,  9 Oct 2017 17:03:01 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v99H30JK080251;
 Mon, 9 Oct 2017 17:03:00 GMT (envelope-from rene@FreeBSD.org)
Received: (from rene@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v99H30mE080249;
 Mon, 9 Oct 2017 17:03:00 GMT (envelope-from rene@FreeBSD.org)
Message-Id: <201710091703.v99H30mE080249@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rene set sender to
 rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
Date: Mon, 9 Oct 2017 17:03:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r451624 - in head: sysutils/py-dirsync www/py-jsonfield
X-SVN-Group: ports-head
X-SVN-Commit-Author: rene
X-SVN-Commit-Paths: in head: sysutils/py-dirsync www/py-jsonfield
X-SVN-Commit-Revision: 451624
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Oct 2017 17:03:02 -0000

Author: rene
Date: Mon Oct  9 17:03:00 2017
New Revision: 451624
URL: https://svnweb.freebsd.org/changeset/ports/451624

Log:
  Register conflicts for sysutils/py-dirsync and www/py-jsonfield
  
  Reported by:	http://pkgtool.osorio.me/conflicts/rene@FreeBSD.org.html

Modified:
  head/sysutils/py-dirsync/Makefile
  head/www/py-jsonfield/Makefile

Modified: head/sysutils/py-dirsync/Makefile
==============================================================================
--- head/sysutils/py-dirsync/Makefile	Mon Oct  9 16:58:44 2017	(r451623)
+++ head/sysutils/py-dirsync/Makefile	Mon Oct  9 17:03:00 2017	(r451624)
@@ -12,6 +12,8 @@ COMMENT=	Advanced directory tree synchronisation tool
 
 LICENSE=	MIT
 
+CONFLICT_INSTALL=p5-File-Dirsync
+
 USES=		python zip
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes

Modified: head/www/py-jsonfield/Makefile
==============================================================================
--- head/www/py-jsonfield/Makefile	Mon Oct  9 16:58:44 2017	(r451623)
+++ head/www/py-jsonfield/Makefile	Mon Oct  9 17:03:00 2017	(r451624)
@@ -15,6 +15,8 @@ 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