2 files changed, 196 insertions, 141 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 28216005e6d6..6120bca55890 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	exim
-# Date created:		23 June 1996
-# Whom:			markm@FreeBSD.org
-#
+# Created by: markm@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	exim
 PORTVERSION?=	${EXIM_VERSION}
@@ -45,34 +41,34 @@ MAKE_JOBS_UNSAFE=	yes
 .include "options"
 .include <bsd.port.options.mk>
 
-.if defined(WITH_SA_EXIM)
-.if defined(WITH_KAS)
+.if ${PORT_OPTIONS:MSA_EXIM}
+.if ${PORT_OPTIONS:MKAS}
 IGNORE=		You cannot select both SA_EXIM and KAS options
 .endif
-.if defined(WITH_SO_1024)
+.if ${PORT_OPTIONS:MSO_1024}
 IGNORE=		You cannot select both SA_EXIM and SO_1024 options
 .endif
 .endif
 
-.if defined(WITH_KAS)
-.if defined(WITH_SO_1024)
+.if ${PORT_OPTIONS:MKAS}
+.if ${PORT_OPTIONS:MSO_1024}
 IGNORE=		You cannot select both SA_KAS and SO_1024 options
 .endif
 .endif
 
-.if defined(WITH_SA_EXIM) || defined(FETCH_ALL)
+.if ${PORT_OPTIONS:MSA_EXIM) || defined(FETCH_ALL}
 MASTER_SITES+=	http://marc.merlins.org/linux/exim/files/:sa_exim \
 		SF/sa-exim/sa-exim/${SA_EXIM_VERSION}:sa_exim
 MASTER_SITE_SUBDIR+=	sa-exim/:sa_exim
 DISTFILES+=	sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
 .endif
 
-.if defined(WITH_SO_1024) || defined(FETCH_ALL)
+.if ${PORT_OPTIONS:MSO_1024) || defined(FETCH_ALL}
 MASTER_SITES+=	ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/:so_1024
 DISTFILES+=	spamooborona1024-src-${SO_1024_VERSION}.tar.gz:so_1024
 .endif
 
-.if defined(WITH_SO_1024)
+.if ${PORT_OPTIONS:MSO_1024}
 LDFLAGS+=	-lz
 PLIST_SUB+=	SO_1024=""
 .else
@@ -92,14 +88,14 @@ CONFLICTS+=	${PKGNAMEPREFIX}${PORTNAME}-4.*
 CONFLICTS+=	${PKGNAMEPREFIX}${PORTNAME}${suffix}-4.*
 .endif
 .endfor
-.if defined(WITH_EXIMON)
+.if ${PORT_OPTIONS:MEXIMON}
 CONFLICTS+=	${PKGNAMEPREFIX}${PORTNAME}-monitor-4.*
 .endif
 .else
 WITH_EXIMON=	yes
 .endif
 
-.if defined(WITH_EXIMON)
+.if ${PORT_OPTIONS:MEXIMON}
 USE_XORG=	x11 xaw xt
 .endif
 
@@ -129,7 +125,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 MAKE_ENV+=	OSTYPE="${OPSYS}" ARCHTYPE="${ARCH}" DUMMY_LDFLAGS="${DUMMY_LDFLAGS}"
 .if defined(EXIMON_ONLY)
 MAKE_ENV+=	INSTALL_ARG="eximon eximon.bin"
-.elif defined(WITHOUT_SUID)
+.elif ! ${PORT_OPTIONS:MSUID}
 MAKE_ENV+=	INSTALL_ARG="-no_chown"
 .endif
 
@@ -167,28 +163,28 @@ WITH_DEFAULT_CHARSET?=	ISO-8859-1
 
 LIB_DEPENDS+=	pcre.3:${PORTSDIR}/devel/pcre
 
-.if defined(WITHOUT_DKIM)
+.if ! ${PORT_OPTIONS:MDKIM}
 SEDLIST+=	-e 's,^\# (DISABLE_DKIM=),\1,'
 .endif
 
-.if defined(WITH_LISTMATCH_RHS)
+.if ${PORT_OPTIONS:MLISTMATCH_RHS}
 SEDLIST+=	-e 's,^\# (EXPAND_LISTMATCH_RHS=),\1,'
 .endif
 
-.if defined(WITH_DCC)
+.if ${PORT_OPTIONS:MDCC}
 SEDLIST+=	-e 's,^\# (EXPERIMENTAL_DCC=),\1,'
 .endif
 
