Update to 1.9.1:

* Wget 1.9.1 is a bugfix release with no user-visible changes.

* Changes in Wget 1.9.

** It is now possible to specify that POST method be used for HTTP
requests.  For example, `wget --post-data="id=foo&data=bar" URL' will
send a POST request with the specified contents.

** IPv6 support is available, although it's still experimental.

** The `--timeout' option now also affects DNS lookup and establishing
the TCP connection.  Previously it only affected reading and writing
data.  Those three timeouts can be set separately using
`--dns-timeout', `--connection-timeout', and `--read-timeout',
respectively.

** Download speed shown by the progress bar is based on the data
recently read, rather than the average speed of the entire download.
The ETA projection is still based on the overall average.

** It is now possible to connect to FTP servers through FWTK
firewalls.  Set ftp_proxy to an FTP URL, and Wget will automatically
log on to the proxy as "username@host".

** The new option `--retry-connrefused' makes Wget retry downloads
even in the face of refused connections, which are otherwise
considered a fatal error.

** The new option `--dns-cache=off' may be used to prevent Wget from
caching DNS lookups.

** Wget no longer escapes characters in local file names based on
whether they're appropriate in URLs.  Escaping can still occur for
nonprintable characters or for '/', but no longer for frequent
characters such as space.  You can use the new option
--restrict-file-names to relax or strengthen these rules, which can be
useful if you dislike the default or if you're downloading to
non-native partitions.

** Handling of HTML comments has been dumbed down to conform to what
users expect and other browsers do: instead of being treated as SGML
declaration, a comment is terminated at the first occurrence of "-->".
Use `--strict-comments' to revert to the old behavior.

** Wget now correctly handles relative URIs that begin with "//", such
as "//img.foo.com/foo.jpg".

** Boolean options in `.wgetrc' and on the command line now accept
values "yes" and "no" along with the traditional "on" and "off".

** It is now possible to specify decimal values for timeouts, waiting
periods, and download rate.  For instance, `--wait=0.5' now works as
expected, as does `--dns-timeout=0.5' and even `--limit-rate=2.5k'.

9 files changed, 22 insertions, 134 deletions

diff --git a/net/wget/Makefile b/net/wget/Makefile
index 21bbc8839d6..d3c3549b2ea 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2003/11/12 03:39:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.69 2003/12/08 21:44:35 wiz Exp $
 
-DISTNAME=	wget-1.8.2
-PKGREVISION=	2
+DISTNAME=	wget-1.9.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU:=wget/}
 
diff --git a/net/wget/PLIST b/net/wget/PLIST
index c53b7a48230..3dd08db30c3 100644
--- a/net/wget/PLIST
+++ b/net/wget/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.7 2003/08/04 14:27:29 seb Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/12/08 21:44:35 wiz Exp $
 bin/wget
-man/man1/wget.1
 info/wget.info
 info/wget.info-1
 info/wget.info-2
 info/wget.info-3
 info/wget.info-4
+man/man1/wget.1
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/wget.mo
@@ -25,12 +25,14 @@ ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/wget.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/wget.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/wget.mo
 share/examples/wget/wgetrc
 @dirrm share/examples/wget
diff --git a/net/wget/distinfo b/net/wget/distinfo
index 6c29c5e2090..d4357ad7481 100644
--- a/net/wget/distinfo
+++ b/net/wget/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.19 2003/06/04 09:02:24 jmmv Exp $
+$NetBSD: distinfo,v 1.20 2003/12/08 21:44:35 wiz Exp $
 
