update to 1.8.

IPv6 capability has been lost. Please use wget+ipv6 instead.
as zh_TW.po is distributed in Big5, we no longer requires iconv hack.

zh_TW message tested by:	clive

10 files changed, 12 insertions, 106 deletions

diff --git a/ftp/wget-devel/Makefile b/ftp/wget-devel/Makefile
index c1c246ffb945..f2dc351ba43f 100644
--- a/ftp/wget-devel/Makefile
+++ b/ftp/wget-devel/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	wget
-PORTVERSION=	1.7
-PORTREVISION=	4
-CATEGORIES=	ftp www ipv6
+PORTVERSION=	1.8
+CATEGORIES=	ftp www
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/wget/pub/unix/util/wget/ \
 		ftp://ftp.informatik.hu-berlin.de/gnu/wget/ \
@@ -16,15 +15,9 @@ MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ftp.max.irk.ru/unix/net/www/wget/
 MASTER_SITE_SUBDIR=	wget
 
-PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}
-PATCHFILES=	wget-17-v6-20010716a.diff.gz
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	sf@FreeBSD.org
 
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
-BUILD_DEPENDS=	giconv:${PORTSDIR}/converters/libiconv
 
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
@@ -38,18 +31,8 @@ CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
 MAN1=		wget.1
 
 post-patch:
-# made by broken KAME patch. Already contacted.
-	@${RM} -f ${WRKSRC}/po/zh.po*
 # we don't need to run autoconf.
 	${TOUCH} ${WRKSRC}/configure
-# convert utf-8 to Big5 for FreeBSD's default old fashioned gettext.
-	(cd ${WRKSRC}; \
-	${MV} po/zh_TW.po po/zh_TW.po.utf-8; \
-	${LOCALBASE}/bin/giconv -f UTF-8 -t BIG5 po/zh_TW.po.utf-8 |\
-		${SED} -e 's/utf-8/big5/' |\
-		${PERL} -p -e 's{([\x81-\xfe])\\}{$$1\\\\}g' |\
-		${PERL} -p -e 's,\\\\([nt\"]),\\$$1,g' \
-		> po/zh_TW.po)
 
 pre-build:
 	@${RM} -f ${WRKSRC}/doc/wget.info*
