16 files changed, 229 insertions, 232 deletions

diff --git a/mail/gld/Makefile b/mail/gld/Makefile
index dc2592dc9dc5..50bdd643ecc0 100644
--- a/mail/gld/Makefile
+++ b/mail/gld/Makefile
@@ -20,20 +20,18 @@ HAS_CONFIGURE=	yes
 
 SUB_FILES=	pkg-message
 
-OPTIONS=	MYSQL   "MySQL support"         on \
-		PGSQL   "PgSQL support"         off \
-		LOCAL_DB_SERVER "RUN_DEPEND also on selected DB server" off
+OPTIONS_SINGLE=	DB
+OPTIONS_SINGLE_DB=	MYSQL PGSQL
+OPTIONS_DEFINE=	LOCAL_DB_SERVER
+OPTIONS_DEFAULT=	MYSQL
+LOCAL_DB_SERVER_DESC=	RUN_DEPEND also on selected DB server
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MYSQL) && defined(WITH_PGSQL)
-BROKEN=		Cannot compile with both MySQL and PgSQL support
-.endif
-
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 USE_MYSQL=	yes
-.	if defined(WITH_LOCAL_DB_SERVER)
+.	if ${PORT_OPTIONS:MLOCAL_DB_SERVER}
 RUN_DEPENDS+=	mysql-server>=0:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
 SUB_LIST+=	MYSQL=mysql
 SUB_LIST+=	PGSQL=
@@ -42,10 +40,10 @@ SUB_LIST+=	MYSQL=
 .	endif
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
 USE_PGSQL=	yes
-.	if defined(WITH_LOCAL_DB_SERVER)
+.	if ${PORT_OPTIONS:MLOCAL_DB_SERVER}
 RUN_DEPENDS+=	postgresql-server>=0:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
 SUB_LIST+=	PGSQL=postgresql
 SUB_LIST+=	MYSQL=
@@ -66,7 +64,7 @@ do-install:
 .if !exists(${PREFIX}/etc/gld.conf)
 	${INSTALL_DATA} ${WRKSRC}/gld.conf ${PREFIX}/etc/gld.conf
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for FILE in HISTORY LICENCE README table-whitelist.sql tables.mysql tables.pgsql
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
@@ -76,4 +74,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 2c3ff3075052..bad373c9f0a8 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -17,8 +17,8 @@ COMMENT=	A library for posting electronic mail
 
 LICENSE=	LGPL21
 
-OPTIONS=	OPENSSL	"Enable TLS support"	on \
-		DEBUG	"Enables debugging support"	off
+OPTIONS_DEFINE=	OPENSSL DEBUG DOCS EXAMPLES
+OPTIONS_DEFAULT=	OPENSSL
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -35,7 +35,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_OPENSSL)
+.if ${PORT_OPTIONS:MOPENSSL}
 CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 PLIST_SUB+=		NEED_OPENSSL=""
 .else
@@ -43,18 +43,18 @@ CONFIGURE_ARGS+=	--without-openssl
 PLIST_SUB+=		NEED_OPENSSL="@comment "
 .endif
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for f in AUTHORS ChangeLog NEWS Notes README TODO
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 .endif
diff --git a/mail/libspf/Makefile b/mail/libspf/Makefile
index 306cab0d2d28..df8bbaa9c82e 100644
--- a/mail/libspf/Makefile
+++ b/mail/libspf/Makefile
@@ -23,21 +23,21 @@ USE_LDCONFIG=	yes
 
 PORTDOCS=	*
 
-OPTIONS=	RFC_RECURSION	"Change SPF recursion to 20 (as per RFC)"	off \
-		LOGFILE_STATS	"Enables logfile stats"				off \
-		DEBUG		"Enables debug option"				off
+OPTIONS_DEFINE=	RFC_RECURSION LOGFILE_STATS DEBUG DOCS
+RFC_RECURSION_DESC=	Change SPF recursion to 20 (as per RFC)
+LOGFILE_STATS_DESC=	Enables logfile stats
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_RFC_RECURSION)
+.if ${PORT_OPTIONS:MRFC_RECURSION}
 CONFIGURE_ARGS+=	--enable-rfc-recursion
 .endif
 
-.if defined(WITH_LOGFILE_STATS)
+.if ${PORT_OPTIONS:MLOGFILE_STATS}
 CONFIGURE_ARGS+=	--enable-logfile-stats
 .endif
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
@@ -46,7 +46,7 @@ post-patch:
 		${WRKSRC}/src/libspf/Makefile.in ${WRKSRC}/src/spfqtool/Makefile.in
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${FIND} ${WRKSRC}/docs -type d -name CVS | ${XARGS} ${RM} -rf
 .for i in docs docs/API docs/API/doxygen docs/API/doxygen/html docs/RFC docs/qmail \
@@ -78,4 +78,4 @@ post-install:
 	done
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/mahogany/Makefile b/mail/mahogany/Makefile
index b75f5ea641de..4ef64f2b0123 100644
--- a/mail/mahogany/Makefile
+++ b/mail/mahogany/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS=	--without-dspam --with-python=none
 ALL_TARGET=	all locales
 INSTALL_TARGET=	install_bin install_locale
 
-OPTIONS=	NLS "Enable Native Language Support" on
+OPTIONS_DEFINE=	NLS
 
 MAN1=		M.1 mahogany.1
 
@@ -33,7 +33,7 @@ MAN1=		M.1 mahogany.1
 BROKEN=		Does not compile with GCC 4.2
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 98de2744a1ec..e3abd6c5601c 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -66,54 +66,42 @@ PORTDOCS=	ACKNOWLEDGMENTS BUGS FAQ INSTALL NEWS README README-I18N.en \
 		mailman-member.txt \
 		FreeBSD-post-install-notes
 
