On Sat, 11 Feb 2017 17:19:50 -0500, Daniel Jakots <[email protected]> wrote:
> 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. And we do now. If it's installed it gets automatically picked up and there's no flag to disable it, yay. Here's an updated diff that use libidn2, it also uses libunistring. But configure says that it needs libunicode which we don't have (yet? :)). > --with-libidn=DIR Support IDN2008/IRIs (needs GNU libidn2 + > libunicode) Though grepping the source doesn't give anything (or I'm not looking for the right thing), so I'm not really sure libunicode is really needed. fwiw, make test is still fine 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 18 Feb 2017 18:26:51 -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,8 +10,9 @@ HOMEPAGE = https://www.gnu.org/software/ # GPLv3 PERMIT_PACKAGE_CDROM = Yes -WANTLIB = c crypto idn pcre psl ssl z -LIB_DEPENDS = devel/libidn \ +WANTLIB = c crypto idn2 pcre psl ssl unistring z +LIB_DEPENDS = converters/libunistring \ + devel/libidn2 \ devel/pcre \ net/libpsl @@ -33,7 +34,9 @@ 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-libidn=${LOCALBASE} \ + --with-libunistring-prefix=${LOCALBASE} \ + --with-ssl=openssl # 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 18 Feb 2017 18:26:51 -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 18 Feb 2017 18:26:51 -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
