diff options
| author | cs <cs@FreeBSD.org> | 2016-12-10 06:44:38 +0800 |
|---|---|---|
| committer | cs <cs@FreeBSD.org> | 2016-12-10 06:44:38 +0800 |
| commit | 0ba5bf73a18d69d26e9f79a28bf0e9098abe5239 (patch) | |
| tree | ebe256a882315e34ac1b3af86bd39bfd014d488d | |
| parent | b29ebcc6932f50e9d84aae2b5317ef38b36fef14 (diff) | |
| download | freebsd-ports-gnome-0ba5bf73a18d69d26e9f79a28bf0e9098abe5239.tar.gz freebsd-ports-gnome-0ba5bf73a18d69d26e9f79a28bf0e9098abe5239.tar.zst freebsd-ports-gnome-0ba5bf73a18d69d26e9f79a28bf0e9098abe5239.zip | |
Add CONFLICTS_INSTALL
PR: 208633
Submitted by: Kevin Golding <ports@caomhin.org>
Approved by: maintainer
| -rw-r--r-- | www/py-django-happenings/Makefile | 2 | ||||
| -rw-r--r-- | www/py-django-mptt/Makefile | 2 |
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 |