- Update to 20130106 snapshot

- Trim header
- Use multi-choices of new options framework

Security:	1b769b72-582b-11e2-b66b-00e0814cab4e

www/py-django-devel/Makefile

@@ -1,9 +1,5 @@
-# New ports collection makefile for:	django-devel
-# Date created:				Jul 04 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	django
 PORTVERSION=	${SNAPSHOTDATE}
@@ -21,7 +17,7 @@ COMMENT=	High-level Python Web framework
 
 LICENSE=	BSD
 
-SNAPSHOTDATE=	20120731
+SNAPSHOTDATE=	20130106
 
 USE_XZ=	yes
 USE_GETTEXT=	yes
@@ -29,26 +25,26 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
 PYDISTUTILS_PKGNAME=	Django
-PYDISTUTILS_PKGVERSION=	1.5
+PYDISTUTILS_PKGVERSION=	1.6
 
 CONFLICTS=	py2[0-9]-django-[0-9]*
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
 
-OPTIONS_DEFINE=	PGSQL MYSQL SQLITE FASTCGI DOCS
-OPTIONS_DEFAULT=
-
-HTMLDOCS_DESC=	Build and install the HTML documentation (requires Sphinx)
+# bypass infrastructure bug
+OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}-devel/options
+OPTIONS_DEFINE=	FASTCGI HTMLDOCS
+OPTIONS_DEFAULT=SQLITE
+OPTIONS_MULTI=	DATABASE
+OPTIONS_MULTI_DATABASE=	PGSQL MYSQL SQLITE
+HTMLDOCS_DESC=	Install the HTML documentation (requires Sphinx)
 
 MAN1=		daily_cleanup.1 django-admin.1 gather_profile_stats.1
 
-# bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}-devel/options
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psycopg2/_psycopg.so:${PORTSDIR}/databases/py-psycopg2
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
@@ -56,7 +52,7 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MyS
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MFASTCGI}
@@ -64,7 +60,7 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
 .endif
 
 .if ${PORT_OPTIONS:MHTMLDOCS}
-.	if defined(NOPORTDOCS)
+.	if empty(PORT_OPTIONS:MDOCS)
 IGNORE=	you cannot build documentation while setting NOPORTDOCS
 .	endif
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
@@ -86,4 +82,4 @@ post-install:
 	${CP} -R ${WRKSRC}/docs/_build/html ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

www/py-django-devel/distinfo

@@ -1,2 +1,2 @@
-SHA256 (python/Django-20120731.tar.xz) = 37e0d7347b90ac23b9f0030066c371b320bb2c5d3447095fe7ca0e31c0e13217
-SIZE (python/Django-20120731.tar.xz) = 4446176
+SHA256 (python/Django-20130106.tar.xz) = 0b359087f99ef29fcd0fcdc362bf2463872605d6d44b7fbee0fd20ac253454c4
+SIZE (python/Django-20130106.tar.xz) = 4178276