-.if defined(WITH_XCLIENT)
+.if ${PORT_OPTIONS:MXCLIENT}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-xclient
 .endif
 
-.if defined(WITH_KAS)
+.if ${PORT_OPTIONS:MKAS}
 BUILD_DEPENDS+=	libspamtest>=0:${PORTSDIR}/mail/libspamtest
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-kas
 .endif
 
-.if defined(WITH_WISHLIST)
+.if ${PORT_OPTIONS:MWISHLIST}
 EXTRA_PATCHES+=	`${FIND} ${PATCHDIR} -name 'wishlist-*.patch'`
 .endif
 
@@ -202,20 +198,20 @@ SEDLIST+=	-e 's,XX_CFLAGS_XX,${CFLAGS:S/,/\\,/g},' \
 		-e 's,XX_EXIM_GROUP_XX,${EXIM_GROUP:S/,/\\,/g},' \
 		-e 's,XX_DEFAULT_CHARSET_XX,${WITH_DEFAULT_CHARSET:S/,/\\,/g},'
 
-.if defined(WITH_FIXED_NEVER_USERS)
+.if ${PORT_OPTIONS:MFIXED_NEVER_USERS}
 SEDLIST+=	-e 's,^(FIXED_NEVER_USERS=).*,\1${WITH_FIXED_NEVER_USERS:S/,/\\,/g},'
 .endif
 
-.if defined(WITH_EXIMON)
+.if ${PORT_OPTIONS:MEXIMON}
 SEDLIST+=	-e 's,^\# (EXIM_MONITOR=),\1,'
 PLIST_SUB+=	EXIMON=""
 .else
 PLIST_SUB+=	EXIMON="@comment "
 .endif
 
-.if !defined(WITHOUT_TLS)
+.if ${PORT_OPTIONS:MTLS}
 SEDLIST+=	-e 's,^\# (SUPPORT_TLS=),\1,'
-.if !defined(WITH_GNUTLS)
+.if ! ${PORT_OPTIONS:MGNUTLS}
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 SEDLIST+=	-e 's,^\# (TLS_LIBS=.*-lssl[[:space:]]),\1,'
 .else
@@ -225,19 +221,19 @@ SEDLIST+=	-e 's,^\# (TLS_LIBS=.*-lgnutls[[:space:]]),\1,'
 .endif
 .endif
 
-.if !defined(WITHOUT_EMBEDDED_PERL)
+.if ${PORT_OPTIONS:MEMBEDDED_PERL}
 USE_PERL5=	yes
 SEDLIST+=	-e 's,^\# (EXIM_PERL=),\1,'
 .endif
 
-.if defined(WITH_TCP_WRAPPERS)
+.if ${PORT_OPTIONS:MTCP_WRAPPERS}
 SEDLIST+=	-e 's,XX_TCP_WRAPPERS_LIBS_XX,-lwrap,' \
 		-e 's,^\# (USE_TCP_WRAPPERS=),\1,'
 .else
 SEDLIST+=	-e 's,XX_TCP_WRAPPERS_LIBS_XX,,'
 .endif
 
-.if !defined(WITHOUT_ICONV)
+.if ${PORT_OPTIONS:MICONV}
 USES=		iconv
 SEDLIST+=	-e 's,XX_ICONV_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -liconv,' \
 		-e 's,^\# (HAVE_ICONV=),\1,'
@@ -245,17 +241,17 @@ SEDLIST+=	-e 's,XX_ICONV_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -liconv,' \
 SEDLIST+=	-e 's,XX_ICONV_LIBS_XX,,'
 .endif
 
-.if defined(WITH_LDAP) || defined(LDAP_LIB_TYPE) \
-	|| defined(WITH_OPENLDAP1) || defined(WITH_OPENLDAP2) \
-	|| defined(WITH_OPENLDAP20) || defined(WITH_OPENLDAP21)
+.if ${PORT_OPTIONS:MLDAP) || defined(LDAP_LIB_TYPE} \
+	|| ${PORT_OPTIONS:MOPENLDAP1) || defined(WITH_OPENLDAP2} \
+	|| ${PORT_OPTIONS:MOPENLDAP20) || defined(WITH_OPENLDAP21}
 BROKEN=		deprecated LDAP option defined, use WITH_OPENLDAP or WITH_OPENLDAP_VER
 .endif
 