-OPTIONS=	SENDMAIL "for use with sendmail" off \
-		EXIM3 "for use with exim3" off \
-		EXIM4 "for use with exim4" off \
-		POSTFIX "for use with postfix" off \
-		COURIER "for use with courier" off \
-		HTDIG "htdig integration patches" off \
-		INTEGRATION "integrating postfix and mailman" off \
-		NAMAZU2 "make private archives searchable with namazu2" off
+OPTIONS_SINGLE=	MTA
+OPTIONS_SINGLE_MTA=	SENDMAIL EXIM3 EXIM4 POSTFIX COURIER
+OPTIONS_DEFINE=	MTA HTDIG INTEGRATION NAMAZU2 NLS DOCS
+SENDMAIL_DESC=	for use with sendmail
+EXIM3_DESC=	for use with exim3
+EXIM4_DESC=	for use with exim4
+POSTFIX_DESC=	for use with postfix
+COURIER_DESC=	fr use with courier
+HTDIG_DESC=	htdig integration patches
+INTEGRATION_DESC=	integrating postfix and mailman
+NAMAZU2_DESC=	make private archives searchable with namazu2
+MTA_DESC=	integrate with a MTA
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_NLS)
-PLIST_SUB+=	NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITH_SENDMAIL)
-.if defined(WITH_EXIM3) || defined(WITH_EXIM4) || defined(WITH_POSTFIX) || \
-defined(WITH_COURIER)
-IGNORE=	can only have one MTA selected to integrate with
-.endif
+.if ${PORT_OPTIONS:MSENDMAIL}
 MAIL_GID?=	mailnull
 .endif
 
-.if defined(WITH_EXIM3)
-.if defined(WITH_SENDMAIL) || defined(WITH_EXIM4) || defined(WITH_POSTFIX) || \
-defined(WITH_COURIER)
-IGNORE=	can only have one MTA selected to integrate with
-.endif
+.if ${PORT_OPTIONS:MEXIM3}
 MAIL_GID?=	nobody
 .endif
 
-.if defined(WITH_EXIM4)
-.if defined(WITH_SENDMAIL) || defined(WITH_EXIM3) || defined(WITH_POSTFIX) || \
-defined(WITH_COURIER)
-IGNORE=	can only have one MTA selected to integrate with
-.endif
+.if ${PORT_OPTIONS:MEXIM4}
 MAIL_GID?=	mail
 .endif
 
-.if defined(WITH_POSTFIX)
-.if defined(WITH_SENDMAIL) || defined(WITH_EXIM3) || defined(WITH_EXIM4) || \
-defined(WITH_COURIER)
-IGNORE=	can only have one MTA selected to integrate with
-.endif
-.if defined(WITH_INTEGRATION)
+.if ${PORT_OPTIONS:MPOSTFIX}
+.if ${PORT_OPTIONS:MINTEGRATION}
 MAIL_GID?=	mailman
 .else
 MAIL_GID?=	nobody
@@ -121,15 +109,11 @@ MAIL_GID?=	nobody
 EXTRA_PATCHES+=	${FILESDIR}/postfix-verp.diff
 .endif
 
-.if defined(WITH_COURIER)
-.if defined(WITH_SENDMAIL) || defined(WITH_EXIM3) || defined(WITH_EXIM4) || \
-defined(WITH_POSTFIX)
-IGNORE=	can only have one MTA selected to integrate with
-.endif
+.if ${PORT_OPTIONS:MCOURIER}
 MAIL_GID?=	courier
 .endif
 
-.if defined(WITH_HTDIG)
+.if ${PORT_OPTIONS:MHTDIG}
 BROKEN=	the HTDIG option is currently broken
 PATCH_SITES+=	http://www.openinfo.co.uk/mm/patches/444879/:patch1 \
 		http://www.openinfo.co.uk/mm/patches/444884/:patch2
@@ -143,7 +127,7 @@ PLIST_SUB+=	SUB_HTDIG=""
 PLIST_SUB+=	SUB_HTDIG="@comment "
 .endif
 
-.if defined(WITH_NAMAZU2)
+.if ${PORT_OPTIONS:MNAMAZU2}
 RUN_DEPENDS+=	mknmz:${PORTSDIR}/databases/namazu2
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Mailman-Cgi-private.py
 .endif
@@ -164,12 +148,12 @@ post-patch:
 	@${REINPLACE_CMD} -e 's#%%LOCALBASE%%#${LOCALBASE}#g' \
 	  ${WRKSRC}/Mailman/Defaults.py.in
 	@${REINPLACE_CMD} -e 's/^0,5,10/#&/' ${WRKSRC}/cron/crontab.in.in
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e 's/messages//' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's/templates//' ${WRKSRC}/Makefile.in
 .endif
 
-.if defined(WITH_POSTFIX) && defined(WITH_INTEGRATION)
+.if ${PORT_OPTIONS:MPOSTFIX} && !empty(PORT_OPTIONS:MINTEGRATION)
 pre-configure:
 	@${ECHO} "MTA = 'Postfix'" >> ${WRKSRC}/Mailman/mm_cfg.py.dist.in
 .endif
