- Add runtime dependency on perl for exim utilities [1], [2]

- Support berkeley DB lookups [3]
- Remove unnecessary options checks [1]
- Improve description for EXIMON option
- Bump portrevision

PR:		189019 [2], 181863 [3]
Submitted by:	ak [1], tim at bishnet.net [2], odavydenko at gmail.com [3]

2 files changed, 7 insertions, 20 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index f87845596360..b9085958d8ec 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	exim
 PORTVERSION?=	${EXIM_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_EXIM:S/$/:exim/}
 MASTER_SITE_SUBDIR=	exim4/:exim
@@ -17,7 +17,8 @@ COMMENT?=	High performance MTA for Unix systems on the Internet
 
 LICENSE=	GPLv2
 
-USES=	tar:bzip2
+USES=	tar:bzip2 perl5
+USE_PERL5=	run
 
 # Exim build system is job unsafe atm
 MAKE_JOBS_UNSAFE=	yes
@@ -44,7 +45,7 @@ OPTIONS_SUB=	yes
 AUTH_SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 BDB_USE=	bdb=yes
 DMARC_LIB_DEPENDS=	libopendmarc.so:${PORTSDIR}/mail/opendmarc
-EMBEDDED_PERL_USES=	perl5
+EMBEDDED_PERL_USE=	perl5=run,build
 EXIMON_USE=	xorg=x11,xaw,xt
 GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
 ICONV_USES=	iconv:lib,build
@@ -64,21 +65,6 @@ XCLIENT_EXTRA_PATCHES=	${FILESDIR}/extra-patch-xclient
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSA_EXIM}
-.if ${PORT_OPTIONS:MKAS}
-IGNORE=		You cannot select both SA_EXIM and KAS options
-.endif
-.if ${PORT_OPTIONS:MSO_1024}
-IGNORE=		You cannot select both SA_EXIM and SO_1024 options
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MKAS}
-.if ${PORT_OPTIONS:MSO_1024}
-IGNORE=		You cannot select both SA_KAS and SO_1024 options
-.endif
-.endif
-
 # OCSP is supported for openssl only
 .if ${PORT_OPTIONS:MOCSP}
 .if ! ${PORT_OPTIONS:MTLS}
diff --git a/mail/exim/options b/mail/exim/options
index 55892768957d..cde86962d3b9 100644
--- a/mail/exim/options
+++ b/mail/exim/options
@@ -55,7 +55,7 @@ OPTIONS_RADIO=	TLS LS
 
 OPTIONS_GROUP_AUTH=	AUTH_CRAM_MD5 AUTH_DOVECOT AUTH_PLAINTEXT AUTH_RADIUS AUTH_SASL AUTH_SPA SASLAUTHD PAM PASSWD
 AUTH_DESC=	SMTP Authorization
-OPTIONS_GROUP_LOOKUP=	CDB DNSDB DSEARCH LSEARCH MYSQL NIS OPENLDAP PGSQL REDIS SQLITE
+OPTIONS_GROUP_LOOKUP=	CDB BDB DNSDB DSEARCH LSEARCH MYSQL NIS OPENLDAP PGSQL REDIS SQLITE
 LOOKUP_DESC=	Lookup support
 OPTIONS_GROUP_STORAGE=	MAILDIR MAILSTORE MBX
 STORAGE_DESC=	Supported storage formats
@@ -68,6 +68,7 @@ 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
+BDB_DESC=		Enable Berkeley DB lookups
 CDB_DESC=		Enable CDB-style lookups
 CONTENT_SCAN_DESC=	Enable exiscan email content scanner
 DAEMON_DESC=		Install scripts to run as a daemon
@@ -78,7 +79,7 @@ DMARC_DESC=		Enable DMARC support
 DNSDB_DESC=		Enable DNS-style lookups
 DSEARCH_DESC=		Enable directory-list lookups
 EMBEDDED_PERL_DESC=	Enable embedded Perl interpreter
-EXIMON_DESC=		Build eximon monitor (requires X server)
+EXIMON_DESC=		Build eximon monitor (requires X libraries)
 ICONV_DESC=		Enable header charset conversion
 KAS_DESC=		Build with Kaspersky AntiSpam local scan
 LISTMATCH_RHS_DESC=	Enable pre-4.77 behaviour for match_*