--- Makefile.orig	2012-07-09 22:03:38.000000000 +0200
+++ Makefile	2012-07-09 21:56:03.000000000 +0200
@@ -30,6 +30,15 @@
 # consult the maintainer of those ports before updating this one.    #
 ######################################################################
 
+OPTIONS_DEFINE=	DOCS KQUEUE SSL MANAGESIEVE GSSAPI VPOPMAIL BDB LDAP PGSQL MYSQL SQLITE
+OPTIONS_DEFAULT=KQUEUE SSL MANAGESIEVE
+
+KQUEUE_DESC=		kqueue(2) support
+MANAGESIEVE_DESC=	ManageSieve support
+VPOPMAIL_DESC=		VPopMail support
+
+.include <bsd.port.options.mk>
+
 USE_ICONV=	yes
 USE_RC_SUBR=	dovecot.sh
 
@@ -45,7 +54,7 @@
 		${PREFIX}/lib/dovecot/pop3 \
 		${PREFIX}/lib/dovecot/lda
 
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=	--without-docs
 .else
 DOCS=		AUTHORS COPYING COPYING.LGPL COPYING.MIT INSTALL NEWS TODO README
@@ -57,17 +66,6 @@
 
 PROTOCOLS=	imap pop3
 
-OPTIONS=	KQUEUE		"kqueue(2) support"	on  \
-		SSL		"SSL support"		on  \
-		MANAGESIEVE	"ManageSieve support"	on  \
-		GSSAPI		"GSSAPI support"	off \
-		VPOPMAIL	"VPopMail support"	off \
-		BDB		"BerkleyDB support"	off \
-		LDAP		"OpenLDAP support"	off \
-		PGSQL		"PostgreSQL support"	off \
-		MYSQL		"MySQL support"		off \
-		SQLITE		"SQLite support"	off
-
 .include <bsd.port.pre.mk>
 
 # Default requirement for dovecot rc script
@@ -84,13 +82,13 @@
 
 ## kqueue(2) support
 #
-.if !defined(WITHOUT_KQUEUE)
+.if ${PORT_OPTIONS:MKQUEUE}
 CONFIGURE_ARGS+=	--with-ioloop=kqueue
 .endif
 
 ## SSL support
 #
-.if defined(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
 PROTOCOLS+=		imaps pop3s
 .else
 CONFIGURE_ARGS+=	--without-ssl
@@ -98,7 +96,7 @@
 
 ## ManageSieve support
 #
-.if defined(WITH_MANAGESIEVE)
+.if ${PORT_OPTIONS:MMANAGESIEVE}
 MANAGESIEVEVERSION!=	${MAKE} -C ${.CURDIR}/../dovecot-managesieve -V PORTVERSION
 PATCH_SITES!=		${MAKE} -C ${.CURDIR}/../dovecot-managesieve -V MASTER_SITES
 PATCHFILES+=		dovecot-${PORTVERSION}-managesieve-${MANAGESIEVEVERSION}.diff.gz
@@ -109,7 +107,7 @@
 
 ## GSSAPI support
 #
-.if defined(WITH_GSSAPI)
+.if ${PORT_OPTIONS:MGSAPI}
 CONFIGURE_ARGS+=	--with-gssapi
 .else
 CONFIGURE_ARGS+=	--without-gssapi
@@ -117,7 +115,7 @@
 
 ## VPopMail Support
 #
-.if defined(WITH_VPOPMAIL)
+.if ${PORT_OPTIONS:MVPOPMAIL}
 VPOPMAIL=		${LOCALBASE}/vpopmail/bin/vchkpw
 BUILD_DEPENDS+=		${VPOPMAIL}:${PORTSDIR}/mail/vpopmail
 CONFIGURE_ARGS+=	--with-vpopmail
@@ -127,7 +125,7 @@
 
 ## BDB Support
 #
-.if defined(WITH_BDB)
+.if ${PORT_OPTIONS:MBDB}
 USE_BDB=		42+
 CONFIGURE_ARGS+=	--with-db
 CFLAGS+=		-I${BDB_INCLUDE_DIR} -L${BDB_LIB_DIR}
@@ -139,7 +137,7 @@
 
 ## OpenLDAP Support
 #
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--with-ldap
 PLIST_SUB+=		LDAP=""
@@ -151,7 +149,7 @@
 
 ## PostgreSQL Support
 #
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-pgsql
 PLIST_SUB+=		SQL=""
@@ -163,7 +161,7 @@
 
 ## MySQL Support
 #
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql
 PLIST_SUB+=		SQL=""
@@ -175,7 +173,7 @@
 
 ## SQLite Support
 #
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=		3
 CONFIGURE_ARGS+=	--with-sqlite
 PLIST_SUB+=		SQL=""
@@ -215,7 +213,7 @@
 		| ${SED} -e 's:^@exec ::; s:%D:${PREFIX}:g;' \
 		> ${WRKDIR}/.PLIST.exec \
 		&& ${SH} ${WRKDIR}/.PLIST.exec
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor