aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--www/py-django-happenings/Makefile2
-rw-r--r--www/py-django-mptt/Makefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/www/py-django-happenings/Makefile b/www/py-django-happenings/Makefile
index eb8d5f8b17b7..297812c1e27f 100644
--- a/www/py-django-happenings/Makefile
+++ b/www/py-django-happenings/Makefile
@@ -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
diff --git a/www/py-django-mptt/Makefile b/www/py-django-mptt/Makefile
index 25c6e36db516..4eda0ad20e3a 100644
--- a/www/py-django-mptt/Makefile
+++ b/www/py-django-mptt/Makefile
@@ -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