Index: head/www/py-django14/Makefile
===================================================================
--- head/www/py-django14/Makefile	(revision 395744)
+++ head/www/py-django14/Makefile	(revision 395745)
@@ -1,68 +1,70 @@
 # Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
 
 PORTNAME=	django
 PORTVERSION=	1.4.22
 CATEGORIES=	www python
-MASTER_SITES=	https://www.djangoproject.com/m/releases/${PORTVERSION:R}/ \
-		CHEESESHOP
+MASTER_SITES=	CHEESESHOP \
+		https://www.djangoproject.com/m/releases/${PORTVERSION:R}/		
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	14
 DISTNAME=	Django-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
-COMMENT=	High-level Python Web framework
+COMMENT=	High-level Python Web Framework (1.4.x LTS)
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe python:2
 USE_PYTHON=	autoplist distutils
 
-CONFLICTS=	py[23][0-9]-django-devel-[0-9]* py[23][0-9]-django-1.[0-35-9].*
-CPE_VENDOR=	djangoproject
+CONFLICTS_INSTALL=	py??-django-devel-* py??-django-1.[012356789].*
+CPE_VENDOR=		djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
 
-OPTIONS_DEFINE=	FASTCGI HTMLDOCS
-OPTIONS_DEFAULT=SQLITE
-OPTIONS_GROUP=	DATABASE
+OPTIONS_DEFINE=		FASTCGI HTMLDOCS
+OPTIONS_DEFAULT=	SQLITE
+
+OPTIONS_GROUP=		DATABASE
 OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