-SHA1 (wget-1.8.2.tar.gz) = cb14189c47f281b33fd1ef37c4c8df39250fa7d5
-Size (wget-1.8.2.tar.gz) = 1154648 bytes
-SHA1 (patch-ac) = c1dc89799a58775709fd7b7abe0dc1b46ca62d89
-SHA1 (patch-ad) = ecd764d96e1d0646ab0b6dbce5b2aad606979d43
-SHA1 (patch-ae) = 200b93efcbea69292dd62559a90116c379aa6e0d
-SHA1 (patch-af) = 3921360a2986004063ded15f9eaa5a6290a54bfc
-SHA1 (patch-ag) = ea1e64523b8a6dcf5976840863ca995a7d4c755b
-SHA1 (patch-ah) = 4d2cd80e4d9170b5072b6af502c624aab7fb507c
+SHA1 (wget-1.9.1.tar.gz) = 0597a4f47b056e3e60cf7d08c9409d67358e7099
+Size (wget-1.9.1.tar.gz) = 1322378 bytes
+SHA1 (patch-ag) = d13900b60f52cac6c71f701026e6de8b32f00354
+SHA1 (patch-ah) = 86a03b2d1c0c4849f7b6e69f973bcef427f78e0f
diff --git a/net/wget/patches/patch-ac b/net/wget/patches/patch-ac
deleted file mode 100644
index 4811fa21110..00000000000
--- a/net/wget/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2002/12/16 11:39:01 wiz Exp $
-
---- src/fnmatch.c.orig	Sat May 18 05:05:15 2002
-+++ src/fnmatch.c
-@@ -198,6 +198,17 @@ fnmatch (const char *pattern, const char
-   return (FNM_NOMATCH);
- }
- 
-+/* Return non-zero if S has a leading '/'  or contains '../' */
-+int
-+has_invalid_name (const char *s)
-+{
-+	if (*s == '/')
-+		return 1;
-+	if (strstr(s, "../") != 0)
-+		return 1;
-+	return 0;
-+}
-+
- /* Return non-zero if S contains globbing wildcards (`*', `?', `[' or
-    `]').  */
- int
diff --git a/net/wget/patches/patch-ad b/net/wget/patches/patch-ad
deleted file mode 100644
index ba744efe708..00000000000
--- a/net/wget/patches/patch-ad
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2002/12/16 11:39:02 wiz Exp $
-
---- src/ftp.c.orig	Sat May 18 05:05:16 2002
-+++ src/ftp.c
-@@ -1551,6 +1551,8 @@ ftp_retrieve_glob (struct url *u, ccon *
- {
-   struct fileinfo *orig, *start;
-   uerr_t res;
-+  struct fileinfo *f;
-+
- 
-   con->cmd |= LEAVE_PENDING;
- 
-@@ -1562,8 +1564,7 @@ ftp_retrieve_glob (struct url *u, ccon *
-      opt.accepts and opt.rejects.  */
-   if (opt.accepts || opt.rejects)
-     {
--      struct fileinfo *f = orig;
--
-+	f = orig;
-       while (f)
- 	{
- 	  if (f->type != FT_DIRECTORY && !acceptable (f->name))
-@@ -1575,6 +1576,18 @@ ftp_retrieve_glob (struct url *u, ccon *
- 	    f = f->next;
- 	}
-     }
-+  /* Remove all files with possible harmful names */
-+  f = orig;
-+  while (f)
-+  {
-+     if (has_invalid_name(f->name))
-+     {
-+	  logprintf (LOG_VERBOSE, _("Rejecting `%s'.\n"), f->name);
-+	  f = delelement (f, &start);
-+     }
-+     else
-+	  f = f->next;
-+  }
-   /* Now weed out the files that do not match our globbing pattern.
-      If we are dealing with a globbing pattern, that is.  */
-   if (*u->file && (action == GLOBALL || action == GETONE))
diff --git a/net/wget/patches/patch-ae b/net/wget/patches/patch-ae
deleted file mode 100644
index 23f2737c172..00000000000
--- a/net/wget/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2002/12/16 11:39:02 wiz Exp $
-
---- src/recur.c.orig	Mon May 27 16:00:06 2002
-+++ src/recur.c
-@@ -254,7 +254,8 @@ retrieve_tree (const char *start_url)
- 	  DEBUGP (("Already downloaded \"%s\", reusing it from \"%s\".\n",
- 		   url, file));
- 
--	  if (string_set_contains (downloaded_html_set, file))
-+	  if (downloaded_html_set
-+	      && string_set_contains (downloaded_html_set, file))
- 	    descend = 1;
- 	}
-       else
diff --git a/net/wget/patches/patch-af b/net/wget/patches/patch-af
deleted file mode 100644
index ae3903688cc..00000000000
--- a/net/wget/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.4 2002/12/16 11:39:02 wiz Exp $
-
---- src/cookies.c.orig	Sun May 19 05:04:53 2002
-+++ src/cookies.c
-@@ -491,7 +491,12 @@ parse_set_cookies (const char *sc)
- 	{
- 	case S_NAME_PRE:
- 	  if (ISSPACE (c))
--	    FETCH (c, p);
-+	    {
-+	      FETCH1 (c, p);
-+	      /* drop trailing whitespace */
-+	      if (!c)
-+	        state = S_DONE;
-+	    }
- 	  else if (ATTR_NAME_CHAR (c))
- 	    {
- 	      name_b = p - 1;
-@@ -622,7 +627,11 @@ parse_set_cookies (const char *sc)
- 	}
-     }
-   if (state == S_DONE)
--    return cookie;
-+    {
-+      if (!cookie->attr)
-+	goto eof;
-+      return cookie;
-+    }
- 
-   delete_cookie (cookie);
-   if (state == S_ERROR)
diff --git a/net/wget/patches/patch-ag b/net/wget/patches/patch-ag
index 1eaec96debd..5fee1b15b2f 100644
--- a/net/wget/patches/patch-ag
+++ b/net/wget/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.4 2002/12/16 11:39:02 wiz Exp $
+$NetBSD: patch-ag,v 1.5 2003/12/08 21:44:35 wiz Exp $
 
---- doc/Makefile.in.orig	Sat Nov 17 00:23:22 2001
+--- doc/Makefile.in.orig	Fri Oct 24 00:53:05 2003
 +++ doc/Makefile.in
 @@ -40,6 +40,7 @@ prefix     = @prefix@
  infodir    = @infodir@
@@ -19,7 +19,7 @@ $NetBSD: patch-ag,v 1.4 2002/12/16 11:39:02 wiz Exp $
  SAMPLERCTEXI = sample.wgetrc.munged_for_texi_inclusion
  
  #
-@@ -127,7 +128,7 @@ install.man: $(MAN)
+@@ -129,7 +130,7 @@ install.man: $(MAN)
  
  # install sample.wgetrc
  install.wgetrc: $(srcdir)/sample.wgetrc
diff --git a/net/wget/patches/patch-ah b/net/wget/patches/patch-ah
index 0f92a23852c..587331590b2 100644
--- a/net/wget/patches/patch-ah
+++ b/net/wget/patches/patch-ah
@@ -1,17 +1,17 @@
-$NetBSD: patch-ah,v 1.3 2003/06/04 09:02:25 jmmv Exp $
+$NetBSD: patch-ah,v 1.4 2003/12/08 21:44:35 wiz Exp $
 
---- configure.orig	Mon Dec 16 17:06:11 2002
-+++ configure	Mon Dec 16 17:07:42 2002
-@@ -7178,7 +7178,7 @@
+--- configure.orig	Wed Nov 12 00:42:20 2003
++++ configure
+@@ -12385,7 +12385,7 @@ if test x"$with_ssl" != x"no"; then
    wget_save_LDFLAGS=$LDFLAGS
    wget_save_CPPFLAGS=$CPPFLAGS
  
 -      CC="$SHELL ./libtool $CC"
 +#      CC="$SHELL ./libtool $CC"
  
-             echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
- echo "configure:7185: checking for dlopen in -ldl" >&5
-@@ -7283,7 +7283,7 @@
+ 
+ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+@@ -12524,7 +12524,7 @@ fi
              SSL_INCLUDES=
      else
              SSL_INCLUDES=-I$ssl_root/include
@@ -19,4 +19,4 @@ $NetBSD: patch-ah,v 1.3 2003/06/04 09:02:25 jmmv Exp $
 +                  LDFLAGS="${OPENSSL_LDFLAGS} $wget_save_LDFLAGS"
      fi
  
-     echo "$ac_t"""Looking for SSL libraries in $ssl_root"" 1>&6
+     echo "$as_me:$LINENO: result: Looking for SSL libraries in $ssl_root" >&5