-.if defined(WITH_OPENLDAP_VER) && ${WITH_OPENLDAP_VER:L} != "auto"
+.if ${PORT_OPTIONS:MOPENLDAP_VER} && ${WITH_OPENLDAP_VER:L} != "auto"
 WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 .endif
 
-.if defined(WITH_OPENLDAP)
+.if ${PORT_OPTIONS:MOPENLDAP}
 USE_OPENLDAP=	yes
 LDAP_LIB_TYPE=	OPENLDAP2
 SEDLIST+=	-e 's,XX_LDAP_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -llber -lldap,' \
@@ -271,13 +267,13 @@ SEDLIST+=	-e 's,XX_LDAP_[^ ]*_XX,,' \
 BROKEN=		deprecated option DB_LIB_VERSION used, use WITH_BDB_VER
 .endif
 
-.if defined(WITH_BDB_VER)
+.if ${PORT_OPTIONS:MBDB_VER}
 .if ${WITH_BDB_VER} > 1
 WITH_BDB=	yes
 .endif
 .endif
 
-.if defined(WITH_BDB)
+.if ${PORT_OPTIONS:MBDB}
 USE_BDB=	yes
 INVALID_BDB_VER=	2 3
 DB_LIBS=	-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
@@ -290,13 +286,13 @@ SEDLIST+=	-e 's,^(DBMLIB=),\# \1,'
 SEDLIST+=	-e 's,XX_DB_LIBS_XX,${DB_LIBS:S/,/\\,/g},' \
 		-e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES:S/,/\\,/g},'
 
-.if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER:L} != "auto"
+.if ${PORT_OPTIONS:MMYSQL_VER} && ${WITH_MYSQL_VER:L} != "auto"
 WANT_MYSQL_VER=	${WITH_MYSQL_VER}
 .else
 .undef WITH_MYSQL_VER
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib/mysql -lmysqlclient,' \
 		-e 's,XX_MYSQL_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include/mysql,' \
@@ -305,42 +301,42 @@ SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib/mysql -lmysqlclien
 SEDLIST+=	-e 's,XX_MYSQL_[^ ]*_XX,,'
 .endif
 
-.if defined(WITH_SASLAUTHD)
+.if ${PORT_OPTIONS:MSASLAUTHD}
 RUN_DEPENDS+=	${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
 SASLAUTHD_SOCKET?=	/var/run/saslauthd/mux
 SEDLIST+=	-e 's,^\# (CYRUS_SASLAUTHD_SOCKET=).*,\1${SASLAUTHD_SOCKET:S/,/\\,/g},'
 .endif
 
-.if !defined(WITHOUT_PAM)
+.if ${PORT_OPTIONS:MPAM}
 SEDLIST+=	-e 's,XX_PAM_LIBS_XX,-lpam,' \
 		-e 's,^\# (SUPPORT_PAM=),\1,'
 .else
 SEDLIST+=	-e 's,XX_PAM_LIBS_XX,,'
 .endif
 
-.if !defined(WITHOUT_AUTH_CRAM_MD5)
+.if ${PORT_OPTIONS:MAUTH_CRAM_MD5}
 SEDLIST+=	-e 's,^\# (AUTH_CRAM_MD5=),\1,'
 .endif
 
-.if !defined(WITHOUT_AUTH_PLAINTEXT)
+.if ${PORT_OPTIONS:MAUTH_PLAINTEXT}
 SEDLIST+=	-e 's,^\# (AUTH_PLAINTEXT=),\1,'
 .endif
 
-.if !defined(WITHOUT_AUTH_DOVECOT)
+.if ${PORT_OPTIONS:MAUTH_DOVECOT}
 SEDLIST+=	-e 's,^\# (AUTH_DOVECOT=),\1,'
 .endif
 
-.if !defined(WITHOUT_AUTH_SPA)
+.if ${PORT_OPTIONS:MAUTH_SPA}
 SEDLIST+=	-e 's,^\# (AUTH_SPA=),\1,'
 .endif
 
-.if defined(WITH_AUTH_SASL)
+.if ${PORT_OPTIONS:MAUTH_SASL}
 LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 SEDLIST+=	-e 's,^\# (AUTH_CYRUS_SASL=),\1,' \
 		-e 's,^\# (AUTH_LIBS=.*-lsasl2),\1,'
 .endif
 
-.if defined(WITH_AUTH_RADIUS)
+.if ${PORT_OPTIONS:MAUTH_RADIUS}
 WITH_RADIUS_TYPE?=	RADLIB
 .if ${WITH_RADIUS_TYPE:L} == radlib
 SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,-lradius,' \
@@ -358,7 +354,7 @@ IGNORE=		the variable WITH_RADIUS_TYPE must be either RADLIB or RADIUSCLIENT
 SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,,'
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 SEDLIST+=	-e 's,XX_PGSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -lpq,' \
 		-e 's,XX_PGSQL_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include/pgsql,' \
@@ -367,49 +363,49 @@ SEDLIST+=	-e 's,XX_PGSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -lpq,' \
 SEDLIST+=	-e 's,XX_PGSQL_[^ ]*_XX,,'
 .endif
 
-.if !defined(WITH_PGSQL) && !defined(WITH_MYSQL) && !defined(LDAP_LIB_TYPE) && \
-    !defined(WITH_BDB)
+.if ! ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MMYSQL} && !defined(LDAP_LIB_TYPE) && \
+    ! ${PORT_OPTIONS:MBDB}
 SEDLIST+=	-e 's,^(LOOKUP_LIBS=),\# \1,' \
 		-e 's,^(LOOKUP_INCLUDE=),\# \1,'
 .endif
 
