Make this package work with Perl 5.9+

Approved by agc

5 files changed, 51 insertions, 3 deletions

diff --git a/mail/p5-Mail-Mbox-MessageParser/Makefile b/mail/p5-Mail-Mbox-MessageParser/Makefile
index b742a2146e8..cc38b909262 100644
--- a/mail/p5-Mail-Mbox-MessageParser/Makefile
+++ b/mail/p5-Mail-Mbox-MessageParser/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2008/10/19 19:18:12 he Exp $
+# $NetBSD: Makefile,v 1.13 2009/04/02 18:10:39 tez Exp $
 
 DISTNAME=	Mail-Mbox-MessageParser-1.5000
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}
 
diff --git a/mail/p5-Mail-Mbox-MessageParser/distinfo b/mail/p5-Mail-Mbox-MessageParser/distinfo
index 5c40af7dbc5..89921ec4164 100644
--- a/mail/p5-Mail-Mbox-MessageParser/distinfo
+++ b/mail/p5-Mail-Mbox-MessageParser/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.5 2007/02/24 23:08:35 wiz Exp $
+$NetBSD: distinfo,v 1.6 2009/04/02 18:10:39 tez Exp $
 
 SHA1 (Mail-Mbox-MessageParser-1.5000.tar.gz) = d9a446f2700a8808297a1a8ce4bb9f972bf3e13f
 RMD160 (Mail-Mbox-MessageParser-1.5000.tar.gz) = 410b46a68360b044124dc36442729e24e6d4eda6
 Size (Mail-Mbox-MessageParser-1.5000.tar.gz) = 279116 bytes
+SHA1 (patch-aa) = c13ac36819e59578a8f5f3a64be55303a1bb9ddd
+SHA1 (patch-ab) = e8c92e569bb452d9d4a8e34352ba33e227fcc42a
+SHA1 (patch-ac) = e7cb7a428a14e5d3220c948d40e5b2cdb5d3c1b5
diff --git a/mail/p5-Mail-Mbox-MessageParser/patches/patch-aa b/mail/p5-Mail-Mbox-MessageParser/patches/patch-aa
new file mode 100644
index 00000000000..dfe70526297
--- /dev/null
+++ b/mail/p5-Mail-Mbox-MessageParser/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2009/04/02 18:10:39 tez Exp $
+
+diff -ruN lib/Mail/Mbox/MessageParser/Config.pm.orig lib/Mail/Mbox/MessageParser/Config.pm > ../../patches/patch-aa
+
+--- lib/Mail/Mbox/MessageParser/Config.pm.orig	2009-03-31 16:22:14.517431000 -0500
++++ lib/Mail/Mbox/MessageParser/Config.pm	2009-03-31 16:22:41.477544900 -0500
+@@ -19,7 +19,7 @@
+ 
+   'read_chunk_size' => 20000,
+ 
+-  'from_pattern' => q/(?x)^
++  'from_pattern' => q/(?mx)^
+     (From\s
+       # Skip names, months, days
+       (?> [^:\n]+ )
diff --git a/mail/p5-Mail-Mbox-MessageParser/patches/patch-ab b/mail/p5-Mail-Mbox-MessageParser/patches/patch-ab
new file mode 100644
index 00000000000..4fc43a0874e
--- /dev/null
+++ b/mail/p5-Mail-Mbox-MessageParser/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2009/04/02 18:10:39 tez Exp $
+
+diff -ruN lib/Mail/Mbox/MessageParser/Grep.pm.orig lib/Mail/Mbox/MessageParser/Grep.pm > ../../patches/patch-ab
+
+--- lib/Mail/Mbox/MessageParser/Grep.pm.orig	2009-03-31 16:21:34.719068900 -0500
++++ lib/Mail/Mbox/MessageParser/Grep.pm	2009-03-31 16:23:08.691314600 -0500
+@@ -289,7 +289,7 @@
+   # RFC 1521 says the boundary can be no longer than 70 characters. Back up a
+   # little more than that.
+   my $endline = $self->{'endline'};
+-  $self->_read_until_match(qr/^--\Q$boundary\E--$endline/,76)
++  $self->_read_until_match(qr/^--\Q$boundary\E--$endline/m,76)
+     or return 0;
+ 
+   return 1;
diff --git a/mail/p5-Mail-Mbox-MessageParser/patches/patch-ac b/mail/p5-Mail-Mbox-MessageParser/patches/patch-ac
new file mode 100644
index 00000000000..3a241ef8224
--- /dev/null
+++ b/mail/p5-Mail-Mbox-MessageParser/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2009/04/02 18:10:39 tez Exp $
+
+diff -ruN lib/Mail/Mbox/MessageParser/Perl.pm.orig lib/Mail/Mbox/MessageParser/Perl.pm > ../../patches/patch-ac
+
+--- lib/Mail/Mbox/MessageParser/Perl.pm.orig	2009-03-31 16:21:44.338876800 -0500
++++ lib/Mail/Mbox/MessageParser/Perl.pm	2009-03-31 16:23:32.285106100 -0500
+@@ -265,7 +265,7 @@
+   # RFC 1521 says the boundary can be no longer than 70 characters. Back up a
+   # little more than that.
+   my $endline = $self->{'endline'};
+-  $self->_read_until_match(qr/^--\Q$boundary\E--$endline/,76)
++  $self->_read_until_match(qr/^--\Q$boundary\E--$endline/m,76)
+     or return 0;
+ 
+   return 1;