Daniel Jakots <danj+o...@chown.me> writes: > On Sat, 11 Feb 2017 17:19:50 -0500, Daniel Jakots <danj+o...@chown.me> > 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.
It is a not a bad thing. > 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? :)). I think that the mention of libunicode is a fluke. >> --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 Looks right, please address my concern below and it's ok jca@ > 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} \ No need to pass those. Using libidn(2) and libunistring is the default. Also we already help autotools find stuff in /usr/local: CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" So unless I'm missing something, please just leave CONFIGURE_ARGS as is (works fine here). -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
