aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/exim/Makefile5
-rw-r--r--mail/exim/options4
2 files changed, 2 insertions, 7 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index a55ba33322ed..001e52a6a74f 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -3,6 +3,7 @@
PORTNAME= exim
PORTVERSION?= ${EXIM_VERSION}
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= EXIM:exim
MASTER_SITE_SUBDIR= /exim4/:exim \
@@ -483,10 +484,6 @@ SEDLIST+= -e 's,^\# (USE_READLINE=),\1,'
SEDLIST+= -e 's,^\# (WITH_CONTENT_SCAN=),\1,'
.endif
-.if ${PORT_OPTIONS:MOLD_DEMIME}
-SEDLIST+= -e 's,^\# (WITH_OLD_DEMIME=),\1,'
-.endif
-
.if !defined(EXIMON_ONLY) && ${PORT_OPTIONS:MDAEMON}
USE_RC_SUBR= exim
PLIST_SUB+= EXIMDAEMON=""
diff --git a/mail/exim/options b/mail/exim/options
index eb18788fdee6..38452b4db72b 100644
--- a/mail/exim/options
+++ b/mail/exim/options
@@ -13,7 +13,6 @@ OPTIONS_DEFINE+= ALT_CONFIG_PREFIX \
LISTMATCH_RHS \
LMTP \
OCSP \
- OLD_DEMIME \
PRDR \
READLINE \
SUID \
@@ -29,6 +28,7 @@ OPTIONS_DEFAULT+= AUTH_CRAM_MD5 \
AUTH_PLAINTEXT \
AUTH_SPA \
CDB \
+ CONTENT_SCAN \
DAEMON \
DISABLE_D_OPT \
DKIM \
@@ -45,7 +45,6 @@ OPTIONS_DEFAULT+= AUTH_CRAM_MD5 \
MAILSTORE \
MBX \
OCSP \
- OLD_DEMIME \
PAM \
PASSWD \
PRDR \
@@ -105,7 +104,6 @@ MAILSTORE_DESC= Enable Mailstore mailbox format
MBX_DESC= Enable MBX mailbox format
MYSQL_DESC= Enable mysql lookups
NIS_DESC= Enable NIS-style lookups
-OLD_DEMIME_DESC= Enable old, deprecated "demime" ACL
OPENLDAP_DESC= Enable LDAP lookups
OCSP_DESC= Enable OCSP stapling
QUEUEFILE_DESC= Enable queuefile transport