--- Makefile.orig	Thu Apr 26 10:11:45 2007
+++ Makefile	Thu Apr 26 10:13:10 2007
@@ -18,7 +18,7 @@
 PERMIT_DISTFILES_FTP=   Yes
 WANTLIB=		c crypto perl ssl util wrap m
 
-FLAVORS=no_exiscan no_x11 mysql postgresql sqlite3 ldap iconv sasl
+FLAVORS=no_exiscan no_x11 mysql postgresql sqlite3 ldap iconv sasl spf dlfunc
 FLAVOR?=
 
 NO_REGRESS=Yes
@@ -32,6 +32,18 @@
 USE_X11=		Yes
 EXIM_MAKECAT+=		"EXIM_MONITOR=eximon.bin\n"
 WANTLIB+=		X11 Xaw Xext Xmu Xt
+.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}