51 files changed, 99 insertions, 58 deletions

diff --git a/www/py-django-allauth/Makefile b/www/py-django-allauth/Makefile
index 3518b24db1da..d124709025da 100644
--- a/www/py-django-allauth/Makefile
+++ b/www/py-django-allauth/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-allauth
 PORTVERSION=	0.24.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ COMMENT=	User registration with social account authentication
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.6:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.6:${PORTSDIR}/www/py-django18
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-django-annoying/Makefile b/www/py-django-annoying/Makefile
index 6f291ff4540c..fe821d52697a 100644
--- a/www/py-django-annoying/Makefile
+++ b/www/py-django-annoying/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-annoying
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 DISTVERSIONPREFIX=	release-
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Application to eliminate annoying things in the Django framework
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
 
 USE_GITHUB=	yes
 
diff --git a/www/py-django-app-plugins/Makefile b/www/py-django-app-plugins/Makefile
index 8e5f9a02a5bc..584aebae4629 100644
--- a/www/py-django-app-plugins/Makefile
+++ b/www/py-django-app-plugins/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	django-app-plugins
 PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@caomhin.org
 COMMENT=	Reusable django application for writing pluggable reusable django applications
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-appconf/Makefile b/www/py-django-appconf/Makefile
index b5f97cf94462..a6fe329dce7f 100644
--- a/www/py-django-appconf/Makefile
+++ b/www/py-django-appconf/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-appconf
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-django-appmedia/Makefile b/www/py-django-appmedia/Makefile
index c6d5f017192c..07355bdc009d 100644
--- a/www/py-django-appmedia/Makefile
+++ b/www/py-django-appmedia/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	django-appmedia
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	kurt.lidl@cello.com
 COMMENT=	Serve static content from within django app directories
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-assets/Makefile b/www/py-django-assets/Makefile
index 8496fff359c5..3fed84ed9eb6 100644
--- a/www/py-django-assets/Makefile
+++ b/www/py-django-assets/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	django-assets
 PORTVERSION=	0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,7 @@ COMMENT=	Compress and merge CSS and Javascript files
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}webassets>0:${PORTSDIR}/www/py-webassets
 
 USES=		python
diff --git a/www/py-django-auth-ldap/Makefile b/www/py-django-auth-ldap/Makefile
index 281ac2566881..8023ea31904d 100644
--- a/www/py-django-auth-ldap/Makefile
+++ b/www/py-django-auth-ldap/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	django-auth-ldap
 PORTVERSION=	1.1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ COMMENT=	LDAP integration for django.contrib.auth
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.3.1:${PORTSDIR}/www/py-django \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.3.1:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}ldap>=2.0:${PORTSDIR}/net/py-ldap
 
 USES=		python:2
diff --git a/www/py-django-bootstrap-form/Makefile b/www/py-django-bootstrap-form/Makefile
index 5bdeda0ca2ad..5b97d9853b79 100644
--- a/www/py-django-bootstrap-form/Makefile
+++ b/www/py-django-bootstrap-form/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-bootstrap-form
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,6 +16,6 @@ LICENSE=	MIT
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.5:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.5:${PORTSDIR}/www/py-django18
 
 .include <bsd.port.mk>
diff --git a/www/py-django-caching-app-plugins/Makefile b/www/py-django-caching-app-plugins/Makefile
index 2c97d62ee633..6c3128e4664b 100644
--- a/www/py-django-caching-app-plugins/Makefile
+++ b/www/py-django-caching-app-plugins/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-caching-app-plugins
 PORTVERSION=	0.1.4
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=   ${WRKSRC}/LICENSE.rst
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:${PORTSDIR}/devel/py-setuptools_hg
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
 
 USES=   python
 USE_PYTHON= distutils autoplist
diff --git a/www/py-django-classy-tags/Makefile b/www/py-django-classy-tags/Makefile
index fe19937ce307..a44a5b767193 100644
--- a/www/py-django-classy-tags/Makefile
+++ b/www/py-django-classy-tags/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-classy-tags
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Class based template tags for Django
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile
index b6f850dd8da0..7c1ab0b65ec6 100644
--- a/www/py-django-cms/Makefile
+++ b/www/py-django-cms/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	django-cms
 PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ COMMENT=	Content management system built with the Django framework
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}south>=0.7.3:${PORTSDIR}/databases/py-south \
-		${PYTHON_PKGNAMEPREFIX}django>=1.4:${PORTSDIR}/www/py-django \
+		${PYTHON_PKGNAMEPREFIX}django>=1.4:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.4.1:${PORTSDIR}/www/py-django-classy-tags \
 		${PYTHON_PKGNAMEPREFIX}django-mptt>=0.5.2:${PORTSDIR}/www/py-django-mptt \
 		${PYTHON_PKGNAMEPREFIX}django-sekizai>=0.6.1:${PORTSDIR}/www/py-django-sekizai \
