Fix SPF support, add experimental ARC option

Reported by:	pi via email

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 \
@@ -71,13 +72,19 @@ IGNORE=	you cannot enable OCSP stapling with gnutls
 .endif
 .endif
 
-# DMARC implies SPF
+# DMARC implies SPF and DKIM
 .if ${PORT_OPTIONS:MDMARC}
 .if ! ${PORT_OPTIONS:MSPF} || ! ${PORT_OPTIONS:MDKIM}
 IGNORE=	you cannot enable DMARC without SPF and DKIM support
 .endif
 .endif
 
+# ARC implies SPF and DKIM
+.if ${PORT_OPTIONS:MARC}
+.if ! ${PORT_OPTIONS:MSPF} || ! ${PORT_OPTIONS:MDKIM}
+IGNORE=	you cannot enable ARC without SPF and DKIM support
+.endif
+.endif
 # DANE implies DNSSEC
 .if ${PORT_OPTIONS:MDANE}
 .if ! ${PORT_OPTIONS:MDNSSEC} || ! ${PORT_OPTIONS:MTLS}
@@ -210,6 +217,10 @@ SEDLIST+=	-e 's,^\# (EXPERIMENTAL_DSN=),\1,'
 SEDLIST+=	-e 's,^\# (EXPERIMENTAL_DANE=),\1,'
 .endif
 
+.if ${PORT_OPTIONS:MARC}
+SEDLIST+=	-e 's,^\# (EXPERIMENTAL_ARC=),\1,'
+.endif
+
 .if !${PORT_OPTIONS:MEVENT}
 SEDLIST+=	-e 's,^\# (DISABLE_EVENT=),\1,'
 .endif
@@ -460,7 +471,7 @@ SEDLIST+=	-e 's,^(ALT_CONFIG_PREFIX=),\# \1,'
 .if ${PORT_OPTIONS:MSPF}
 SEDLIST+=	-e 's,XX_SPF_FLAGS_XX,-DSPF,' \
 		-e 's,XX_SPF_LIBS_XX,-L${LOCALBASE}/lib -lspf2 -lpthread,' \
-		-e 's,^\# (EXPERIMENTAL_SPF=),\1,'
+		-e 's,^\# (SUPPORT_SPF=),\1,'
 .else
 SEDLIST+=	-e 's,XX_SPF_FLAGS_XX,,' \
 		-e 's,XX_SPF_LIBS_XX,,'

mail/exim/options

@@ -4,6 +4,7 @@ OPTIONS_DEFINE+=	ALT_CONFIG_PREFIX \
 			DEBUG \
 			DISABLE_D_OPT \
 			DKIM \
+			SPF \
 			DNSSEC \
 			DOCS \
 			EMBEDDED_PERL \
@@ -65,11 +66,12 @@ OPTIONS_GROUP_LOOKUP=	CDB BDB DNSDB DSEARCH LSEARCH MYSQL NIS OPENLDAP PGSQL RED
 LOOKUP_DESC=	Lookup support
 OPTIONS_GROUP_STORAGE=	MAILDIR MAILSTORE MBX
 STORAGE_DESC=	Supported storage formats
-OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DANE DCC DMARC DSN SPF LMDB QUEUEFILE
+OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DANE DCC DMARC DSN ARC LMDB QUEUEFILE
 EXPERIMENTAL_DESC=	Experimental options
 OPTIONS_GROUP=	AUTH LOOKUP STORAGE EXPERIMENTAL
 
 ALT_CONFIG_PREFIX_DESC=	Restrict the set of configuration files
+ARC_DESC=		Enable experimental ARC support
 AUTH_CRAM_MD5_DESC=	Enable CRAM-MD5 authentication mechanisms
 AUTH_DOVECOT_DESC=	Enable Dovecot authentication mechanisms
 AUTH_PLAINTEXT_DESC=	Enable plaintext authentication