diff options
| author | Wen Heping <wen@FreeBSD.org> | 2019-04-02 07:49:12 +0800 |
|---|---|---|
| committer | Wen Heping <wen@FreeBSD.org> | 2019-04-02 07:49:12 +0800 |
| commit | ab61d732aebe2e4614c1846a84ac53701e5696f5 (patch) | |
| tree | 4b0c9d91380a7f12432f4e55f8264127d8874342 /www | |
| parent | 2342427f0254303a6a85b2bc0a77856c7d19416f (diff) | |
| download | freebsd-ports-gnome-ab61d732aebe2e4614c1846a84ac53701e5696f5.tar.gz freebsd-ports-gnome-ab61d732aebe2e4614c1846a84ac53701e5696f5.tar.zst freebsd-ports-gnome-ab61d732aebe2e4614c1846a84ac53701e5696f5.zip | |
- Adjust CONFLICTS to welcome py-django22
Diffstat (limited to 'www')
| -rw-r--r-- | www/py-django111/Makefile | 2 | ||||
| -rw-r--r-- | www/py-django20/Makefile | 2 | ||||
| -rw-r--r-- | www/py-django21/Makefile | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/www/py-django111/Makefile b/www/py-django111/Makefile index bd8d645e1f4f..20ef5e567820 100644 --- a/www/py-django111/Makefile +++ b/www/py-django111/Makefile @@ -27,7 +27,7 @@ USE_PYTHON= autoplist distutils SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py-tpl -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django2[01] +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django2[0-2] CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django diff --git a/www/py-django20/Makefile b/www/py-django20/Makefile index a71236cc2862..9d2bda86fad8 100644 --- a/www/py-django20/Makefile +++ b/www/py-django20/Makefile @@ -26,7 +26,7 @@ SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py-tpl CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django111 \ - ${PYTHON_PKGNAMEPREFIX}django21 + ${PYTHON_PKGNAMEPREFIX}django2[12] CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django diff --git a/www/py-django21/Makefile b/www/py-django21/Makefile index 09df59b14ade..23b905ec2312 100644 --- a/www/py-django21/Makefile +++ b/www/py-django21/Makefile @@ -25,7 +25,8 @@ USE_PYTHON= autoplist distutils SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py-tpl -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django20 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django20 \ + ${PYTHON_PKGNAMEPREFIX}django22 CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django |