diff --git a/ftp/wget-devel/distinfo b/ftp/wget-devel/distinfo
index 97763e456b6d..b21826c84cea 100644
--- a/ftp/wget-devel/distinfo
+++ b/ftp/wget-devel/distinfo
@@ -1,2 +1 @@
-MD5 (wget-1.7.tar.gz) = c911a6b937c0a18757d3211fb62831de
-MD5 (wget-17-v6-20010716a.diff.gz) = 95664b130be966834f7770d66d03654b
+MD5 (wget-1.8.tar.gz) = 000caf43722b46df1f58b6fb2deb5b58
diff --git a/ftp/wget-devel/files/patch-host.c b/ftp/wget-devel/files/patch-host.c
deleted file mode 100644
index 9495ff9ec250..000000000000
--- a/ftp/wget-devel/files/patch-host.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/host.c.orig	Thu Aug  9 10:11:56 2001
-+++ src/host.c	Thu Aug  9 10:12:27 2001
-@@ -106,7 +106,7 @@
- 
-     hp = gethostbyname2(name, af);
-     if (!hp) {
--	if (inet_pton(af, name, addr) != -1) {
-+	if (inet_pton(af, name, addr) == 1) {
- 	    switch (af) {
- 	    case AF_INET:
- 		socksize = sizeof (struct sockaddr_in);
diff --git a/ftp/wget-devel/files/patch-retr.c b/ftp/wget-devel/files/patch-retr.c
deleted file mode 100644
index dac6d57d6591..000000000000
--- a/ftp/wget-devel/files/patch-retr.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/retr.c.orig	Wed Feb  9 00:18:45 2000
-+++ src/retr.c	Wed Feb  9 00:18:51 2000
-@@ -445,7 +445,7 @@
-   recursive_reset ();
-   for (cur_url = url_list; cur_url; cur_url = cur_url->next, ++*count)
-     {
--      char *filename, *new_file;
-+      char *filename, *new_file, *referer;
-       int dt;
- 
-       if (opt.quota && opt.downloaded > opt.quota)
-@@ -453,7 +453,8 @@
- 	  status = QUOTEXC;
- 	  break;
- 	}
--      status = retrieve_url (cur_url->url, &filename, &new_file, NULL, &dt);
-+      referer = getenv("referer");
-+      status = retrieve_url (cur_url->url, &filename, &new_file, referer, &dt);
-       if (opt.recursive && status == RETROK && (dt & TEXTHTML))
- 	status = recursive_retrieve (filename, new_file ? new_file : cur_url->url);
- 
diff --git a/ftp/wget-devel/pkg-plist b/ftp/wget-devel/pkg-plist
index 96543579d40c..15807a06ebed 100644
--- a/ftp/wget-devel/pkg-plist
+++ b/ftp/wget-devel/pkg-plist
@@ -11,7 +11,9 @@ share/locale/es/LC_MESSAGES/wget.mo
 share/locale/et/LC_MESSAGES/wget.mo
 share/locale/fr/LC_MESSAGES/wget.mo
 share/locale/gl/LC_MESSAGES/wget.mo
+share/locale/he/LC_MESSAGES/wget.mo
 share/locale/hr/LC_MESSAGES/wget.mo
+share/locale/hu/LC_MESSAGES/wget.mo
 share/locale/it/LC_MESSAGES/wget.mo
 share/locale/ja/LC_MESSAGES/wget.mo
 share/locale/nl/LC_MESSAGES/wget.mo
@@ -23,4 +25,5 @@ share/locale/sk/LC_MESSAGES/wget.mo
 share/locale/sl/LC_MESSAGES/wget.mo
 share/locale/sv/LC_MESSAGES/wget.mo
 share/locale/tr/LC_MESSAGES/wget.mo
+share/locale/uk/LC_MESSAGES/wget.mo
 share/locale/zh_TW/LC_MESSAGES/wget.mo
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index c1c246ffb945..f2dc351ba43f 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	wget
-PORTVERSION=	1.7
-PORTREVISION=	4
-CATEGORIES=	ftp www ipv6
+PORTVERSION=	1.8
+CATEGORIES=	ftp www
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/wget/pub/unix/util/wget/ \
 		ftp://ftp.informatik.hu-berlin.de/gnu/wget/ \
@@ -16,15 +15,9 @@ MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ftp.max.irk.ru/unix/net/www/wget/
 MASTER_SITE_SUBDIR=	wget
 
-PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}
-PATCHFILES=	wget-17-v6-20010716a.diff.gz
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	sf@FreeBSD.org
 
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
-BUILD_DEPENDS=	giconv:${PORTSDIR}/converters/libiconv
 
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
@@ -38,18 +31,8 @@ CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
 MAN1=		wget.1
 
 post-patch:
-# made by broken KAME patch. Already contacted.
-	@${RM} -f ${WRKSRC}/po/zh.po*
 # we don't need to run autoconf.
 	${TOUCH} ${WRKSRC}/configure
-# convert utf-8 to Big5 for FreeBSD's default old fashioned gettext.
-	(cd ${WRKSRC}; \
-	${MV} po/zh_TW.po po/zh_TW.po.utf-8; \
-	${LOCALBASE}/bin/giconv -f UTF-8 -t BIG5 po/zh_TW.po.utf-8 |\
-		${SED} -e 's/utf-8/big5/' |\
-		${PERL} -p -e 's{([\x81-\xfe])\\}{$$1\\\\}g' |\
-		${PERL} -p -e 's,\\\\([nt\"]),\\$$1,g' \
-		> po/zh_TW.po)
 
 pre-build:
 	@${RM} -f ${WRKSRC}/doc/wget.info*
diff --git a/ftp/wget/distinfo b/ftp/wget/distinfo
index 97763e456b6d..b21826c84cea 100644
--- a/ftp/wget/distinfo
+++ b/ftp/wget/distinfo
@@ -1,2 +1 @@
-MD5 (wget-1.7.tar.gz) = c911a6b937c0a18757d3211fb62831de
-MD5 (wget-17-v6-20010716a.diff.gz) = 95664b130be966834f7770d66d03654b
+MD5 (wget-1.8.tar.gz) = 000caf43722b46df1f58b6fb2deb5b58
diff --git a/ftp/wget/files/patch-host.c b/ftp/wget/files/patch-host.c
deleted file mode 100644
index 9495ff9ec250..000000000000
--- a/ftp/wget/files/patch-host.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/host.c.orig	Thu Aug  9 10:11:56 2001
-+++ src/host.c	Thu Aug  9 10:12:27 2001
-@@ -106,7 +106,7 @@
- 
-     hp = gethostbyname2(name, af);
-     if (!hp) {
--	if (inet_pton(af, name, addr) != -1) {
-+	if (inet_pton(af, name, addr) == 1) {
- 	    switch (af) {
- 	    case AF_INET:
- 		socksize = sizeof (struct sockaddr_in);
diff --git a/ftp/wget/files/patch-retr.c b/ftp/wget/files/patch-retr.c
deleted file mode 100644
index dac6d57d6591..000000000000
--- a/ftp/wget/files/patch-retr.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/retr.c.orig	Wed Feb  9 00:18:45 2000
-+++ src/retr.c	Wed Feb  9 00:18:51 2000
-@@ -445,7 +445,7 @@
-   recursive_reset ();
-   for (cur_url = url_list; cur_url; cur_url = cur_url->next, ++*count)
-     {
--      char *filename, *new_file;
-+      char *filename, *new_file, *referer;
-       int dt;
- 
-       if (opt.quota && opt.downloaded > opt.quota)
-@@ -453,7 +453,8 @@
- 	  status = QUOTEXC;
- 	  break;
- 	}
--      status = retrieve_url (cur_url->url, &filename, &new_file, NULL, &dt);
-+      referer = getenv("referer");
-+      status = retrieve_url (cur_url->url, &filename, &new_file, referer, &dt);
-       if (opt.recursive && status == RETROK && (dt & TEXTHTML))
- 	status = recursive_retrieve (filename, new_file ? new_file : cur_url->url);
- 
diff --git a/ftp/wget/pkg-plist b/ftp/wget/pkg-plist
index 96543579d40c..15807a06ebed 100644
--- a/ftp/wget/pkg-plist
+++ b/ftp/wget/pkg-plist
@@ -11,7 +11,9 @@ share/locale/es/LC_MESSAGES/wget.mo
 share/locale/et/LC_MESSAGES/wget.mo
 share/locale/fr/LC_MESSAGES/wget.mo
 share/locale/gl/LC_MESSAGES/wget.mo
+share/locale/he/LC_MESSAGES/wget.mo
 share/locale/hr/LC_MESSAGES/wget.mo
+share/locale/hu/LC_MESSAGES/wget.mo
 share/locale/it/LC_MESSAGES/wget.mo
 share/locale/ja/LC_MESSAGES/wget.mo
 share/locale/nl/LC_MESSAGES/wget.mo
@@ -23,4 +25,5 @@ share/locale/sk/LC_MESSAGES/wget.mo
 share/locale/sl/LC_MESSAGES/wget.mo
 share/locale/sv/LC_MESSAGES/wget.mo
 share/locale/tr/LC_MESSAGES/wget.mo
+share/locale/uk/LC_MESSAGES/wget.mo
 share/locale/zh_TW/LC_MESSAGES/wget.mo