Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Feb 2019 12:00:30 +0000 (UTC)
From:      Kai Knoblich <kai@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r492690 - in head/www: . py-dj21-django-cors-headers py-dj21-django-debug-toolbar py-dj21-django-filter py-dj21-django-js-asset py-dj21-django-mptt py-dj21-django-tables2 py-dj21-django...
Message-ID:  <201902111200.x1BC0U6q027409@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kai
Date: Mon Feb 11 12:00:30 2019
New Revision: 492690
URL: https://svnweb.freebsd.org/changeset/ports/492690

Log:
  Create some ports that are assigned to Django 2.1 instead Django 1.11.
  
  Django 1.11 is currently the "default" version in the ports tree due its
  long term support until April 2020 thus ports that are assigned to that
  version will exist until then.
  
  The following packages are required to make the upgrade of net-mgmt/netbox
  to 2.5.x possible because upstream has decided to switch from Django 1.11
  to Django 2.1:
  
  * www/py-dj21-django-cors-headers
  * www/py-dj21-django-debug-toolbar
  * www/py-dj21-django-filter
  * www/py-dj21-django-js-asset
  * www/py-dj21-django-mptt
  * www/py-dj21-django-tables2
  * www/py-dj21-django-taggit
  * www/py-dj21-django-timezone-field
  * www/py-dj21-djangorestframework
  * www/py-dj21-drf-yasg
  
  Also limit the new ports to Python 3.5 and later to match the requirements
  for Django 2.1 and to reduce some overhead in the building infrastructure.
  
  Reviewed by:	miwi, tcberner (mentors)
  Approved by:	miwi
  Differential Revision:	https://reviews.freebsd.org/D19059

Added:
  head/www/py-dj21-django-cors-headers/
     - copied from r492685, head/www/py-django-cors-headers/
  head/www/py-dj21-django-debug-toolbar/
     - copied from r492685, head/www/py-django-debug-toolbar/
  head/www/py-dj21-django-filter/
     - copied from r492685, head/www/py-django-filter/
  head/www/py-dj21-django-js-asset/
     - copied from r492685, head/www/py-django-js-asset/
  head/www/py-dj21-django-mptt/
     - copied from r492685, head/www/py-django-mptt/
  head/www/py-dj21-django-tables2/
     - copied from r492685, head/www/py-django-tables2/
  head/www/py-dj21-django-taggit/
     - copied from r492685, head/www/py-django-taggit/
  head/www/py-dj21-django-taggit-serializer/
     - copied from r492685, head/www/py-django-taggit-serializer/
  head/www/py-dj21-django-timezone-field/
     - copied from r492685, head/www/py-django-timezone-field/
  head/www/py-dj21-djangorestframework/
     - copied from r492685, head/www/py-djangorestframework/
  head/www/py-dj21-drf-yasg/
     - copied from r492685, head/www/py-drf-yasg/
Modified:
  head/www/Makefile
  head/www/py-dj21-django-cors-headers/Makefile
  head/www/py-dj21-django-debug-toolbar/Makefile
  head/www/py-dj21-django-filter/Makefile
  head/www/py-dj21-django-js-asset/Makefile
  head/www/py-dj21-django-mptt/Makefile
  head/www/py-dj21-django-tables2/Makefile
  head/www/py-dj21-django-taggit-serializer/Makefile
  head/www/py-dj21-django-taggit-serializer/pkg-descr
  head/www/py-dj21-django-taggit/Makefile
  head/www/py-dj21-django-timezone-field/Makefile
  head/www/py-dj21-djangorestframework/Makefile
  head/www/py-dj21-drf-yasg/Makefile
  head/www/py-django-cors-headers/Makefile
  head/www/py-django-debug-toolbar/Makefile
  head/www/py-django-filter/Makefile
  head/www/py-django-js-asset/Makefile
  head/www/py-django-mptt/Makefile
  head/www/py-django-tables2/Makefile
  head/www/py-django-taggit-serializer/Makefile
  head/www/py-django-taggit-serializer/pkg-descr
  head/www/py-django-taggit/Makefile
  head/www/py-django-timezone-field/Makefile
  head/www/py-djangorestframework/Makefile
  head/www/py-djangorestframework36/Makefile
  head/www/py-drf-yasg/Makefile

Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile	Mon Feb 11 11:33:44 2019	(r492689)
+++ head/www/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -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

Modified: head/www/py-dj21-django-cors-headers/Makefile
==============================================================================
--- head/www/py-django-cors-headers/Makefile	Mon Feb 11 10:46:04 2019	(r492685)
+++ head/www/py-dj21-django-cors-headers/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -4,16 +4,18 @@ PORTNAME=	django-cors-headers
 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 <bsd.port.mk>

