--- p5-Mail-IMAPClient/Makefile	2017-02-06 16:05:56.000000000 +0100
+++ p5-Mail-IMAPClient/Makefile	2017-04-22 08:47:37.776127000 +0200
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	Mail-IMAPClient
 PORTVERSION=	3.39
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PLOBBES
@@ -13,10 +14,25 @@ 
 
 LICENSE=	ARTPERL10
 
-RUN_DEPENDS=	p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
-		p5-Parse-RecDescent>=1.94:devel/p5-Parse-RecDescent \
-		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
-		p5-Authen-SASL>=0:security/p5-Authen-SASL
+RUN_DEPENDS=	p5-Parse-RecDescent>=1.94:devel/p5-Parse-RecDescent \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
+
+OPTIONS_DEFINE=	CRAMMD5 DIGESTMD5 NTLM
+
+OPTIONS_DEFAULT=
+
+CRAMMD5_DEFINE=	Allow CRAM-MD5 auth scheme.
+CRAMMD5_RUN_DEPENDS=	p5-Digest-HMAC>=0:security/p5-Digest-HMAC
+CRAMMD5_RUN_DEPENDS_OFF=
+
+DIGESTMD5_DEFINE=	Allow DIGEST-MD5 auth scheme.
+DIGESTMD5_RUN_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL \
+			p5-Digest-MD5>=0:security/p5-Digest-MD5
+DIGESTMD5_RUN_DEPENDS_OFF=
+
+NTLM_DEFINE=	Allow NTLM auth scheme.
+NTLM_RUN_DEPENDS=	p5-Authen-NTLM>=0:security/p5-Authen-NTLM
+NTLM_RUN_DEPENDS_OFF=
 
 USES=		perl5
 USE_PERL5=	configure