diff --git a/www/py-django-contact-form/Makefile b/www/py-django-contact-form/Makefile
index 37b1d3616e0e..22149e1d782b 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.0
+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}django>=0:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:${PORTSDIR}/www/py-django18
 
 NO_ARCH=	yes
 
diff --git a/www/py-django-crispy-forms/Makefile b/www/py-django-crispy-forms/Makefile
index 5acf68e42fd0..d37929ade064 100644
--- a/www/py-django-crispy-forms/Makefile
+++ b/www/py-django-crispy-forms/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-crispy-forms
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	The best way to have Django DRY forms
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-datetime-widget/Makefile b/www/py-django-datetime-widget/Makefile
index 0f13c906b22a..17a92f895a62 100644
--- a/www/py-django-datetime-widget/Makefile
+++ b/www/py-django-datetime-widget/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-datetime-widget
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	melvyn@magemana.nl
 COMMENT=	Simple and clean widget for DateTimeField
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django18
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-debug-toolbar/Makefile b/www/py-django-debug-toolbar/Makefile
index 290686ae51f2..02cb02ef885d 100644
--- a/www/py-django-debug-toolbar/Makefile
+++ b/www/py-django-debug-toolbar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-debug-toolbar
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Configurable set of panels to display debug information
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.4.2:${PORTSDIR}/www/py-django \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.4.2:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}sqlparse>0:${PORTSDIR}/databases/py-sqlparse
 
 USES=		python
diff --git a/www/py-django-dpaste/Makefile b/www/py-django-dpaste/Makefile
index 4136d26303db..00c7278b9a7a 100644
--- a/www/py-django-dpaste/Makefile
+++ b/www/py-django-dpaste/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dpaste
 PORTVERSION=	2.9
+PORTREVISION=	1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
 
@@ -12,7 +13,7 @@ COMMENT=	Django based pastebin
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django \
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}django-mptt>=0.7.4:${PORTSDIR}/www/py-django-mptt \
 		${PYTHON_PKGNAMEPREFIX}pygments>=1.6:${PORTSDIR}/textproc/py-pygments \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:${PORTSDIR}/www/py-requests
diff --git a/www/py-django-evolution/Makefile b/www/py-django-evolution/Makefile
index 164bb01e461b..e1776fd46720 100644
--- a/www/py-django-evolution/Makefile
+++ b/www/py-django-evolution/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-evolution
 PORTVERSION=	0.7.6
+PORTREVISION=	1
 DISTVERSIONPREFIX=	release-
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Database schema evolution tool for the Django web framework
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
 
 USE_GITHUB=	yes
 
diff --git a/www/py-django-extensions/Makefile b/www/py-django-extensions/Makefile
index ce496a8d8fdd..84e927a5d321 100644
--- a/www/py-django-extensions/Makefile
+++ b/www/py-django-extensions/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-extensions
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Global custom management extensions for the Django Framework
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:${PORTSDIR}/www/py-django \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
 
 NO_ARCH=	yes
diff --git a/www/py-django-filer/Makefile b/www/py-django-filer/Makefile
index db28f9279abc..88d867bd130c 100644
--- a/www/py-django-filer/Makefile
+++ b/www/py-django-filer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	django-filer
 PORTVERSION=	0.8.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	xenophon+fbsdports@irtnog.org
 COMMENT=	File and Image Management Application for django
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:${PORTSDIR}/www/py-django \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}django-easy-thumbnails>=0:${PORTSDIR}/graphics/py-django-easy-thumbnails \
 		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow
 
diff --git a/www/py-django-json-rpc/Makefile b/www/py-django-json-rpc/Makefile
index 8c685709418e..d8a614e9f26b 100644
--- a/www/py-django-json-rpc/Makefile
+++ b/www/py-django-json-rpc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	django-json-rpc
 PORTVERSION=	0.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	http://wiki.pcbsd.org/ports/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	john@ixsystems.com
 COMMENT=	Simple JSON-RPC implementation for Django
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
 
 LICENSE=	MIT
 
