svn commit: r544320 - branches/2020Q3/www/py-django22

[Wen Heping]

Author: wen
Date: Fri Aug  7 10:43:55 2020
New Revision: 544320
URL: https://svnweb.freebsd.org/changeset/ports/544320

Log:
  MFH: r544194
  
  - Update to 2.2.15(bugfix release)
  - Adjust CONFLICTS to welcome Django31
  
  Approved by:	ports-secteam@(joneum@)

Modified:
  branches/2020Q3/www/py-django22/Makefile
  branches/2020Q3/www/py-django22/distinfo
Directory Properties:
  branches/2020Q3/   (props changed)

Modified: branches/2020Q3/www/py-django22/Makefile
==============================================================================
--- branches/2020Q3/www/py-django22/Makefile	Fri Aug  7 10:39:08 2020	(r544319)
+++ branches/2020Q3/www/py-django22/Makefile	Fri Aug  7 10:43:55 2020	(r544320)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	django
-PORTVERSION=	2.2.13
+PORTVERSION=	2.2.15
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP \
 		https://www.djangoproject.com/m/releases/${PORTVERSION}/
@@ -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}django30
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django30 \
+			${PYTHON_PKGNAMEPREFIX}django31
 CPE_VENDOR=		djangoproject
 
 DOCSDIR=		${PREFIX}/share/doc/py-django

Modified: branches/2020Q3/www/py-django22/distinfo
==============================================================================
--- branches/2020Q3/www/py-django22/distinfo	Fri Aug  7 10:39:08 2020	(r544319)
+++ branches/2020Q3/www/py-django22/distinfo	Fri Aug  7 10:43:55 2020	(r544320)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591277467
-SHA256 (python/Django-2.2.13.tar.gz) = 84f370f6acedbe1f3c41e1a02de44ac206efda3355e427139ecb785b5f596d80
-SIZE (python/Django-2.2.13.tar.gz) = 8879757
+TIMESTAMP = 1596613382
+SHA256 (python/Django-2.2.15.tar.gz) = 3e2f5d172215862abf2bac3138d8a04229d34dbd2d0dab42c6bf33876cc22323
+SIZE (python/Django-2.2.15.tar.gz) = 9023679