Friday, September 10, 2021

Re: update net/wget 1.21.2

Stuart Henderson writes:

> On 2021/09/09 03:44, Nam Nguyen wrote:
>> Here is an update to wget 1.21.2 released on September 7, 2021. It is
>> from tj@ with tweaks by me to revise the python3 hack.
>
> ok, though I'm not sure there's much benefit to keeping the hack for
> building without python; these days, with many things using meson,
> if you're building ports you are pretty much guaranteed to have python
> installed.

python3 seems safe to add back given its availability.

Here is a fresh diff that:
- Removes python3 hack and require python3 at build time instead.
MODPY_RUN_DEPENDS is in TEST_DEPENDS (as before) and BUILD_DEPENDS
(via removal of MODPY_BUILDDEP = No).

sthen@, still OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.88
diff -u -p -u -p -r1.88 Makefile
--- Makefile 10 Aug 2021 13:42:34 -0000 1.88
+++ Makefile 10 Sep 2021 06:49:12 -0000
@@ -2,7 +2,7 @@

COMMENT = retrieve files from the web via HTTP, HTTPS and FTP

-DISTNAME = wget-1.21.1
+DISTNAME = wget-1.21.2
CATEGORIES = net

HOMEPAGE = https://www.gnu.org/software/wget/
@@ -25,7 +25,6 @@ MASTER_SITES = ${MASTER_SITE_GNU:=wget/

# some regression tests require python3
MODULES += lang/python
-MODPY_BUILDDEP = No
MODPY_RUNDEP = No

TEST_DEPENDS = www/p5-HTTP-Daemon ${MODPY_RUN_DEPENDS}
@@ -36,9 +35,6 @@ FAKE_FLAGS = sysconfdir="${PREFIX}/shar

CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --with-ssl=openssl
-# hack to avoid depending on python3 at build time
-CONFIGURE_ARGS += PYTHON="" \
- am_cv_pathless_PYTHON="${MODPY_BIN}"
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/build-aux
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 distinfo
--- distinfo 27 Jun 2021 23:49:58 -0000 1.26
+++ distinfo 10 Sep 2021 06:49:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (wget-1.21.1.tar.gz) = WboL2t6a0TXtpYGuTlmnqfJeOkvealQZYysxkGEg4m4=
-SIZE (wget-1.21.1.tar.gz) = 4884887
+SHA256 (wget-1.21.2.tar.gz) = 5tTHa+gsZ23X6MYaKbKshRCuEIqBC10dGPyaHSyaJJc=
+SIZE (wget-1.21.2.tar.gz) = 5004576
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/wget/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 27 Jun 2021 23:49:58 -0000 1.3
+++ patches/patch-Makefile_in 10 Sep 2021 06:49:12 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2021/0
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -1644,7 +1644,7 @@ distuninstallcheck_listfiles = find . -type f | \
+@@ -1669,7 +1669,7 @@ distuninstallcheck_listfiles = find . -type f | \
ACLOCAL_AMFLAGS = -I m4

# subdirectories in the distribution
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/wget/pkg/PLIST,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 PLIST
--- pkg/PLIST 27 Jun 2021 23:49:58 -0000 1.27
+++ pkg/PLIST 10 Sep 2021 06:49:12 -0000
@@ -52,6 +52,7 @@ share/locale/it/LC_MESSAGES/wget.mo
share/locale/ja/LC_MESSAGES/wget-gnulib.mo
share/locale/ja/LC_MESSAGES/wget.mo
share/locale/ko/LC_MESSAGES/wget-gnulib.mo
+share/locale/ko/LC_MESSAGES/wget.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/wget.mo

No comments:

Post a Comment