@@ -186,7 +170,7 @@ post-install:
 .endfor
 	@uudecode -p ${FILESDIR}/powerlogo.gif.uue > \
 	  ${PREFIX}/${IMGDIR}/powerlogo.gif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${CP} -R ${WRKSRC}/doc/* ${WRKSRC}/
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${FILESDIR}/FreeBSD-post-install-notes ${DOCSDIR}
@@ -196,7 +180,7 @@ post-install:
 .endif
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
-.if defined(WITH_POSTFIX)
+.if ${PORT_OPTIONS:MPOSTFIX}
 	@if [ "x`${LOCALBASE}/sbin/postconf -h myhostname`" != "xlocalhost" ]; then \
 		${ECHO_CMD} ""; \
 		${ECHO_CMD} "Your Postfix hostname is non-default."; \
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index b06cd2f92f38..44e46b4bdc59 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -17,7 +17,9 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Implementation of MIME, the Multipurpose Internet Mail Extensions
 
-OPTIONS=	X11 "X11 hebrew font support" on
+OPTIONS_DEFINE=	X11
+OPTIONS_DEFAULT=	X11
+X11_DESC=	X11 hebrew font support
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 MAN1=		audiocompose.1 audiosend.1 extcompose.1 \
@@ -28,9 +30,9 @@ MAN1=		audiocompose.1 audiosend.1 extcompose.1 \
 		showpicture.1 splitmail.1
 MAN4=		mailcap.4
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 BUILD_DEPENDS+=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 RUN_DEPENDS+=	xloadimage:${PORTSDIR}/x11/xloadimage \
@@ -42,9 +44,9 @@ PLIST_SUB+=	X11="@comment "
 .endif
 
 post-patch:
-.if defined(WITHOUT_X11)
+.if empty(PORT_OPTIONS:MX11)
 	@${REINPLACE_CMD} -e '/fonts/d' ${WRKSRC}/Makefile
 .endif
 	@${RM} ${WRKSRC}/bin/*.orig
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/mixminion/Makefile b/mail/mixminion/Makefile
index f4cc7d5a0905..bbc4e47e1432 100644
--- a/mail/mixminion/Makefile
+++ b/mail/mixminion/Makefile
@@ -25,11 +25,13 @@ MAN8=	mixminiond.8
 
 PORTDOCS=	statusfd.txt tutorial.txt
 
-OPTIONS=	SERVER "Also install the server" on
+OPTIONS_DEFINE=	SERVER DOCS
+OPTIONS_DEFAULT=	SERVER
+SERVER_DESC=	Also install the server
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_SERVER)
+.if ${PORT_OPTIONS:MSERVER}
 USE_RC_SUBR+=	mixminiond
 SUB_FILES+=	pkg-message
 PLIST_SUB+=	SERVER=""
@@ -43,7 +45,7 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|share/man|man|g" ${WRKSRC}/setup.py
 
 post-install:
-.if !defined(WITHOUT_SERVER)
+.if ${PORT_OPTIONS:MSERVER}
 	@${INSTALL_DATA} ${WRKSRC}/etc/mixminiond.conf \
 		${PREFIX}/etc/mixminiond.conf.sample
 	@${INSTALL_DATA} ${WRKSRC}/etc/blacklist.conf \
@@ -59,11 +61,11 @@ post-install:
 	@${CHMOD} 0700 /var/log/mixminion
 	@${CAT} ${PKGMESSAGE}
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/openwebmail/Makefile b/mail/openwebmail/Makefile
index 6a1d30403fe2..77ae3c983b9f 100644
--- a/mail/openwebmail/Makefile
+++ b/mail/openwebmail/Makefile
@@ -27,86 +27,86 @@ PATCH_WRKSRC=	${WRKSRC}/cgi-bin/openwebmail
 PATCH_STRIP=	-p1
 PLIST=		${WRKDIR}/.PLIST.${PKGNAME}
 
-OPTIONS=	ANTIWORD "AntiWord" off \
-		IMAGEMAGICK "ImageMagicK" off \
-		ISPELL "ISpell" off \
-		LEARNSPAM "Learn HAM/SPAM" off \
-		LSOF "lsof" off \
-		PAM "PAM" off \
-		POP3_OVER_SSL "POP3 Over SSL" off \
-		QUOTA "Quota" off \
-		SPAMCHECK "Spam check (Mail::SpamAssassin)" off \
-		SPAMCHECK_ALL "Spam check for all (default: pop3)" off \
-		SPEEDYCGI "SpeedyCGI" off \
-		TNEF "tnef" off \
-		VIRUSCHECK "Virus check (Clam AntiVirus)" off \
-		VIRUSCHECK_ALL "Virus check for all (default: pop3)" off \
-		WGET "wget" off \
-		ZLIB "ZLib" off
+OPTIONS_DEFINE=	ANTIWORD MAGICK ISPELL LEARNSPAM LSOF PAM POP3_OVER_SSL QUOTA \
+		SPAMCHECK SPAMCHECK_ALL SPEEDYCGI TNEF VIRUSCHECK VIRUSCHECK_ALL \
+		WGET ZLIB
+
+ANTIWORD_DESC=	AntiWord
+ISPELL_DESC=	ISpell
+LEARNSPAM_DESC=	Learn HAM/SPAM
+LSOF_DESC=	lsof
+PAM_DESC=	PAM
+POP3_OVER_SSL_DESC=	POP3 Over SSL
+QUOTA_DESC=	Quota
+SPAMCHECK_DESC=	Spam check (Mail::SpamAssassin)
+SPAMCHECK_ALL_DESC=	Spam check for all (default: pop3)
+SPEEDYCGI_DESC=	SpeedyCGI
+TNEF_DESC=	tnef
+VIRUSCHECK_DESC=	Virus check (Clam AntiVirus)
+VIRUSCHECK_ALL_DESC=	Virus check for all (default: pop3)
+WGET_DESC=	wget
+ZLIB_DESC=	ZLib
 
 .include <bsd.port.pre.mk>
 
 # WITH_SPEEDYCGI needs suidperl enabled under perl 5.8.4 or above,
 # so, disable it first, and enable it again if perl exists and enabled suidperl
-.if ${PERL_LEVEL} >= 500804 && defined(WITH_SPEEDYCGI)
+.if ${PERL_LEVEL} >= 500804 && !empty(PORT_OPTIONS:MSPEEDYCGI)
 DISABLE_SPEEDYCGI=yes
-WITHOUT_SPEEDYCGI=yes
-.undef WITH_SPEEDYCGI
+PORT_OPTIONS:=	${PORT_OPTIONS:NSPEEDYCGI}
 .if exists(${PERL})
 PERL_V!=	${PERL} -V
 .if ${PERL_V:M*dosuid*} != ""
 .undef DISABLE_SPEEDYCGI
-.undef WITHOUT_SPEEDYCGI
-WITH_SPEEDYCGI=	yes
 .endif # dosuid
 .endif # exists(${PERL})
 .endif # perl5.8
 
-.if defined(WITH_LEARNSPAM) || defined(WITH_SPAMCHECK_ALL)
-WITH_SPAMCHECK=	true
+.if ${PORT_OPTIONS:MLEARNSPAM} || !empty(PORT_OPTIONS:MSPAMCHECK_ALL)
+PORT_OPTIONS+=	SPAMCHECK
 .endif
 
-.if defined(WITH_VIRUSCHECK_ALL)
-WITH_VIRUSCHECK=true
+.if ${PORT_OPTIONS:MVIRUSCHECK_ALL}
+PORT_OPTIONS+=	VIRUSCHECK
 .endif
 
-.if defined(WITH_ANTIWORD)
+.if ${PORT_OPTIONS:MANTIWORD}
 RUN_DEPENDS+=	antiword:${PORTSDIR}/textproc/antiword
 .endif
 
-.if defined(WITH_IMAGEMAGICK)
+.if ${PORT_OPTIONS:MMAGICK}
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .endif
 
-.if defined(WITH_ISPELL)
+.if ${PORT_OPTIONS:MISPELL}
 RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 .endif
 
-.if defined(WITH_LSOF)
+.if ${PORT_OPTIONS:MLSOF}
 RUN_DEPENDS+	${LOCALBASE}/sbin/lsof:${PORTSDIR}/sysutils/lsof
 .endif
 
-.if defined(WITH_PAM)
+.if ${PORT_OPTIONS:MPAM}
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Authen/PAM.pm:${PORTSDIR}/security/p5-Authen-PAM
 .endif
 
-.if defined(WITH_POP3_OVER_SSL)
+.if ${PORT_OPTIONS:MPOP3_OVER_SSL}
 RUN_DEPENDS+=	${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
 .endif
 
-.if defined(WITH_QUOTA)
+.if ${PORT_OPTIONS:MQUOTA}
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Quota.pm:${PORTSDIR}/sysutils/p5-Quota
 .endif
 
-.if defined(WITH_TNEF)
+.if ${PORT_OPTIONS:MTNEF}
 RUN_DEPENDS+=	${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
 .endif
 
-.if defined(WITH_SPAMCHECK)
+.if ${PORT_OPTIONS:MSPAMCHECK}
 RUN_DEPENDS+=	${SITE_PERL}/Mail/SpamAssassin.pm:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 .endif
 
-.if defined(WITH_SPEEDYCGI)
+.if ${PORT_OPTIONS:MSPEEDYCGI}
 RUN_DEPENDS+=	speedy_suidperl:${PORTSDIR}/www/p5-CGI-SpeedyCGI
 .if ${PERL_LEVEL} < 500804
 EXTRA_PATCHES+=	${PATCH_WRKSRC}/misc/patches/suidperl2speedy_suidperl.patch
@@ -115,15 +115,15 @@ EXTRA_PATCHES+=	${PATCH_WRKSRC}/misc/patches/suidperl2speedy_suidperl.notmp.patc
 .endif
 .endif
 
-.if defined(WITH_VIRUSCHECK)
+.if ${PORT_OPTIONS:MVIRUSCHECK}
 RUN_DEPENDS+=	clamdscan:${PORTSDIR}/security/clamav
 .endif
 
-.if defined(WITH_WGET)
+.if ${PORT_OPTIONS:MWGET}
 RUN_DEPENDS+=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 .endif
 
-.if defined(WITH_ZLIB)
+.if ${PORT_OPTIONS:MZLIB}
 . if ${PERL_LEVEL} < 500903
 RUN_DEPENDS+=	${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Compress
 . endif
@@ -149,23 +149,23 @@ post-patch:
 	@${MV} ${PATCH_WRKSRC}/etc/openwebmail.conf ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 	@${PERL} -pi.bak -e 's,${LOCALBASE}/www/cgi-bin/openwebmail,${OWCGIDIR},g' ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 	@${PERL} -pi.bak -e 's,${LOCALBASE}/www/data/openwebmail,${OWDATADIR},g' ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
-.if defined(WITH_LEARNSPAM)
+.if ${PORT_OPTIONS:MLEARNSPAM}
 	@${PERL} -pi.bak -e 's,enable_learnspam	no,enable_learnspam	yes,g' ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 .endif
-.if defined(WITH_SPAMCHECK)
+.if ${PORT_OPTIONS:MSPAMCHECK}
 	@${PERL} -pi.bak -e 's,enable_spamcheck	no,enable_spamcheck	yes,g' ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 	@${ECHO} "enable_saprefs	yes" >> ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 .endif
-.if defined(WITH_SPAMCHECK_ALL)
+.if ${PORT_OPTIONS:MSPAMCHECK_ALL}
 	@${ECHO} "spamcheck_source_allowed	all" >> ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 .endif
-.if defined(WITH_VIRUSCHECK)
+.if ${PORT_OPTIONS:MVIRUSCHECK}
 	@${PERL} -pi.bak -e 's,enable_viruscheck	no,enable_viruscheck	yes,g' ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 .endif
-.if defined(WITH_VIRUSCHECK_ALL)
+.if ${PORT_OPTIONS:MVIRUSCHECK_ALL}
 	@${ECHO} "viruscheck_source_allowed	all" >> ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 .endif
-.if defined(WITH_SPEEDYCGI)
+.if ${PORT_OPTIONS:MSPEEDYCGI}
 	@${ECHO} "has_savedsuid_support	no" >> ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 .else
 	@${PERL} -pi.bak -e 's,/usr/bin/suidperl,${PERL},g' ${PATCH_WRKSRC}/openwebmail*pl
@@ -182,7 +182,7 @@ pre-install:
 .for f in b2g g2b lunar
 	@${ECHO} "www/cgi-bin/openwebmail/etc/maps/${f}.db" >> ${PLIST}
 .endfor
-.if defined(WITHOUT_SPEEDYCGI)
+.if empty(PORT_OPTIONS:MSPEEDYCGI)
 	@${FIND} ${WRKSRC}/*/openwebmail -name "openwebmail*pl" | \
 		${SED} -e 's,${WRKSRC},www,g' \
 		-e 's,openwebmail/openwebmail,openwebmail/.openwebmail,g' \