-.if !defined(WITH_DNSDB)
+.if ! ${PORT_OPTIONS:MDNSDB}
 SEDLIST+=	-e 's,^(LOOKUP_DNSDB=),\# \1,'
 .endif
 
-.if !defined(WITHOUT_MAILDIR)
+.if ${PORT_OPTIONS:MMAILDIR}
 SEDLIST+=	-e 's,^\# (SUPPORT_MAILDIR=),\1,'
 .endif
 
-.if !defined(WITHOUT_MAILSTORE)
+.if ${PORT_OPTIONS:MMAILSTORE}
 SEDLIST+=	-e 's,^\# (SUPPORT_MAILSTORE=),\1,'
 .endif
 
-.if !defined(WITHOUT_MBX)
+.if ${PORT_OPTIONS:MMBX}
 SEDLIST+=	-e 's,^\# (SUPPORT_MBX=),\1,'
 .endif
 
-.if !defined(WITHOUT_CDB)
+.if ${PORT_OPTIONS:MCDB}
 SEDLIST+=	-e 's,^\# (LOOKUP_CDB=),\1,'
 .endif
 
-.if !defined(WITHOUT_DSEARCH)
+.if ${PORT_OPTIONS:MDSEARCH}
 SEDLIST+=	-e 's,^\# (LOOKUP_DSEARCH=),\1,'
 .endif
 
-.if defined(WITHOUT_LSEARCH)
+.if ! ${PORT_OPTIONS:MLSEARCH}
 SEDLIST+=	-e 's,^(LOOKUP_LSEARCH=),\# \1,'
 .endif
 
-.if !defined(WITHOUT_NIS)
+.if ${PORT_OPTIONS:MNIS}
 SEDLIST+=	-e 's,^\# (LOOKUP_NIS=),\1,'
 .endif
 
-.if !defined(WITHOUT_PASSWD)
+.if ${PORT_OPTIONS:MPASSWD}
 SEDLIST+=	-e 's,^\# (LOOKUP_PASSWD=),\1,'
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=	yes
 USE_GNOME=	pkgconfig
 SEDLIST+=	-e 's,XX_SQLITE_LIBS_XX,`pkg-config --static --libs sqlite3`,' \
@@ -420,15 +416,15 @@ SEDLIST+=	-e 's,XX_SQLITE_LIBS_XX,,' \
 		-e 's,XX_SQLITE_FLAGS_XX,,'
 .endif
 
-.if !defined(WITHOUT_LMTP)
+.if ${PORT_OPTIONS:MLMTP}
 SEDLIST+=	-e 's,^\# (TRANSPORT_LMTP=),\1,'
 .endif
 
-.if defined(WITHOUT_ALT_CONFIG_PREFIX)
+.if ! ${PORT_OPTIONS:MALT_CONFIG_PREFIX}
 SEDLIST+=	-e 's,^(ALT_CONFIG_PREFIX=),\# \1,'
 .endif
 
