Date: Fri, 9 Dec 2022 20:29:40 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7911950dd9bb - main - =?utf-8?Q?www/wget2:=20update=202.0.0=20=E2=86=92=202.0.1?= Message-ID: <202212092029.2B9KTeIx087754@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=7911950dd9bbbe60a7618659115f80671ff5b51a commit 7911950dd9bbbe60a7618659115f80671ff5b51a Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2022-12-09 15:18:16 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2022-12-09 20:27:38 +0000 www/wget2: update 2.0.0 → 2.0.1 --- www/wget2/Makefile | 39 +++++++------ www/wget2/distinfo | 6 +- www/wget2/files/patch-Makefile.am | 11 ---- www/wget2/files/patch-configure.ac | 12 ---- www/wget2/files/patch-docs_libwget.doxy.in | 11 ++++ www/wget2/pkg-plist | 92 ------------------------------ 6 files changed, 37 insertions(+), 134 deletions(-) diff --git a/www/wget2/Makefile b/www/wget2/Makefile index af8227ad8e61..7f479f1e44de 100644 --- a/www/wget2/Makefile +++ b/www/wget2/Makefile @@ -1,6 +1,5 @@ PORTNAME= wget2 -DISTVERSION= 2.0.0 -PORTREVISION= 4 +DISTVERSION= 2.0.1 CATEGORIES= www MASTER_SITES= GNU/wget @@ -13,19 +12,22 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING LICENSE_FILE_LGPL3+ = ${WRKSRC}/COPYING.LESSER -USES= autoreconf charsetfix cpe iconv libtool:build localbase pkgconfig tar:lz +USES= autoreconf charsetfix cpe gmake iconv libtool:build localbase pkgconfig tar:lz CPE_VENDOR= gnu CPE_PRODUCT= wget GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-lz # not in ports yet +CONFIGURE_ARGS+=--without-libidn # only libidn2 is used INSTALL_TARGET= install-strip USE_LDCONFIG= yes -OPTIONS_DEFINE= IDN MANPAGES DOXYGEN NLS PSL NGHTTP2 BROTLI ZSTD GPGME TEST HSTS -OPTIONS_RADIO= SSL PCRE -OPTIONS_RADIO_SSL=GNUTLS OPENSSL NOSSL # WOLFSSL +OPTIONS_DEFINE= IDN MANPAGES DOXYGEN NLS PSL NGHTTP2 GPGME TEST HSTS +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 NGHTTP2 BROTLI ZSTD GPGME TEST HSTS +OPTIONS_DEFAULT=IDN MANPAGES OPENSSL NLS PSL NGHTTP2 BROTLI ZSTD GPGME TEST HSTS LZMA BZIP2 OPTIONS_SUB= yes IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 @@ -61,20 +63,13 @@ NGHTTP2_DESC= Support HTTP/2.0 through libnghttp2 NGHTTP2_CONFIGURE_WITH= libnghttp2 NGHTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2 -BROTLI_CONFIGURE_WITH= brotlidec -BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli - -ZSTD_CONFIGURE_WITH= zstd -ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd - 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 \ - libgnutls.so:security/gnutls +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 @@ -94,6 +89,18 @@ 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 + post-patch-MANPAGES-off: @${REINPLACE_CMD} -e '/AC_CHECK_PROGS/ s|pandoc|&-not-found|' ${WRKSRC}/configure.ac diff --git a/www/wget2/distinfo b/www/wget2/distinfo index 4ebdf8646f48..fd31c07d8f17 100644 --- a/www/wget2/distinfo +++ b/www/wget2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1637155143 -SHA256 (wget2-2.0.0.tar.lz) = da95b1477fa4ede1ac712f179c1354d9624fbc91e778d89cf8d2ae46aa15e3d2 -SIZE (wget2-2.0.0.tar.lz) = 1956207 +TIMESTAMP = 1670516795 +SHA256 (wget2-2.0.1.tar.lz) = 2c942fba6a547997aa7aae0053b7c46a5203e311e4e62d305d575b6d2f06411f +SIZE (wget2-2.0.1.tar.lz) = 2059922 diff --git a/www/wget2/files/patch-Makefile.am b/www/wget2/files/patch-Makefile.am deleted file mode 100644 index 8311bf5c46eb..000000000000 --- a/www/wget2/files/patch-Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -Don't try run non-existing target during testing ---- Makefile.am.orig 2021-08-21 17:47:39 UTC -+++ Makefile.am -@@ -89,7 +89,6 @@ fuzz-coverage: clean clean-lcov - @echo "You can now view the coverage report with 'xdg-open lcov/index.html'" - - check-local: -- $(AM_V_at)$(MAKE) -s syntax-check >/dev/null - $(AM_V_at)$(srcdir)/contrib/check_options $(srcdir)/docs/wget2.md $(builddir)/src/wget2$(EXEEXT) - - # ppl often forget to run ldconfig after an install, so let's do it here diff --git a/www/wget2/files/patch-configure.ac b/www/wget2/files/patch-configure.ac deleted file mode 100644 index 9a61f1d8b26f..000000000000 --- a/www/wget2/files/patch-configure.ac +++ /dev/null @@ -1,12 +0,0 @@ -Fix openssl library name ---- configure.ac.orig 2021-09-12 11:12:41 UTC -+++ configure.ac -@@ -503,7 +502,7 @@ AS_IF([test "$with_ssl" = "openssl" || (test "$with_ss - CFLAGS="$OPENSSL_CFLAGS $CFLAGS" - AC_DEFINE([WITH_OPENSSL], [1], [Use OpenSSL]) - ], [ -- AC_SEARCH_LIBS(SSL_CTX_new, openssl, -+ AC_SEARCH_LIBS(SSL_CTX_new, ssl, - [with_openssl=yes; AC_DEFINE([WITH_OPENSSL], [1], [Use OpenSSL])], - [AC_MSG_WARN(*** OpenSSL was not found.) - ]) diff --git a/www/wget2/files/patch-docs_libwget.doxy.in b/www/wget2/files/patch-docs_libwget.doxy.in new file mode 100644 index 000000000000..79c0a7c034f9 --- /dev/null +++ b/www/wget2/files/patch-docs_libwget.doxy.in @@ -0,0 +1,11 @@ +--- docs/libwget.doxy.in.orig 2022-02-27 18:30:34 UTC ++++ docs/libwget.doxy.in +@@ -718,7 +718,7 @@ SHOW_NAMESPACES = YES + # by doxygen. Whatever the program writes to standard output is used as the file + # version. For an example see the documentation. + +-FILE_VERSION_FILTER = "/bin/sh -c 'git log --pretty=\"format:%ci, (build %h)\" -1' \"${1}\"" ++FILE_VERSION_FILTER = + + # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed + # by doxygen. The layout file controls the global structure of the generated diff --git a/www/wget2/pkg-plist b/www/wget2/pkg-plist index 84151eddd13b..e9f9261eb437 100644 --- a/www/wget2/pkg-plist +++ b/www/wget2/pkg-plist @@ -6,98 +6,6 @@ lib/libwget.a lib/libwget.so lib/libwget.so.1 lib/libwget.so.1.0.0 -lib/libwget_alloc.a -lib/libwget_alloc.so -lib/libwget_alloc.so.1 -lib/libwget_alloc.so.1.0.0 -lib/libwget_common.a -lib/libwget_common.so -lib/libwget_common.so.1 -lib/libwget_common.so.1.0.0 -lib/libwget_css.a -lib/libwget_css.so -lib/libwget_css.so.1 -lib/libwget_css.so.1.0.0 -lib/libwget_decompress.a -lib/libwget_decompress.so -lib/libwget_decompress.so.1 -lib/libwget_decompress.so.1.0.0 -lib/libwget_dns.a -lib/libwget_dns.so -lib/libwget_dns.so.1 -lib/libwget_dns.so.1.0.0 -lib/libwget_dnscache.a -lib/libwget_dnscache.so -lib/libwget_dnscache.so.1 -lib/libwget_dnscache.so.1.0.0 -lib/libwget_encoding.a -lib/libwget_encoding.so -lib/libwget_encoding.so.1 -lib/libwget_encoding.so.1.0.0 -lib/libwget_hashfile.a -lib/libwget_hashfile.so -lib/libwget_hashfile.so.1 -lib/libwget_hashfile.so.1.0.0 -lib/libwget_hpkp_db.a -lib/libwget_hpkp_db.so -lib/libwget_hpkp_db.so.1 -lib/libwget_hpkp_db.so.1.0.0 -lib/libwget_hsts.a -lib/libwget_hsts.so -lib/libwget_hsts.so.1 -lib/libwget_hsts.so.1.0.0 -lib/libwget_http_parse.a -lib/libwget_http_parse.so -lib/libwget_http_parse.so.1 -lib/libwget_http_parse.so.1.0.0 -lib/libwget_io.a -lib/libwget_io.so -lib/libwget_io.so.1 -lib/libwget_io.so.1.0.0 -lib/libwget_ip.a -lib/libwget_ip.so -lib/libwget_ip.so.1 -lib/libwget_ip.so.1.0.0 -lib/libwget_iri.a -lib/libwget_iri.so -lib/libwget_iri.so.1 -lib/libwget_iri.so.1.0.0 -lib/libwget_logger.a -lib/libwget_logger.so -lib/libwget_logger.so.1 -lib/libwget_logger.so.1.0.0 -lib/libwget_metalink.a -lib/libwget_metalink.so -lib/libwget_metalink.so.1 -lib/libwget_metalink.so.1.0.0 -lib/libwget_netrc.a -lib/libwget_netrc.so -lib/libwget_netrc.so.1 -lib/libwget_netrc.so.1.0.0 -lib/libwget_ocsp.a -lib/libwget_ocsp.so -lib/libwget_ocsp.so.1 -lib/libwget_ocsp.so.1.0.0 -lib/libwget_progress.a -lib/libwget_progress.so -lib/libwget_progress.so.1 -lib/libwget_progress.so.1.0.0 -lib/libwget_robots.a -lib/libwget_robots.so -lib/libwget_robots.so.1 -lib/libwget_robots.so.1.0.0 -lib/libwget_thread.a -lib/libwget_thread.so -lib/libwget_thread.so.1 -lib/libwget_thread.so.1.0.0 -lib/libwget_tls_session.a -lib/libwget_tls_session.so -lib/libwget_tls_session.so.1 -lib/libwget_tls_session.so.1.0.0 -lib/libwget_xml.a -lib/libwget_xml.so -lib/libwget_xml.so.1 -lib/libwget_xml.so.1.0.0 libdata/pkgconfig/libwget.pc %%MANPAGES%%man/man1/wget2.1.gz %%DOXYGEN%%man/man3/libwget-base64.3.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212092029.2B9KTeIx087754>