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.

Release notes:
https://lists.gnu.org/archive/html/info-gnu/2021-09/msg00003.html
https://git.savannah.gnu.org/cgit/wget.git/commit/?id=c8d7a66217db9f5d85ce54caca449da5d825c9c3

"Release tarballs no longer have a dependency on Python." However, in my
testing, PYTHON="" is needed to avoid failing a python3 check during
configure.

This update:
- moves to 1.21.2
- `make test' runs two test suites: tests/ and testenv/. Only testenv/
  relies on python3. Rework python3 hack by uncommenting:
  #TESTS = $(DEFAULT_TESTS) $(am__append_2).
  This makes it easier to read than am_cv_pathless_PYTHON and still
  achieves the goal of running the python3 tests.

To test:
1. uninstall python3
2. `make update-plist' builds fine without python3
3. `make test' pulls in python3

I tested this by downloading install69.iso and verifying it.

Feedback is welcome. 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    9 Sep 2021 02:41:52 -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/
@@ -36,15 +36,17 @@ 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_ARGS +=      PYTHON=""
 CONFIGURE_ENV +=       CPPFLAGS="-I${LOCALBASE}/include" \
                        LDFLAGS="-L${LOCALBASE}/lib"
 MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/build-aux
 
 pre-build:
        @${SUBST_CMD} ${WRKSRC}/doc/wget.texi ${WRKSRC}/doc/sample.wgetrc
+
+# hack to run python3 tests while avoiding depending on python3 at build time
+pre-test:
+       @sed -i 's/^#TESTS/TESTS/' ${WRKSRC}/testenv/Makefile
 
 .include <bsd.port.arch.mk>
 .if !${PROPERTIES:Mclang}
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    9 Sep 2021 02:41:52 -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   9 Sep 2021 02:41:52 -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   9 Sep 2021 02:41:52 -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

Reply via email to