[pkgsrc/trunk]: pkgsrc/www/wml Applied fix from PR pkg/30052 by Christian Gal...

[heinz <heinz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1c9853516f52
branches:  trunk
changeset: 533783:1c9853516f52
user:      heinz <heinz%pkgsrc.org@localhost>
date:      Sat Sep 29 21:21:27 2007 +0000

description:
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:

 www/wml/distinfo         |   4 ++--
 www/wml/patches/patch-ab |  10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (61 lines):

diff -r 87854d2a76bb -r 1c9853516f52 www/wml/distinfo
--- a/www/wml/distinfo  Sat Sep 29 19:44:05 2007 +0000
+++ b/www/wml/distinfo  Sat Sep 29 21:21:27 2007 +0000
@@ -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 -r 87854d2a76bb -r 1c9853516f52 www/wml/patches/patch-ab
--- a/www/wml/patches/patch-ab  Sat Sep 29 19:44:05 2007 +0000
+++ b/www/wml/patches/patch-ab  Sat Sep 29 21:21:27 2007 +0000
@@ -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 @@
  
              #   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 @@
  
              #   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 @@
      $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 @@
          $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;