-.if defined(WITH_SPF)
+.if ${PORT_OPTIONS:MSPF}
 LIB_DEPENDS+=	spf2.3:${PORTSDIR}/mail/libspf2
 SEDLIST+=	-e 's,XX_SPF_FLAGS_XX,-DSPF,' \
 		-e 's,XX_SPF_LIBS_XX,-lspf2 ${PTHREAD_LIBS:S/,/\\,/g},' \
@@ -438,11 +434,11 @@ SEDLIST+=	-e 's,XX_SPF_FLAGS_XX,,' \
 		-e 's,XX_SPF_LIBS_XX,,'
 .endif
 
-.if defined(WITH_SRS)
+.if ${PORT_OPTIONS:MSRS}
 LIB_DEPENDS+=	srs2.0:${PORTSDIR}/mail/libsrs2
 SEDLIST+=	-e 's,XX_SRS_FLAGS_XX,-DSRS,' \
 		-e 's,XX_SRS_LIBS_XX,-lsrs2,'
-.elif defined(WITH_SRS_ALT)
+.elif ${PORT_OPTIONS:MSRS_ALT}
 LIB_DEPENDS+=	srs_alt.1:${PORTSDIR}/mail/libsrs_alt
 SEDLIST+=	-e 's,XX_SRS_FLAGS_XX,-DEXPERIMENTAL_SRS,' \
 		-e 's,XX_SRS_LIBS_XX,-lsrs_alt,'
@@ -451,26 +447,26 @@ SEDLIST+=	-e 's,XX_SRS_FLAGS_XX,,' \
 		-e 's,XX_SRS_LIBS_XX,,'
 .endif
 
-.if defined(WITH_SA_EXIM)
+.if ${PORT_OPTIONS:MSA_EXIM}
 RUN_DEPENDS+=	${LOCALBASE}/bin/spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 PLIST_SUB+=	SA_EXIM=""
 .else
 PLIST_SUB+=	SA_EXIM="@comment "
 .endif
 
-.if defined(WITH_READLINE)
+.if ${PORT_OPTIONS:MREADLINE}
 SEDLIST+=	-e 's,^\# (USE_READLINE=),\1,'
 .endif
 
-.if defined(WITH_CONTENT_SCAN)
+.if ${PORT_OPTIONS:MCONTENT_SCAN}
 SEDLIST+=	-e 's,^\# (WITH_CONTENT_SCAN=),\1,'
 .endif
 
-.if !defined(WITHOUT_OLD_DEMIME)
+.if ${PORT_OPTIONS:MOLD_DEMIME}
 SEDLIST+=	-e 's,^\# (WITH_OLD_DEMIME=),\1,'
 .endif
 
-.if !defined(EXIMON_ONLY) && !defined(WITHOUT_DAEMON)
+.if !defined(EXIMON_ONLY) && ${PORT_OPTIONS:MDAEMON}
 USE_RC_SUBR=	exim
 PLIST_SUB+=	DAEMON=""
 SUB_LIST+=	LOGDIR="${LOGDIR}"
@@ -482,11 +478,11 @@ PLIST_SUB+=	DAEMON="@comment "
 .error EXIMON_ONLY is not user settable
 .endif
 
