Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Dec 2016 22:44:38 +0000 (UTC)
From:      Carlo Strub <cs@FreeBSD.org>
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
Message-ID:  <201612092244.uB9Mic9i007564@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612092244.uB9Mic9i007564>