diff --git a/www/wget2/Makefile b/www/wget2/Makefile index 437de18068ce..ad8f5b8aa335 100644 --- a/www/wget2/Makefile +++ b/www/wget2/Makefile @@ -1,126 +1,128 @@ PORTNAME= wget2 -DISTVERSION= 2.2.0 -PORTREVISION= 1 +DISTVERSION= 2.2.1 +PORTREVISION= 0 CATEGORIES= www MASTER_SITES= GNU/wget MAINTAINER= amdmi3@FreeBSD.org COMMENT= File and recursive website downloader WWW= https://gitlab.com/gnuwget/wget2 LICENSE= GPLv3+ LGPL3+ LICENSE_COMB= multi LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING LICENSE_FILE_LGPL3+ = ${WRKSRC}/COPYING.LESSER USES= autoreconf charsetfix cpe gmake iconv libtool:build localbase pkgconfig tar:lz CPE_VENDOR= gnu CPE_PRODUCT= wget GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS+=--without-libidn # only libidn2 is used INSTALL_TARGET= install-strip USE_LDCONFIG= yes OPTIONS_DEFINE= DANE IDN MANPAGES DOXYGEN NLS PSL HTTP2 GPGME TEST HSTS PROXY OPTIONS_GROUP= COMPRESSION OPTIONS_GROUP_COMPRESSION= BROTLI ZSTD LZMA BZIP2 OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL=GNUTLS OPENSSL NOSSL # WOLFSSL OPTIONS_RADIO= PCRE OPTIONS_RADIO_PCRE=PCRE1 PCRE2 OPTIONS_DEFAULT=IDN MANPAGES OPENSSL NLS PSL HTTP2 BROTLI ZSTD GPGME TEST HSTS LZMA BZIP2 OPTIONS_SUB= yes # requires gnutls built with DANE option enabled DANE_DESC= Support for DANE certificate checking (requires gnutls built with DANE option) DANE_CONFIGURE_WITH= libdane DANE_LIB_DEPENDS= libgnutls-dane.so:security/gnutls IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 IDN_CONFIGURE_WITH= libidn2 MANPAGES_BUILD_DEPENDS= pandoc:textproc/hs-pandoc \ gsed:textproc/gsed DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen NLS_USES= gettext NLS_USES_OFF= gettext-tools NLS_CONFIGURE_ENABLE= nls PCRE_DESC= Support Perl regular expressions in addition to POSIX PCRE1_DESC= Support PCRE style regular expressions PCRE1_LIB_DEPENDS= libpcre.so:devel/pcre PCRE1_CONFIGURE_WITH= libpcre PCRE2_DESC= Support PCRE2 style regular expressions PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 PCRE2_CONFIGURE_WITH= libpcre2 PSL_CONFIGURE_WITH= libpsl PSL_LIB_DEPENDS= libpsl.so:dns/libpsl HSTS_DESC= Support HSTS preload lists HSTS_CONFIGURE_WITH= libhsts HSTS_LIB_DEPENDS= libhsts.so:www/libhsts HTTP2_CONFIGURE_WITH= libnghttp2 HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2 GPGME_DESC= Support signature verification with gpgme GPGME_CONFIGURE_WITH= gpgme GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme TEST_TEST_TARGET= check TEST_CONFIGURE_WITH= libmicrohttpd TEST_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd TEST_TEST_DEPENDS= p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \ p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL OPENSSL_CONFIGURE_ON= --with-ssl=openssl --with-openssl OPENSSL_USES= ssl OPENSSL_CPPFLAGS= -I${OPENSSLINC} OPENSSL_LDFLAGS= -L${OPENSSLLIB} GNUTLS_CONFIGURE_ON= --with-ssl=gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls WOLFSSL_CONFIGURE_ON= --with-ssl=wolfssl WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl WOLFSSL_BROKEN= does not build: use of undeclared identifier WOLFSSL_ALPN_CONTINUE_ON_MISMATCH NOSSL_DESC= Disable SSL support NOSSL_LIB_DEPENDS= libnettle.so:security/nettle # still required libnettle for hashing and checksumming NOSSL_CONFIGURE_ON= --with-ssl=none COMPRESSION_DESC= Compression algorithms support BROTLI_CONFIGURE_WITH= brotlidec BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli ZSTD_CONFIGURE_WITH= zstd ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd LZMA_CONFIGURE_WITH= lzma BZIP2_CONFIGURE_WITH= bzip2 PROXY_DESC= Systemwide proxy configuration through libproxy PROXY_CONFIGURE_ENABLE= libproxy PROXY_LIB_DEPENDS= libproxy.so:net/libproxy +PROXY_PREVENTS= IDN +PROXY_PREVENTS_MSG= IDN self-tests break if PROXY option enabled .include .if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif post-patch-MANPAGES-off: @${REINPLACE_CMD} -e '/AC_CHECK_PROGS/ s|pandoc|&-not-found|' ${WRKSRC}/configure.ac post-patch-DOXYGEN-off: @${REINPLACE_CMD} -e '/AC_CHECK_PROGS/ s|doxygen|&-not-found|' ${WRKSRC}/configure.ac .include diff --git a/www/wget2/distinfo b/www/wget2/distinfo index 810e863bb1fc..a0e08e17ef79 100644 --- a/www/wget2/distinfo +++ b/www/wget2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1732543185 -SHA256 (wget2-2.2.0.tar.lz) = ffa5e49db90c9ddc0c830b66e473630c679b1b0a26a53d24981d4f0efa1c90b6 -SIZE (wget2-2.2.0.tar.lz) = 2214840 +TIMESTAMP = 1767788378 +SHA256 (wget2-2.2.1.tar.lz) = f77397cce50b60670f48cfca5867517caed93f7c07ebea76541984d5d8d5c6d1 +SIZE (wget2-2.2.1.tar.lz) = 2266029 diff --git a/www/wget2/files/patch-configure.ac b/www/wget2/files/patch-configure.ac deleted file mode 100644 index 07e5cc33b04b..000000000000 --- a/www/wget2/files/patch-configure.ac +++ /dev/null @@ -1,23 +0,0 @@ ---- configure.ac.orig 2024-11-24 18:15:30 UTC -+++ configure.ac -@@ -410,17 +410,10 @@ test "${ENABLE_XATTR}" = "yes" && AC_DEFINE([ENABLE_XA - # - # Gettext - # --m4_ifdef([AM_GNU_GETTEXT], [ -- AM_GNU_GETTEXT([external],[need-ngettext]) -- AC_CONFIG_FILES([po/Makefile.in]) -- have_po=yes --], [ -- have_po=no --]) --m4_ifdef([AM_GNU_GETTEXT_VERSION], [ --#do not indent here -+AM_GNU_GETTEXT([external],[need-ngettext]) -+AC_CONFIG_FILES([po/Makefile.in]) -+have_po=yes - AM_GNU_GETTEXT_VERSION([0.22.5]) --]) - AM_CONDITIONAL([HAVE_PO], [ test "$have_po" = "yes" ]) - - # diff --git a/www/wget2/files/patch-tests_libtest.c b/www/wget2/files/patch-tests_libtest.c new file mode 100644 index 000000000000..5da29ff571b8 --- /dev/null +++ b/www/wget2/files/patch-tests_libtest.c @@ -0,0 +1,11 @@ +--- tests/libtest.c.orig 2025-12-29 13:41:40 UTC ++++ tests/libtest.c +@@ -73,6 +73,8 @@ enum MHD_Result { + #include + #include + ++#include ++ + #ifdef WITH_GNUTLS_IN_TESTSUITE + #ifdef WITH_GNUTLS_OCSP + # include diff --git a/www/wget2/pkg-plist b/www/wget2/pkg-plist index 0835e97cfcbf..43a46a81da9b 100644 --- a/www/wget2/pkg-plist +++ b/www/wget2/pkg-plist @@ -1,64 +1,65 @@ bin/wget2 bin/wget2_noinstall include/wget.h include/wgetver.h lib/libwget.a lib/libwget.so -lib/libwget.so.3 -lib/libwget.so.3.0.0 +lib/libwget.so.4 +lib/libwget.so.4.0.0 libdata/pkgconfig/libwget.pc +%%NLS%%share/locale/ar/LC_MESSAGES/wget2.mo %%NLS%%share/locale/ca/LC_MESSAGES/wget2.mo %%NLS%%share/locale/cs/LC_MESSAGES/wget2.mo %%NLS%%share/locale/de/LC_MESSAGES/wget2.mo %%NLS%%share/locale/eo/LC_MESSAGES/wget2.mo %%NLS%%share/locale/es/LC_MESSAGES/wget2.mo %%NLS%%share/locale/et/LC_MESSAGES/wget2.mo %%NLS%%share/locale/fi/LC_MESSAGES/wget2.mo %%NLS%%share/locale/fr/LC_MESSAGES/wget2.mo %%NLS%%share/locale/ga/LC_MESSAGES/wget2.mo %%NLS%%share/locale/hr/LC_MESSAGES/wget2.mo %%NLS%%share/locale/hu/LC_MESSAGES/wget2.mo %%NLS%%share/locale/id/LC_MESSAGES/wget2.mo %%NLS%%share/locale/it/LC_MESSAGES/wget2.mo %%NLS%%share/locale/ja/LC_MESSAGES/wget2.mo %%NLS%%share/locale/ka/LC_MESSAGES/wget2.mo %%NLS%%share/locale/ko/LC_MESSAGES/wget2.mo %%NLS%%share/locale/ms/LC_MESSAGES/wget2.mo %%NLS%%share/locale/nb/LC_MESSAGES/wget2.mo %%NLS%%share/locale/nl/LC_MESSAGES/wget2.mo %%NLS%%share/locale/pl/LC_MESSAGES/wget2.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/wget2.mo %%NLS%%share/locale/ro/LC_MESSAGES/wget2.mo %%NLS%%share/locale/ru/LC_MESSAGES/wget2.mo %%NLS%%share/locale/sk/LC_MESSAGES/wget2.mo %%NLS%%share/locale/sr/LC_MESSAGES/wget2.mo %%NLS%%share/locale/sv/LC_MESSAGES/wget2.mo %%NLS%%share/locale/tr/LC_MESSAGES/wget2.mo %%NLS%%share/locale/uk/LC_MESSAGES/wget2.mo %%NLS%%share/locale/vi/LC_MESSAGES/wget2.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/wget2.mo %%MANPAGES%%share/man/man1/wget2.1.gz %%DOXYGEN%%share/man/man3/libwget-base64.3.gz %%DOXYGEN%%share/man/man3/libwget-bitmap.3.gz %%DOXYGEN%%share/man/man3/libwget-console.3.gz %%DOXYGEN%%share/man/man3/libwget-dns-caching.3.gz %%DOXYGEN%%share/man/man3/libwget-dns.3.gz %%DOXYGEN%%share/man/man3/libwget-error.3.gz %%DOXYGEN%%share/man/man3/libwget-hash.3.gz %%DOXYGEN%%share/man/man3/libwget-hashmap.3.gz %%DOXYGEN%%share/man/man3/libwget-io.3.gz %%DOXYGEN%%share/man/man3/libwget-ip.3.gz %%DOXYGEN%%share/man/man3/libwget-list.3.gz %%DOXYGEN%%share/man/man3/libwget-mem.3.gz %%DOXYGEN%%share/man/man3/libwget-net.3.gz %%DOXYGEN%%share/man/man3/libwget-parse_atom.3.gz %%DOXYGEN%%share/man/man3/libwget-parse_sitemap.3.gz %%DOXYGEN%%share/man/man3/libwget-printf.3.gz %%DOXYGEN%%share/man/man3/libwget-random.3.gz %%DOXYGEN%%share/man/man3/libwget-robots.3.gz %%DOXYGEN%%share/man/man3/libwget-stringmap.3.gz %%DOXYGEN%%share/man/man3/libwget-thread.3.gz %%DOXYGEN%%share/man/man3/libwget-utils.3.gz %%DOXYGEN%%share/man/man3/libwget-vector.3.gz %%DOXYGEN%%share/man/man3/libwget-xalloc.3.gz %%DOXYGEN%%share/man/man3/libwget-xml.3.gz