Index: www/Makefile =================================================================== --- www/Makefile +++ www/Makefile @@ -1517,6 +1517,17 @@ SUBDIR += py-cssselect SUBDIR += py-cssutils SUBDIR += py-ddgr + SUBDIR += py-dj21-django-cors-headers + SUBDIR += py-dj21-django-debug-toolbar + SUBDIR += py-dj21-django-filter + SUBDIR += py-dj21-django-js-asset + SUBDIR += py-dj21-django-mptt + SUBDIR += py-dj21-django-tables2 + SUBDIR += py-dj21-django-taggit + SUBDIR += py-dj21-django-taggit-serializer + SUBDIR += py-dj21-django-timezone-field + SUBDIR += py-dj21-djangorestframework + SUBDIR += py-dj21-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 @@ -4,16 +4,18 @@ PORTVERSION= 2.4.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj21- -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}django21>0:www/py-django21@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist + +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}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 @@ -5,20 +5,21 @@ PORTVERSION= 1.11 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj21- -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}django21>=1.11:www/py-django21@${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 +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-debug-toolbar .include Index: www/py-dj21-django-filter/Makefile =================================================================== --- www/py-dj21-django-filter/Makefile +++ www/py-dj21-django-filter/Makefile @@ -4,7 +4,7 @@ DISTVERSION= 1.1.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj21- MAINTAINER= kai@FreeBSD.org COMMENT= Dynamic filtering for querysets with Django @@ -12,13 +12,15 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}djangorestframework>0:www/py-djangorestframework@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django21>0:www/py-django21@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj21-djangorestframework>0:www/py-dj21-djangorestframework@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coreapi>0:devel/py-coreapi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coreschema>0:devel/py-coreschema@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist -NO_ARCH= yes + +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}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 @@ -4,7 +4,7 @@ DISTVERSION= 1.1.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj21- MAINTAINER= kai@FreeBSD.org COMMENT= Insert script tags with additional attributes for django.forms.Media @@ -12,10 +12,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django21>0:www/py-django21@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist -NO_ARCH= yes + +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-js-asset .include Index: www/py-dj21-django-mptt/Makefile =================================================================== --- www/py-dj21-django-mptt/Makefile +++ www/py-dj21-django-mptt/Makefile @@ -5,22 +5,22 @@ PORTVERSION= 0.9.1 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj21- -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}django21>=1.11:www/py-django21@${PY_FLAVOR}\ + ${PYTHON_PKGNAMEPREFIX}dj21-django-js-asset>0:www/py-dj21-django-js-asset@${PY_FLAVOR} -CONFLICTS_INSTALL=py*-django-happenings - -USES= gettext python +USES= gettext python:3.5+ USE_PYTHON= autoplist distutils -NO_ARCH= yes +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-happenings \ + ${PYTHON_PKGNAMEPREFIX}django-mptt .include Index: www/py-dj21-django-tables2/Makefile =================================================================== --- www/py-dj21-django-tables2/Makefile +++ www/py-dj21-django-tables2/Makefile @@ -3,10 +3,9 @@ PORTNAME= django-tables2 DISTVERSION= 1.21.2 -PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj21- MAINTAINER= kai@FreeBSD.org COMMENT= Table/data-grid framework for Django @@ -14,11 +13,13 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django21>=0:www/py-django21@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tablib>=0:textproc/py-tablib@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist -NO_ARCH= yes + +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}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 @@ -4,7 +4,7 @@ DISTVERSION= 0.1.7 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj21- MAINTAINER= kai@FreeBSD.org COMMENT= Django Taggit serializer for the Django REST Framework @@ -12,12 +12,13 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-taggit>=0:www/py-django-taggit@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dj21-django-taggit>=0:www/py-dj21-django-taggit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist -NO_ARCH= yes +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-taggit-serializer .include Index: www/py-dj21-django-taggit-serializer/pkg-descr =================================================================== --- www/py-dj21-django-taggit-serializer/pkg-descr +++ www/py-dj21-django-taggit-serializer/pkg-descr @@ -1,6 +1,6 @@ This package makes it possible to serialize tags generated by the django-taggit package. Because the tags in the django-taggit package need to be added into a TaggableManager() one cannot use the usual Serializer that is retrieved from the -Django REST Framework. +Django REST Framework. WWW: https://github.com/glemmaPaul/django-taggit-serializer Index: www/py-dj21-django-taggit/Makefile =================================================================== --- www/py-dj21-django-taggit/Makefile +++ www/py-dj21-django-taggit/Makefile @@ -4,7 +4,7 @@ PORTVERSION= 0.23.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj21- MAINTAINER= kai@FreeBSD.org COMMENT= Reusable Django application for simple tagging @@ -13,11 +13,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}isort>0:devel/py-isort@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django21>=1.11:www/py-django21@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= autoplist distutils -NO_ARCH= yes +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-taggit .include Index: www/py-dj21-django-timezone-field/Makefile =================================================================== --- www/py-dj21-django-timezone-field/Makefile +++ www/py-dj21-django-timezone-field/Makefile @@ -4,7 +4,7 @@ DISTVERSION= 3.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj21- MAINTAINER= kai@FreeBSD.org COMMENT= Provides database and form fields for pytz timezone objects for Django @@ -12,12 +12,13 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django21>=1.8:www/py-django21@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist -NO_ARCH= yes +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-timezone-field .include Index: www/py-dj21-djangorestframework/Makefile =================================================================== --- www/py-dj21-djangorestframework/Makefile +++ www/py-dj21-djangorestframework/Makefile @@ -2,10 +2,9 @@ PORTNAME= djangorestframework DISTVERSION= 3.9.0 -PORTEPOCH= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj21- MAINTAINER= kai@FreeBSD.org COMMENT= Django REST framework @@ -13,13 +12,14 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django21>0:www/py-django21@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}djangorestframework36 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}djangorestframework \ + ${PYTHON_PKGNAMEPREFIX}djangorestframework?? NO_ARCH= yes .include Index: www/py-dj21-drf-yasg/Makefile =================================================================== --- www/py-dj21-drf-yasg/Makefile +++ www/py-dj21-drf-yasg/Makefile @@ -4,7 +4,7 @@ DISTVERSION= 1.11.1 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj21- 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}django21>=1.11.7:www/py-django21@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj21-djangorestframework>=3.7.7:www/py-dj21-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}flex>=6.11.1:devel/py-flex@${PY_FLAVOR} \ @@ -26,9 +26,10 @@ ${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 +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}drf-yasg .include Index: www/py-django-cors-headers/Makefile =================================================================== --- www/py-django-cors-headers/Makefile +++ www/py-django-cors-headers/Makefile @@ -16,4 +16,6 @@ USES= python USE_PYTHON= distutils autoplist +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-cors-headers + .include Index: www/py-django-debug-toolbar/Makefile =================================================================== --- www/py-django-debug-toolbar/Makefile +++ www/py-django-debug-toolbar/Makefile @@ -19,6 +19,7 @@ USES= python USE_PYTHON= autoplist concurrent distutils -NO_ARCH= yes +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-debug-toolbar .include Index: www/py-django-filter/Makefile =================================================================== --- www/py-django-filter/Makefile +++ www/py-django-filter/Makefile @@ -19,6 +19,8 @@ USES= python USE_PYTHON= distutils autoplist -NO_ARCH= yes + +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-filter .include Index: www/py-django-js-asset/Makefile =================================================================== --- www/py-django-js-asset/Makefile +++ www/py-django-js-asset/Makefile @@ -16,6 +16,8 @@ USES= python USE_PYTHON= distutils autoplist -NO_ARCH= yes + +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-js-asset .include Index: www/py-django-mptt/Makefile =================================================================== --- www/py-django-mptt/Makefile +++ www/py-django-mptt/Makefile @@ -16,11 +16,11 @@ 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} -CONFLICTS_INSTALL=py*-django-happenings - USES= gettext python USE_PYTHON= autoplist distutils -NO_ARCH= yes +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-happenings \ + ${PYTHON_PKGNAMEPREFIX}dj21-django-mptt .include Index: www/py-django-tables2/Makefile =================================================================== --- www/py-django-tables2/Makefile +++ www/py-django-tables2/Makefile @@ -19,6 +19,8 @@ USES= python USE_PYTHON= distutils autoplist -NO_ARCH= yes + +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-tables2 .include Index: www/py-django-taggit-serializer/Makefile =================================================================== --- www/py-django-taggit-serializer/Makefile +++ www/py-django-taggit-serializer/Makefile @@ -18,6 +18,7 @@ USES= python USE_PYTHON= distutils autoplist -NO_ARCH= yes +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-taggit-serializer .include Index: www/py-django-taggit-serializer/pkg-descr =================================================================== --- www/py-django-taggit-serializer/pkg-descr +++ www/py-django-taggit-serializer/pkg-descr @@ -1,6 +1,6 @@ This package makes it possible to serialize tags generated by the django-taggit package. Because the tags in the django-taggit package need to be added into a TaggableManager() one cannot use the usual Serializer that is retrieved from the -Django REST Framework. +Django REST Framework. WWW: https://github.com/glemmaPaul/django-taggit-serializer Index: www/py-django-taggit/Makefile =================================================================== --- www/py-django-taggit/Makefile +++ www/py-django-taggit/Makefile @@ -18,6 +18,7 @@ USES= python USE_PYTHON= autoplist distutils -NO_ARCH= yes +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-taggit .include Index: www/py-django-timezone-field/Makefile =================================================================== --- www/py-django-timezone-field/Makefile +++ www/py-django-timezone-field/Makefile @@ -18,6 +18,7 @@ USES= python USE_PYTHON= distutils autoplist -NO_ARCH= yes +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-timezone-field .include Index: www/py-djangorestframework/Makefile =================================================================== --- www/py-djangorestframework/Makefile +++ www/py-djangorestframework/Makefile @@ -19,7 +19,8 @@ USES= python USE_PYTHON= distutils autoplist -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}djangorestframework36 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}djangorestframework?? \ + ${PYTHON_PKGNAMEPREFIX}dj21-djangorestframework NO_ARCH= yes .include Index: www/py-djangorestframework36/Makefile =================================================================== --- www/py-djangorestframework36/Makefile +++ www/py-djangorestframework36/Makefile @@ -16,6 +16,7 @@ USES= python USE_PYTHON= distutils autoplist -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}djangorestframework +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}djangorestframework \ + ${PYTHON_PKGNAMEPREFIX}dj21-djangorestframework .include Index: www/py-drf-yasg/Makefile =================================================================== --- www/py-drf-yasg/Makefile +++ www/py-drf-yasg/Makefile @@ -29,6 +29,7 @@ USES= python USE_PYTHON= distutils autoplist -NO_ARCH= yes +NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-drf-yasg .include