@@ -207,7 +207,7 @@ do-install:
 .endif
 	@${PERL} ${OWCGIDIR}/misc/test/dbmtest.pl | ${GREP} "^dbm" > ${OWCGIDIR}/etc/dbm.conf
 	@${CHMOD} 4755 ${OWCGIDIR}/openwebmail*pl
-.if defined(WITHOUT_SPEEDYCGI)
+.if empty(PORT_OPTIONS:MSPEEDYCGI)
 	@${PERL} ${OWCGIDIR}/misc/tools/wrapsuid/wrapsuid.pl ${OWCGIDIR} 2>/dev/null
 .endif
 
diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile
index 587617f52c5f..1bcb9f6d651a 100644
--- a/mail/serialmail/Makefile
+++ b/mail/serialmail/Makefile
@@ -24,8 +24,9 @@ RESTRICTED=	Unsure of DJB license
 
 ALL_TARGET=	it
 
-OPTIONS=	AUTH "Add CRAM-MD5, PLAIN and LOGIN authentication" OFF \
-		UCSPI_SSL "Add ucspi-ssl SMTP SSL transport layer support" OFF
+OPTIONS_DEFINE=	AUTH UCSPI_SSL
+AUTH_DESC=	Add CRAM-MD5, PLAIN and LOGIN authentication
+UCSPI_SSL_DESC=	Add ucspi-ssl SMTP SSL transport layer support
 
 PROGRAMS=	serialqmtp serialsmtp maildirserial setlock
 SCRIPTS=	maildirqmtp maildirsmtp
