49 lines
1.5 KiB
Text
49 lines
1.5 KiB
Text
$NetBSD: patch-ab,v 1.2 2007/09/29 21:21:27 heinz Exp $
|
|
|
|
--- wml_frontend/wml.src.orig 2002-04-20 19:04:28.000000000 -0400
|
|
+++ wml_frontend/wml.src 2004-09-23 19:12:33.000000000 -0400
|
|
@@ -49,7 +49,7 @@
|
|
}
|
|
|
|
use Getopt::Long 2.13;
|
|
-use File::PathConvert;
|
|
+use File::Spec 0.87;
|
|
use IO::File 1.06;
|
|
use Term::ReadKey;
|
|
use Cwd;
|
|
@@ -338,7 +338,7 @@
|
|
@opt_I_NEW = @opt_I_OLD;
|
|
|
|
# adjust -D options
|
|
- $reldir = File::PathConvert::abs2rel("$dir", "$src");
|
|
+ $reldir = File::Spec->abs2rel("$dir", "$src");
|
|
$reldir = "." if $reldir eq '';
|
|
foreach $d (@opt_D) {
|
|
if ($d =~ m|^([A-Za-z0-9_]+)~(.+)$|) {
|
|
@@ -363,7 +363,7 @@
|
|
}
|
|
|
|
# adjust -I options
|
|
- $reldir = File::PathConvert::abs2rel("$dir");
|
|
+ $reldir = File::Spec->abs2rel("$dir");
|
|
$reldir = "." if $reldir eq '';
|
|
foreach $path (@opt_I) {
|
|
if ($path !~ m|^/|) {
|
|
@@ -477,7 +477,7 @@
|
|
$reldir = $src;
|
|
$reldir =~ s,(:?/|^)[^/]+$,,;
|
|
($cwd = Cwd::cwd) =~ s|/$||;
|
|
- $reldir = File::PathConvert::abs2rel($cwd, "$cwd/$reldir");
|
|
+ $reldir = File::Spec->abs2rel($cwd, "$cwd/$reldir");
|
|
$reldir = "." if $reldir eq '';
|
|
}
|
|
else {
|
|
@@ -958,7 +958,7 @@
|
|
if ($src =~ m|/|) {
|
|
$src_dirname = $src;
|
|
$src_dirname =~ s|/+[^/]*$||;
|
|
- $src_dirname = File::PathConvert::realpath("$src_dirname");
|
|
+ $src_dirname = File::Spec->canonpath("$src_dirname");
|
|
}
|
|
else {
|
|
$src_dirname = $cwd;
|