diff options
author | heinz <heinz> | 2007-09-29 21:21:27 +0000 |
---|---|---|
committer | heinz <heinz> | 2007-09-29 21:21:27 +0000 |
commit | 324f4ca9875f19ef75316d775f649139ac105050 (patch) | |
tree | a1e93b128df52841a20bf99ea1dbf42480df1383 /www | |
parent | 43e2e39eb89c053cc6582d0f0502db581d383fa7 (diff) | |
download | pkgsrc-324f4ca9875f19ef75316d775f649139ac105050.tar.gz |
Applied fix from PR pkg/30052 by Christian Gall. This makes the program
work again and enables a successful run of the "test" target.
Diffstat (limited to 'www')
-rw-r--r-- | www/wml/distinfo | 4 | ||||
-rw-r--r-- | www/wml/patches/patch-ab | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/www/wml/distinfo b/www/wml/distinfo index 9668253c131..9bab8a7be74 100644 --- a/www/wml/distinfo +++ b/www/wml/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.6 2007/09/29 16:34:42 rillig Exp $ +$NetBSD: distinfo,v 1.7 2007/09/29 21:21:27 heinz Exp $ SHA1 (wml-2.0.9.tar.gz) = ce95ad9c55fd52e2028099d391858d88cffd5d9f RMD160 (wml-2.0.9.tar.gz) = bf14a4c09bdd850c5bad5f48f712717a13b13412 Size (wml-2.0.9.tar.gz) = 2570742 bytes SHA1 (patch-aa) = 398ddb03402c17306e259b10cf9b5d7ec774d71b -SHA1 (patch-ab) = 77e99d3babc1e55c688fd607241fa5beeb29763c +SHA1 (patch-ab) = dbd30a0a23189963aa60b06c319342fac4408a6b SHA1 (patch-ac) = 80863037faadf220ba1d01ef2133cdc42e08f0fa SHA1 (patch-ad) = 2955f349aa737f1758493897d1989a0b96220268 SHA1 (patch-ae) = d250ebf44fa67fb247b0248476226d31a0c0c0c8 diff --git a/www/wml/patches/patch-ab b/www/wml/patches/patch-ab index edbf5686c10..a7466c044ae 100644 --- a/www/wml/patches/patch-ab +++ b/www/wml/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1 2004/09/24 00:58:30 kim Exp $ +$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 @@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.1 2004/09/24 00:58:30 kim Exp $ # adjust -D options - $reldir = File::PathConvert::abs2rel("$dir", "$src"); -+ $reldir = File::Spec::abs2rel("$dir", "$src"); ++ $reldir = File::Spec->abs2rel("$dir", "$src"); $reldir = "." if $reldir eq ''; foreach $d (@opt_D) { if ($d =~ m|^([A-Za-z0-9_]+)~(.+)$|) { @@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.1 2004/09/24 00:58:30 kim Exp $ # adjust -I options - $reldir = File::PathConvert::abs2rel("$dir"); -+ $reldir = File::Spec::abs2rel("$dir"); ++ $reldir = File::Spec->abs2rel("$dir"); $reldir = "." if $reldir eq ''; foreach $path (@opt_I) { if ($path !~ m|^/|) { @@ -34,7 +34,7 @@ $NetBSD: patch-ab,v 1.1 2004/09/24 00:58:30 kim Exp $ $reldir =~ s,(:?/|^)[^/]+$,,; ($cwd = Cwd::cwd) =~ s|/$||; - $reldir = File::PathConvert::abs2rel($cwd, "$cwd/$reldir"); -+ $reldir = File::Spec::abs2rel($cwd, "$cwd/$reldir"); ++ $reldir = File::Spec->abs2rel($cwd, "$cwd/$reldir"); $reldir = "." if $reldir eq ''; } else { @@ -43,7 +43,7 @@ $NetBSD: patch-ab,v 1.1 2004/09/24 00:58:30 kim Exp $ $src_dirname = $src; $src_dirname =~ s|/+[^/]*$||; - $src_dirname = File::PathConvert::realpath("$src_dirname"); -+ $src_dirname = File::Spec::canonpath("$src_dirname"); ++ $src_dirname = File::Spec->canonpath("$src_dirname"); } else { $src_dirname = $cwd; |