Allo,

1.19 was released at the beginning of February [1] and today they
released a bugfix release [2].

They moved from libidn to libidn2 if I understand correctly but we
don't have the latter. It picked up libunistring on my laptop but from
the changelog:

> We use libunistring (resp. the unicode code from gnulib) for
> lowercasing UTF-8 before we give data to libidn2.

so I wanted to disable it, but it seems there's no any configure flags
to do it:

> --with-included-libunistring  use the libunistring parts included here
> --with-libunistring-prefix[=DIR]  search for libunistring in DIR/include and 
> DIR/lib
> --without-libunistring-prefix     don't search for libunistring in
> includedir and libdir

In my diff I use --with-included-libunistring and this way it doesn't
pick anything.

All tests pass except the usual (related to https because of the certs
included in the tests).

[1]: https://lists.gnu.org/archive/html/bug-wget/2017-02/msg00008.html
[2]: https://lists.gnu.org/archive/html/bug-wget/2017-02/msg00065.html

Cheerful comments? OK?

Cheers,
Daniel

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile    19 Jun 2016 20:42:57 -0000      1.71
+++ Makefile    11 Feb 2017 22:18:05 -0000
@@ -2,7 +2,7 @@
 
 COMMENT =      retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME =     wget-1.18
+DISTNAME =     wget-1.19.1
 CATEGORIES =   net
 
 HOMEPAGE =     https://www.gnu.org/software/wget/
@@ -10,9 +10,8 @@ HOMEPAGE =    https://www.gnu.org/software/
 # GPLv3
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB =              c crypto idn pcre psl ssl z
-LIB_DEPENDS =          devel/libidn \
-                       devel/pcre \
+WANTLIB =              c crypto pcre psl ssl z
+LIB_DEPENDS =          devel/pcre \
                        net/libpsl
 
 MASTER_SITES =         ${MASTER_SITE_GNU:=wget/}
@@ -33,7 +32,8 @@ TEST_DEPENDS +=               www/p5-HTTP-Message sec
 FAKE_FLAGS =           sysconfdir="${PREFIX}/share/examples/wget"
 
 CONFIGURE_STYLE =      gnu
-CONFIGURE_ARGS =       --with-ssl=openssl
+CONFIGURE_ARGS =       --with-ssl=openssl \
+                       --with-included-libunistring
 # hack to avoid depending on python3 at build time
 CONFIGURE_ARGS +=      PYTHON="" \
                        am_cv_pathless_PYTHON="${MODPY_BIN}"
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo    19 Jun 2016 20:42:57 -0000      1.18
+++ distinfo    11 Feb 2017 22:18:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (wget-1.18.tar.xz) = tbVbdXJsBMBv4lPa7JMppvGjwMGHjj6nbr/rwTnqnME=
-SIZE (wget-1.18.tar.xz) = 1922376
+SHA256 (wget-1.19.1.tar.xz) = DJULlnGIEiKk04WwE8lgTpioAl0ZiFKd/KDpNhd0TNI=
+SIZE (wget-1.19.1.tar.xz) = 2111756
Index: patches/patch-doc_wget_texi
===================================================================
RCS file: /cvs/ports/net/wget/patches/patch-doc_wget_texi,v
retrieving revision 1.11
diff -u -p -r1.11 patch-doc_wget_texi
--- patches/patch-doc_wget_texi 19 Jun 2016 20:42:57 -0000      1.11
+++ patches/patch-doc_wget_texi 11 Feb 2017 22:18:05 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-doc_wget_texi,v 1.11 2016/06/19 20:42:57 danj Exp $
---- doc/wget.texi.orig Fri Jun  3 13:55:13 2016
-+++ doc/wget.texi      Sun Jun 19 10:57:35 2016
+--- doc/wget.texi.orig Sat Feb 11 05:45:22 2017
++++ doc/wget.texi      Sat Feb 11 16:46:13 2017
 @@ -191,14 +191,14 @@ gauge can be customized to your preferences.
  Most of the features are fully configurable, either through command line
  options, or via the initialization file @file{.wgetrc} (@pxref{Startup
@@ -18,7 +18,7 @@ $OpenBSD: patch-doc_wget_texi,v 1.11 201
  Default location of the @dfn{global} startup file.
  
  @item .wgetrc
-@@ -3067,9 +3067,8 @@ commands.
+@@ -3113,9 +3113,8 @@ commands.
  @cindex location of wgetrc
  
  When initializing, Wget will look for a @dfn{global} startup file,
@@ -30,7 +30,7 @@ $OpenBSD: patch-doc_wget_texi,v 1.11 201
  
  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
-@@ -3079,7 +3078,7 @@ If @code{WGETRC} is not set, Wget will try to load @fi
+@@ -3125,7 +3124,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

Reply via email to