mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-22 20:41:26 +00:00
57 lines
1.8 KiB
Perl
57 lines
1.8 KiB
Perl
|
--- 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 {
|