svn commit: r518887 - in head/www: py-django111 py-django21 py-django22

[Wen Heping]

Author: wen
Date: Tue Dec  3 00:06:24 2019
New Revision: 518887
URL: https://svnweb.freebsd.org/changeset/ports/518887

Log:
  - Adjust CONFLICTS_INSTALL to welcome py-django30

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

Modified: head/www/py-django111/Makefile
==============================================================================
--- head/www/py-django111/Makefile	Tue Dec  3 00:03:16 2019	(r518886)
+++ head/www/py-django111/Makefile	Tue Dec  3 00:06:24 2019	(r518887)
@@ -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[0-2]
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django2[0-2] ${PYTHON_PKGNAMEPREFIX}django30
 CPE_VENDOR=		djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django

Modified: head/www/py-django21/Makefile
==============================================================================
--- head/www/py-django21/Makefile	Tue Dec  3 00:03:16 2019	(r518886)
+++ head/www/py-django21/Makefile	Tue Dec  3 00:06:24 2019	(r518887)
@@ -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}django22
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django22 \
+			${PYTHON_PKGNAMEPREFIX}django30
 CPE_VENDOR=		djangoproject
 
 DOCSDIR=		${PREFIX}/share/doc/py-django

Modified: head/www/py-django22/Makefile
==============================================================================
--- head/www/py-django22/Makefile	Tue Dec  3 00:03:16 2019	(r518886)
+++ head/www/py-django22/Makefile	Tue Dec  3 00:06:24 2019	(r518887)
@@ -27,7 +27,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}django21
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django21 \
+			${PYTHON_PKGNAMEPREFIX}django30
 CPE_VENDOR=		djangoproject
 
 DOCSDIR=		${PREFIX}/share/doc/py-django