@@ -33,15 +34,15 @@ MAN1=		maildirqmtp.1 maildirserial.1 maildirsmtp.1 serialqmtp.1 \
 		serialsmtp.1 setlock.1
 DOCS=		AUTOTURN BLURB CHANGES FROMISP README TODO TOISP THANKS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_AUTH)
+.if ${PORT_OPTIONS:MAUTH}
 PATCH_SITES=	http://www.ingorohloff.de/soft/
 PATCHFILES=	serialmail-auth.patch
 PATCH_DIST_STRIP=	-p1
 .endif
 
-.if defined(WITH_UCSPI_SSL)
+.if ${PORT_OPTIONS:MUCSPI_SSL}
 RUN_DEPENDS+=	sslclient:${PORTSDIR}/sysutils/ucspi-ssl
 
 PLIST_FILES+=	bin/maildirsmtps
@@ -49,7 +50,7 @@ MLINKS+=	maildirsmtp.1 maildirsmtps.1
 .endif
 
 post-patch:
-.if defined(WITH_UCSPI_SSL)
+.if ${PORT_OPTIONS:MUCSPI_SSL}
 	@${SED} -E \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		-e 's|%%PREFIX%%|${PREFIX}|' \
@@ -69,12 +70,12 @@ do-install:
 		${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/bin && \
 		${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin && \
 		${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
-.if defined(WITH_UCSPI_SSL)
+.if ${PORT_OPTIONS:MUCSPI_SSL}
 	@${INSTALL_SCRIPT} ${WRKDIR}/maildirsmtps ${PREFIX}/bin
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/smail/Makefile b/mail/smail/Makefile
index b0ed8e8c77a4..777e3a1166cf 100644
--- a/mail/smail/Makefile
+++ b/mail/smail/Makefile
@@ -39,23 +39,23 @@ CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 CYRUS_DELIVER_PATH?=	${LOCALBASE}/cyrus/bin/deliver
 
-OPTIONS=	CYRUS22 "Use mail/cyrus-imapd22 as local transport" off \
-		CYRUS23 "Use mail/cyrus-imapd23 as local transport" off \
-		REPLACE_CONF "Replace /etc/mail/mailer.conf" off
+OPTIONS_SINGLE=	CYRUS
+OPTIONS_SINGLE_CYRUS=	CYRUS22 CYRUS23
+OPTIONS_DEFINE=	CYRUS REPLACE_CONF
+CYRUS_DESC=	Use cyrus as local transport
+CYRUS22_DESC=	Use mail/cyrus-imapd22 as local transport
+CYRUS23_DESC=	Use mail/cyrus-imapd23 as local transport
+REPLACE_CONF_DESC=	Replace /etc/mail/mailer.conf
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_CYRUS22) && defined(WITH_CYRUS23)
-IGNORE=		WITH_CYRUS22 and WITH_CYRUS23 are mutually exclusive. Please run make options again
-.endif
-
-.if defined(WITH_CYRUS22)
+.if ${PORT_OPTIONS:MCYRUS22}
 CYRUS_PORT=	${PORTSDIR}/mail/cyrus-imapd22
 .else
 CYRUS_PORT=	${PORTSDIR}/mail/cyrus-imapd23
 .endif
 
-.if defined(WITH_CYRUS22) || defined(WITH_CYRUS23)
+.if ${PORT_OPTIONS:MCYRUS}
 RUN_DEPENDS+=	cyrus/bin/deliver:${CYRUS_PORT}
 CYRUS_IMAPD=	USE_CYRUS_IMAPD
 PLIST_SUB+=	CYRUS_DELIVER=""
@@ -94,11 +94,11 @@ pre-install:
 	@${MKDIR} ${PREFIX}/etc/smail
 
 post-install:
-.if defined(WITH_REPLACE_CONF)
+.if ${PORT_OPTIONS:MREPLACE_CONF}
 	@make replace
 .endif
 
-.if defined(WITH_CYRUS22) || defined(WITH_CYRUS23)
+.if ${PORT_OPTIONS:MCYRUS}
 	@cd ${WRKSRC}/util && make install-cyrus-bins
 .endif
 
diff --git a/mail/smtp-gated/Makefile b/mail/smtp-gated/Makefile
index 9ad01d7df16b..0d3487f507ac 100644
--- a/mail/smtp-gated/Makefile
+++ b/mail/smtp-gated/Makefile
@@ -15,10 +15,11 @@ COMMENT=	Proxy for SMTP sessions with virus and spam scan
 
 LICENSE=	GPLv2
 
-OPTIONS=	NAT "NAT transparent proxy code" On \
-		CHUNKING "Enable support for SMTP CHUNKING extension" Off \
-		ECONNRESET "Be quiet about Connection reset by peer message" Off \
-		PCRE "Enable support for PCRE" On
+OPTIONS_DEFINE=	NAT CHUNKING ECONNRESET PCRE
+OPTIONS_DEFAULT=	NAT PCRE
+NAT_DESC=	NAT transparent proxy code
+CHUNKING_DESC=	Enable support for SMTP CHUNKING extension
+ECONNRESET_DESC=	Be quiet about Connection reset by peer message
 
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
@@ -32,21 +33,21 @@ PLIST_FILES=	sbin/smtp-gated
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_NAT)
+.if ${PORT_OPTIONS:MNAT}
 CONFIGURE_ARGS+=	--enable-nat
 .else
 CONFIGURE_ARGS+=	--disable-nat
 .endif
 
-.if defined(WITH_CHUNKING)
+.if ${PORT_OPTIONS:MCHUNKING}
 CONFIGURE_ARGS+=	--enable-chunking
 .endif
 
-.if defined(WITH_ECONNRESET)
+.if ${PORT_OPTIONS:MECONNRESET}
 CONFIGURE_ARGS+=	--enable-silent-econnreset
 .endif
 
-.if defined(WITH_PCRE)
+.if ${PORT_OPTIONS:MPCRE}
 LIB_DEPENDS+=	pcre.1:${PORTSDIR}/devel/pcre
 .else
 CONFIGURE_ARGS+=	--disable-pcre
diff --git a/mail/spamdyke/Makefile b/mail/spamdyke/Makefile
index fc18c293bda9..0bc7acc1d2b5 100644
--- a/mail/spamdyke/Makefile
+++ b/mail/spamdyke/Makefile
@@ -23,9 +23,10 @@ GNU_CONFIGURE=	yes
 
 ALL_TARGET=	spamdyke
 
-OPTIONS=	TLS "Enable TLS support" On \
-		DEBUG "Enable debugging output" Off \
-		DEBUG_EXCESSIVE "Enable excessive debugging output" Off
+OPTIONS_DEFINE=	TLS DEBUG DEBUG_EXCESSIVE DOCS
+OPTIONS_DEFAULT=	TLS
+TLS_DESC=	Enable TLS support
+DEBUG_DESC=	Enable debugging output
 
 .include <bsd.port.pre.mk>
 
@@ -33,25 +34,25 @@ OPTIONS=	TLS "Enable TLS support" On \
 IGNORE=	uses nested functions, not supported by clang
 .endif
 
-.if defined(WITHOUT_TLS)
-CONFIGURE_ARGS+=	--disable-tls
-.else
+.if ${PORT_OPTIONS:MTLS}
 CONFIGURE_ARGS+=	--enable-tls
+.else
+CONFIGURE_ARGS+=	--disable-tls
 .endif
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--with-debug-output
 .else
 CONFIGURE_ARGS+=	--without-debug-output
 .endif
 
-.if defined(WITH_DEBUG_EXCESSIVE)
+.if ${PORT_OPTIONS:MDEBUG_EXCESSIVE}
 CONFIGURE_ARGS+=	--with-excessive-output
 .else
 CONFIGURE_ARGS+=	--without-excessive-output
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	Changelog.txt FAQ.html GNUGPL.txt INSTALL.txt \
 		README.html README_ip_file_format.html \
 		README_rdns_directory_format.html README_rdns_file_format.html \
@@ -59,7 +60,7 @@ PORTDOCS=	Changelog.txt FAQ.html GNUGPL.txt INSTALL.txt \
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKDIR}/${DISTNAME}/documentation && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
diff --git a/mail/squirrelmail-plugins/Makefile b/mail/squirrelmail-plugins/Makefile
index da581b96cff3..9ab084d052f2 100644
--- a/mail/squirrelmail-plugins/Makefile
+++ b/mail/squirrelmail-plugins/Makefile
@@ -31,121 +31,124 @@ SUB_LIST+=	"SQUIRRELDIR=squirrelmail"
 .endif
 .endif
 
