Update 2.066->2.082

- another fix for the case of two "Content-Type" lines, hit
  by a recent, now frequently appearing, spam message.
- various IMAP4 improvements by [David Golden]
- stop when message coersion is called but not possible.
- fixtest, to work with MIME::Entity changes.
- field attributes which contained a '\' where considered
  empty.  Reported by [Ricardo Signes]
- Message rebuild with nested message failed.  Fixed by
  [Mat Johns]

3 files changed, 29 insertions, 18 deletions

diff --git a/mail/p5-Mail-Box/Makefile b/mail/p5-Mail-Box/Makefile
index 42d1b9c143f..ef519af4a2b 100644
--- a/mail/p5-Mail-Box/Makefile
+++ b/mail/p5-Mail-Box/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2008/06/12 02:14:34 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/06/16 10:50:15 adrianp Exp $
 
-DISTNAME=	Mail-Box-2.066
-PKGREVISION=	1
+DISTNAME=	Mail-Box-2.082
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}
diff --git a/mail/p5-Mail-Box/distinfo b/mail/p5-Mail-Box/distinfo
index 6c73f94dc54..6c7045d9cc0 100644
--- a/mail/p5-Mail-Box/distinfo
+++ b/mail/p5-Mail-Box/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2006/09/16 15:29:36 hira Exp $
+$NetBSD: distinfo,v 1.4 2008/06/16 10:50:15 adrianp Exp $
 
-SHA1 (Mail-Box-2.066.tar.gz) = cfdef08ec2381d6ba051dd83e8c05d37062bd671
-RMD160 (Mail-Box-2.066.tar.gz) = 7fd9c21b6949c9901824a4225d33541928136a81
-Size (Mail-Box-2.066.tar.gz) = 589834 bytes
-SHA1 (patch-aa) = 7e8c160c7cec4eac27873395a64a5bff6937f25b
+SHA1 (Mail-Box-2.082.tar.gz) = 5c05888fd23e27f6d9cb2c441efb416863b780a2
+RMD160 (Mail-Box-2.082.tar.gz) = f4c37838f00ed504ebcbb9ba776ea92e11514d33
+Size (Mail-Box-2.082.tar.gz) = 597558 bytes
+SHA1 (patch-aa) = 63cfb55fb8b76b544d5b226251a8e1639ffa7c58
diff --git a/mail/p5-Mail-Box/patches/patch-aa b/mail/p5-Mail-Box/patches/patch-aa
index 66e1cdc3514..faaf1fe7a1f 100644
--- a/mail/p5-Mail-Box/patches/patch-aa
+++ b/mail/p5-Mail-Box/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2006/09/16 15:29:36 hira Exp $
+$NetBSD: patch-aa,v 1.4 2008/06/16 10:50:15 adrianp Exp $
 
---- Makefile.PL.orig	2006-08-06 13:49:57.000000000 +0100
-+++ Makefile.PL	2006-08-06 13:51:08.000000000 +0100
-@@ -163,76 +163,8 @@
+--- Makefile.PL.orig	2008-04-28 08:30:56.000000000 +0100
++++ Makefile.PL
+@@ -159,88 +159,8 @@ FIX
      exit 1;
  }
  
@@ -19,6 +19,18 @@ $NetBSD: patch-aa,v 1.3 2006/09/16 15:29:36 hira Exp $
 -    my $requirements = $args{requires} || sub {1};
 -    next unless $requirements->();
 -
+-    if($module eq 'MIME::Entity')
+-    {   # work-around for awkward development situation at home,
+-        # where the VERSION string is not in the development pre-release.
+-        no warnings;
+-        eval "require Mail::Internet";
+-        unless($@)
+-        {   $Mail::Internet::VERSION ||= '2.00';
+-            $Mail::Field::VERSION    ||= '2.00';
+-            $Mail::Header::VERSION   ||= '2.00';
+-        }
+-    }
+-
 -    print "\n";
 -    eval "require $module";
 -    if($@)
@@ -26,14 +38,14 @@ $NetBSD: patch-aa,v 1.3 2006/09/16 15:29:36 hira Exp $
 -             { print "**** Optional $module is not installed\n"        }
 -        else { print "**** Optional $module compilation failed:\n$@\n" }
 -    }
--    elsif($module->VERSION < $version )
+-    elsif(eval '$module->VERSION($version)' && $@)
 -    {   print "**** Optional $module too old: requires $version but is ",
--            $module->VERSION,"\n";
+-            $module->VERSION,";$@\n";
 -    }
 -    else
 -    {   my $v = $module->VERSION;
 -        my $r = $v eq $version ? ''
--              : $version == 0  ? " (any version will do)"
+-              : $version eq 0  ? " (any version will do)"
 -              :                  " (at least $version required)";
 -
 -        print "**** Found optional $module version $v$r\n";
@@ -52,8 +64,8 @@ $NetBSD: patch-aa,v 1.3 2006/09/16 15:29:36 hira Exp $
 -    }
 -    
 -    my $install = $default_install_answer
--               || prompt( "Do you want to install $module? yes/no/all"
--                        , -t STDIN ? 'y' : 'n');
+-     || prompt "Do you want to install $module? yes/no/all"
+-             , (-t STDIN ? 'y' : 'n');
 -
 -    $install = $default_install_answer = 'y'
 -        if $install eq 'a';
@@ -67,7 +79,7 @@ $NetBSD: patch-aa,v 1.3 2006/09/16 15:29:36 hira Exp $
 -}
 -
 -my $tests = $ENV{MAILBOX_RUN_TESTS}
--         || prompt "Do you want to run the (large set of) tests? yes/no", "yes";
+- || prompt "Do you want to run the (large set of) tests? yes/no", "yes";
 -
 -if($tests =~ m/n/i)
 -{   open F, ">", "skiptests";