From owner-svn-ports-all@freebsd.org  Fri Dec  9 22:44:39 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 E2932C6FDEC;
 Fri,  9 Dec 2016 22:44:39 +0000 (UTC) (envelope-from cs@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 B2175B70;
 Fri,  9 Dec 2016 22:44:39 +0000 (UTC) (envelope-from cs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB9Micsb007566;
 Fri, 9 Dec 2016 22:44:38 GMT (envelope-from cs@FreeBSD.org)
Received: (from cs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB9Mic9i007564;
 Fri, 9 Dec 2016 22:44:38 GMT (envelope-from cs@FreeBSD.org)
Message-Id: <201612092244.uB9Mic9i007564@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cs set sender to cs@FreeBSD.org
 using -f
From: Carlo Strub <cs@FreeBSD.org>
Date: Fri, 9 Dec 2016 22:44:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r428257 - in head/www: py-django-happenings py-django-mptt
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Dec 2016 22:44:40 -0000

Author: cs
Date: Fri Dec  9 22:44:38 2016
New Revision: 428257
URL: https://svnweb.freebsd.org/changeset/ports/428257

Log:
  Add CONFLICTS_INSTALL
  
  PR:		208633
  Submitted by:	Kevin Golding <ports@caomhin.org>
  Approved by:	maintainer

Modified:
  head/www/py-django-happenings/Makefile
  head/www/py-django-mptt/Makefile

Modified: head/www/py-django-happenings/Makefile
==============================================================================
--- head/www/py-django-happenings/Makefile	Fri Dec  9 22:39:46 2016	(r428256)
+++ head/www/py-django-happenings/Makefile	Fri Dec  9 22:44:38 2016	(r428257)
@@ -16,6 +16,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
 
+CONFLICTS_INSTALL= py*-django-mptt
+
 USES=		python
 USE_PYTHON=	distutils autoplist
 

Modified: head/www/py-django-mptt/Makefile
==============================================================================
--- head/www/py-django-mptt/Makefile	Fri Dec  9 22:39:46 2016	(r428256)
+++ head/www/py-django-mptt/Makefile	Fri Dec  9 22:44:38 2016	(r428257)
@@ -14,6 +14,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 # >= 1.8
 
+CONFLICTS_INSTALL= py*-django-happenings
+
 USE_GITHUB=	yes
 
 USES=		gettext python