Use the Django meta-port for my Django port to avoid conflicts between them.

Bump PORTREVISIONs

6 files changed, 12 insertions, 9 deletions

diff --git a/databases/py-django-transaction-hooks/Makefile b/databases/py-django-transaction-hooks/Makefile
index 6748f7e330b3..396bcd37a8be 100644
--- a/databases/py-django-transaction-hooks/Makefile
+++ b/databases/py-django-transaction-hooks/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	django-transaction-hooks
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ COMMENT=	Django database backends to register transaction-commit hooks
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.6.1:www/py-django18@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${FLAVOR}
 
 NO_ARCH=	yes
 
diff --git a/devel/py-django-rq/Makefile b/devel/py-django-rq/Makefile
index f437996c969e..e92eddae456a 100644
--- a/devel/py-django-rq/Makefile
+++ b/devel/py-django-rq/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	django-rq
 PORTVERSION=	1.0.1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -13,7 +14,7 @@ COMMENT=	Provides Django integration for RQ (Redis Queue)
 LICENSE=	MIT
 
 TEST_DEPENDS=	redis-server:databases/redis
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18@${FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rq>=0.5.5:devel/py-rq@${FLAVOR}
 
 NO_ARCH=	yes
diff --git a/www/py-django-bulk-update/Makefile b/www/py-django-bulk-update/Makefile
index 17b8d2ccb012..6c3187432821 100644
--- a/www/py-django-bulk-update/Makefile
+++ b/www/py-django-bulk-update/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	django-bulk-update
 PORTVERSION=	2.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,7 @@ COMMENT=	Bulk update using a single query over Django ORM
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.11:www/py-django@${FLAVOR}
 
 NO_ARCH=	yes
 USES=		python:-3.4
diff --git a/www/py-django-contact-form/Makefile b/www/py-django-contact-form/Makefile
index d0c53fe3027d..14698a39764e 100644
--- a/www/py-django-contact-form/Makefile
+++ b/www/py-django-contact-form/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-contact-form
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Generic contact-form application for Django
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.11:www/py-django@${FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}akismet>=0:devel/py-akismet@${FLAVOR}
 
 NO_ARCH=	yes
diff --git a/www/py-django-overextends/Makefile b/www/py-django-overextends/Makefile
index 62bb7bf4efcf..9f8dc2a8122a 100644
--- a/www/py-django-overextends/Makefile
+++ b/www/py-django-overextends/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-overextends
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Django reusable app enabling circular template inheritance
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx-me>=0.1.2:textproc/py-sphinx-me@${FLAVOR}
 
 NO_ARCH=	yes
diff --git a/www/py-django-redis/Makefile b/www/py-django-redis/Makefile
index cdff3285c451..114214496e2c 100644
--- a/www/py-django-redis/Makefile
+++ b/www/py-django-redis/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-redis
 PORTVERSION=	4.9.0
+PORTREVISION=	1
 CATEGORIES=	www databases
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,9 +13,8 @@ COMMENT=	Full featured Redis cache/session backend for Django
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}redis>=2.10.0:databases/py-redis@${FLAVOR}
-
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fakeredis>=0:databases/py-fakeredis@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \