Index: branches/2015Q3/www/py-django14/Makefile
===================================================================
--- branches/2015Q3/www/py-django14/Makefile	(revision 391671)
+++ branches/2015Q3/www/py-django14/Makefile	(revision 391672)
@@ -1,68 +1,68 @@
 # Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
 
 PORTNAME=	django
-PORTVERSION=	1.4.20
+PORTVERSION=	1.4.21
 CATEGORIES=	www python
 MASTER_SITES=	https://www.djangoproject.com/m/releases/${PORTVERSION:R}/ \
 		CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	14
 DISTNAME=	Django-${PORTVERSION}
 DIST_SUBDIR=	python
 
-MAINTAINER=	lwhsu@FreeBSD.org
+MAINTAINER=	python@FreeBSD.org
 COMMENT=	High-level Python Web framework
 
 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
 
 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 ! ${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: branches/2015Q3/www/py-django14/distinfo
===================================================================
--- branches/2015Q3/www/py-django14/distinfo	(revision 391671)
+++ branches/2015Q3/www/py-django14/distinfo	(revision 391672)
@@ -1,2 +1,2 @@
-SHA256 (python/Django-1.4.20.tar.gz) = 58ac719464c4c8b13d664ded6770450602528bf4c36f9fd5daabdae8d410ebb1
-SIZE (python/Django-1.4.20.tar.gz) = 7877794
+SHA256 (python/Django-1.4.21.tar.gz) = 934f1975218680d51c4da9d63a39bc5fb1ddaac48476fd34b9ab7903fd98bcf4
+SIZE (python/Django-1.4.21.tar.gz) = 7878015
Index: branches/2015Q3
===================================================================
--- branches/2015Q3	(revision 391671)
+++ branches/2015Q3	(revision 391672)

Property changes on: branches/2015Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r391667