diff --git a/www/py-django-keyedcache/Makefile b/www/py-django-keyedcache/Makefile
index 4746539e0a8d..b8b67d25b07d 100644
--- a/www/py-django-keyedcache/Makefile
+++ b/www/py-django-keyedcache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-keyedcache
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Simplified, speedy way to manage caching in Django apps
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-ldapdb/Makefile b/www/py-django-ldapdb/Makefile
index de6697040048..59ff0e675d1c 100644
--- a/www/py-django-ldapdb/Makefile
+++ b/www/py-django-ldapdb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	django-ldapdb
 PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ COMMENT=	Support for django models over LDAP
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.6.0:${PORTSDIR}/www/py-django \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.6.0:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}ldap>=2.0:${PORTSDIR}/net/py-ldap
 
 USES=		python
diff --git a/www/py-django-livesettings/Makefile b/www/py-django-livesettings/Makefile
index 68f18ec0a97b..4f7092fa8fb4 100644
--- a/www/py-django-livesettings/Makefile
+++ b/www/py-django-livesettings/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-livesettings
 DISTVERSION=	1.4-16
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP/source/d/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Configure Django project settings via admin interface
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:${PORTSDIR}/devel/py-setuptools_hg
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django18
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-markwhat/Makefile b/www/py-django-markwhat/Makefile
index 85cb9f05972a..852b6e157051 100644
--- a/www/py-django-markwhat/Makefile
+++ b/www/py-django-markwhat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-markwhat
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	www python textproc
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-django-mptt/Makefile b/www/py-django-mptt/Makefile
index c4b737e98765..e5df76ca483c 100644
--- a/www/py-django-mptt/Makefile
+++ b/www/py-django-mptt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-mptt
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -12,7 +13,7 @@ COMMENT=	Utilities for implementing Modified Preorder Tree Traversal in Django
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django # >= 1.8
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18 # >= 1.8
 
 USE_GITHUB=	yes
 
diff --git a/www/py-django-openid-auth/Makefile b/www/py-django-openid-auth/Makefile
index 51ef36761c70..b69de806277f 100644
--- a/www/py-django-openid-auth/Makefile
+++ b/www/py-django-openid-auth/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-openid-auth
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	www security python
 MASTER_SITES=	http://launchpadlibrarian.net/80020365/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	OpenID integration for django.contrib.auth
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.3.1:${PORTSDIR}/www/py-django \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.3.1:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}openid>=2.2.5:${PORTSDIR}/security/py-openid
 
 USES=		python
diff --git a/www/py-django-overextends/Makefile b/www/py-django-overextends/Makefile
index d203f10fe2e1..9218fe4aa520 100644
--- a/www/py-django-overextends/Makefile
+++ b/www/py-django-overextends/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-overextends
 PORTVERSION=	0.4.1
+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}django>=1.7:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.7:${PORTSDIR}/www/py-django18
 
 NO_ARCH=	yes
 
diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile
index 2fd95091e085..64d734081a74 100644
--- a/www/py-django-photologue/Makefile
+++ b/www/py-django-photologue/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-photologue
 PORTVERSION=	3.3.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Powerful image management and gallery application for Django
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:${PORTSDIR}/devel/py-pip
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}django-sortedm2m>0:${PORTSDIR}/www/py-django-sortedm2m \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
diff --git a/www/py-django-picklefield/Makefile b/www/py-django-picklefield/Makefile
index e9282f8d04aa..b9c15315543d 100644
--- a/www/py-django-picklefield/Makefile
+++ b/www/py-django-picklefield/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	picklefield
 PORTVERSION=	0.3.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
@@ -13,7 +14,7 @@ COMMENT=	Pickled object field for Django
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:${PORTSDIR}/www/py-django \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
 
 USES=		python
diff --git a/www/py-django-piston/Makefile b/www/py-django-piston/Makefile
index bfd672c9d62a..e42ef43a2549 100644
--- a/www/py-django-piston/Makefile
+++ b/www/py-django-piston/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-piston
 PORTVERSION=	0.2.3
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Piston is a Django mini-framework creating APIs
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-profiles/Makefile b/www/py-django-profiles/Makefile
index 89ec8c72dc93..a0f41f43555c 100644
--- a/www/py-django-profiles/Makefile
+++ b/www/py-django-profiles/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-profiles
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://bitbucket.org/ubernostrum/django-profiles/get/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ COMMENT=	User-profile application for Django
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
 USES=		python