-OPTIONS=	SIEVE	"Sieve Mail Filters plugin" off \
-		CALENDR	"Shared Calendars plugin" off \
-		LDAPPW	"Change LDAP passwords plugin" off \
-		SQLPW	"Change *SQL passwords plugin" off \
-		MAILFT	"E-mail footer plugin" off \
-		LGAUTH	"HTTP-auth based login plugin" off \
-		LGNOTES	"Notes on login screen plugin" off \
-		MLOGIN	"Multilogin plugin" off \
-		NOTES	"Notes plugin" off \
-		NOTIFY	"New mail notify plugin" off \
-		PW4GET	"Password forget plugin" off \
-		PUPDATE	"Plugin update check plugin" off \
-		QMADMIN	"Qmailadmin login plugin" off \
-		QUOTA	"Quota usage plugin" off \
-		SASQL	"SpamAssassin SQL plugin" off \
-		BUTTONS "Custom (spam/ham/etc.) buttons" off \
-		SLOGIN	"SSL login plugin" off \
-		TIMEOUT	"User session timeout plugin" off \
-		TMDA	"TMDA plugin" off \
-		VLOGIN	"Multi-site-hosting capabilities plugin" off \
-		WEBSRCH	"Web search engines plugin" off \
-		WETTER	"Weather in Germany plugin" off
-#		NEWUSER "New user wizard plugin" off
+OPTIONS_DEFINE=	SIEVE CALENDR LDAPPW SQLPW MAILFT LGAUTH LGNOTES \
+		MLOGIN NOTES NOTIFY PW4GET PUPDATE QMADMIN QUOTA \
+		SASQL BUTTONS SLOGIN TIMEOUT TMDA VLOGIN WEBSRCH \
+		WETTER
+SIEVE_DESC=	Sieve Mail Filters plugin
+CALENDR_DESC=	Shared Calendars plugin
+LDAPPW_DESC=	Change LDAP passwords plugin
+SQLPW_DESC=	Change *SQL passwords plugin
+MAILFT_DESC=	E-mail footer plugin
+LGAUTH_DESC=	HTTP-auth based login plugin
+LGNOTES_DESC=	Notes on login screen plugin
+MLOGIN_DESC=	Multilogin plugin
+NOTES_DESC=	Notes plugin
+NOTIFY_DESC=	New mail notify plugin
+PW4GET_DESC=	Password forget plugin
+PUPDATE_DESC=	Plugin update check plugin
+QMADMIN_DESC=	Qmailadmin login plugin
+QUOTA_DESC=	Quota usage plugin
+SASQL_DESC=	SpamAssassin SQL plugin
+BUTTONS_DESC=	Custom (spam/ham/etc.) buttons
+SLOGIN_DESC=	SSL login plugin
+TIMEOUT_DESC=	User session timeout plugin
+TMDA_DESC=	TMDA plugin
+VLOGIN_DESC=	Multi-site-hosting capabilities plugin
+WEBSRCH_DESC=	Web search engines plugin
+WETTER_DESC=	Weather in Germany plugin
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_SIEVE) || defined(WITH_SIEVE)
+.if ${PORT_OPTIONS:MSIEVE}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/avelsieve:${PORTSDIR}/mail/squirrelmail-avelsieve-plugin
 .endif
 
