Aaron Bieber <aa...@bolddaemon.com> writes: >> > Nam, you still want maintainer? >> > OK abieber@ for Nam's diff. Builds / wget's things fine here.
Stuart Henderson <s...@spacehopper.org> writes: > It's good to have this fixed upstream but it doesn't really seem to > add much to the port at the moment. I would go with the plain update > for now. That sounds good. The plain update is reproduced here for convenience. I made some changes, though, compared to the earlier one that Aaron had reviewed. -Add AUTOCONF_VERSION -Add AUTOMAKE_VERSION -Add autoconf and automake to BUILD_DEPENDS This is necessary because it failed to build when I did not have autoconf and automake installed on my system. --8<---------------cut here---------------start------------->8--- Index: Makefile =================================================================== RCS file: /cvs/ports/net/wget/Makefile,v retrieving revision 1.75 diff -u -p -r1.75 Makefile --- Makefile 7 May 2018 10:37:59 -0000 1.75 +++ Makefile 21 Feb 2019 22:04:35 -0000 @@ -2,22 +2,25 @@ COMMENT = retrieve files from the web via HTTP, HTTPS and FTP -DISTNAME = wget-1.19.5 +DISTNAME = wget-1.20.1 CATEGORIES = net HOMEPAGE = https://www.gnu.org/software/wget/ +MAINTAINER = Nam Nguyen <n...@berkeley.edu> # GPLv3 PERMIT_PACKAGE_CDROM = Yes -WANTLIB += c crypto iconv idn2 intl pcre psl ssl unistring z +WANTLIB += c crypto iconv idn2 intl pcre2-8 psl ssl unistring z -BUILD_DEPENDS = devel/gettext-tools +BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \ + ${MODGNU_AUTOMAKE_DEPENDS} \ + devel/gettext-tools LIB_DEPENDS = converters/libunistring \ devel/gettext \ devel/libidn2 \ - devel/pcre \ + devel/pcre2 \ net/libpsl MASTER_SITES = ${MASTER_SITE_GNU:=wget/} @@ -36,6 +39,8 @@ FAKE_FLAGS = sysconfdir="${PREFIX}/shar CONFIGURE_STYLE = gnu CONFIGURE_ARGS = --with-ssl=openssl +AUTOCONF_VERSION = 2.69 +AUTOMAKE_VERSION = 1.16 # 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.22 diff -u -p -r1.22 distinfo --- distinfo 7 May 2018 10:37:59 -0000 1.22 +++ distinfo 21 Feb 2019 22:04:35 -0000 @@ -1,2 +1,2 @@ -SHA256 (wget-1.19.5.tar.gz) = s5ISq+GnPyso9MbLIjxzhVnKrJHW5Bam2R1LnVXJ+u4= -SIZE (wget-1.19.5.tar.gz) = 4455797 +SHA256 (wget-1.20.1.tar.gz) = t4OzkMtXHIN7OShXlF9aHwDsawQxd8xCq7juG1Qu4bM= +SIZE (wget-1.20.1.tar.gz) = 4392853 Index: patches/patch-doc_wget_texi =================================================================== RCS file: /cvs/ports/net/wget/patches/patch-doc_wget_texi,v retrieving revision 1.15 diff -u -p -r1.15 patch-doc_wget_texi --- patches/patch-doc_wget_texi 7 May 2018 10:37:59 -0000 1.15 +++ patches/patch-doc_wget_texi 21 Feb 2019 22:04:35 -0000 @@ -20,7 +20,7 @@ Index: doc/wget.texi Default location of the @dfn{global} startup file. @item .wgetrc -@@ -3154,9 +3154,8 @@ commands. +@@ -3166,9 +3166,8 @@ commands. @cindex location of wgetrc When initializing, Wget will look for a @dfn{global} startup file, @@ -32,7 +32,7 @@ Index: doc/wget.texi 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 -@@ -3166,7 +3165,7 @@ If @code{WGETRC} is not set, Wget will try to load @fi +@@ -3178,7 +3177,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 --8<---------------cut here---------------end--------------->8---