diff --git a/www/py-django-redis/Makefile b/www/py-django-redis/Makefile
index 4dca265b776b..a295ce163f67 100644
--- a/www/py-django-redis/Makefile
+++ b/www/py-django-redis/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-redis
 PORTVERSION=	3.6.2
+PORTREVISION=	1
 CATEGORIES=	www databases
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ COMMENT=	Full featured Redis cache/session backend for Django
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.3:${PORTSDIR}/www/py-django \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.3:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}redis>=2.9.0:${PORTSDIR}/databases/py-redis
 
 USES=		python
diff --git a/www/py-django-registration-defaults/Makefile b/www/py-django-registration-defaults/Makefile
index 20e6c904b7dd..b38fb1e1db5a 100644
--- a/www/py-django-registration-defaults/Makefile
+++ b/www/py-django-registration-defaults/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-registration-defaults
 PORTVERSION=	0.4.4
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Default templates and settings for django-registration
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django-registration>=0:${PORTSDIR}/www/py-django-registration
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django-registration>=0:${PORTSDIR}/www/py-django-registration18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-registration-redux/Makefile b/www/py-django-registration-redux/Makefile
index c7179b01f083..6c33298e8f2c 100644
--- a/www/py-django-registration-redux/Makefile
+++ b/www/py-django-registration-redux/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-registration-redux
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	User-registration application for Django
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.4:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.4:${PORTSDIR}/www/py-django18
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-django-registration/Makefile b/www/py-django-registration/Makefile
index 37642948dafe..240b6e50eba1 100644
--- a/www/py-django-registration/Makefile
+++ b/www/py-django-registration/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-registration
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	User-registration application for Django
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.4:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.4:${PORTSDIR}/www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-reversion/Makefile b/www/py-django-reversion/Makefile
index 88c217b4cb97..740a8ec9efee 100644
--- a/www/py-django-reversion/Makefile
+++ b/www/py-django-reversion/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-reversion
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Provides comprehensive version control facilities to Django apps
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:${PORTSDIR}/www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/www/py-django-sekizai/Makefile b/www/py-django-sekizai/Makefile
index 109df8573dbd..360f1cdb63cb 100644
--- a/www/py-django-sekizai/Makefile
+++ b/www/py-django-sekizai/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	django-sekizai
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	xenophon+fbsdports@irtnog.org
 COMMENT=	Block templating system for Django
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.1:${PORTSDIR}/www/py-django-classy-tags
 
 USES=		python:2
diff --git a/www/py-django-signals-ahoy/Makefile b/www/py-django-signals-ahoy/Makefile
index 45a31fb57a3d..41cc339ebe78 100644
--- a/www/py-django-signals-ahoy/Makefile
+++ b/www/py-django-signals-ahoy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-signals-ahoy
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP/source/d/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Extended set of signals for use by Django apps
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-django-simple-captcha/Makefile b/www/py-django-simple-captcha/Makefile
index 28a0b56ed9af..ba34ca69f4b5 100644
--- a/www/py-django-simple-captcha/Makefile
+++ b/www/py-django-simple-captcha/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-simple-captcha
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Simple, yet powerful, Django captcha application
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.3:${PORTSDIR}/www/py-django \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.3:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}pillow>=2.0.0:${PORTSDIR}/graphics/py-pillow \
 		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:${PORTSDIR}/devel/py-six
 
diff --git a/www/py-django-simple-history/Makefile b/www/py-django-simple-history/Makefile
index b693123b0150..d381fee1c44c 100644
--- a/www/py-django-simple-history/Makefile
+++ b/www/py-django-simple-history/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-simple-history
 PORTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -11,7 +12,7 @@ COMMENT=	Store model history and view/revert changes from admin site
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django # >= 1.8
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18 # >= 1.8
 
 USE_GITHUB=	yes
 
diff --git a/www/py-django-sortedm2m/Makefile b/www/py-django-sortedm2m/Makefile
index 35ab91a4b73f..300f4ab79fd1 100644
--- a/www/py-django-sortedm2m/Makefile
+++ b/www/py-django-sortedm2m/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-sortedm2m
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Replacement for Django's many to many field
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
 
 NO_ARCH=	yes
 USES=		python
