diff options
| author | marcus <marcus@FreeBSD.org> | 2004-03-09 17:03:58 +0000 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2004-03-09 17:03:58 +0000 |
| commit | e0ee45d178f75774e6d2a1f263cb9d6106b3b1c1 (patch) | |
| tree | f634964adbad3db6720ebfd88c29b3f07e61eebc /mail/thunderbird | |
| parent | c81eb877488b02190e643fae43c930069e7b5e3b (diff) | |
| download | FreeBSD-ports-e0ee45d178f75774e6d2a1f263cb9d6106b3b1c1.zip FreeBSD-ports-e0ee45d178f75774e6d2a1f263cb9d6106b3b1c1.tar.gz | |
Re-add the Perl patch to fix the build with Perl < 5.6. Looks like this was
need for Tunderbird after all.
Reported by: many
Diffstat (limited to 'mail/thunderbird')
| -rw-r--r-- | mail/thunderbird/files/patch-config_preprocess.pl | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/mail/thunderbird/files/patch-config_preprocess.pl b/mail/thunderbird/files/patch-config_preprocess.pl new file mode 100644 index 0000000..390f470 --- /dev/null +++ b/mail/thunderbird/files/patch-config_preprocess.pl @@ -0,0 +1,56 @@ +--- config/preprocessor.pl.orig Fri Oct 24 18:17:32 2003 ++++ config/preprocessor.pl Sun Dec 7 15:17:57 2003 +@@ -76,16 +76,40 @@ + ######################################################################## + + package main; +-use File::Spec 0.8; ++use File::Spec; + use File::Spec::Unix; # on all platforms, because the #include syntax is unix-based ++use File::Basename; ++use Cwd; ++ ++# This code is taken from File::Spec::Unix 0.8. ++sub rel2abs { ++ my ($path, $base) = @_; ++ ++ if ( ! File::Spec->file_name_is_absolute( $path ) ) { ++ if ( !defined( $base ) || $base eq '' ) { ++ $base = cwd() ; ++ } ++ elsif ( ! File::Spec->file_name_is_absolute( $base ) ) { ++ $base = rel2abs( $base ); ++ } ++ else { ++ $base = File::Spec->canonpath( $base ); ++ } ++ ++ $path = File::Spec->catdir( $base, $path ); ++ } ++ ++ return File::Spec->canonpath( $path ); ++} ++# End code from File::Spec::Unix ++ + + sub include { + my($stack, $filename) = @_; + my $directory = $stack->{'variables'}->{'DIRECTORY'}; + if ($filename ne '-') { +- $filename = File::Spec->rel2abs($filename, $directory); +- my($volume, $path) = File::Spec->splitpath($filename); +- $directory = File::Spec->catpath($volume, $path, ''); ++ $filename = rel2abs($filename, $directory); ++ $directory = File::Spec->catdir(dirname($filename)); + } + local $stack->{'variables'}->{'DIRECTORY'} = $directory; + local $stack->{'variables'}->{'FILE'} = $filename; +@@ -395,7 +419,7 @@ + my $stack = shift; + return if $stack->disabled; + die "argument expected\n" unless @_; +- my $filename = File::Spec->catpath(File::Spec::Unix->splitpath(@_)); ++ my $filename = File::Spec->catpath(dirname(@_), basename(@_)); + if ($stack->{'dependencies'}) { + $stack->visit($filename); + } else { |