Modified: head/www/py-dj21-django-debug-toolbar/Makefile
==============================================================================
--- head/www/py-django-debug-toolbar/Makefile	Mon Feb 11 10:46:04 2019	(r492685)
+++ head/www/py-dj21-django-debug-toolbar/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -5,20 +5,21 @@ PORTNAME=	django-debug-toolbar
 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 <bsd.port.mk>

Modified: head/www/py-dj21-django-filter/Makefile
==============================================================================
--- head/www/py-django-filter/Makefile	Mon Feb 11 10:46:04 2019	(r492685)
+++ head/www/py-dj21-django-filter/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -4,7 +4,7 @@ PORTNAME=	django-filter
 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 @@ COMMENT=	Dynamic filtering for querysets with Django
 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 <bsd.port.mk>

Modified: head/www/py-dj21-django-js-asset/Makefile
==============================================================================
--- head/www/py-django-js-asset/Makefile	Mon Feb 11 10:46:04 2019	(r492685)
+++ head/www/py-dj21-django-js-asset/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -4,7 +4,7 @@ PORTNAME=	django-js-asset
 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 @@ COMMENT=	Insert script tags with additional attributes
 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 <bsd.port.mk>

Modified: head/www/py-dj21-django-mptt/Makefile
==============================================================================
--- head/www/py-django-mptt/Makefile	Mon Feb 11 10:46:04 2019	(r492685)
+++ head/www/py-dj21-django-mptt/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -5,22 +5,22 @@ PORTNAME=	django-mptt
 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 <bsd.port.mk>

Modified: head/www/py-dj21-django-tables2/Makefile
==============================================================================
--- head/www/py-django-tables2/Makefile	Mon Feb 11 10:46:04 2019	(r492685)
+++ head/www/py-dj21-django-tables2/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -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 @@ COMMENT=	Table/data-grid framework for Django
 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 <bsd.port.mk>

Modified: head/www/py-dj21-django-taggit-serializer/Makefile
==============================================================================
--- head/www/py-django-taggit-serializer/Makefile	Mon Feb 11 10:46:04 2019	(r492685)
+++ head/www/py-dj21-django-taggit-serializer/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -4,7 +4,7 @@ PORTNAME=	django-taggit-serializer
 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 @@ COMMENT=	Django Taggit serializer for the Django REST 
 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 <bsd.port.mk>

Modified: head/www/py-dj21-django-taggit-serializer/pkg-descr
==============================================================================
--- head/www/py-django-taggit-serializer/pkg-descr	Mon Feb 11 10:46:04 2019	(r492685)
+++ head/www/py-dj21-django-taggit-serializer/pkg-descr	Mon Feb 11 12:00:30 2019	(r492690)
@@ -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

Modified: head/www/py-dj21-django-taggit/Makefile
==============================================================================
--- head/www/py-django-taggit/Makefile	Mon Feb 11 10:46:04 2019	(r492685)
+++ head/www/py-dj21-django-taggit/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -4,7 +4,7 @@ PORTNAME=	django-taggit
 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=	BSD3CLAUSE
 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 <bsd.port.mk>

Modified: head/www/py-dj21-django-timezone-field/Makefile
==============================================================================
--- head/www/py-django-timezone-field/Makefile	Mon Feb 11 10:46:04 2019	(r492685)
+++ head/www/py-dj21-django-timezone-field/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -4,7 +4,7 @@ PORTNAME=	django-timezone-field
 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 @@ COMMENT=	Provides database and form fields for pytz ti
 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 <bsd.port.mk>

Modified: head/www/py-dj21-djangorestframework/Makefile
==============================================================================
--- head/www/py-djangorestframework/Makefile	Mon Feb 11 10:46:04 2019	(r492685)
+++ head/www/py-dj21-djangorestframework/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -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 @@ COMMENT=	Django REST framework
 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 <bsd.port.mk>

