OK with me.
On Fri, Oct 19, 2012 at 9:14 AM, David Coppa <dco...@openbsd.org> wrote:
>
> Hi,
>
> Here's an update to wget-1.14.
>
> Tested with and without proxy on i386 and sparc64: no problems found
> so far...
>
> Ciao,
> David
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/wget/Makefile,v
> retrieving revision 1.57
> diff -u -p -r1.57 Makefile
> --- Makefile 17 May 2012 11:49:07 -0000 1.57
> +++ Makefile 19 Oct 2012 08:19:59 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT = retrieve files from the web via HTTP, HTTPS and FTP
>
> -DISTNAME = wget-1.13.4
> +DISTNAME = wget-1.14
> CATEGORIES = net
>
> HOMEPAGE = http://www.gnu.org/software/wget/
> @@ -13,8 +13,9 @@ PERMIT_PACKAGE_FTP = Yes
> PERMIT_DISTFILES_CDROM =Yes
> PERMIT_DISTFILES_FTP = Yes
>
> -WANTLIB = c crypto idn ssl z
> -LIB_DEPENDS = devel/libidn
> +WANTLIB = c crypto idn pcre ssl z
> +LIB_DEPENDS = devel/libidn \
> + devel/pcre
>
> MASTER_SITES = ${MASTER_SITE_GNU:=wget/}
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/net/wget/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- distinfo 12 Oct 2011 10:14:30 -0000 1.11
> +++ distinfo 19 Oct 2012 08:19:59 -0000
> @@ -1,5 +1,2 @@
> -MD5 (wget-1.13.4.tar.gz) = HfSJl2oRi5y+GwNQKtv8Jw==
> -RMD160 (wget-1.13.4.tar.gz) = YQYr/Uwo+Fox9ZnpD4P6hLoccdA=
> -SHA1 (wget-1.13.4.tar.gz) = 4l4bSHAm3dkCbKfSavIfBEyITSg=
> -SHA256 (wget-1.13.4.tar.gz) = JMdxC8nyIM4j2Kng9Wc7DvwcrOYttt4CObWGPsyTTc0=
> -SIZE (wget-1.13.4.tar.gz) = 2815185
> +SHA256 (wget-1.14.tar.gz) = 86aJjjp2W7lENbBKZmjbnl0Zs+kODGmlA6J3Ouk2wmk=
> +SIZE (wget-1.14.tar.gz) = 3118130
> Index: patches/patch-doc_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/net/wget/patches/patch-doc_Makefile_in,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-doc_Makefile_in
> --- patches/patch-doc_Makefile_in 12 Oct 2011 10:18:33 -0000 1.6
> +++ patches/patch-doc_Makefile_in 19 Oct 2012 08:19:59 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-doc_Makefile_in,v 1.6 2011/10/12 10:18:33 dcoppa Exp $
> ---- doc/Makefile.in.orig Thu Oct 6 09:25:28 2011
> -+++ doc/Makefile.in Thu Oct 6 09:27:11 2011
> -@@ -1061,7 +1061,7 @@ manext = 1
> +--- doc/Makefile.in.orig Sun Aug 5 22:17:16 2012
> ++++ doc/Makefile.in Fri Oct 19 09:34:53 2012
> +@@ -1163,7 +1163,7 @@ manext = 1
> RM = rm -f
> TEXI2POD = $(srcdir)/texi2pod.pl
> MAN = wget.$(manext)
> @@ -10,7 +10,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.6 20
> SAMPLERCTEXI = sample.wgetrc.munged_for_texi_inclusion
>
> #
> -@@ -1558,22 +1558,8 @@ install.man: $(MAN)
> +@@ -1678,22 +1678,8 @@ install.man: $(MAN)
>
> # install sample.wgetrc
> install.wgetrc: $(srcdir)/sample.wgetrc
> Index: patches/patch-doc_wget_texi
> ===================================================================
> RCS file: /cvs/ports/net/wget/patches/patch-doc_wget_texi,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-doc_wget_texi
> --- patches/patch-doc_wget_texi 12 Oct 2011 10:14:30 -0000 1.4
> +++ patches/patch-doc_wget_texi 19 Oct 2012 08:19:59 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-doc_wget_texi,v 1.4 2011/10/12 10:14:30 dcoppa Exp $
> ---- doc/wget.texi.orig Sat Aug 6 12:22:58 2011
> -+++ doc/wget.texi Thu Oct 6 10:25:12 2011
> +--- doc/wget.texi.orig Sat Aug 4 10:41:52 2012
> ++++ doc/wget.texi Fri Oct 19 09:34:53 2012
> @@ -10,6 +10,11 @@
> @setchapternewpage on
> @c %**end of header
> @@ -30,7 +30,7 @@ $OpenBSD: patch-doc_wget_texi,v 1.4 2011
> Default location of the @dfn{global} startup file.
>
> @item .wgetrc
> -@@ -2696,9 +2701,8 @@ commands.
> +@@ -2746,9 +2751,8 @@ commands.
> @cindex location of wgetrc
>
> When initializing, Wget will look for a @dfn{global} startup file,
> @@ -42,7 +42,7 @@ $OpenBSD: patch-doc_wget_texi,v 1.4 2011
>
> Then it will look for the user's file. If the environmental variable
> @code{WGETRC} is set, Wget will try to load that file. Failing that, no
> -@@ -2708,7 +2712,7 @@ If @code{WGETRC} is not set, Wget will try to load @fi
> +@@ -2758,7 +2762,7 @@ If @code{WGETRC} is not set, Wget will try to load @fi
>
> The fact that user's settings are loaded after the system-wide ones
> means that in case of collision user's wgetrc @emph{overrides} the
> Index: patches/patch-src_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/net/wget/patches/patch-src_Makefile_in,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-src_Makefile_in
> --- patches/patch-src_Makefile_in 12 Oct 2011 10:14:30 -0000 1.2
> +++ patches/patch-src_Makefile_in 19 Oct 2012 08:19:59 -0000
> @@ -3,9 +3,9 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 20
> Fix linking order so this works on static arches too.
> (libidn before libintl before libiconv).
>
> ---- src/Makefile.in.orig Thu Oct 6 09:39:27 2011
> -+++ src/Makefile.in Thu Oct 6 09:41:44 2011
> -@@ -803,7 +803,7 @@ LIBMULTITHREAD = @LIBMULTITHREAD@
> +--- src/Makefile.in.orig Sun Aug 5 22:17:16 2012
> ++++ src/Makefile.in Fri Oct 19 09:34:53 2012
> +@@ -874,7 +874,7 @@ LIBMULTITHREAD = @LIBMULTITHREAD@
> LIBOBJS = @LIBOBJS@
> LIBPTH = @LIBPTH@
> LIBPTH_PREFIX = @LIBPTH_PREFIX@
> Index: patches/patch-src_openssl_c
> ===================================================================
> RCS file: /cvs/ports/net/wget/patches/patch-src_openssl_c,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-src_openssl_c
> --- patches/patch-src_openssl_c 12 Oct 2011 10:14:30 -0000 1.4
> +++ patches/patch-src_openssl_c 19 Oct 2012 08:19:59 -0000
> @@ -2,9 +2,9 @@ $OpenBSD: patch-src_openssl_c,v 1.4 2011
>
> Fix build with GCC2.
>
> ---- src/openssl.c.orig Thu Oct 6 09:42:04 2011
> -+++ src/openssl.c Thu Oct 6 09:43:29 2011
> -@@ -498,6 +498,8 @@ ssl_check_certificate (int fd, const char *host)
> +--- src/openssl.c.orig Mon Jun 4 22:05:40 2012
> ++++ src/openssl.c Fri Oct 19 09:34:53 2012
> +@@ -513,6 +513,8 @@ ssl_check_certificate (int fd, const char *host)
> bool success = true;
> bool alt_name_checked = false;
>
> @@ -13,7 +13,7 @@ Fix build with GCC2.
> /* If the user has specified --no-check-cert, we still want to warn
> him about problems with the server's certificate. */
> const char *severity = opt.check_cert ? _("ERROR") : _("WARNING");
> -@@ -646,7 +648,7 @@ ssl_check_certificate (int fd, const char *host)
> +@@ -661,7 +663,7 @@ ssl_check_certificate (int fd, const char *host)
> if (alt_name_checked == false)
> {
> /* Test commomName */
>
