Update to 1.10:

* Changes in Wget 1.10.

** Downloading files larger than 2GB, sometimes referred to as "large
files", now works on systems that support them.  This includes the
majority of modern Unixes, as well as MS Windows.

** IPv6 is now supported by Wget.  Unlike the experimental code in
1.9, this version supports dual-family systems.  The new flags
`--inet4' and `--inet6' (or `-4' and `-6' for short) force the use of
IPv4 and IPv6 respectively.  Note that IPv6 support has not yet been
tested on Windows.

** Microsoft's proprietary "NTLM" method of HTTP authentication is now
supported.  This authentication method is undocumented and only used
by IIS.  Note that *proxy* authentication is not supported in this
release; you can only authenticate to the target web site.

** Wget no longer truncates partially downloaded files when download
has to start over because the server doesn't support Range.  Instead,
with such servers Wget now simply ignores the data up to the byte
where the last attempt left off, and only then continues appending to
the file.  That way the downloaded file never shrinks, and download
retries from servers without support for partial downloads work even
when downloading to stdout.

** SSL/TLS changes:

*** SSL/TLS downloads now attempt to verify the server's certificate
against the recognized certificate authorities.  This requires CA
certificates to have been installed in a location visible to the
OpenSSL library.  If this is not the case, you can get the bundle
yourself from a source you trust (for example, the bundle extracted
from Mozilla available at http://curl.haxx.se/docs/caextract.html),
and point Wget to the PEM file using the `--ca-certificate'
command-line option or the corresponding `.wgetrc' command.

*** Secure downloads now verify that the host name in the URL matches
the "common name" in the certificate presented by the server.

*** Although the above checks provide more secure downloads, they
unavoidably break interoperability with some sites that worked with
previous versions, particularly those using self-signed, expired, or
otherwise invalid certificates.  If you encounter "certificate
verification" errors or complaints that "common name doesn't match
requested host name" and are convinced of the site's authenticity, you
can use `--no-check-certificate' to bypass both checks.

*** Talking to SSL/TLS servers over proxies now actually works.
Previous versions of Wget erroneously sent GET requests for https
URLs.  Wget 1.10 utilizes the CONNECT method designed for this
purpose.

*** The SSL/TLS-related options have been redesigned and, for the
first time, documented in the manual.  The old, undocumented, options
are no longer supported.

** Passive FTP is now the default FTP transfer mode.  Use
`--no-passive-ftp' or specify `passive_ftp = off' in your init file to
revert to the old behavior.

** The `--header' option can now be used to override generated
headers.  For example, `wget --header="Host: foo.bar"
http://127.0.0.1' tells Wget to connect to localhost, but to specify
"foo.bar" in the `Host' header.  In previous versions such use of
`--header' lead to duplicate headers in HTTP requests.

** The responses without headers, aka "HTTP 0.9" responses, are
detected and handled.  Although HTTP 0.9 has long been obsolete, it is
still occasionally used, sometimes by accident.

** The progress bar is now updated regularly even when the data does
not arrive from the network.

** Wget no longer preserves permissions of files retrieved by FTP by
default.  Anonymous FTP servers frequently use permissions like "664",
which might not be what the user wants.  The new option
`--preserve-permissions' and the corresponding `.wgetrc' variable can
be used to revert to the old behavior.

** The new option `--protocol-directories' instructs Wget to also use
the protocol name as a directory component of local file names.

** Options that previously unconditionally set or unset various flags
are now boolean options that can be invoked as either `--OPTION' or
`--no-OPTION'.  Options that required an argument "on" or "off" have
also been changed this way, but they still accept the old syntax for
backward compatibility.  For example, instead of `--glob=off' you can
write `--no-glob'.

Allowing `--no-OPTION' for every `--OPTION' and the other way around
is useful because it allows the user to override non-default behavior
specified via `.wgetrc'.

** The new option `--keep-session-cookies' causes `--save-cookies' to
save session cookies (normally only kept in memory) along with the
permanent ones.  This is useful because many sites track important
information, such as whether the user has authenticated, in session
cookies.  With this option multiple Wget runs are treated as a single
browser session.

