--- options.mk.orig	Sat Dec 15 18:04:41 2007
+++ options.mk	Wed Jun 30 21:48:26 2010
@@ -10,6 +10,10 @@
 PKG_SUPPORTED_OPTIONS+=	exim-tls exim-transport-lmtp gdbm inet6 saslauthd
 PKG_SUPPORTED_OPTIONS+=	readline
 
+PKG_SUPPORTED_OPTIONS+=	exim-perl
+PKG_SUPPORTED_OPTIONS+=	exim-expand-dlfunc
+PKG_SUPPORTED_OPTIONS+=	exim-spf
+
 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
@@ -156,4 +160,20 @@
 LOOKUP_LIBS+=		-lreadline
 USE_GNU_READLINE=	yes
 .  include "../../devel/readline/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mexim-perl)
+LOCAL_MAKEFILE_OPTIONS+=EXIM_PERL=perl.o
+.endif
+
+.if !empty(PKG_OPTIONS:Mexim-expand-dlfunc)
+LOCAL_MAKEFILE_OPTIONS+=EXPAND_DLFUNC=yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mexim-spf)
+LOCAL_MAKEFILE_OPTIONS+=EXPERIMENTAL_SPF=yes
+LOOKUP_LIBS+=-L${LOCALBASE}/lib-lspf2
+LDFLAGS+= -L${LOCALBASE}/lib -lspf2
+CFLAGS+= -DSPF -I${LOCALBASE}/include
+.  include "../../mail/libspf2/buildlink3.mk"
 .endif