Modified: head/www/py-dj21-drf-yasg/Makefile
==============================================================================
--- head/www/py-drf-yasg/Makefile	Mon Feb 11 10:46:04 2019	(r492685)
+++ head/www/py-dj21-drf-yasg/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -4,7 +4,7 @@ PORTNAME=	drf-yasg
 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=	BSD3CLAUSE
 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 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.11.7:
 		${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 <bsd.port.mk>

Modified: head/www/py-django-cors-headers/Makefile
==============================================================================
--- head/www/py-django-cors-headers/Makefile	Mon Feb 11 11:33:44 2019	(r492689)
+++ head/www/py-django-cors-headers/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -16,4 +16,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>0:www/py
 USES=		python
 USE_PYTHON=	distutils autoplist
 
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj21-django-cors-headers
+
 .include <bsd.port.mk>

Modified: head/www/py-django-debug-toolbar/Makefile
==============================================================================
--- head/www/py-django-debug-toolbar/Makefile	Mon Feb 11 11:33:44 2019	(r492689)
+++ head/www/py-django-debug-toolbar/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -19,6 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.11:ww
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
-NO_ARCH=	yes
+NO_ARCH=		yes
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj21-django-debug-toolbar
 
 .include <bsd.port.mk>

Modified: head/www/py-django-filter/Makefile
==============================================================================
--- head/www/py-django-filter/Makefile	Mon Feb 11 11:33:44 2019	(r492689)
+++ head/www/py-django-filter/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -19,6 +19,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-dj
 
 USES=		python
 USE_PYTHON=	distutils autoplist
-NO_ARCH=	yes
+
+NO_ARCH=		yes
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj21-django-filter
 
 .include <bsd.port.mk>

Modified: head/www/py-django-js-asset/Makefile
==============================================================================
--- head/www/py-django-js-asset/Makefile	Mon Feb 11 11:33:44 2019	(r492689)
+++ head/www/py-django-js-asset/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -16,6 +16,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>0:www/py
 
 USES=		python
 USE_PYTHON=	distutils autoplist
-NO_ARCH=	yes
+
+NO_ARCH=		yes
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj21-django-js-asset
 
 .include <bsd.port.mk>

Modified: head/www/py-django-mptt/Makefile
==============================================================================
--- head/www/py-django-mptt/Makefile	Mon Feb 11 11:33:44 2019	(r492689)
+++ head/www/py-django-mptt/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -16,11 +16,11 @@ 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}
 
-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 <bsd.port.mk>

Modified: head/www/py-django-tables2/Makefile
==============================================================================
--- head/www/py-django-tables2/Makefile	Mon Feb 11 11:33:44 2019	(r492689)
+++ head/www/py-django-tables2/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -19,6 +19,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=0:www/p
 
 USES=		python
 USE_PYTHON=	distutils autoplist
-NO_ARCH=	yes
+
+NO_ARCH=		yes
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj21-django-tables2
 
 .include <bsd.port.mk>

Modified: head/www/py-django-taggit-serializer/Makefile
==============================================================================
--- head/www/py-django-taggit-serializer/Makefile	Mon Feb 11 11:33:44 2019	(r492689)
+++ head/www/py-django-taggit-serializer/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -18,6 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django-taggit>=0:w
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-NO_ARCH=	yes
+NO_ARCH=		yes
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj21-django-taggit-serializer
 
 .include <bsd.port.mk>

Modified: head/www/py-django-taggit-serializer/pkg-descr
==============================================================================
--- head/www/py-django-taggit-serializer/pkg-descr	Mon Feb 11 11:33:44 2019	(r492689)
+++ head/www/py-django-taggit-serializer/pkg-descr	Mon Feb 11 12:00:30 2019	(r492690)
@@ -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

Modified: head/www/py-django-taggit/Makefile
==============================================================================
--- head/www/py-django-taggit/Makefile	Mon Feb 11 11:33:44 2019	(r492689)
+++ head/www/py-django-taggit/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -18,6 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.11:ww
 USES=		python
 USE_PYTHON=	autoplist distutils
 
-NO_ARCH=	yes
+NO_ARCH=		yes
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj21-django-taggit
 
 .include <bsd.port.mk>

Modified: head/www/py-django-timezone-field/Makefile
==============================================================================
--- head/www/py-django-timezone-field/Makefile	Mon Feb 11 11:33:44 2019	(r492689)
+++ head/www/py-django-timezone-field/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -18,6 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.8:www
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-NO_ARCH=	yes
+NO_ARCH=		yes
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj21-django-timezone-field
 
 .include <bsd.port.mk>

Modified: head/www/py-djangorestframework/Makefile
==============================================================================
--- head/www/py-djangorestframework/Makefile	Mon Feb 11 11:33:44 2019	(r492689)
+++ head/www/py-djangorestframework/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -19,7 +19,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>0:www/py
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}djangorestframework36
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}djangorestframework?? \
+			${PYTHON_PKGNAMEPREFIX}dj21-djangorestframework
 NO_ARCH=		yes
 
 .include <bsd.port.mk>

Modified: head/www/py-djangorestframework36/Makefile
==============================================================================
--- head/www/py-djangorestframework36/Makefile	Mon Feb 11 11:33:44 2019	(r492689)
+++ head/www/py-djangorestframework36/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -16,6 +16,7 @@ LICENSE=	BSD2CLAUSE
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}djangorestframework
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}djangorestframework \
+			${PYTHON_PKGNAMEPREFIX}dj21-djangorestframework
 
 .include <bsd.port.mk>

Modified: head/www/py-drf-yasg/Makefile
==============================================================================
--- head/www/py-drf-yasg/Makefile	Mon Feb 11 11:33:44 2019	(r492689)
+++ head/www/py-drf-yasg/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
@@ -29,6 +29,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.11.7:
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-NO_ARCH=	yes
+NO_ARCH=		yes
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj21-drf-yasg
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902111200.x1BC0U6q027409>