-.if !defined(WITHOUT_CALENDR) || defined(WITH_CALENDR)
+.if ${PORT_OPTIONS:MCALENDR}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/calendar:${PORTSDIR}/mail/squirrelmail-shared_calendars-plugin
 .endif
 
-.if !defined(WITHOUT_LDAPPW) || defined(WITH_LDAPPW)
+.if ${PORT_OPTIONS:MLDAPPW}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/change_ldappass:${PORTSDIR}/mail/squirrelmail-change_ldappass-plugin
 .endif
 
-.if !defined(WITHOUT_SQLPW) || defined(WITH_SQLPW)
+.if ${PORT_OPTIONS:MSQLPW}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/change_sqlpass:${PORTSDIR}/mail/squirrelmail-change_sqlpass-plugin
 .endif
 
-.if !defined(WITHOUT_MAILFT) || defined(WITH_MAILFT)
+.if ${PORT_OPTIONS:MMAILFT}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/email_footer:${PORTSDIR}/mail/squirrelmail-email_footer-plugin
 .endif
 
-.if !defined(WITHOUT_LGAUTH) || defined(WITH_LGAUTH)
+.if ${PORT_OPTIONS:MLGAUTH}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/login_auth:${PORTSDIR}/mail/squirrelmail-login_auth-plugin
 .endif
 
-.if !defined(WITHOUT_LGNOTES) || defined(WITH_LGNOTES)
+.if ${PORT_OPTIONS:MLGNOTES}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/login_notes:${PORTSDIR}/mail/squirrelmail-login_notes-plugin
 .endif
 
-.if !defined(WITHOUT_MLOGIN) || defined(WITH_MLOGIN)
+.if ${PORT_OPTIONS:MMLOGIN}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/multilogin:${PORTSDIR}/mail/squirrelmail-multilogin-plugin
 .endif
 # requires compatibility1 plugin - breaks other plugins
-#.if !defined(WITHOUT_NEWUSER) || defined(WITH_NEWUSER)
+#.if ${PORT_OPTIONS:MNEWUSER}
 #RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/newuser_wiz:${PORTSDIR}/mail/squirrelmail-newuser_wiz-plugin
 #.endif
 
-.if !defined(WITHOUT_NOTES) || defined(WITH_NOTES)
+.if ${PORT_OPTIONS:MNOTES}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/notes:${PORTSDIR}/mail/squirrelmail-notes-plugin
 .endif
 
-.if !defined(WITHOUT_NOTIFY) || defined(WITH_NOTIFY)
+.if ${PORT_OPTIONS:MNOTIFY}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/notify:${PORTSDIR}/mail/squirrelmail-notify-plugin
 .endif
 
-.if !defined(WITHOUT_PW4GET) || defined(WITH_PW4GET)
+.if ${PORT_OPTIONS:MPW4GET}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/password_forget:${PORTSDIR}/mail/squirrelmail-password_forget-plugin
 .endif
 
-.if !defined(WITHOUT_PUPDATE) || defined(WITH_PUPDATE)
+.if ${PORT_OPTIONS:MPUPDATE}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/pupdate:${PORTSDIR}/mail/squirrelmail-pupdate-plugin
 .endif
 
-.if !defined(WITHOUT_QMADMIN) || defined(WITH_QMADMIN)
+.if ${PORT_OPTIONS:MQMADMIN}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/qmailadmin_login:${PORTSDIR}/mail/squirrelmail-qmailadmin_login-plugin
 .endif
 
-.if !defined(WITHOUT_QUOTA) || defined(WITH_QUOTA)
+.if ${PORT_OPTIONS:MQUOTA}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/quota_usage:${PORTSDIR}/mail/squirrelmail-quota_usage-plugin
 .endif
 
-.if !defined(WITHOUT_SASQL) || defined(WITH_SASQL)
+.if ${PORT_OPTIONS:MSASQL}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/sasql:${PORTSDIR}/mail/squirrelmail-sasql-plugin
 .endif
 
-.if !defined(WITHOUT_BUTTONS) || defined(WITH_BUTTONS)
+.if ${PORT_OPTIONS:MBUTTONS}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/spam_buttons:${PORTSDIR}/mail/squirrelmail-spam-buttons-plugin
 .endif
 
-.if !defined(WITHOUT_SLOGIN) || defined(WITH_SLOGIN)
+.if ${PORT_OPTIONS:MSLOGIN}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/secure_login:${PORTSDIR}/mail/squirrelmail-secure_login-plugin
 .endif
 
