svn commit: r497533 - in head/www: py-django111 py-django20 py-django21

[Wen Heping]

Author: wen
Date: Mon Apr  1 23:49:12 2019
New Revision: 497533
URL: https://svnweb.freebsd.org/changeset/ports/497533

Log:
  - Adjust CONFLICTS to welcome py-django22

Modified:
  head/www/py-django111/Makefile
  head/www/py-django20/Makefile
  head/www/py-django21/Makefile

Modified: head/www/py-django111/Makefile
==============================================================================
--- head/www/py-django111/Makefile	Mon Apr  1 23:45:05 2019	(r497532)
+++ head/www/py-django111/Makefile	Mon Apr  1 23:49:12 2019	(r497533)
@@ -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

Modified: head/www/py-django20/Makefile
==============================================================================
--- head/www/py-django20/Makefile	Mon Apr  1 23:45:05 2019	(r497532)
+++ head/www/py-django20/Makefile	Mon Apr  1 23:49:12 2019	(r497533)
@@ -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

Modified: head/www/py-django21/Makefile
==============================================================================
--- head/www/py-django21/Makefile	Mon Apr  1 23:45:05 2019	(r497532)
+++ head/www/py-django21/Makefile	Mon Apr  1 23:49:12 2019	(r497533)
@@ -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