Index: www/py-google-api-python-client/Makefile
===================================================================
--- www/py-google-api-python-client/Makefile
+++ www/py-google-api-python-client/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	google-api-python-client
 PORTVERSION=	1.7.6
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -24,13 +24,25 @@
 
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=	DJANGO GAE WEBTEST
+OPTIONS_DEFINE=	GAE WEBTEST
+OPTIONS_GROUP=	BACKENDS
+OPTIONS_GROUP_BACKENDS=	DJANGO
+
 DJANGO_DESC=		Use the library with Django
-DJANGO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.3:www/py-django111@${PY_FLAVOR}
 GAE_DESC=		Use the library with Google App Engine
 GAE_RUN_DEPENDS=	google-appengine>=1.4.3:www/google-appengine
 WEBTEST_DESC=		Use WebTest helper to test WSGI apps
 WEBTEST_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}WebTest>=1.3.3:www/py-WebTest@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${PY_FLAVOR}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3500
+OPTIONS_GROUP_BACKENDS:=	${OPTIONS_GROUP_BACKENDS:NDJANGO}
+COMPLETE_OPTIONS_LIST:=		${COMPLETE_OPTIONS_LIST:NDJANGO}
+PORT_OPTIONS:=			${PORT_OPTIONS:NDJANGO}
+.elif ${PORT_OPTIONS:MDJANGO}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}django22>=1.3:www/py-django22@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>