--- Makefile.orig	Tue Feb  2 22:23:30 2010
+++ Makefile	Sun Jun 13 14:18:31 2010
@@ -23,7 +23,8 @@
 PERMIT_DISTFILES_FTP =   Yes
 
 PSEUDO_FLAVORS =	no_eximon
-FLAVORS =		mysql postgresql sqlite3 ldap sasl
+#FLAVORS =		mysql postgresql sqlite3 ldap sasl
+FLAVORS =		mysql postgresql sqlite3 ldap sasl spf dlfunc
 FLAVOR ?=
 MULTI_PACKAGES =	-main
 
@@ -41,6 +42,18 @@
 USE_X11 =		Yes
 MULTI_PACKAGES +=	-eximon
 EXIM_MAKECAT +=		"EXIM_MONITOR=eximon.bin\n"
+.endif
+
+.if ${FLAVOR:L:Mspf}
+EXIM_MAKECAT+= "EXPERIMENTAL_SPF=yes\n"
+EXIM_EXTRA_LIBS+= -L${LOCALBASE}/lib -lspf2
+EXIM_LDFLAGS+= -L${LOCALBASE}/lib -lspf2
+EXIM_CFLAGS+= -DSPF -I${LOCALBASE}/include
+LIB_DEPENDS+= spf2.:libspf2-*:mail/libspf2
+.endif
+
+.if ${FLAVOR:L:Mdlfunc}
+EXIM_MAKECAT+= "EXPAND_DLFUNC=yes\n"
 .endif
 
 .if ${FLAVOR:L:Mmysql}