Index: www/Makefile =================================================================== --- www/Makefile +++ www/Makefile @@ -1521,9 +1521,20 @@ SUBDIR += py-dj21-djangoql SUBDIR += py-dj21-djangorestframework SUBDIR += py-dj21-drf-yasg + SUBDIR += py-dj22-django-cacheops + SUBDIR += py-dj22-django-cors-headers + SUBDIR += py-dj22-django-debug-toolbar + SUBDIR += py-dj22-django-filter + SUBDIR += py-dj22-django-js-asset + SUBDIR += py-dj22-django-mptt + SUBDIR += py-dj22-django-prometheus + SUBDIR += py-dj22-django-tables2 SUBDIR += py-dj22-django-taggit + SUBDIR += py-dj22-django-taggit-serializer + SUBDIR += py-dj22-django-timezone-field SUBDIR += py-dj22-django-treebeard SUBDIR += py-dj22-djangorestframework + SUBDIR += py-dj22-drf-yasg SUBDIR += py-django SUBDIR += py-django-allauth SUBDIR += py-django-annotations Index: www/py-dj21-django-cors-headers/Makefile =================================================================== --- www/py-dj21-django-cors-headers/Makefile +++ www/py-dj21-django-cors-headers/Makefile @@ -17,6 +17,7 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-cors-headers +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-cors-headers \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-cors-headers .include Index: www/py-dj21-django-debug-toolbar/Makefile =================================================================== --- www/py-dj21-django-debug-toolbar/Makefile +++ www/py-dj21-django-debug-toolbar/Makefile @@ -20,6 +20,7 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-debug-toolbar +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-debug-toolbar \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-debug-toolbar .include Index: www/py-dj21-django-filter/Makefile =================================================================== --- www/py-dj21-django-filter/Makefile +++ www/py-dj21-django-filter/Makefile @@ -18,6 +18,7 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-filter +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-filter \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-filter .include Index: www/py-dj21-django-js-asset/Makefile =================================================================== --- www/py-dj21-django-js-asset/Makefile +++ www/py-dj21-django-js-asset/Makefile @@ -18,6 +18,7 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-js-asset +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-js-asset \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-js-asset .include Index: www/py-dj21-django-mptt/Makefile =================================================================== --- www/py-dj21-django-mptt/Makefile +++ www/py-dj21-django-mptt/Makefile @@ -21,6 +21,7 @@ NO_ARCH= yes CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-happenings \ - ${PYTHON_PKGNAMEPREFIX}django-mptt + ${PYTHON_PKGNAMEPREFIX}django-mptt \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-mptt .include Index: www/py-dj21-django-tables2/Makefile =================================================================== --- www/py-dj21-django-tables2/Makefile +++ www/py-dj21-django-tables2/Makefile @@ -20,6 +20,7 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-tables2 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-tables2 \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-tables2 .include Index: www/py-dj21-django-taggit-serializer/Makefile =================================================================== --- www/py-dj21-django-taggit-serializer/Makefile +++ www/py-dj21-django-taggit-serializer/Makefile @@ -19,6 +19,7 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-taggit-serializer +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-taggit-serializer \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-taggit-serializer .include Index: www/py-dj21-django-timezone-field/Makefile =================================================================== --- www/py-dj21-django-timezone-field/Makefile +++ www/py-dj21-django-timezone-field/Makefile @@ -19,6 +19,7 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-timezone-field +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-timezone-field \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-timezone-field .include Index: www/py-dj21-drf-yasg/Makefile =================================================================== --- www/py-dj21-drf-yasg/Makefile +++ www/py-dj21-drf-yasg/Makefile @@ -27,6 +27,7 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}drf-yasg +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}drf-yasg \ + ${PYTHON_PKGNAMEPREFIX}dj22-drf-yasg .include Index: www/py-dj22-django-cacheops/Makefile =================================================================== --- www/py-dj22-django-cacheops/Makefile +++ www/py-dj22-django-cacheops/Makefile @@ -4,7 +4,7 @@ PORTVERSION= 4.1 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- MAINTAINER= kai@FreeBSD.org COMMENT= Slick ORM cache with automatic granular event-driven invalidation @@ -12,14 +12,15 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.8:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}redis>=2.9.1:databases/py-redis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}funcy>=1.8:devel/py-funcy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= autoplist distutils NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-cacheops .include Index: www/py-dj22-django-cors-headers/Makefile =================================================================== --- www/py-dj22-django-cors-headers/Makefile +++ www/py-dj22-django-cors-headers/Makefile @@ -4,19 +4,20 @@ PORTVERSION= 2.5.2 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- -MAINTAINER= swills@FreeBSD.org +MAINTAINER= kai@FreeBSD.org COMMENT= Handles server headers required for Cross-Origin Resource Sharing LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>0:www/py-django22@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-cors-headers +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-cors-headers \ + ${PYTHON_PKGNAMEPREFIX}dj21-django-cors-headers .include Index: www/py-dj22-django-debug-toolbar/Makefile =================================================================== --- www/py-dj22-django-debug-toolbar/Makefile +++ www/py-dj22-django-debug-toolbar/Makefile @@ -5,21 +5,22 @@ PORTVERSION= 1.11 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- -MAINTAINER= sunpoet@FreeBSD.org +MAINTAINER= kai@FreeBSD.org COMMENT= Configurable set of panels to display debug information LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.0:databases/py-sqlparse@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-debug-toolbar +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-debug-toolbar \ + ${PYTHON_PKGNAMEPREFIX}dj21-django-debug-toolbar .include Index: www/py-dj22-django-filter/Makefile =================================================================== --- www/py-dj22-django-filter/Makefile +++ www/py-dj22-django-filter/Makefile @@ -4,7 +4,7 @@ DISTVERSION= 2.1.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- MAINTAINER= kai@FreeBSD.org COMMENT= Dynamic filtering for querysets with Django @@ -12,12 +12,13 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} USES= python:3.4+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-filter +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-filter \ + ${PYTHON_PKGNAMEPREFIX}dj21-django-filter .include Index: www/py-dj22-django-js-asset/Makefile =================================================================== --- www/py-dj22-django-js-asset/Makefile +++ www/py-dj22-django-js-asset/Makefile @@ -4,7 +4,7 @@ DISTVERSION= 1.1.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- MAINTAINER= kai@FreeBSD.org COMMENT= Insert script tags with additional attributes for django.forms.Media @@ -12,12 +12,13 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>0:www/py-django22@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-js-asset +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-js-asset \ + ${PYTHON_PKGNAMEPREFIX}dj21-django-js-asset .include Index: www/py-dj22-django-mptt/Makefile =================================================================== --- www/py-dj22-django-mptt/Makefile +++ www/py-dj22-django-mptt/Makefile @@ -5,22 +5,23 @@ PORTVERSION= 0.9.1 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- -MAINTAINER= cs@FreeBSD.org +MAINTAINER= kai@FreeBSD.org COMMENT= Utilities for implementing Modified Preorder Tree Traversal in Django LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR}\ - ${PYTHON_PKGNAMEPREFIX}django-js-asset>0:www/py-django-js-asset@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR}\ + ${PYTHON_PKGNAMEPREFIX}dj22-django-js-asset>0:www/py-dj22-django-js-asset@${PY_FLAVOR} -USES= gettext python +USES= gettext python:3.5+ USE_PYTHON= autoplist distutils NO_ARCH= yes CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-happenings \ + ${PYTHON_PKGNAMEPREFIX}django-mptt \ ${PYTHON_PKGNAMEPREFIX}dj21-django-mptt .include Index: www/py-dj22-django-prometheus/Makefile =================================================================== --- www/py-dj22-django-prometheus/Makefile +++ www/py-dj22-django-prometheus/Makefile @@ -4,20 +4,21 @@ PORTVERSION= 1.0.15 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- MAINTAINER= kai@FreeBSD.org COMMENT= Export Django monitoring metrics for Prometheus.io LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.8:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prometheus-client>=0.0.21:net-mgmt/py-prometheus-client@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-prometheus OPTIONS_GROUP= DATABASE CACHE OPTIONS_GROUP_DATABASE= MYSQL PGSQL Index: www/py-dj22-django-tables2/Makefile =================================================================== --- www/py-dj22-django-tables2/Makefile +++ www/py-dj22-django-tables2/Makefile @@ -5,7 +5,7 @@ DISTVERSION= 2.0.6 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- MAINTAINER= kai@FreeBSD.org COMMENT= Table/data-grid framework for Django @@ -13,13 +13,14 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=0:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tablib>=0:textproc/py-tablib@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-tables2 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-tables2 \ + ${PYTHON_PKGNAMEPREFIX}dj21-django-tables2 .include Index: www/py-dj22-django-taggit-serializer/Makefile =================================================================== --- www/py-dj22-django-taggit-serializer/Makefile +++ www/py-dj22-django-taggit-serializer/Makefile @@ -4,7 +4,7 @@ DISTVERSION= 0.1.7 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- MAINTAINER= kai@FreeBSD.org COMMENT= Django Taggit serializer for the Django REST Framework @@ -12,13 +12,14 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-taggit>=0:www/py-django-taggit@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dj22-django-taggit>=0:www/py-dj22-django-taggit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-taggit-serializer +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-taggit-serializer \ + ${PYTHON_PKGNAMEPREFIX}dj21-django-taggit-serializer .include Index: www/py-dj22-django-timezone-field/Makefile =================================================================== --- www/py-dj22-django-timezone-field/Makefile +++ www/py-dj22-django-timezone-field/Makefile @@ -4,7 +4,7 @@ DISTVERSION= 3.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- MAINTAINER= kai@FreeBSD.org COMMENT= Provides database and form fields for pytz timezone objects for Django @@ -12,13 +12,14 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.8:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-timezone-field +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-timezone-field \ + ${PYTHON_PKGNAMEPREFIX}dj21-django-timezone-field .include Index: www/py-dj22-drf-yasg/Makefile =================================================================== --- www/py-dj22-drf-yasg/Makefile +++ www/py-dj22-drf-yasg/Makefile @@ -4,7 +4,7 @@ DISTVERSION= 1.15.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- MAINTAINER= kai@FreeBSD.org COMMENT= Yet Another Swagger Generator @@ -13,8 +13,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.0.6:devel/py-setuptools_scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11.7:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.7.7:www/py-djangorestframework@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11.7:www/py-django22@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj22-djangorestframework>=3.7.7:www/py-dj22-djangorestframework@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coreapi>=2.3.3:devel/py-coreapi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coreschema>=0.0.4:devel/py-coreschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}inflection>=0.3.1:devel/py-inflection@${PY_FLAVOR} \ @@ -23,10 +23,11 @@ ${PYTHON_PKGNAMEPREFIX}swagger-spec-validator>=2.1.0:devel/py-swagger-spec-validator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-drf-yasg +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}drf-yasg \ + ${PYTHON_PKGNAMEPREFIX}dj21-drf-yasg .include Index: www/py-django-cacheops/Makefile =================================================================== --- www/py-django-cacheops/Makefile +++ www/py-django-cacheops/Makefile @@ -21,5 +21,6 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-cacheops .include Index: www/py-django-cors-headers/Makefile =================================================================== --- www/py-django-cors-headers/Makefile +++ www/py-django-cors-headers/Makefile @@ -17,6 +17,7 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-cors-headers +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-cors-headers \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-cors-headers .include Index: www/py-django-debug-toolbar/Makefile =================================================================== --- www/py-django-debug-toolbar/Makefile +++ www/py-django-debug-toolbar/Makefile @@ -20,6 +20,7 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-debug-toolbar +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-debug-toolbar \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-debug-toolbar .include Index: www/py-django-filter/Makefile =================================================================== --- www/py-django-filter/Makefile +++ www/py-django-filter/Makefile @@ -18,6 +18,7 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-filter +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-filter \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-filter .include Index: www/py-django-js-asset/Makefile =================================================================== --- www/py-django-js-asset/Makefile +++ www/py-django-js-asset/Makefile @@ -18,6 +18,7 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-js-asset +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-js-asset \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-js-asset .include Index: www/py-django-mptt/Makefile =================================================================== --- www/py-django-mptt/Makefile +++ www/py-django-mptt/Makefile @@ -21,6 +21,7 @@ NO_ARCH= yes CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-happenings \ - ${PYTHON_PKGNAMEPREFIX}dj21-django-mptt + ${PYTHON_PKGNAMEPREFIX}dj21-django-mptt \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-mptt .include Index: www/py-django-prometheus/Makefile =================================================================== --- www/py-django-prometheus/Makefile +++ www/py-django-prometheus/Makefile @@ -18,6 +18,7 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-prometheus OPTIONS_GROUP= DATABASE CACHE OPTIONS_GROUP_DATABASE= MYSQL PGSQL Index: www/py-django-tables2/Makefile =================================================================== --- www/py-django-tables2/Makefile +++ www/py-django-tables2/Makefile @@ -20,6 +20,7 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-tables2 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-tables2 \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-tables2 .include Index: www/py-django-taggit-serializer/Makefile =================================================================== --- www/py-django-taggit-serializer/Makefile +++ www/py-django-taggit-serializer/Makefile @@ -19,6 +19,7 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-taggit-serializer +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-taggit-serializer \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-taggit-serializer .include Index: www/py-django-timezone-field/Makefile =================================================================== --- www/py-django-timezone-field/Makefile +++ www/py-django-timezone-field/Makefile @@ -19,6 +19,7 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-timezone-field +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-timezone-field \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-timezone-field .include Index: www/py-drf-yasg/Makefile =================================================================== --- www/py-drf-yasg/Makefile +++ www/py-drf-yasg/Makefile @@ -27,6 +27,7 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-drf-yasg +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-drf-yasg \ + ${PYTHON_PKGNAMEPREFIX}dj22-drf-yasg .include