diff --git a/mail/exim/Portfile b/mail/exim/Portfile
index 84a8f9ce99db2..b27538d150161 100644
--- a/mail/exim/Portfile
+++ b/mail/exim/Portfile
@@ -1,4 +1,4 @@
-# $Id: Portfile,v 1.18 2003/11/11 14:06:04 fkr Exp $
+# $Id: Portfile,v 1.19 2003/11/11 21:52:19 fkr Exp $
 
 PortSystem 1.0
 name            exim
@@ -21,6 +21,7 @@ depends_build   bin:perl:perl5.8
 depends_run 	path:/Library/StartupItems/DarwinPortsStartup:DarwinPortsStartup
 
 set exim_user   exim
+patch.pre_args	-p1
 
 configure   {   cd ${worksrcpath}
                 system "cp src/EDITME Local/Makefile"
@@ -42,6 +43,7 @@ post-destroot { system "mv ${destroot}${prefix}/etc/exim/exim.conf ${destroot}${
                 system "install -o root -m 755 -d ${destroot}${prefix}/etc/rc.d"
                 system "install -o root -m 755 -c \
                      ${portpath}/files/exim.sh ${destroot}${prefix}/etc/rc.d"
+		system "touch '${destroot}${prefix}/var/spool/exim/.turd'"
                 reinplace "s|__PREFIX|${prefix}|g" ${destroot}${prefix}/etc/rc.d/exim.sh }
 
 platform darwin 7 {	patchfiles-append	patch-EDITME \
@@ -52,8 +54,7 @@ variant tls { }
 
 variant exiscan { patch_sites		http://duncanthrax.net/exiscan-acl/
 		  patchfiles-append 	exiscan-acl-4.24-13.patch	
-       		  checksums-append	exiscan-acl-4.24-13.patch md5 c8eb375adc7a7233d754eec20f07997f 
-		  patch.pre_args 	-p1 }
+       		  checksums-append	exiscan-acl-4.24-13.patch md5 c8eb375adc7a7233d754eec20f07997f }
 
 variant mysql { depends_lib-append      lib:libmysqlclient:mysql }
 
@@ -71,7 +72,7 @@ post-configure {
  		reinplace "s|# SUPPORT_MAILDIR=yes|SUPPORT_MAILDIR=yes|g" Local/Makefile       
 	}
 
-	if {[variant_isset smtp_auth ]} {
+	if {[variant_isset smtp-auth ]} {
 		reinplace "s|# AUTH_CRAM_MD5=yes|AUTH_CRAM_MD5=yes|g" Local/Makefile
 		reinplace "s|# AUTH_PLAINTEXT=yes|AUTH_PLAINTEXT=yes|g" Local/Makefile
 		reinplace "s|# AUTH_SPA=yes|AUTH_SPA=yes|g" Local/Makefile