svn commit: r431639 - head/mail/exim

[Vsevolod Stakhov]

Author: vsevolod
Date: Mon Jan 16 13:03:27 2017
New Revision: 431639
URL: https://svnweb.freebsd.org/changeset/ports/431639

Log:
  - Remove obsoleted OLD_DEMIME option
  - Enable CONTENT_SCAN by default to compensate OLD_DEMIME removal
  
  PR:		215871
  Submitted by:	Mark Hills mark-freebsd at xwax.org

Modified:
  head/mail/exim/Makefile
  head/mail/exim/options

Modified: head/mail/exim/Makefile
==============================================================================
--- head/mail/exim/Makefile	Mon Jan 16 12:57:56 2017	(r431638)
+++ head/mail/exim/Makefile	Mon Jan 16 13:03:27 2017	(r431639)
@@ -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=""

Modified: head/mail/exim/options
==============================================================================
--- head/mail/exim/options	Mon Jan 16 12:57:56 2017	(r431638)
+++ head/mail/exim/options	Mon Jan 16 13:03:27 2017	(r431639)
@@ -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 mailbo
 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