diff --git a/www/py-django-statici18n/Makefile b/www/py-django-statici18n/Makefile
index a3b29493efce..f155e8269307 100644
--- a/www/py-django-statici18n/Makefile
+++ b/www/py-django-statici18n/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-statici18n
 PORTVERSION=	1.1.5
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Helper for generating Javascript catalog to static files
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django<=18:${PORTSDIR}/www/py-django \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django<=18:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}django-appconf>=0.6:${PORTSDIR}/www/py-django-appconf
 
 USES=		python
diff --git a/www/py-django-subdomains/Makefile b/www/py-django-subdomains/Makefile
index 956173b8ec96..54d036a6f26e 100644
--- a/www/py-django-subdomains/Makefile
+++ b/www/py-django-subdomains/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-subdomains
 PORTVERSION=	2.0.4
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	rum1cro@yandex.ru
 COMMENT=	Subdomains helpers for the Django framework
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django18
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-tables2/Makefile b/www/py-django-tables2/Makefile
index e8451a30bc71..cf2e5842dadd 100644
--- a/www/py-django-tables2/Makefile
+++ b/www/py-django-tables2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-tables2
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Table/data-grid framework for Django
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:${PORTSDIR}/www/py-django \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
 
 USES=		python
diff --git a/www/py-django-tagging/Makefile b/www/py-django-tagging/Makefile
index f6f8c5b1ec31..49d3c339b752 100644
--- a/www/py-django-tagging/Makefile
+++ b/www/py-django-tagging/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-tagging
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ COMMENT=	Generic tagging application for Django
 LICENSE=	BSD3CLAUSE MIT
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-taggit/Makefile b/www/py-django-taggit/Makefile
index bd883d13ac4c..66670146a012 100644
--- a/www/py-django-taggit/Makefile
+++ b/www/py-django-taggit/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-taggit
 PORTVERSION=	0.15.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ COMMENT=	Reusable Django application for simple tagging
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django18
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-tastypie/Makefile b/www/py-django-tastypie/Makefile
index e32d3800fc14..0b64f8b38ef6 100644
--- a/www/py-django-tastypie/Makefile
+++ b/www/py-django-tastypie/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-tastypie
 PORTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +19,7 @@ MY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:${PORTSDIR}/devel/py-mimepar
 BUILD_DEPENDS=	${MY_DEPENDS}
 
 RUN_DEPENDS?=	${MY_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}django>=1.5:${PORTSDIR}/www/py-django
+		${PYTHON_PKGNAMEPREFIX}django>=1.5:${PORTSDIR}/www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-threaded-multihost/Makefile b/www/py-django-threaded-multihost/Makefile
index 686c98f7e206..2380aaee7fe4 100644
--- a/www/py-django-threaded-multihost/Makefile
+++ b/www/py-django-threaded-multihost/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	django-threaded-multihost
 PORTVERSION=	1.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	http://www.caomhin.org/geek/ports/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,7 @@ MAINTAINER=	ports@caomhin.org
 COMMENT=	Multi-host utilities to Django
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:${PORTSDIR}/devel/py-setuptools_hg
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django18
 
 LICENSE=	BSD3CLAUSE
 
diff --git a/www/py-django-tinymce/Makefile b/www/py-django-tinymce/Makefile
index aff86dd0b9ff..6be37829c0e8 100644
--- a/www/py-django-tinymce/Makefile
+++ b/www/py-django-tinymce/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-tinymce
 PORTVERSION=	2.0.4
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Django application to use TinyMCE editor
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:${PORTSDIR}/www/py-django18
 
 NO_ARCH=	yes
 
diff --git a/www/py-django_compressor/Makefile b/www/py-django_compressor/Makefile
index a4b2a9c80a02..2e7265c6c17b 100644
--- a/www/py-django_compressor/Makefile
+++ b/www/py-django_compressor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django_compressor
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-djangotoolbox/Makefile b/www/py-djangotoolbox/Makefile
index f99f50c0c766..babc3e6a0e83 100644
--- a/www/py-djangotoolbox/Makefile
+++ b/www/py-djangotoolbox/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	djangotoolbox
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Common API for running Django on non-relational/NoSQL databases
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django18
 
 USES=		python
 USE_PYTHON=	distutils autoplist