+
 HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 PLIST_FILES=	man/man1/daily_cleanup.1.gz \
 		man/man1/django-admin.1.gz \
 		man/man1/gather_profile_stats.1.gz
 
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHTMLDOCS}
-.	if ! ${PORT_OPTIONS:MDOCS}
+.	if empty(PORT_OPTIONS:MDOCS)
 IGNORE=	you cannot build documentation with DOCS option disabled
 .	endif
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
 PORTDOCS=	*
 .endif
 
 post-build:
 .if ${PORT_OPTIONS:MHTMLDOCS}
 	cd ${WRKSRC}/docs && ${MAKE} html
 .endif
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"			* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
 .if ${PORT_OPTIONS:MHTMLDOCS}
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/_build/html ${STAGEDIR}/${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: head/www/py-django16/Makefile
===================================================================
--- head/www/py-django16/Makefile	(revision 395744)
+++ head/www/py-django16/Makefile	(revision 395745)
@@ -1,74 +1,73 @@
 # Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
 
 PORTNAME=	django
 PORTVERSION=	1.6.11
 CATEGORIES=	www python
-MASTER_SITES=	https://www.djangoproject.com/m/releases/${PORTVERSION}/ \
-		CHEESESHOP
+MASTER_SITES=	CHEESESHOP \
+		https://www.djangoproject.com/m/releases/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	16
 DISTNAME=	Django-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
-COMMENT=	High-level Python Web framework
+COMMENT=	High-level Python Web Framework (1.6.x)
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 DEPRECATED=		End of extended support: April 1, 2015
 EXPIRATION_DATE=	2015-10-01
 
 USES=		cpe python
 USE_PYTHON=	autoplist distutils
 
-CPE_VENDOR=	djangoproject
-
-CONFLICTS=	py[23][0-9]-django-devel-[0-9]* py[23][0-9]-django-1.[0-57-9].*
+CONFLICTS_INSTALL=	py??-django-devel-* py??-django-1.[012345789].*
+CPE_VENDOR=		djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
 
 OPTIONS_DEFINE=		FASTCGI HTMLDOCS
 OPTIONS_DEFAULT=	SQLITE
 
 OPTIONS_GROUP=		DATABASE
 OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
 
 HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 PLIST_FILES=	man/man1/daily_cleanup.1.gz \
 		man/man1/django-admin.1.gz \
 		man/man1/gather_profile_stats.1.gz
 
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHTMLDOCS}
 .	if empty(PORT_OPTIONS:MDOCS)
 IGNORE=	you cannot build documentation with DOCS option disabled
 .	endif
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
 PORTDOCS=	*
 .endif
 
 post-build:
 .if ${PORT_OPTIONS:MHTMLDOCS}
 	cd ${WRKSRC}/docs && ${MAKE} html
 .endif
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"			* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
 .if ${PORT_OPTIONS:MHTMLDOCS}
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/_build/html ${STAGEDIR}/${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: head/www/py-django17/Makefile
===================================================================
--- head/www/py-django17/Makefile	(revision 395744)
+++ head/www/py-django17/Makefile	(revision 395745)
@@ -1,68 +1,69 @@
 # Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
 
 PORTNAME=	django
 PORTVERSION=	1.7.10
 CATEGORIES=	www python
-MASTER_SITES=	https://www.djangoproject.com/m/releases/${PORTVERSION}/ \
-		CHEESESHOP
+MASTER_SITES=	CHEESESHOP \
+		https://www.djangoproject.com/m/releases/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	17
 DISTNAME=	Django-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
-COMMENT=	High-level Python Web framework
+COMMENT=	High-level Python Web Framework (1.7.x)
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe python
 USE_PYTHON=	autoplist distutils
 
-CPE_VENDOR=	djangoproject
+CONFLICTS_INSTALL=	py??-django-devel-* py??-django-1.[012345689].*
+CPE_VENDOR=		djangoproject
 
-CONFLICTS=	py[23][0-9]-django-devel-[0-9]* py[23][0-9]-django-1.[0-57-9].*
-
 DOCSDIR=	${PREFIX}/share/doc/py-django
 
-OPTIONS_DEFINE=	FASTCGI HTMLDOCS
-OPTIONS_DEFAULT=SQLITE
-OPTIONS_GROUP=	DATABASE
+OPTIONS_DEFINE=		FASTCGI HTMLDOCS
+OPTIONS_DEFAULT=	SQLITE
+
+OPTIONS_GROUP=		DATABASE
 OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
+
 HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 PLIST_FILES=	man/man1/django-admin.1.gz \
 		man/man1/gather_profile_stats.1.gz
 
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHTMLDOCS}
 .	if empty(PORT_OPTIONS:MDOCS)
 IGNORE=	you cannot build documentation with DOCS option disabled
 .	endif
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
 PORTDOCS=	*
 .endif
 
 post-build:
 .if ${PORT_OPTIONS:MHTMLDOCS}
 	cd ${WRKSRC}/docs && ${MAKE} html
 .endif
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"			* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
 .if ${PORT_OPTIONS:MHTMLDOCS}
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/_build/html ${STAGEDIR}/${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: head/www/py-django18/Makefile
===================================================================
--- head/www/py-django18/Makefile	(revision 395744)
+++ head/www/py-django18/Makefile	(revision 395745)
@@ -1,69 +1,68 @@
 # Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
 
 PORTNAME=	django
 PORTVERSION=	1.8.4
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP \
 		https://www.djangoproject.com/m/releases/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	18
 DISTNAME=	Django-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	High-level Python Web Framework (1.8.x LTS)
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe python
 USE_PYTHON=	autoplist distutils
 
-CPE_VENDOR=	djangoproject
-
 CONFLICTS_INSTALL=	py??-django-devel-* py??-django-1.[012345679].*
+CPE_VENDOR=		djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
 
 OPTIONS_DEFINE=		FASTCGI HTMLDOCS
 OPTIONS_DEFAULT=	SQLITE
 
 OPTIONS_GROUP=		DATABASE
 OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
 
 HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 PLIST_FILES=	man/man1/django-admin.1.gz
 
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHTMLDOCS}
 .	if empty(PORT_OPTIONS:MDOCS)
 IGNORE=	you cannot build documentation with DOCS option disabled
 .	endif
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
 PORTDOCS=	*
 .endif
 
 post-build:
 .if ${PORT_OPTIONS:MHTMLDOCS}
 	cd ${WRKSRC}/docs && ${MAKE} html
 .endif
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"			* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
 .if ${PORT_OPTIONS:MHTMLDOCS}
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/_build/html ${STAGEDIR}/${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>