Index: branches/2017Q2/ftp/wget/files/patch-src__main.c
===================================================================
--- branches/2017Q2/ftp/wget/files/patch-src__main.c	(revision 443487)
+++ branches/2017Q2/ftp/wget/files/patch-src__main.c	(nonexistent)
@@ -1,12 +0,0 @@
---- src/main.c.orig	2015-02-10 23:31:49.000000000 +0200
-+++ src/main.c	2015-03-06 21:55:03.975252490 +0200
-@@ -1272,6 +1272,9 @@
-   if (opt.verbose == -1)
-     opt.verbose = !opt.quiet;
- 
-+  if (opt.quiet && opt.show_progress == -1)
-+    opt.show_progress = false;
-+
-   /* Sanity checks.  */
-   if (opt.verbose && opt.quiet)
-     {

Property changes on: branches/2017Q2/ftp/wget/files/patch-src__main.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2017Q2/ftp/wget/Makefile
===================================================================
--- branches/2017Q2/ftp/wget/Makefile	(revision 443487)
+++ branches/2017Q2/ftp/wget/Makefile	(revision 443488)
@@ -1,90 +1,90 @@
 # Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	wget
-DISTVERSION=	1.19
+DISTVERSION=	1.19.1
 CATEGORIES=	ftp www ipv6
 MASTER_SITES=	GNU
 
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	Retrieve files from the Net via HTTP(S) and FTP
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		charsetfix cpe gmake iconv makeinfo perl5 tar:xz
+TEST_DEPENDS=	p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
+
+USES=		charsetfix cpe iconv makeinfo perl5 tar:xz
 USE_PERL5=	build
 CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
 OPTIONS_SUB=	yes
 
 OPTIONS_RADIO=	SSL
 OPTIONS_RADIO_SSL=GNUTLS OPENSSL
 OPTIONS_DEFINE=	IPV6 NLS IDN METALINK PCRE PSL
 OPTIONS_DEFAULT=OPENSSL IDN
 
 PCRE_DESC=	Support Perl regular expressions in addition to POSIX
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CPPFLAGS=		-I${LOCALBASE}/include
 NLS_LDFLAGS=		-L${LOCALBASE}/lib
 
-IDN_USES=		iconv
-IDN_LIB_DEPENDS=	libidn.so:dns/libidn
+IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2 \
+			libunistring.so:devel/libunistring
+IDN_CPPFLAGS=		-I${LOCALBASE}/include
+IDN_LDFLAGS=		-L${LOCALBASE}/lib
 IDN_CONFIGURE_ENABLE=	iri
-IDN_CONFIGURE_ON=	--with-libidn=${LOCALBASE}
+IDN_CONFIGURE_ON=	--with-libidn=${LOCALBASE} --with-libunistring-prefix=${LOCALBASE}
+IDN_CONFIGURE_OFF=	--with-included-libunistring
 
 METALINK_CONFIGURE_WITH=metalink
 METALINK_LIB_DEPENDS=	libmetalink.so:misc/libmetalink
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CPPFLAGS=		-I${LOCALBASE}/include
 PCRE_LDFLAGS=		-L${LOCALBASE}/lib
-PCRE_CONFIGURE_ENV_OFF=	ac_cv_header_pcre_h=no
+PCRE_CONFIGURE_ENABLE=	pcre
 
 PSL_CONFIGURE_WITH=	libpsl
 PSL_LIB_DEPENDS=	libpsl.so:dns/libpsl
 
 .include <bsd.port.options.mk>
 
-CONFIGURE_ARGS+=--with-included-libunistring
-
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=		ssl
 CONFIGURE_ARGS+=--with-ssl=openssl --with-libssl-prefix=${OPENSSLBASE}
 CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 .elif ${PORT_OPTIONS:MGNUTLS}
 USES+=		pkgconfig
 LIB_DEPENDS+=	libgnutls.so:security/gnutls
 CONFIGURE_ARGS+=--with-ssl=gnutls
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 .else
 CONFIGURE_ARGS+=--without-ssl
 .endif
 
 INFO=		wget
 
-# eliminate gmakism
+TEST_TARGET=	check
+
 post-patch:
-	${REINPLACE_CMD} -e 's,$$<,$$(srcdir)/wget.texi,' \
-			 -e 's,WGETRC = $$(sysconfdir)/wgetrc,&.sample,' \
+	${REINPLACE_CMD} -e 's,WGETRC = $$(sysconfdir)/wgetrc,&.sample,' \
 		${WRKSRC}/doc/Makefile.in
 	${REINPLACE_CMD} -e 's,/usr/local/etc/wgetrc,${PREFIX}/etc/wgetrc,' \
-			 -e 's,@file{},@file{${PREFIX}},' \
-		${WRKSRC}/doc/sample.wgetrc* ${WRKSRC}/doc/wget.texi
-	${REINPLACE_CMD} -e '/ac_fn_c_check_header_mongrel.*uuid\/uuid.h/ d' \
-			 -e 's|-R$$found_dir|-Wl,-rpath=$$found_dir|g' \
-		${WRKSRC}/configure
+		${WRKSRC}/doc/sample.wgetrc* ${WRKSRC}/doc/wget.texi ${WRKSRC}/doc/wget.info
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel}
 BROKEN=		Does not build with openssl-devel
 .endif
 
 .include <bsd.port.post.mk>
Index: branches/2017Q2/ftp/wget/distinfo
===================================================================
--- branches/2017Q2/ftp/wget/distinfo	(revision 443487)
+++ branches/2017Q2/ftp/wget/distinfo	(revision 443488)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486213522
-SHA256 (wget-1.19.tar.xz) = 0f1157bbf4daae19f3e1ddb70c6ccb2067feb834a6aa23c9d9daa7f048606384
-SIZE (wget-1.19.tar.xz) = 2075916
+TIMESTAMP = 1491337367
+SHA256 (wget-1.19.1.tar.xz) = 0c950b9671881222a4d385b013c9604e98a8025d1988529dfca0e93617744cd2
+SIZE (wget-1.19.1.tar.xz) = 2111756
Index: branches/2017Q2
===================================================================
--- branches/2017Q2	(revision 443487)
+++ branches/2017Q2	(revision 443488)

Property changes on: branches/2017Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r437857