--- options.mk.orig	2010-09-17 15:01:37.000000000 +0300
+++ options.mk	2011-01-20 14:11:28.000000000 +0200
@@ -10,11 +10,22 @@
 PKG_SUPPORTED_OPTIONS+=	exim-tls exim-transport-lmtp gdbm inet6 saslauthd spf
 PKG_SUPPORTED_OPTIONS+=	readline
 
+PKG_SUPPORTED_OPTIONS+=	exim-auth-cyrus-sasl
+PKG_SUPPORTED_OPTIONS+=	exim-perl
+PKG_SUPPORTED_OPTIONS+=	exim-expand-dlfunc
+PKG_SUPPORTED_OPTIONS+=	alt-config-prefix
+PKG_SUPPORTED_OPTIONS+=	disable-d-option
+
 PKG_SUGGESTED_OPTIONS=	exim-appendfile-maildir exim-appendfile-mailstore
 PKG_SUGGESTED_OPTIONS+=	exim-appendfile-mbx exim-content-scan
 PKG_SUGGESTED_OPTIONS+=	exim-lookup-dsearch exim-old-demime exim-tcp-wrappers
 PKG_SUGGESTED_OPTIONS+=	exim-tls
 
+PKG_SUGGESTED_OPTIONS+=	exim-perl
+PKG_SUGGESTED_OPTIONS+=	exim-expand-dlfunc
+PKG_SUGGESTED_OPTIONS+=	alt-config-prefix
+PKG_SUGGESTED_OPTIONS+=	disable-d-option
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mexim-appendfile-maildir)
@@ -155,3 +166,29 @@
 USE_GNU_READLINE=	yes
 .  include "../../devel/readline/buildlink3.mk"
 .endif
+
+
+.if !empty(PKG_OPTIONS:Mexim-auth-cyrus-sasl)
+LOCAL_MAKEFILE_OPTIONS+=AUTH_CYRUS_SASL=yes
+LOCAL_MAKEFILE_OPTIONS+=AUTH_LIBS=-lsasl2
+.  include "../../security/cyrus-sasl/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mexim-perl)
+#BUILD_DEPENDS+= perl-[0-9]*:../../lang/perl5
+#DEPENDS+=       perl-[0-9]*:../../lang/perl5
+LOCAL_MAKEFILE_OPTIONS+=EXIM_PERL=perl.o
+.  include "../../lang/perl5/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mexim-expand-dlfunc)
+LOCAL_MAKEFILE_OPTIONS+=EXPAND_DLFUNC=yes
+.endif
+
+.if !empty(PKG_OPTIONS:Malt-config-prefix)
+LOCAL_MAKEFILE_OPTIONS+=ALT_CONFIG_PREFIX=${PKG_SYSCONFDIR}/configure
+.endif
+
+.if !empty(PKG_OPTIONS:Mdisable-d-option)
+LOCAL_MAKEFILE_OPTIONS+=DISABLE_D_OPTION=yes
+.endif