** Wget now supports the --ftp-user and --ftp-password command
switches to set username and password for FTP, and the --user and
--password command switches to set username and password for both FTP
and HTTP.  The --http-passwd and --proxy-passwd command switches have
been renamed to --http-password and --proxy-password respectively, and
the related http_passwd and proxy_passwd .wgetrc commands to
http_password and proxy_password respectively.  The login and passwd
.wgetrc commands have been deprecated.

* `wget -b' now works correctly under Windows.

9 files changed, 25 insertions, 460 deletions

diff --git a/net/wget/Makefile b/net/wget/Makefile
index 31cd2be787a..25a9176abdf 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.82 2005/06/24 17:28:15 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2005/07/02 15:10:23 wiz Exp $
 
-DISTNAME=	wget-1.9.1
-PKGREVISION=	5
+DISTNAME=	wget-1.10
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU:=wget/}
 
@@ -15,6 +14,7 @@ USE_TOOLS+=		perl
 USE_PKGINSTALL=		YES
 
 GNU_CONFIGURE=		YES
+USE_OLD_DES_API=	YES
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 
diff --git a/net/wget/PLIST b/net/wget/PLIST
index 1008a712176..0d6b5c2906f 100644
--- a/net/wget/PLIST
+++ b/net/wget/PLIST
@@ -1,15 +1,21 @@
-@comment $NetBSD: PLIST,v 1.9 2004/03/09 15:23:53 seb Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/07/02 15:10:23 wiz Exp $
 bin/wget
 man/man1/wget.1
+share/examples/wget/wgetrc
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/wget.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/wget.mo
+${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/wget.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/wget.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/wget.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/wget.mo
@@ -24,10 +30,11 @@ ${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/sr/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/vi/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 931a77baaa1..577a5b4774b 100644
--- a/net/wget/distinfo
+++ b/net/wget/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.25 2005/02/24 12:14:07 agc Exp $
+$NetBSD: distinfo,v 1.26 2005/07/02 15:10:23 wiz Exp $
 
-SHA1 (wget-1.9.1.tar.gz) = 0597a4f47b056e3e60cf7d08c9409d67358e7099
-RMD160 (wget-1.9.1.tar.gz) = 46db7bd647f7482a1066bac10fb0836f70e7832f
-Size (wget-1.9.1.tar.gz) = 1322378 bytes
-SHA1 (patch-aa) = 6ddfbceb3d66c8bce99695cf5be50b7b91aee7b2
-SHA1 (patch-ab) = b00db7f71a3add563121066a3bfd378019d206bf
-SHA1 (patch-ac) = 5ad24408048d2b2264b101369959dcac25bb1d9f
-SHA1 (patch-ad) = 7605ad58dfc5e6982a06437d953ec8ceb55c86e7
-SHA1 (patch-ag) = d13900b60f52cac6c71f701026e6de8b32f00354
-SHA1 (patch-ah) = e31060497c77f87f0ed4cab44e63597654ca0525
+SHA1 (wget-1.10.tar.gz) = 2204e65f08e23b3cf5ff83210a669d2e5267a2d0
+RMD160 (wget-1.10.tar.gz) = 4c3368fd698751a54d812c8ef5a4bae2136d9edf
+Size (wget-1.10.tar.gz) = 1593119 bytes
+SHA1 (patch-ag) = c501bc48070ba9b71d51d6cdebf5c3e5d5aa5ffb
+SHA1 (patch-ah) = d4d1e152c5d65e743489b325397080060ac1de37
diff --git a/net/wget/patches/patch-aa b/net/wget/patches/patch-aa
deleted file mode 100644
index 5bcf17c6689..00000000000
--- a/net/wget/patches/patch-aa
+++ /dev/null
@@ -1,109 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2005/01/25 20:07:25 bouyer Exp $
-
---- src/connect.c.orig	Sat Nov  1 15:08:22 2003
-+++ src/connect.c	Sun Jan 23 22:11:24 2005
-@@ -155,11 +155,11 @@
-   int sock, save_errno;
- 
-   /* Set port and protocol */
--  wget_sockaddr_set_address (&sa, ip_default_family, port, addr);
-+  wget_sockaddr_set_address (&sa, port, addr, addr->family);
- 
-   if (!silent)
-     {
--      char *pretty_addr = pretty_print_address (addr);
-+      char *pretty_addr = pretty_print_address (addr->bytes);
-       if (connection_host_name
- 	  && 0 != strcmp (connection_host_name, pretty_addr))
- 	logprintf (LOG_VERBOSE, _("Connecting to %s[%s]:%hu... "),
-@@ -170,7 +170,7 @@
-     }
- 
-   /* Make an internet socket, stream type.  */
--  sock = socket (ip_default_family, SOCK_STREAM, 0);
-+  sock = socket (addr->family, SOCK_STREAM, 0);
-   if (sock < 0)
-     goto out;
- 
-@@ -196,8 +196,8 @@
-     {
-       /* Bind the client side to the requested address. */
-       wget_sockaddr bsa;
--      wget_sockaddr_set_address (&bsa, ip_default_family, 0, &bind_address);
--      if (bind (sock, &bsa.sa, sockaddr_len ()))
-+      wget_sockaddr_set_address (&bsa, 0, &bind_address, bind_address.family);
-+      if (bind (sock, &bsa.sa, sockaddr_len (bind_address.family)))
- 	{
- 	  CLOSE (sock);
- 	  sock = -1;
-@@ -206,7 +206,7 @@
-     }
- 
-   /* Connect the socket to the remote host.  */
--  if (connect_with_timeout (sock, &sa.sa, sockaddr_len (),
-+  if (connect_with_timeout (sock, &sa.sa, sockaddr_len (addr->family),
- 			    opt.connect_timeout) < 0)
-     {
-       CLOSE (sock);
-@@ -248,8 +248,11 @@
- 
-       sock = connect_to_one (&addr, port, silent);
-       if (sock >= 0)
--	/* Success. */
--	return sock;
-+        {
-+	  /* Success. */
-+          ip_default_family = addr.family;
-+	  return sock;
-+        }
- 
-       address_list_set_faulty (al, i);
- 
-@@ -316,9 +319,10 @@
- #endif
- 
-   resolve_bind_address ();
--  wget_sockaddr_set_address (&srv, ip_default_family, htons (*port),
--			     bind_address_resolved ? &bind_address : NULL);
--  if (bind (msock, &srv.sa, sockaddr_len ()) < 0)
-+  wget_sockaddr_set_address (&srv, htons (*port),
-+			     bind_address_resolved ? &bind_address : NULL,
-+                             family);
-+  if (bind (msock, &srv.sa, sockaddr_len (family)) < 0)
-     {
-       CLOSE (msock);
-       msock = -1;
-@@ -327,7 +331,7 @@
-   DEBUGP (("Master socket fd %d bound.\n", msock));
-   if (!*port)
-     {
--      socklen_t sa_len = sockaddr_len ();
-+      socklen_t sa_len = sockaddr_len (family);
-       if (getsockname (msock, &srv.sa, &sa_len) < 0)
- 	{
- 	  CLOSE (msock);
-@@ -389,7 +393,7 @@
- uerr_t
- acceptport (int *sock)
- {
--  socklen_t addrlen = sockaddr_len ();
-+  socklen_t addrlen = sockaddr_len (ip_default_family);
- 
- #ifdef HAVE_SELECT
-   if (opt.connect_timeout)
-@@ -429,11 +433,13 @@
-     {
- #ifdef ENABLE_IPV6
-     case AF_INET6:
--      memcpy (ip, &mysrv.sin6.sin6_addr, 16);
-+      memcpy (ip->bytes, &mysrv.sin6.sin6_addr, 16);
-+      ip->family = AF_INET6;
-       return 1;
- #endif
-     case AF_INET:
--      map_ipv4_to_ip ((ip4_address *)&mysrv.sin.sin_addr, ip);
-+      memcpy (ip->bytes, &mysrv.sin.sin_addr, 4);
-+      ip->family = AF_INET;
-       return 1;
-     default:
-       abort ();
diff --git a/net/wget/patches/patch-ab b/net/wget/patches/patch-ab
deleted file mode 100644
index a665a697656..00000000000
--- a/net/wget/patches/patch-ab
+++ /dev/null
@@ -1,103 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2005/01/25 20:07:25 bouyer Exp $
-
---- src/ftp-basic.c.orig	Sat Nov  8 20:17:55 2003
-+++ src/ftp-basic.c	Sun Jan 23 22:20:35 2005
-@@ -267,7 +267,7 @@
- 
-   /* Setting port to 0 lets the system choose a free port.  */
-   port = 0;
--  err = bindport (&port, ip_default_family);
-+  err = bindport (&port, AF_INET6);
-   if (err != BINDOK)	/* Bind the port.  */
-     return err;
- 
-@@ -275,7 +275,8 @@
-   if (!conaddr (RBUF_FD (rbuf), &in_addr))
-     /* Huh?  This is not BINDERR! */
-     return BINDERR;
--  inet_ntop (AF_INET6, &in_addr, ipv6, sizeof (ipv6));
-+  inet_ntop (AF_INET6, in_addr.bytes, ipv6, sizeof (ipv6));
-+  in_addr.family = AF_INET6;
- 
-   /* Construct the argument of EPRT (of the form |2|IPv6.ascii|PORT.ascii|). */
-   bytes = alloca (3 + strlen (ipv6) + 1 + numdigit (port) + 1 + 1);
-@@ -319,8 +320,6 @@
-   char bytes[6 * 4 +1];
- 
-   ip_address in_addr;
--  ip4_address in_addr_4;
--  unsigned char *in_addr4_ptr = (unsigned char *)&in_addr_4;
- 
-   int nwritten;
-   unsigned short port;
-@@ -347,16 +346,14 @@
-   if (!conaddr (RBUF_FD (rbuf), &in_addr))
-     /* Huh?  This is not BINDERR! */
-     return BINDERR;
--  if (!map_ip_to_ipv4 (&in_addr, &in_addr_4))
--    return BINDERR;
- 
-   /* Construct the argument of PORT (of the form a,b,c,d,e,f).  Port
-      is unsigned short so (unsigned) (port & 0xff000) >> 8 is the same
-      like port >> 8
-    */
-   sprintf (bytes, "%d,%d,%d,%d,%d,%d",
--	   in_addr4_ptr[0], in_addr4_ptr[1], in_addr4_ptr[2], in_addr4_ptr[3],
--	   port >> 8, port & 0xff);
-+	   in_addr.bytes[0], in_addr.bytes[1], in_addr.bytes[2],
-+           in_addr.bytes[3], port >> 8, port & 0xff);
-   /* Send PORT request.  */
-   request = ftp_request ("PORT", bytes);
-   nwritten = iwrite (RBUF_FD (rbuf), request, strlen (request));
-@@ -426,10 +423,12 @@
-     switch(remote.sa.sa_family)
-       {
-         case AF_INET6:
--          memcpy (addr, &remote.sin6.sin6_addr, 16);
-+          memcpy (&addr->bytes[0], &remote.sin6.sin6_addr, 16);
-+          addr->family =   AF_INET6;
- 	  break;
- 	case AF_INET:  
--          map_ipv4_to_ip ((ip4_address *)&ipv4_sock->sin_addr, addr);
-+          memcpy (&addr->bytes[0], &remote.sin.sin_addr, 4);
-+          addr->family =   AF_INET;
- 	  break;
- 	default:
- 	  abort();
-@@ -454,15 +453,12 @@
-   unsigned char addr4[4];
- 
- #ifdef ENABLE_IPV6
--  if (ip_default_family == AF_INET6) 
--    {
-       err = ftp_epsv (rbuf, addr, port, "2");	/* try IPv6 with EPSV */
-       if (FTPOK == err) 
-         return FTPOK;
-       err = ftp_epsv (rbuf, addr, port, "1");	/* try IPv4 with EPSV */
-       if (FTPOK == err) 
-         return FTPOK;
--    }
- #endif  
-   /* Form the request.  */
-   request = ftp_request ("PASV", NULL);
-@@ -505,9 +501,8 @@
-           return FTPINVPASV;
-         }
-     }
--
--  /* Eventually make an IPv4 in IPv6 adress if needed */
--  map_ipv4_to_ip ((ip4_address *)addr4, addr);
-+  memcpy(addr->bytes, addr4, 4);
-+  addr->family = AF_INET;
- 
-   *port=0;
-   for (; ISDIGIT (*s); s++)
-@@ -526,7 +521,7 @@
-       port2 = (*s - '0') + 10 * port2;
-     *port = (*port) * 256 + port2;
-   }
--  xfree (respline);
-+  xfree (respline); 
-   return FTPOK;
- }
- 
diff --git a/net/wget/patches/patch-ac b/net/wget/patches/patch-ac
deleted file mode 100644
index a7917a8bc3a..00000000000
--- a/net/wget/patches/patch-ac
+++ /dev/null
@@ -1,196 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2005/02/09 11:42:38 bouyer Exp $
-
---- src/host.c.orig	2003-10-26 02:38:25.000000000 +0100
-+++ src/host.c	2005-02-08 17:36:26.000000000 +0100
-@@ -189,13 +189,15 @@
-     if (ai->ai_family == AF_INET6) 
-       {
- 	struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)ai->ai_addr;
--	memcpy (al->addresses + i, &sin6->sin6_addr, 16);
-+	memcpy (al->addresses[i].bytes, &sin6->sin6_addr, 16);
-+	al->addresses[i].family = AF_INET6;
- 	++i;
-       } 
-     else if (ai->ai_family == AF_INET)
-       {
- 	struct sockaddr_in *sin = (struct sockaddr_in *)ai->ai_addr;
--        map_ipv4_to_ip ((ip4_address *)&sin->sin_addr, al->addresses + i);
-+	memcpy (al->addresses[i].bytes, &sin->sin_addr, 4);
-+	al->addresses[i].family = AF_INET;
- 	++i;
-       }
-   assert (i == cnt);
-@@ -219,8 +221,11 @@
-   al->addresses = xmalloc (count * sizeof (ip_address));
-   al->refcount  = 1;
- 
--  for (i = 0; i < count; i++)
--    map_ipv4_to_ip ((ip4_address *)h_addr_list[i], al->addresses + i);
-+  for (i = 0; i < count; i++) {
-+    memcpy (al->addresses[i].bytes, h_addr_list[i], 4);
-+    al->addresses[i].family = AF_INET;
-+  }
-+
- 
-   return al;
- }
-@@ -279,33 +284,30 @@
-   */
- void
- wget_sockaddr_set_address (wget_sockaddr *sa, 
--			   int ip_family, unsigned short port, ip_address *addr)
-+			   unsigned short port, ip_address *addr, int family)
- {
--  if (ip_family == AF_INET) 
-+  memset (sa, 0, sizeof(*sa));
-+  if (family == AF_INET)
-     {
--      sa->sin.sin_family = ip_family;
-+      sa->sin.sin_family = AF_INET;
-       sa->sin.sin_port = htons (port);
-       if (addr == NULL) 
- 	memset (&sa->sin.sin_addr, 0,      sizeof(ip4_address));
-       else
- 	{
--	  ip4_address addr4;
--	  if (!map_ip_to_ipv4 (addr, &addr4))
--	    /* should the callers have prevented this? */
--	    abort ();
--	  memcpy (&sa->sin.sin_addr, &addr4, sizeof(ip4_address));
-+	  memcpy (&sa->sin.sin_addr, addr->bytes, sizeof(ip4_address));
- 	}
-       return;
-     }
- #ifdef ENABLE_IPV6
--  if (ip_family == AF_INET6) 
-+  if (family == AF_INET6)
-     {
--      sa->sin6.sin6_family = ip_family;
-+      sa->sin6.sin6_family = AF_INET6;
-       sa->sin6.sin6_port = htons (port);
-       if (addr == NULL) 
- 	memset (&sa->sin6.sin6_addr, 0   , 16);
-       else	     
--	memcpy (&sa->sin6.sin6_addr, addr, 16);
-+	memcpy (&sa->sin6.sin6_addr, addr->bytes, 16);
-       return;
-     }
- #endif  
-@@ -422,12 +424,12 @@
-   * socklen_t	structure length for socket options
-   */
- socklen_t
--sockaddr_len () 
-+sockaddr_len (int family) 
- {
--  if (ip_default_family == AF_INET) 
-+  if (family == AF_INET) 
-     return sizeof (struct sockaddr_in);
- #ifdef ENABLE_IPV6
--  if (ip_default_family == AF_INET6) 
-+  if (family == AF_INET6) 
-     return sizeof (struct sockaddr_in6);
- #endif
-   abort();
-@@ -435,42 +437,6 @@
-   return 0;
- }
- 
--/**
--  * Map an IPv4 adress to the internal adress format.
--  */
--void 
--map_ipv4_to_ip (ip4_address *ipv4, ip_address *ip) 
--{
--#ifdef ENABLE_IPV6
--  static unsigned char ipv64[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff};
--  memcpy ((char *)ip + 12, ipv4 , 4);
--  memcpy ((char *)ip + 0, ipv64, 12);
--#else
--  if ((char *)ip != (char *)ipv4)
--    memcpy (ip, ipv4, 4);
--#endif
--}
--
--/* Detect whether an IP adress represents an IPv4 address and, if so,
--   copy it to IPV4.  0 is returned on failure.
--   This operation always succeeds when Wget is compiled without IPv6.
--   If IPV4 is NULL, don't copy, just detect.  */
--
--int 
--map_ip_to_ipv4 (ip_address *ip, ip4_address *ipv4) 
--{
--#ifdef ENABLE_IPV6
--  static unsigned char ipv64[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff};
--  if (0 != memcmp (ip, ipv64, 12))
--    return 0;
--  if (ipv4)
--    memcpy (ipv4, (char *)ip + 12, 4);
--#else
--  if (ipv4)
--    memcpy (ipv4, (char *)ip, 4);
--#endif
--  return 1;
--}
- 
- /* Versions of gethostbyname and getaddrinfo that support timeout. */
- 
-@@ -559,17 +525,16 @@
- pretty_print_address (ip_address *addr)
- {
- #ifdef ENABLE_IPV6
--  ip4_address addr4;
-   static char buf[128];
- 
--  if (map_ip_to_ipv4 (addr, &addr4))
--    return inet_ntoa (*(struct in_addr *)&addr4);
--
--  if (!inet_ntop (AF_INET6, addr, buf, sizeof (buf)))
--    return "<unknown>";
--  return buf;
-+  if (addr->family == AF_INET6)
-+    {
-+      if (!inet_ntop (AF_INET6, addr->bytes, buf, sizeof (buf)))
-+        return "<unknown>";
-+      return buf;
-+    }
- #endif
--  return inet_ntoa (*(struct in_addr *)addr);
-+  return inet_ntoa (*(struct in_addr *)addr->bytes);
- }
- 
- /* Add host name HOST with the address ADDR_TEXT to the cache.
-@@ -601,23 +566,27 @@
- lookup_host (const char *host, int silent)
- {
-   struct address_list *al = NULL;
--  uint32_t addr_ipv4;
-   ip_address addr;
-+  uint32_t addr4;
- 
-   /* First, try to check whether the address is already a numeric
-      address.  */
- 
- #ifdef ENABLE_IPV6
--  if (inet_pton (AF_INET6, host, &addr) > 0)
--    return address_list_from_single (&addr);
-+  if (inet_pton (AF_INET6, host, addr.bytes) > 0)
-+    {
-+      addr.family = AF_INET6;
-+      return address_list_from_single (&addr);
-+    }
- #endif
- 
--  addr_ipv4 = (uint32_t)inet_addr (host);
--  if (addr_ipv4 != (uint32_t)-1)
-+  addr4 = (uint32_t)inet_addr (host);
-+  memcpy(addr.bytes, &addr4, 4);
-+  addr.family = AF_INET;
-+  if (addr4 != (uint32_t)-1)
-     {
-       /* ADDR is defined to be in network byte order, which is what
- 	 this returns, so we can just copy it to STORE_IP.  */
--      map_ipv4_to_ip ((ip4_address *)&addr_ipv4, &addr);
-       return address_list_from_single (&addr);
-     }
- 
diff --git a/net/wget/patches/patch-ad b/net/wget/patches/patch-ad
deleted file mode 100644
index 1d02270e3f6..00000000000
--- a/net/wget/patches/patch-ad
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2005/01/25 20:07:25 bouyer Exp $
-
---- src/host.h.orig	Sat Oct 11 03:39:07 2003
-+++ src/host.h	Sun Jan 23 21:22:57 2005
-@@ -71,6 +71,7 @@
- 
- typedef struct {
-   unsigned char bytes[MAX_IP_ADDRESS_SIZE];
-+  int family;
- } ip_address;
- 
- /* Function declarations */
-@@ -92,14 +93,12 @@
- 
- void host_cleanup PARAMS ((void));
- 
--void wget_sockaddr_set_address PARAMS((wget_sockaddr *, int, 
--				       unsigned short, ip_address *));
-+void wget_sockaddr_set_address PARAMS((wget_sockaddr *,
-+				       unsigned short, ip_address *, int));
- void wget_sockaddr_set_port PARAMS((wget_sockaddr *, unsigned short));
- void *wget_sockaddr_get_addr PARAMS((wget_sockaddr *));
- unsigned short wget_sockaddr_get_port PARAMS((const wget_sockaddr *));
--socklen_t sockaddr_len PARAMS(());
--void map_ipv4_to_ip PARAMS((ip4_address *, ip_address *));
--int  map_ip_to_ipv4 PARAMS((ip_address *, ip4_address *));
-+socklen_t sockaddr_len PARAMS((int));
-  
- extern	int	ip_default_family;	/* defined in host.c */
- 
diff --git a/net/wget/patches/patch-ag b/net/wget/patches/patch-ag
index 5fee1b15b2f..71d904e7156 100644
--- a/net/wget/patches/patch-ag
+++ b/net/wget/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.5 2003/12/08 21:44:35 wiz Exp $
+$NetBSD: patch-ag,v 1.6 2005/07/02 15:10:23 wiz Exp $
 
---- doc/Makefile.in.orig	Fri Oct 24 00:53:05 2003
+--- doc/Makefile.in.orig	2005-06-06 22:42:17.000000000 +0200
 +++ doc/Makefile.in
 @@ -40,6 +40,7 @@ prefix     = @prefix@
  infodir    = @infodir@
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.5 2003/12/08 21:44:35 wiz Exp $
  
  DESTDIR    =
 @@ -51,7 +52,7 @@ RM = rm -f
- TEXI2POD     = $(srcdir)/texi2pod.pl
+ TEXI2POD     = texi2pod.pl
  POD2MAN      = @POD2MAN@
  MAN          = wget.$(manext)
 -WGETRC       = $(sysconfdir)/wgetrc
@@ -19,7 +19,7 @@ $NetBSD: patch-ag,v 1.5 2003/12/08 21:44:35 wiz Exp $
  SAMPLERCTEXI = sample.wgetrc.munged_for_texi_inclusion
  
  #
-@@ -129,7 +130,7 @@ install.man: $(MAN)
+@@ -131,7 +132,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 88a40218233..03c10bd7df9 100644
--- a/net/wget/patches/patch-ah
+++ b/net/wget/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2004/05/16 20:27:04 danw Exp $
+$NetBSD: patch-ah,v 1.6 2005/07/02 15:10:23 wiz Exp $
 
---- configure.orig	Wed Nov 12 00:42:20 2003
+--- configure.orig	2005-06-08 00:40:03.000000000 +0200
 +++ configure
-@@ -12385,7 +12385,7 @@ if test x"$with_ssl" != x"no"; then
+@@ -25570,7 +25570,7 @@ if test x"$with_ssl" != x"no"; then
    wget_save_LDFLAGS=$LDFLAGS
    wget_save_CPPFLAGS=$CPPFLAGS