ports/122482: [PATCH]ftp/wget: update to 1.11.1; add some OPTIONS

[bf]

>Number:         122482
>Category:       ports
>Synopsis:       [PATCH]ftp/wget: update to 1.11.1; add some OPTIONS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 06 12:00:08 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     bf
>Release:        7-STABLE i386
>Organization:
-
>Environment:
>Description:
Update to 1.11.1 (summary of changes below); use OPTIONS; permit users to disable ipv6 and choose between gnutls and openssl.

Changes:
** Interrupted downloads no longer result in renaming the file
(regression in 1.11 over 1.10.2).

** Progress bar now displays correctly in non-English locales (and a
related assertion failure was fixed).

** Wget no longer issues a GET request over HTTP for files it should
know it's not going to download (regression in 1.11 over 1.10.2).

** Added option --auth-no-challenge, to support broken pre-1.11
authentication-before-server-challenge, which turns out to still be
useful for some limited cases.

** Documentation of accept/reject lists in the manual's "Types of
Files" section now explains various aspects of their behavior that may
be surprising, and notes that they may change in the future.

** Documentation of --no-parents now explains how a trailing slash, or
lack thereof, in the specified URL, will affect behavior.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -druN wget.orig/Makefile wget/Makefile
--- wget.orig/Makefile	2008-02-02 03:03:21.000000000 -0500
+++ wget/Makefile	2008-04-06 06:55:47.736768000 -0400
@@ -5,44 +5,63 @@
 # $FreeBSD: ports/ftp/wget/Makefile,v 1.85 2008/02/02 08:03:21 vd Exp $
 #
 
-PORTNAME=	wget
-DISTVERSION=	1.11
-CATEGORIES=	ftp www ipv6
-MASTER_SITES=	${MASTER_SITE_GNU}
+PORTNAME=		wget
+DISTVERSION=		1.11.1
+CATEGORIES=		ftp www ipv6
+MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	wget
 
 MAINTAINER=	vd at FreeBSD.org
-COMMENT=	Retrieve files from the Net via HTTP and FTP
+COMMENT=	Retrieve files from the Net via HTTP(S) and FTP
 
-USE_BZIP2=	yes
+USE_BZIP2=		yes
+USE_GMAKE=		yes
+USE_PERL5_BUILD=	yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" \
+			LDFLAGS="${LDFLAGS}"
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-.endif
+MAN1=	wget.1
+INFO=	wget
 
-USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
-GNU_CONFIGURE=	yes
+OPTIONS=	GNUTLS "HTTPS suppport with gnutls" Off \
+		IPV6 "IPV6 support" On \
+		NLS "Native Language Support with gettext" On \
+		SSL "HTTPS support with openssl"  On
 
-.if defined(WITHOUT_SSL)
-CONFIGURE_ARGS=		--with-ssl=no
+.include <bsd.port.pre.mk>
+
+.ifdef(WITH_GNUTLS)
+.ifdef(WITH_SSL)
+IGNORE= 	options WITH_GNUTLS and WITH_SSL are mutually exclusive, enable only one of the two
+.endif
+LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+=	--with-ssl=gnutls
+LDFLAGS+=		-L${LOCALBASE}/lib
+CPPFLAGS+=		-I${LOCALBASE}/include
+.elifdef(WITH_SSL)
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+CONFIGURE_ARGS+=	--with-ssl
 .else
-USE_OPENSSL=	yes
+CONFIGURE_ARGS+=	--without-ssl
 .endif
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB=	NLS="@comment "
+.ifdef(WITH_IPV6)
+CONFIGURE_ARGS+=	--enable-ipv6
 .else
-CONFIGURE_ARGS+=	--enable-nls
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		"LDFLAGS=${LDFLAGS}"
-PLIST_SUB=	NLS=""
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-MAN1=		wget.1
-INFO=		wget
+.ifdef(WITH_NLS)
+USE_GETTEXT=		yes
+CONFIGURE_ARGS+=	--enable-nls
+LDFLAGS+=		-L${LOCALBASE}/lib
+CPPFLAGS+=		-I${LOCALBASE}/include
+PLIST_SUB+=		NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB=		NLS="@comment "
+.endif
 
 post-patch:
 	${RM} -f ${WRKSRC}/doc/wget.info* ${WRKSRC}/po/*.mo ${WRKSRC}/po/*.gmo
@@ -53,4 +72,4 @@
 			 -e 's, at file{}, at file{${PREFIX}},' \
 		${WRKSRC}/doc/sample.wgetrc* ${WRKSRC}/doc/wget.texi
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -druN wget.orig/distinfo wget/distinfo
--- wget.orig/distinfo	2008-02-02 03:03:21.000000000 -0500
+++ wget/distinfo	2008-04-04 05:06:16.888596000 -0400
@@ -1,3 +1,3 @@
-MD5 (wget-1.11.tar.bz2) = d2746aac29f2c0f661ee8e26c6b695ad
-SHA256 (wget-1.11.tar.bz2) = 3daa33dc67b9096d785253331b6a95db6901caa913f09e2377e1b61f50180d56
-SIZE (wget-1.11.tar.bz2) = 930167
+MD5 (wget-1.11.1.tar.bz2) = 3fda0bab6a883a5f6599d2da58765f93
+SHA256 (wget-1.11.1.tar.bz2) = 486e2d6be920ceed44602b2f4c08e57d815b8097b4474615f4cd4b463e2b18ca
+SIZE (wget-1.11.1.tar.bz2) = 929618


>Release-Note:
>Audit-Trail:
>Unformatted: