9521017baf
- 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]
95 lines
2.6 KiB
Text
95 lines
2.6 KiB
Text
$NetBSD: patch-aa,v 1.4 2008/06/16 10:50:15 adrianp Exp $
|
|
|
|
--- Makefile.PL.orig 2008-04-28 08:30:56.000000000 +0100
|
|
+++ Makefile.PL
|
|
@@ -159,88 +159,8 @@ FIX
|
|
exit 1;
|
|
}
|
|
|
|
-print <<'OPTIONAL';
|
|
-
|
|
-* Now, let me ask you whether you want some optional modules to be
|
|
-* installed as well. You can always install these modules later, by
|
|
-* hand, without a need to re-install MailBox.
|
|
-*
|
|
-OPTIONAL
|
|
-
|
|
-foreach my $optional (@optional)
|
|
-{ my ($module, $version, %args) = @$optional;
|
|
- 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($@)
|
|
- { if($@ =~ m/^Can't locate /)
|
|
- { print "**** Optional $module is not installed\n" }
|
|
- else { print "**** Optional $module compilation failed:\n$@\n" }
|
|
- }
|
|
- elsif(eval '$module->VERSION($version)' && $@)
|
|
- { print "**** Optional $module too old: requires $version but is ",
|
|
- $module->VERSION,";$@\n";
|
|
- }
|
|
- else
|
|
- { my $v = $module->VERSION;
|
|
- my $r = $v eq $version ? ''
|
|
- : $version eq 0 ? " (any version will do)"
|
|
- : " (at least $version required)";
|
|
-
|
|
- print "**** Found optional $module version $v$r\n";
|
|
- next;
|
|
- }
|
|
-
|
|
- my $reason = $args{reason};
|
|
- $reason =~ s/^/ /gm;
|
|
- $reason =~ s/\A /Use:/;
|
|
- print $reason;
|
|
-
|
|
- if(my $warn = $args{warning})
|
|
- { $warn =~ s/^/ /gm;
|
|
- $warn =~ s/\A /WARN/;
|
|
- print $warn;
|
|
- }
|
|
-
|
|
- my $install = $default_install_answer
|
|
- || prompt "Do you want to install $module? yes/no/all"
|
|
- , (-t STDIN ? 'y' : 'n');
|
|
-
|
|
- $install = $default_install_answer = 'y'
|
|
- if $install eq 'a';
|
|
-
|
|
- next unless $install eq 'y';
|
|
-
|
|
- my $distr = $args{distr} || $module;
|
|
-
|
|
- $prereq{$distr} = $version;
|
|
- print " Added $distr version $version to the requirements\n";
|
|
-}
|
|
-
|
|
-my $tests = $ENV{MAILBOX_RUN_TESTS}
|
|
- || prompt "Do you want to run the (large set of) tests? yes/no", "yes";
|
|
-
|
|
-if($tests =~ m/n/i)
|
|
-{ open F, ">", "skiptests";
|
|
- close F;
|
|
-}
|
|
-else
|
|
-{ unlink "skiptests";
|
|
-}
|
|
+open F, ">", "skiptests";
|
|
+close F;
|
|
|
|
print <<'MAKEFILE';
|
|
|