-.if !defined(WITHOUT_TIMEOUT) || defined(WITH_TIMEOUT)
+.if ${PORT_OPTIONS:MTIMEOUT}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/timeout_user:${PORTSDIR}/mail/squirrelmail-timeout_user-plugin
 .endif
 
-.if !defined(WITHOUT_TMDA) || defined(WITH_TMDA)
+.if ${PORT_OPTIONS:MTMDA}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/tmdatools:${PORTSDIR}/mail/squirrelmail-tmda-plugin
 .endif
 
-.if !defined(WITHOUT_VLOGIN) || defined(WITH_VLOGIN)
+.if ${PORT_OPTIONS:MVLOGIN}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/vlogin:${PORTSDIR}/mail/squirrelmail-vlogin-plugin
 .endif
 
-.if !defined(WITHOUT_WEBSRCH) || defined(WITH_WEBSRCH)
+.if ${PORT_OPTIONS:MWEBSRCH}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/web_search:${PORTSDIR}/mail/squirrelmail-websearch-plugin
 .endif
 
-.if !defined(WITHOUT_WETTER) || defined(WITH_WETTER)
+.if ${PORT_OPTIONS:MWETTER}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/wetteronline:${PORTSDIR}/mail/squirrelmail-wetteronline-plugin
 .endif
 
diff --git a/mail/squirrelmail-shared_calendars-plugin/Makefile b/mail/squirrelmail-shared_calendars-plugin/Makefile
index db3e4b7b788f..1847ae79702b 100644
--- a/mail/squirrelmail-shared_calendars-plugin/Makefile
+++ b/mail/squirrelmail-shared_calendars-plugin/Makefile
@@ -45,13 +45,14 @@ USE_PERL5_BUILD=	yes
 USE_PHP=		yes
 WANT_PHP_WEB=		yes
 
-OPTIONS=	SQL	 "use SQL backend" off
+OPTIONS_DEFINE=	SQL
+SQL_DESC=	use SQL backend
 
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_SQL) || defined(WITH_SQL)
+.if ${PORT_OPTIONS:MSQL}
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/calendar_sql_backend:${PORTSDIR}/mail/squirrelmail-calendar_sql_backend-plugin
 .else
 RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/calendar_file_backend:${PORTSDIR}/mail/squirrelmail-calendar_file_backend-plugin
diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile
index 9703a7522626..21aba0a3767d 100644
--- a/mail/up-imapproxy/Makefile
+++ b/mail/up-imapproxy/Makefile
@@ -27,11 +27,12 @@ SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 
-OPTIONS=	DOVECOT "Use with dovecot2" off
+OPTIONS_DEFINE=	DOVECOT DOCS
+DOVECOT_DESC=	Use with dovecot2
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_DOVECOT)
+.if ${PORT_OPTIONS:MDOVECOT}
 SUB_LIST+=	DOVECOT="dovecot"
 RUN_DEPENDS+=	dovecot>=1.0:${PORTSDIR}/mail/dovecot2
 .else
@@ -39,7 +40,7 @@ SUB_LIST+=	DOVECOT=""
 .endif
 
 do-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
@@ -47,4 +48,4 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/scripts/imapproxy.conf ${PREFIX}/etc/imapproxyd.conf.sample
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/websieve/Makefile b/mail/websieve/Makefile
index 3ebb9d999390..b756bbe3785d 100644
--- a/mail/websieve/Makefile
+++ b/mail/websieve/Makefile
@@ -24,25 +24,28 @@ NO_BUILD=	yes
 # highest select version number.  If no Cyrus IMAPd versions are
 # selected, use some generic IMAP modules
 
-OPTIONS=	CYRUS_IMAPD_21	"With Cyrus IMAPd version 2.1.x" off \
-		CYRUS_IMAPD_22	"With Cyrus IMAPd version 2.2.x" off \
-		CYRUS_IMAPD_23	"With Cyrus IMAPd version 2.3.x" on  \
-		CYRUS_IMAPD_24	"With Cyrus IMAPd version 2.4.x" off
+OPTIONS_DEFINE=	CYRUS_IMAPD_21 CYRUS_IMAPD_22 CYRUS_IMAPD_23 CYRUS_IMAPD_24
+OPTIONS_DEFAULT=	CYRUS_IMAPD_23
 
-.include <bsd.port.pre.mk>
+CYRUS_IMAPD_21_DESC=	With Cyrus IMAPd version 2.1.x
+CYRUS_IMAPD_22_DESC=	With Cyrus IMAPd version 2.2.x
+CYRUS_IMAPD_23_DESC=	With Cyrus IMAPd version 2.3.x
+CYRUS_IMAPD_24_DESC=	With Cyrus IMAPd version 2.4.x
+
+.include <bsd.port.options.mk>
 
 CYRUS_IMAP_PM=	${SITE_PERL}/${PERL_ARCH}/Cyrus/IMAP/Admin.pm
 
-.if defined(WITH_CYRUS_IMAPD_24)
+.if ${PORT_OPTIONS:MCYRUS_IMAPD_24}
 RUN_DEPENDS+=	${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd24
 FUNCLIB_PL=	funclib.cyrus
-.elif defined(WITH_CYRUS_IMAPD_23)
+.elif ${PORT_OPTIONS:MCYRUS_IMAPD_23}
 RUN_DEPENDS+=	${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd23
 FUNCLIB_PL=	funclib.cyrus
-.elif defined(WITH_CYRUS_IMAPD_22)
+.elif ${PORT_OPTIONS:MCYRUS_IMAPD_22}
 RUN_DEPENDS+=	${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd22
 FUNCLIB_PL=	funclib.cyrus
-.elif defined(WITH_CYRUS_IMAPD_21)
+.elif ${PORT_OPTIONS:MCYRUS_IMAPD_21}
 RUN_DEPENDS+=	${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd2
 FUNCLIB_PL=	funclib.cyrus
 .else
@@ -67,4 +70,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>