svn commit: r455898 - in head/www: py-django110 py-django111 py-django18

[Wen Heping]

Author: wen
Date: Sun Dec 10 13:48:51 2017
New Revision: 455898
URL: https://svnweb.freebsd.org/changeset/ports/455898

Log:
  - Adjust CONFLICTS_INSTALL

Modified:
  head/www/py-django110/Makefile
  head/www/py-django111/Makefile
  head/www/py-django18/Makefile

Modified: head/www/py-django110/Makefile
==============================================================================
--- head/www/py-django110/Makefile	Sun Dec 10 13:39:34 2017	(r455897)
+++ head/www/py-django110/Makefile	Sun Dec 10 13:48:51 2017	(r455898)
@@ -25,7 +25,7 @@ USE_PYTHON=	autoplist distutils
 SHEBANG_FILES=	django/bin/django-admin.py \
 		django/conf/project_template/manage.py-tpl
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-devel ${PYTHON_PKGNAMEPREFIX}django1[689] ${PYTHON_PKGNAMEPREFIX}django111
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-devel ${PYTHON_PKGNAMEPREFIX}django18 ${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django20
 CPE_VENDOR=		djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django

Modified: head/www/py-django111/Makefile
==============================================================================
--- head/www/py-django111/Makefile	Sun Dec 10 13:39:34 2017	(r455897)
+++ head/www/py-django111/Makefile	Sun Dec 10 13:48:51 2017	(r455898)
@@ -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}django-devel ${PYTHON_PKGNAMEPREFIX}django1[689] ${PYTHON_PKGNAMEPREFIX}django110
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-devel ${PYTHON_PKGNAMEPREFIX}django18 ${PYTHON_PKGNAMEPREFIX}django110 ${PYTHON_PKGNAMEPREFIX}django20
 CPE_VENDOR=		djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django

Modified: head/www/py-django18/Makefile
==============================================================================
--- head/www/py-django18/Makefile	Sun Dec 10 13:39:34 2017	(r455897)
+++ head/www/py-django18/Makefile	Sun Dec 10 13:48:51 2017	(r455898)
@@ -26,7 +26,9 @@ USE_PYTHON=	autoplist distutils
 SHEBANG_FILES=	django/bin/django-admin.py \
 		django/conf/project_template/manage.py
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-devel ${PYTHON_PKGNAMEPREFIX}django1[69] ${PYTHON_PKGNAMEPREFIX}django110
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-devel \
+			${PYTHON_PKGNAMEPREFIX}django11[01] \
+			${PYTHON_PKGNAMEPREFIX}django20
 CPE_VENDOR=		djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django