revert back to wget 1.7 until issues with ipv6 are solved in 1.8.1

5 files changed, 45 insertions, 12 deletions

diff --git a/net/wget/Makefile b/net/wget/Makefile
index fa94c217823..3a93e051671 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.44 2002/03/30 08:56:36 pooka Exp $
+# $NetBSD: Makefile,v 1.45 2002/03/30 13:57:02 pooka Exp $
 
-DISTNAME=	wget-1.8.1
+DISTNAME=	wget-1.7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU:=wget/}
 
-MAINTAINER=	michael@pasternak.w.lub.pl
+PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
+PATCHFILES=	wget-17-v6-20010716a.diff.gz
+PATCH_DIST_STRIP=-p1
+
+MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/wget/wget.html
 COMMENT=	Retrieve files from the 'net via HTTP and FTP
 
diff --git a/net/wget/PLIST b/net/wget/PLIST
index f767f91c97f..04b5fd74e04 100644
--- a/net/wget/PLIST
+++ b/net/wget/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2002/03/30 08:56:36 pooka Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/03/30 13:57:02 pooka Exp $
 bin/wget
 etc/wgetrc
 man/man1/wget.1
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/wget.info
+@unexec ${INSTALL_INFO} --delete %D/info/wget.info %D/info/dir
 info/wget.info
 info/wget.info-1
 info/wget.info-2
 info/wget.info-3
 info/wget.info-4
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/wget.info
+@exec ${INSTALL_INFO} %D/info/wget.info %D/info/dir
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/wget.mo
@@ -17,9 +17,7 @@ ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/fr/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
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/wget.mo
@@ -31,5 +29,5 @@ ${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/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/wget.mo
diff --git a/net/wget/distinfo b/net/wget/distinfo
index cbf5e65ae69..762366cd56e 100644
--- a/net/wget/distinfo
+++ b/net/wget/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.10 2002/03/30 08:56:36 pooka Exp $
+$NetBSD: distinfo,v 1.11 2002/03/30 13:57:02 pooka Exp $
 
-SHA1 (wget-1.8.1.tar.gz) = d576c23b8e663a6411765299804a6d451a428a5a
-Size (wget-1.8.1.tar.gz) = 1097780 bytes
+SHA1 (wget-1.7.tar.gz) = b44118972c11a410b81ad3d306861b370071e611
+Size (wget-1.7.tar.gz) = 945138 bytes
+SHA1 (wget-17-v6-20010716a.diff.gz) = 02ddc575dc2cd33b38a2b111662198b77ef67491
+Size (wget-17-v6-20010716a.diff.gz) = 49827 bytes
 SHA1 (patch-aa) = 98c944716c403d0501505fc52c69c898d7870ea5
 SHA1 (patch-ab) = 797716b5a213c1e6b12f9407769e606b50818a67
 SHA1 (patch-ac) = 20cc35210374c68ddcaf39830620d853b4311988
+SHA1 (patch-ad) = 8994c291eb3e06c87a6c83dfc2b02fbf9f318c34
+SHA1 (patch-ae) = 1400b747cb0b2cd4311e566941cbc8ff3e59c76d
diff --git a/net/wget/patches/patch-ad b/net/wget/patches/patch-ad
new file mode 100644
index 00000000000..9a7bd3bac8b
--- /dev/null
+++ b/net/wget/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.5 2002/03/30 13:57:03 pooka Exp $
+
+--- src/host.c.orig	Sun Jul 22 17:33:22 2001
++++ src/host.c	Sun Jul 22 17:34:47 2001
+@@ -206,7 +206,9 @@
+   memset(sa, 0, *len);
+   *len = sizeof(struct sockaddr_in);
+   sa->sa_family = AF_INET;
++#ifndef __sun__
+   sa->sa_len = *len;	/*XXX*/
++#endif
+ 
+   where = (char *)&((struct sockaddr_in *)sa)->sin_addr;
+ 
diff --git a/net/wget/patches/patch-ae b/net/wget/patches/patch-ae
new file mode 100644
index 00000000000..eed7606406f
--- /dev/null
+++ b/net/wget/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.5 2002/03/30 13:57:03 pooka Exp $
+
+--- configure.orig	Thu Jul 26 06:52:57 2001
++++ configure
+@@ -3715,7 +3715,7 @@
+   cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+-      LDFLAGS=$ODL_LDFLAGS
++      LDFLAGS=$OLD_LDFLAGS
+       test -n "$dash_r" && break
+     done ;;
+ esac