diff --git a/www/py-django-devel/Makefile b/www/py-django-devel/Makefile
index 966cb2b40aeb..9d6036feb453 100644
--- a/www/py-django-devel/Makefile
+++ b/www/py-django-devel/Makefile
@@ -35,11 +35,10 @@ CONFLICTS=	py2[0-9]-django-[0-9]*
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
 
-OPTIONS=	POSTGRESQL	"PostgreSQL support"	off \
-		MYSQL	"MySQL support"	off \
-		SQLITE	"SQLite support"	off \
-		FASTCGI	"FastCGI support"	off \
-		DOCS	"Install HTML documentation (requires Sphinx)"	off
+OPTIONS_DEFINE=	PGSQL MYSQL SQLITE FASTCGI DOCS
+OPTIONS_DEFAULT=
+
+HTMLDOCS_DESC=	Build and install the HTML documentation (requires Sphinx)
 
 MAN1=		daily_cleanup.1 django-admin.1 gather_profile_stats.1
 
@@ -48,23 +47,23 @@ OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}-devel/options
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psycopg2/_psycopg.so:${PORTSDIR}/databases/py-psycopg2
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
 .endif
 
-.if defined(WITH_FASTCGI)
+.if ${PORT_OPTIONS:MFASTCGI}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
 .endif
 
-.if defined(WITH_DOCS)
+.if ${PORT_OPTIONS:MHTMLDOCS}
 .	if defined(NOPORTDOCS)
 IGNORE=	you cannot build documentation while setting NOPORTDOCS
 .	endif
@@ -73,7 +72,7 @@ PORTDOCS=	*
 .endif
 
 post-build:
-.if defined(WITH_DOCS)
+.if ${PORT_OPTIONS:MHTMLDOCS}
 	cd ${WRKSRC}/docs && ${MAKE} html
 .endif
 
@@ -82,7 +81,7 @@ post-install:
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"			* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
-.if defined(WITH_DOCS)
+.if ${PORT_OPTIONS:MHTMLDOCS}
 	${MKDIR} ${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/_build/html ${DOCSDIR}
 .endif