diff --git a/mail/p5-Email-LocalDelivery/Makefile b/mail/p5-Email-LocalDelivery/Makefile
index 134dd8c91d20..69a6022a7906 100644
--- a/mail/p5-Email-LocalDelivery/Makefile
+++ b/mail/p5-Email-LocalDelivery/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Email-LocalDelivery
-PORTVERSION=	0.08
+PORTVERSION=	0.09
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Email
@@ -28,18 +28,15 @@ MAN3=		Email::LocalDelivery.3
 
 .if ${PERL_LEVEL} < 500600
 
-EXTRA_PATCHES=	${FILESDIR}/5.005-LocalDelivery.pm \
-		${FILESDIR}/5.005-LocalDelivery::Maildir.pm \
-		${FILESDIR}/5.005-LocalDelivery::Mbox.pm
+EXTRA_PATCHES=	${FILESDIR}/5.005-LocalDelivery::Mbox.pm
 
 post-patch:
-	${FIND} ${WRKSRC} -name \*.orig -delete
+	@${PERL} -pi -e 's/^our\s+([\$$\@\%]\w+)/use vars qw($$1); $$1/;' \
+		${WRKSRC}/LocalDelivery.pm \
+		${WRKSRC}/LocalDelivery/Maildir.pm \
+		${WRKSRC}/LocalDelivery/Mbox.pm
+	@${RM} ${WRKSRC}/LocalDelivery/Mbox.pm.orig
 
-post-configure:
-	${PERL} -pi -e 's,/usr/local,${PREFIX},g' ${WRKSRC}/Makefile
 .endif
 
-test:	build
-	cd ${WRKSRC} ; make test
-
 .include <bsd.port.post.mk>
diff --git a/mail/p5-Email-LocalDelivery/distinfo b/mail/p5-Email-LocalDelivery/distinfo
index 614b3fa5767f..c6fe02741928 100644
--- a/mail/p5-Email-LocalDelivery/distinfo
+++ b/mail/p5-Email-LocalDelivery/distinfo
@@ -1,2 +1,2 @@
-MD5 (Email-LocalDelivery-0.08.tar.gz) = 61dd51f919705734fd7da32b506595d6
-SIZE (Email-LocalDelivery-0.08.tar.gz) = 4178
+MD5 (Email-LocalDelivery-0.09.tar.gz) = 74cc1bbf18f036dace59b7bd9da869a2
+SIZE (Email-LocalDelivery-0.09.tar.gz) = 4509
diff --git a/mail/p5-Email-LocalDelivery/files/5.005-LocalDelivery.pm b/mail/p5-Email-LocalDelivery/files/5.005-LocalDelivery.pm
deleted file mode 100644
index 4ee645aebfcd..000000000000
--- a/mail/p5-Email-LocalDelivery/files/5.005-LocalDelivery.pm
+++ /dev/null
@@ -1,16 +0,0 @@
---- LocalDelivery.pm.orig	Tue Jun  1 20:04:19 2004
-+++ LocalDelivery.pm	Tue Jun  1 20:05:12 2004
-@@ -1,12 +1,10 @@
- package Email::LocalDelivery;
- 
--require 5.005_62;
- use strict;
--use warnings;
- use File::Path::Expand qw(expand_filename);
- use Email::FolderType qw(folder_type);
- use Carp;
--our $VERSION = '0.08';
-+use vars qw($VERSION); $VERSION = '0.08';
- 
- =head1 NAME
- 
diff --git a/mail/p5-Email-LocalDelivery/files/5.005-LocalDelivery::Maildir.pm b/mail/p5-Email-LocalDelivery/files/5.005-LocalDelivery::Maildir.pm
deleted file mode 100644
index 1bbad2c88345..000000000000
--- a/mail/p5-Email-LocalDelivery/files/5.005-LocalDelivery::Maildir.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- LocalDelivery/Maildir.pm.orig	Tue Jun  1 20:04:43 2004
-+++ LocalDelivery/Maildir.pm	Tue Jun  1 20:06:01 2004
-@@ -3,7 +3,7 @@
- use Email::Simple;
- use File::Path;
- 
--our $VERSION = "1.06";
-+use vars qw($VERSION); $VERSION = "1.06";
- my $maildir_time    = 0;
- my $maildir_counter = 0;
- use Sys::Hostname; (my $HOSTNAME = hostname) =~ s/\..*//;
diff --git a/mail/p5-Email-LocalDelivery/files/5.005-LocalDelivery::Mbox.pm b/mail/p5-Email-LocalDelivery/files/5.005-LocalDelivery::Mbox.pm
index bf8717a85aed..2030e3a708c7 100644
--- a/mail/p5-Email-LocalDelivery/files/5.005-LocalDelivery::Mbox.pm
+++ b/mail/p5-Email-LocalDelivery/files/5.005-LocalDelivery::Mbox.pm
@@ -1,36 +1,17 @@
---- LocalDelivery/Mbox.pm.orig	Fri Nov 14 10:04:24 2003
-+++ LocalDelivery/Mbox.pm	Tue Jun  1 20:47:05 2004
-@@ -4,7 +4,7 @@
- use Email::Simple;
- use Fcntl ':flock';
+--- LocalDelivery/Mbox.pm.orig	Sun Dec 19 00:06:35 2004
++++ LocalDelivery/Mbox.pm	Sun Dec 19 00:09:40 2004
+@@ -26,10 +26,10 @@
+     my $dir = dirname($file);
+     return if ! -d $dir and not mkpath($dir);
  
--our $VERSION = "1.07";
-+use vars qw($VERSION); $VERSION = "1.07";
+-    open my $fh, ">> $file" or return;
+-    $class->getlock($fh) || return;
+-    seek $fh, 0, 2;
+-    return $fh;
++    open FH, ">> $file" or return;
++    $class->getlock(\*FH) || return;
++    seek FH, 0, 2;
++    return \*FH;
+ }
  
- sub deliver {
-     my ($class, $mail, @files) = @_;
-@@ -13,15 +13,15 @@
-         my $dir = dirname($file);
-         next if ! -d $dir and not mkpath($dir);
- 
--        open my $fh, ">> $file"               or next;
--        $class->getlock($fh)                  || next;
--        seek $fh, 0, 2;
--        print $fh "\n" if tell($fh) > 0;
--        print $fh $class->_from_line(\$mail); # Avoid passing $mail where poss.
--        print $fh $class->_escape_from_body(\$mail);
--        print $fh "\n" unless $mail =~ /\n$/;
--        $class->unlock($fh)                   || next;
--        close $fh                             or next;
-+        open FH, ">> $file"               or next;
-+        $class->getlock(\*FH)                  || next;
-+        seek FH, 0, 2;
-+        print FH "\n" if tell(FH) > 0;
-+        print FH $class->_from_line(\$mail); # Avoid passing $mail where poss.
-+        print FH $class->_escape_from_body(\$mail);
-+        print FH "\n" unless $mail =~ /\n$/;
-+        $class->unlock(\*FH)                   || next;
-+        close FH                             or next;
-         push @rv, $file
-     }
-     return @rv;
+ sub _close_fh {