3 files changed, 47 insertions, 25 deletions

diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index 27dcfcb180bb..4f24a44419fc 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -6,39 +6,61 @@
 #
 
 PORTNAME=	wget
-DISTVERSION=	1.11
+DISTVERSION=	1.11.2
 CATEGORIES=	ftp www ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	wget
 
 MAINTAINER=	vd@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
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-.endif
-
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+
+OPTIONS=	GNUTLS "Support for SSL via GnuTLS" Off \
+		IPV6 "Support for IPv6" On \
+		NLS "Native Language Support with gettext" On \
+		OPENSSL "Support for SSL via OpenSSL" On
 
-.if defined(WITHOUT_SSL)
-CONFIGURE_ARGS=		--with-ssl=no
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_OPENSSL)
+.if !defined(WITHOUT_GNUTLS)
+IGNORE=		GNUTLS and OPENSSL are mutually exclusive, enable at most one of them
+.endif
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+CONFIGURE_ARGS+=--with-ssl
+CPPFLAGS+=	-I${OPENSSLINC}
+LDFLAGS+=	-L${OPENSSLLIB}
+.elif !defined(WITHOUT_GNUTLS)
+LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+=--with-ssl=gnutls
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .else
-USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--without-ssl
 .endif
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB=	NLS="@comment "
+.if !defined(WITHOUT_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
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB=	NLS="@comment "
 .endif
 
 MAN1=		wget.1
@@ -53,4 +75,4 @@ post-patch:
 			 -e 's,@file{},@file{${PREFIX}},' \
 		${WRKSRC}/doc/sample.wgetrc* ${WRKSRC}/doc/wget.texi
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/ftp/wget/distinfo b/ftp/wget/distinfo
index 961948efcd94..30477ee1dcaf 100644
--- a/ftp/wget/distinfo
+++ b/ftp/wget/distinfo
@@ -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.2.tar.bz2) = 730d2687231934f51e47f6f85260b2d3
+SHA256 (wget-1.11.2.tar.bz2) = a22756034521e5d5d9c8f075f0adaab8ef2da13eed06f722ef2e4c28e6b117cb
+SIZE (wget-1.11.2.tar.bz2) = 936502
diff --git a/ftp/wget/files/patch-doc_Makefile.in b/ftp/wget/files/patch-doc_Makefile.in
index c14f30d440ee..65f9c47ca3ee 100644
--- a/ftp/wget/files/patch-doc_Makefile.in
+++ b/ftp/wget/files/patch-doc_Makefile.in
@@ -1,5 +1,5 @@
---- doc/Makefile.in.orig	Mon Jun  6 23:42:17 2005
-+++ doc/Makefile.in	Wed Apr 11 22:18:59 2007
+--- doc/Makefile.in.orig	2008-05-01 04:57:18.613091552 -0400
++++ doc/Makefile.in	2008-05-01 04:58:14.768389781 -0400
 @@ -22,7 +22,7 @@
  SHELL = /bin/sh
  
@@ -10,7 +10,7 @@
  TEXI2DVI = texi2dvi
  # Program to convert DVI files to PostScript
 @@ -51,7 +51,7 @@
- TEXI2POD     = texi2pod.pl
+ TEXI2POD     = $(srcdir)/texi2pod.pl
  POD2MAN      = @POD2MAN@
  MAN          = wget.$(manext)
 -WGETRC       = $(sysconfdir)/wgetrc