Upgrade to wml 2.0.9.

The ChangeLog from 2.0.3 is really huge, so I'm not including it here.

4 files changed, 186 insertions, 51 deletions

diff --git a/www/wml/patches/patch-aa b/www/wml/patches/patch-aa
index 1c57b2b7a20..126829352be 100644
--- a/www/wml/patches/patch-aa
+++ b/www/wml/patches/patch-aa
@@ -1,52 +1,80 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/09/04 21:41:50 kim Exp $
+$NetBSD: patch-aa,v 1.2 2004/09/24 00:58:30 kim Exp $
 
---- configure.orig	Mon May 22 17:00:34 2000
-+++ configure	Mon Sep  4 16:16:44 2000
-@@ -1082,6 +1082,7 @@
- rm -f $TMPFILE
- cat >$TMPFILE <<'EOT'
- eval {
-+    use AutoLoader 'AUTOLOAD';
-     require Getopt::Long;
-     if ('2.16' ne 'ANY') {
-         Getopt::Long->require_version('2.16');
-@@ -1110,6 +1111,7 @@
- rm -f $TMPFILE
- cat >$TMPFILE <<'EOT'
- eval {
-+    use AutoLoader 'AUTOLOAD';
-     require Bit::Vector;
-     if ('5.2' ne 'ANY') {
-         Bit::Vector->require_version('5.2');
-@@ -1138,6 +1140,7 @@
- rm -f $TMPFILE
- cat >$TMPFILE <<'EOT'
- eval {
-+    use AutoLoader 'AUTOLOAD';
-     require File::PathConvert;
-     if ('ANY' ne 'ANY') {
-         File::PathConvert->require_version('ANY');
-@@ -1166,6 +1169,7 @@
- rm -f $TMPFILE
- cat >$TMPFILE <<'EOT'
- eval {
-+    use AutoLoader 'AUTOLOAD';
-     require Image::Size;
-     if ('2.6' ne 'ANY') {
-         Image::Size->require_version('2.6');
-@@ -1194,6 +1198,7 @@
- rm -f $TMPFILE
- cat >$TMPFILE <<'EOT'
- eval {
-+    use AutoLoader 'AUTOLOAD';
-     require IO::File;
-     if ('1.07' ne 'ANY') {
-         IO::File->require_version('1.07');
-@@ -1222,6 +1227,7 @@
- rm -f $TMPFILE
- cat >$TMPFILE <<'EOT'
- eval {
-+    use AutoLoader 'AUTOLOAD';
-     require Term::ReadKey;
-     if ('2.11' ne 'ANY') {
-         Term::ReadKey->require_version('2.11');
+--- configure.orig	2002-10-18 17:44:21.000000000 -0400
++++ configure	2004-09-23 19:14:06.000000000 -0400
+@@ -2568,7 +2568,7 @@
+          if test -f "$dir/$perl"; then
+              if test -x "$dir/$perl"; then
+                  perlprog="$dir/$perl"
+-                 if $perlprog -e 'require 5.003'; then
++                 if $perlprog -e 'use 5.003'; then
+                      perlvers=`$perlprog -e 'printf "%.3f",$]'`
+                      break 2
+                  fi
+@@ -2580,7 +2580,7 @@
+ fi; PATH_PERL=$perlprog
+ echo "$as_me:$LINENO: result: $perlprog v$perlvers" >&5
+ echo "${ECHO_T}$perlprog v$perlvers" >&6
+-if $perlprog -e 'require 5.003'; then
++if $perlprog -e 'use 5.003'; then
+     :
+ else
+     echo ""
+@@ -2639,7 +2639,7 @@
+ else
+     echo "$as_me:$LINENO: checking for Perl module Getopt::Long (2.16)" >&5
+ echo $ECHO_N "checking for Perl module Getopt::Long (2.16)... $ECHO_C" >&6
+-rc=`$path_perl -e 'eval {require Getopt::Long 2.16}; print "ok" unless $@'`;
++rc=`$path_perl -e 'eval {use Getopt::Long 2.16}; print "ok" unless $@'`;
+ if test ".$rc" = .ok; then
+     have_getoptlong=1
+     echo "$as_me:$LINENO: result: found" >&5
+@@ -2653,7 +2653,7 @@
+ 
+     echo "$as_me:$LINENO: checking for Perl module Bit::Vector (5.2)" >&5
+ echo $ECHO_N "checking for Perl module Bit::Vector (5.2)... $ECHO_C" >&6
+-rc=`$path_perl -e 'eval {require Bit::Vector 5.2}; print "ok" unless $@'`;
++rc=`$path_perl -e 'eval {use Bit::Vector 5.2}; print "ok" unless $@'`;
+ if test ".$rc" = .ok; then
+     have_bitvector=1
+     echo "$as_me:$LINENO: result: found" >&5
+@@ -2665,9 +2665,9 @@
+ fi
+ 
+ 
+-    echo "$as_me:$LINENO: checking for Perl module File::PathConvert (ANY)" >&5
+-echo $ECHO_N "checking for Perl module File::PathConvert (ANY)... $ECHO_C" >&6
+-rc=`$path_perl -e 'eval {require File::PathConvert }; print "ok" unless $@'`;
++    echo "$as_me:$LINENO: checking for Perl module File::Spec (0.87)" >&5
++echo $ECHO_N "checking for Perl module File::Spec (0.87)... $ECHO_C" >&6
++rc=`$path_perl -e 'eval {use File::Spec 0.87}; print "ok" unless $@'`;
+ if test ".$rc" = .ok; then
+     have_filepathconvert=1
+     echo "$as_me:$LINENO: result: found" >&5
+@@ -2681,7 +2681,7 @@
+ 
+     echo "$as_me:$LINENO: checking for Perl module Image::Size (2.6)" >&5
+ echo $ECHO_N "checking for Perl module Image::Size (2.6)... $ECHO_C" >&6
+-rc=`$path_perl -e 'eval {require Image::Size 2.6}; print "ok" unless $@'`;
++rc=`$path_perl -e 'eval {use Image::Size 2.6}; print "ok" unless $@'`;
+ if test ".$rc" = .ok; then
+     have_imagesize=1
+     echo "$as_me:$LINENO: result: found" >&5
+@@ -2695,7 +2695,7 @@
+ 
+     echo "$as_me:$LINENO: checking for Perl module IO::File (1.07)" >&5
+ echo $ECHO_N "checking for Perl module IO::File (1.07)... $ECHO_C" >&6
+-rc=`$path_perl -e 'eval {require IO::File 1.07}; print "ok" unless $@'`;
++rc=`$path_perl -e 'eval {use IO::File 1.07}; print "ok" unless $@'`;
+ if test ".$rc" = .ok; then
+     have_io=1
+     echo "$as_me:$LINENO: result: found" >&5
+@@ -2709,7 +2709,7 @@
+ 
+     echo "$as_me:$LINENO: checking for Perl module Term::ReadKey (2.11)" >&5
+ echo $ECHO_N "checking for Perl module Term::ReadKey (2.11)... $ECHO_C" >&6
+-rc=`$path_perl -e 'eval {require Term::ReadKey 2.11}; print "ok" unless $@'`;
++rc=`$path_perl -e 'eval {use Term::ReadKey 2.11}; print "ok" unless $@'`;
+ if test ".$rc" = .ok; then
+     have_termreadkey=1
+     echo "$as_me:$LINENO: result: found" >&5
diff --git a/www/wml/patches/patch-ab b/www/wml/patches/patch-ab
new file mode 100644
index 00000000000..edbf5686c10
--- /dev/null
+++ b/www/wml/patches/patch-ab
@@ -0,0 +1,49 @@
+$NetBSD: patch-ab,v 1.1 2004/09/24 00:58:30 kim 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;
diff --git a/www/wml/patches/patch-ac b/www/wml/patches/patch-ac
new file mode 100644
index 00000000000..6904cec85a0
--- /dev/null
+++ b/www/wml/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/09/24 00:58:30 kim Exp $
+
+--- wml_backend/p4_gm4/configure.in.orig	2002-06-23 17:02:15.000000000 -0400
++++ wml_backend/p4_gm4/configure.in	2004-09-23 19:58:12.000000000 -0400
+@@ -2,7 +2,7 @@
+ # Copyright (C) 1991, 1993, 1994 Free Software Foundation, Inc.
+ # Process this file with autoconf to produce a configure script.
+ 
+-undefine([changeword])
++ifdef([changeword],[undefine([changeword])])
+ 
+ AC_INIT(src/m4.c)
+ AC_CONFIG_HEADER(config.h)
diff --git a/www/wml/patches/patch-ad b/www/wml/patches/patch-ad
new file mode 100644
index 00000000000..8817a27de54
--- /dev/null
+++ b/www/wml/patches/patch-ad
@@ -0,0 +1,45 @@
+$NetBSD: patch-ad,v 1.1 2004/09/24 00:58:30 kim Exp $
+
+--- wml_aux/iselect/aclocal.m4.orig	2000-05-02 14:38:48.000000000 -0400
++++ wml_aux/iselect/aclocal.m4	2004-09-23 20:10:03.000000000 -0400
+@@ -172,40 +172,6 @@
+ ])dnl
+ dnl
+ dnl
+-dnl
+-dnl ##########################################################
+-dnl ##
+-dnl ##  check for ANSI compiler
+-dnl ##
+-dnl ##  Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+-dnl ##  Francois Pinard <pinard@iro.umontreal.ca>, 1992.
+-dnl ##  Check for function prototypes.  Including a few ideas from
+-dnl ##  Brook G. Milligan <brook@trillium.botany.utexas.edu>.
+-dnl ##
+-dnl ##  taken from shar-4.0's aclocal.m4
+-dnl ##
+-dnl ##########################################################
+-dnl
+-AC_DEFUN(AC_C_PROTOTYPES,
+-[AC_MSG_CHECKING([for function prototypes])
+-AC_CACHE_VAL(ac_cv_c_prototypes,
+-[AC_TRY_LINK([#ifndef __STDC__
+-Syntax Error
+-#endif], [extern int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};],
+-  ac_cv_c_prototypes=yes, ac_cv_c_prototypes=no)])dnl
+-AC_MSG_RESULT([$ac_cv_c_prototypes])
+-if test $ac_cv_c_prototypes = yes; then
+-  AC_DEFINE(HAVE_PROTOTYPES)
+-  ANSI_CC=yes
+-else
+-  ANSI_CC=no
+-fi
+-AC_SUBST(ANSI_CC)
+-])dnl
+-dnl
+-dnl
+ dnl ##########################################################
+ dnl ##
+ dnl ##  check for supported system type