-.if !defined(WITHOUT_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 SEDLIST+=	-e 's,^\# (HAVE_IPV6=),\1,'
 .endif
 
-.if defined(WITH_DISABLE_D_OPT)
+.if ${PORT_OPTIONS:MDISABLE_D_OPT}
 SEDLIST+=	-e 's,^\# (DISABLE_D_OPTION=),\1,'
 .else
 .if defined(WHITELIST_D_MACROS)
@@ -512,7 +508,7 @@ pre-everything::
 	@${ECHO} 'removed in some future Exim release, so it is better'
 	@${ECHO} 'to use TRUSTED_CONFIG_LIST to set the list of trusted'
 	@${ECHO} 'configuration files.'
-.if empty(.MAKEFLAGS:M-s) && defined(WITH_WISHLIST)
+.if empty(.MAKEFLAGS:M-s) && ${PORT_OPTIONS:MWISHLIST}
 	@${ECHO} ''
 	@${ECHO} 'Included extra patches:'
 	@${FIND} ${PATCHDIR} -name 'wishlist-*.patch' \
@@ -521,10 +517,10 @@ pre-everything::
 .endif
 
 post-extract:
-.if defined(WITH_SA_EXIM)
+.if ${PORT_OPTIONS:MSA_EXIM}
 	@cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/sa-exim-${SA_EXIM_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}
 .endif
-.if defined(WITH_SO_1024)
+.if ${PORT_OPTIONS:MSO_1024}
 	@cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/spamooborona1024-src-${SO_1024_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}
 	@cd ${WRKDIR} && ${PATCH} --quiet < ${FILESDIR}/extra-patch-so_1024-delimiter
 .endif
@@ -532,7 +528,7 @@ post-extract:
 do-configure:
 	@${MKDIR} ${WRKSRC}/Local
 	@${SED} -E ${SEDLIST} ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile
-.if defined(WITH_EXIMON)
+.if ${PORT_OPTIONS:MEXIMON}
 	@${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf
 .endif
 	@[ ! -f ${PKGDIR}/pkg-install ] || ${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-install > ${PKGINSTALL}
@@ -544,7 +540,7 @@ do-configure:
 	@${REINPLACE_CMD} -e 's/^#include "cnumber\.h"$$/${PORTREVISION}/' ${WRKSRC}/src/version.c
 	@${REINPLACE_CMD} -E -e 's/^(PERL_COMMAND=).*/\1${PERL:S,/,\/,g}/' \
 		-e 's/^(CC=).*/\1${CC:S,/,\/,g}/' ${WRKSRC}/OS/Makefile-Default
-.if defined(WITH_SA_EXIM)
+.if ${PORT_OPTIONS:MSA_EXIM}
 	@${REINPLACE_CMD} -E -e 's/^(LOCAL_SCAN_SOURCE=).*/\1Local\/sa-exim.c/' \
 		${WRKSRC}/OS/Makefile-Default
 	@${CP} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.c ${WRKSRC}/Local
@@ -556,7 +552,7 @@ do-configure:
 	@${REINPLACE_CMD} -e 's,/usr/bin/spamc,${LOCALBASE}/bin/spamc,' \
 	    ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.conf
 .endif
-.if defined(WITH_SO_1024)
+.if ${PORT_OPTIONS:MSO_1024}
 	@${REINPLACE_CMD} -E -e 's/^(LOCAL_SCAN_SOURCE=).*/\1Local\/local_scan_1024.c/' \
 		${WRKSRC}/OS/Makefile-Default
 	@${CP} ${WRKDIR}/local_scan_1024.c ${WRKSRC}/Local
@@ -585,7 +581,7 @@ pre-install:
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-.if !defined(WITHOUT_DAEMON)
+.if ${PORT_OPTIONS:MDAEMON}
 	@${MKDIR} ${PREFIX}/etc/periodic/daily
 .for script in ${DAILY_SCRIPTS}
 	@${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${PREFIX}/etc/periodic/daily/${script}
@@ -596,7 +592,7 @@ post-install:
 .for manfile in ${MAN8}
 	@${INSTALL_MAN} ${WRKSRC}/doc/${manfile} ${MAN8PREFIX}/man/man8
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES.clamd ${DOCSDIR}
@@ -611,14 +607,14 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/build-${OPSYS}-${ARCH}/${example} ${EXAMPLESDIR}
 .endfor
 .endif
-.if defined(WITH_SA_EXIM)
+.if ${PORT_OPTIONS:MSA_EXIM}
 	@${INSTALL_DATA} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.conf \
 		${PREFIX}/etc/exim/sa-exim.conf.default
 	@[ -f ${PREFIX}/etc/exim/sa-exim.conf ] || \
 	    ${CP} ${PREFIX}/etc/exim/sa-exim.conf.default \
 	    ${PREFIX}/etc/exim/sa-exim.conf
 .endif
-.if defined(WITH_SO_1024)
+.if ${PORT_OPTIONS:MSO_1024}
 .if !exists(/var/spool/spamooborona)
 		@${MKDIR} -m 750 /var/spool/spamooborona
 		@${CHOWN} ${EXIM_USER}:${EXIM_GROUP} /var/spool/spamooborona
@@ -634,15 +630,4 @@ post-install:
 
 .endif
 
-show-variables-list:
-	@${SH} -c 'set -- ${OPTIONS:C/".*"//g}; \
-	while [ -n "$$1" ]; do \
-		opt="$$1"; shift; \
-		status="$$1"; shift; \
-		case "X$$status" in \
-		X[Oo][Nn]) echo "WITH_$$opt"=yes; ;; \
-		X[Oo][Ff][Ff]) echo "WITHOUT_$$opt"=yes; ;; \
-		esac; \
-	done'
-
 .include <bsd.port.mk>
diff --git a/mail/exim/options b/mail/exim/options
index 1edf88d8a19d..ca5e816272b5 100644
--- a/mail/exim/options
+++ b/mail/exim/options
@@ -1,49 +1,119 @@
-OPTIONS+= \
-	ALT_CONFIG_PREFIX "Restrict the set of configuration files" off \
-	AUTH_CRAM_MD5 "Enable CRAM-MD5 authentication mechanisms" on \
-	AUTH_DOVECOT "Enable Dovecot authentication mechanisms" on \
-	AUTH_PLAINTEXT "Enable plaintext authentication" on \
-	AUTH_RADIUS "Enable radius (RFC 2865) authentication" off \
-	AUTH_SASL "Enable use of Cyrus SASL auth library" off \
-	AUTH_SPA "Enable Secure Password Authentication" on \
-	CDB "Enable CDB-style lookups" on \
-	CONTENT_SCAN "Enable exiscan email content scanner" off \
-	DAEMON "Install scripts to run as a daemon" on \
-	DCC "Enable DCC at ACL support via dccifd" off \
-	DEBUG "Build with debugging symbols" off \
-	DISABLE_D_OPT "Disable macros overrides using option -D" on \
-	DKIM "Enable support for DKIM" on \
-	DNSDB "Enable DNS-style lookups" on \
-	DSEARCH "Enable directory-list lookups" on \
-	EMBEDDED_PERL "Enable embedded Perl interpreter" on \
-	EXIMON "Build eximon monitor (require XFree86!)" off \
-	ICONV "Enable header charset conversion" on \
-	IPV6 "Enable IPv6 support" on \
-	KAS "Build with Kaspersky AntiSpam local scan" off \
-	LISTMATCH_RHS "Enable pre-4.77 behaviour for match_*" off \
-	LMTP "RFC2033 SMTP over command pipe transport" on \
-	LSEARCH "Enable wildcarded-file lookups" on \
-	MAILDIR "Enable Maildir mailbox format" on \
-	MAILSTORE "Enable Mailstore mailbox format" on \
-	MBX "Enable MBX mailbox format" on \
-	MYSQL "Link against libmysqlclient library" off \
-	NIS "Enable NIS-style lookups" on \
-	OLD_DEMIME "Enable old, deprecated "demime" ACL" on \
-	OPENLDAP "Link against libldap" off \
-	PAM "Enable PAM authentication mechanisms" on \
-	PASSWD "Enable /etc/passwd lookups" on \
-	PGSQL "Link against libpq" off \
-	READLINE "Enable readline(3) library" off \
-	SASLAUTHD "Enable use of Cyrus SASL auth daemon" off \
-	SA_EXIM "SA-Exim support" off \
-	SO_1024 "Build with Spamooborona-1024 local scan" off \
-	SPF "Enable Sender Policy Framework checking" off \
-	SQLITE "Enable SQLite lookups" off \
-	SRS "Enable Sender Rewriting Scheme" off \
-	SRS_ALT "Enable alternative SRS library" off \
-	SUID "Install the exim binary suid root" on \
-	TCP_WRAPPERS "Enable /etc/hosts.allow access control" off \
-	TLS "Enable TLS support" on \
-	GNUTLS "Use GnuTLS instead of OpenSSL for TLS" off \
-	WISHLIST "Include the unsupported patches" off \
-	XCLIENT "Enable XCLIENT command in exim" off
+OPTIONS_DEFINE+=	ALT_CONFIG_PREFIX \
+			AUTH_CRAM_MD5 \
+			AUTH_DOVECOT \
+			AUTH_PLAINTEXT \
+			AUTH_RADIUS \
+			AUTH_SASL \
+			AUTH_SPA \
+			CDB \
+			CONTENT_SCAN \
+			DAEMON \
+			DCC \
+			DEBUG \
+			DISABLE_D_OPT \
+			DKIM \
+			DNSDB \
+			DSEARCH \
+			EMBEDDED_PERL \
+			EXIMON \
+			ICONV \
+			IPV6 \
+			KAS \
+			LISTMATCH_RHS \
+			LMTP \
+			LSEARCH \
+			MAILDIR \
+			MAILSTORE \
+			MBX \
+			MYSQL \
+			NIS \
+			OLD_DEMIME \
+			OPENLDAP \
+			PAM \
+			PASSWD \
+			PGSQL \
+			READLINE \
+			SASLAUTHD \
+			SA_EXIM \
+			SO_1024 \
+			SPF \
+			SQLITE \
+			SRS \
+			SRS_ALT \
+			SUID \
+			TCP_WRAPPERS \
+			TLS \
+			GNUTLS \
+			WISHLIST \
+			XCLIENT
+
+OPTIONS_DEFAULT+=	AUTH_CRAM_MD5 \
+			AUTH_DOVECOT \
+			AUTH_PLAINTEXT \
+			AUTH_SPA \
+			CDB \
+			DAEMON \
+			DISABLE_D_OPT \
+			DKIM \
+			DNSDB \
+			DSEARCH \
+			EMBEDDED_PERL \
+			ICONV \
+			LTMP \
+			LSEARCH \
+			MAILDIR \
+			MAILSTORE \
+			MBX \
+			NIS \
+			OLD_DEMIME \
+			PAM \
+			PASSWD \
+			SUID \
+			TLS
+
+
+ALT_CONFIG_PREFIX_DESC=	Restrict the set of configuration files
+AUTH_CRAM_MD5_DESC=	Enable CRAM-MD5 authentication mechanisms
+AUTH_DOVECOT_DESC=	Enable Dovecot authentication mechanisms
+AUTH_PLAINTEXT_DESC=	Enable plaintext authentication
+AUTH_RADIUS_DESC=	Enable radius (RFC 2865) authentication
+AUTH_SASL_DESC=		Enable use of Cyrus SASL auth library
+AUTH_SPA_DESC=		Enable Secure Password Authentication
+CDB_DESC=		Enable CDB-style lookups
+CONTENT_SCAN_DESC=	Enable exiscan email content scanner
+DAEMON_DESC=		Install scripts to run as a daemon
+DCC_DESC=		Enable DCC at ACL support via dccifd
+DISABLE_D_OPT_DESC=	Disable macros overrides using option -D
+DKIM_DESC=		Enable support for DKIM
+DNSDB_DESC=		Enable DNS-style lookups
+DSEARCH_DESC=		Enable directory-list lookups
+EMBEDDED_PERL_DESC=	Enable embedded Perl interpreter
+EXIMON_DESC=		Build eximon monitor (require XFree86!)
+ICONV_DESC=		Enable header charset conversion
+KAS_DESC=		Build with Kaspersky AntiSpam local scan
+LISTMATCH_RHS_DESC=	Enable pre-4.77 behaviour for match_*
+LMTP_DESC=		RFC2033 SMTP over command pipe transport
+LSEARCH_DESC=		Enable wildcarded-file lookups
+MAILDIR_DESC=		Enable Maildir mailbox format
+MAILSTORE_DESC=		Enable Mailstore mailbox format
+MBX_DESC=		Enable MBX mailbox format
+MYSQL_DESC=		Link against libmysqlclient library
+NIS_DESC=		Enable NIS-style lookups
+OLD_DEMIME_DESC=	Enable old, deprecated "demime" ACL
+OPENLDAP_DESC=		Link against libldap
+PAM_DESC=		Enable PAM authentication mechanisms
+PASSWD_DESC=		Enable /etc/passwd lookups
+PGSQL_DESC=		Link against libpq
+READLINE_DESC=		Enable readline(3) library
+SASLAUTHD_DESC=		Enable use of Cyrus SASL auth daemon
+SA_EXIM_DESC=		SA-Exim support
+SO_1024_DESC=		Build with Spamooborona-1024 local scan
+SPF_DESC=		Enable Sender Policy Framework checking
+SQLITE_DESC=		Enable SQLite lookups
+SRS_DESC=		Enable Sender Rewriting Scheme
+SRS_ALT_DESC=		Enable alternative SRS library
+SUID_DESC=		Install the exim binary suid root
+TCP_WRAPPERS_DESC=	Enable /etc/hosts.allow access control
+GNUTLS_DESC=		Use GnuTLS instead of OpenSSL for TLS
+WISHLIST_DESC=		Include the unsupported patches
+XCLIENT_DESC=		Enable XCLIENT command in exim