4 files changed, 30 insertions, 77 deletions

diff --git a/ftp/wget-devel/Makefile b/ftp/wget-devel/Makefile
index 1e01542bd898..42087bb09a0f 100644
--- a/ftp/wget-devel/Makefile
+++ b/ftp/wget-devel/Makefile
@@ -5,42 +5,41 @@
 # $FreeBSD$
 #
 
-PORTNAME=	wget-devel
-PORTVERSION=	1.9.1
-PORTREVISION=	2
-CATEGORIES=	ftp www
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	wget
-DISTNAME=	wget-${PORTVERSION}
-
-#PATCH_SITES=	${MASTER_SITE_LOCAL}
-#PATCH_SITE_SUBDIR=	sf
-#PATCHFILES=	wget_${PORTVERSION}-12.diff.gz
-#PATCH_DIST_STRIP=	-p1
-
-MAINTAINER=	ports@FreeBSD.org
+PORTNAME=	wget
+DISTVERSION=	1.10-alpha1
+CATEGORIES=	ftp www ipv6
+#MASTER_SITES=	${MASTER_SITE_GNU}
+#MASTER_SITE_SUBDIR=	wget
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	sf
+PKGNAMESUFFIX=	-devel
+
+MAINTAINER=	sf@FreeBSD.org
 COMMENT=	Retrieve files from the Net via HTTP and FTP
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 .endif
 
-CONFLICTS=	wget-*
+CONFLICTS=	wget-1.8*
 
-USE_REINPLACE=	yes
-USE_PERL5_BUILD=yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_BZIP2=		yes
+USE_REINPLACE=		yes
+USE_PERL5_BUILD=	yes
+GNU_CONFIGURE=		yes
 
 .if defined(WITHOUT_SSL)
 CONFIGURE_ARGS=		--with-ssl=no
 .else
 USE_OPENSSL=	yes
 .endif
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
-		LIBS=-L${LOCALBASE}/lib
 PLIST_SUB=	NLS=""
-.if defined(WITHOUT_NLS)
+.if !defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--enable-nls
+LDFLAGS=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		"LDFLAGS=${LDFLAGS}"
+.else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB=	NLS="@comment "
 .endif
@@ -50,8 +49,9 @@ INFO=		wget
 
 post-patch:
 	${RM} -f ${WRKSRC}/doc/wget.info*
-# we don't need to run autoconf.
-	${TOUCH} ${WRKSRC}/configure
+# eliminate gmakism
+	${REINPLACE_CMD} -e 's,$$<,$$(srcdir)/wget.texi,' \
+		${WRKSRC}/doc/Makefile.in
 	${REINPLACE_CMD} -e 's,/etc/wgetrc,${PREFIX}/etc/wgetrc,' \
 			 -e 's,@file{},@file{${PREFIX}},' \
 		${WRKSRC}/doc/sample.wgetrc* ${WRKSRC}/doc/wget.texi
diff --git a/ftp/wget-devel/distinfo b/ftp/wget-devel/distinfo
index 235ef5c92b3c..d3930881a3af 100644
--- a/ftp/wget-devel/distinfo
+++ b/ftp/wget-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (wget-1.9.1.tar.gz) = e6051f1e1487ec0ebfdbda72bedc70ad
-SIZE (wget-1.9.1.tar.gz) = 1322378
+MD5 (wget-1.10-alpha1.tar.bz2) = 2b2ff2768c5161ad2d1e624af7d1a3fb
+SIZE (wget-1.10-alpha1.tar.bz2) = 1064630
diff --git a/ftp/wget-devel/files/patch-CAN-2004-1487 b/ftp/wget-devel/files/patch-CAN-2004-1487
deleted file mode 100644
index d37947a1c88f..000000000000
--- a/ftp/wget-devel/files/patch-CAN-2004-1487
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ruN wget-LFS-20040909/src/http.c wget-LFS-20040909.patched/src/http.c
---- src/http.c.orig	2004-09-09 19:28:26.000000000 -0700
-+++ src/http.c	2005-02-21 04:13:05.000000000 -0800
-@@ -1719,6 +1719,7 @@
-   /* Open the local file.  */
-   if (!output_stream)
-     {
-+      sanitize_path(*hs->local_file);
-       mkalldirs (*hs->local_file);
-       if (opt.backups)
- 	rotate_backups (*hs->local_file);
-diff -ruN wget-LFS-20040909/src/utils.c wget-LFS-20040909.patched/src/utils.c
---- src/utils.c.orig	2004-09-09 13:32:07.000000000 -0700
-+++ src/utils.c	2005-02-21 04:11:54.000000000 -0800
-@@ -368,6 +368,25 @@
- #endif
- }
- 
-+
-+char *
-+sanitize_path(char *path)
-+{
-+	char *str = NULL;
-+
-+	/* evilhost/../ */
-+	while ((str = strstr(path,  "..")) != NULL)
-+		memcpy(str, "__", 2);
-+	/* evilhost/.bashrc */
-+	while ((str = strstr(path, "/.")) != NULL)
-+		str[1] = '_';
-+	/* .bashrc */
-+	if (*path == '.')
-+		*path = '_';
-+	return path;
-+}
-+
-+
- /* Returns 0 if PATH is a directory, 1 otherwise (any kind of file).
-    Returns 0 on error.  */
- int
-diff -ruN wget-LFS-20040909/src/utils.h wget-LFS-20040909.patched/src/utils.h
---- src/utils.h.orig	2004-09-09 21:05:36.000000000 -0700
-+++ src/utils.h	2005-02-21 04:04:07.000000000 -0800
-@@ -83,6 +83,7 @@
- int make_directory PARAMS ((const char *));
- char *unique_name PARAMS ((const char *, int));
- char *file_merge PARAMS ((const char *, const char *));
-+char *sanitize_path PARAMS ((char *));
- 
- int acceptable PARAMS ((const char *));
- int accdir PARAMS ((const char *s, enum accd));
diff --git a/ftp/wget-devel/pkg-plist b/ftp/wget-devel/pkg-plist
index f1011ea4cfd4..47b1cc91c559 100644
--- a/ftp/wget-devel/pkg-plist
+++ b/ftp/wget-devel/pkg-plist
@@ -6,8 +6,11 @@ etc/wgetrc
 %%NLS%%share/locale/da/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/de/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/el/LC_MESSAGES/wget.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/es/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/et/LC_MESSAGES/wget.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/wget.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/he/LC_MESSAGES/wget.mo
@@ -23,6 +26,7 @@ etc/wgetrc
 %%NLS%%share/locale/ru/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/wget.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/wget.mo