From nobody Thu Jun 16 15:07:23 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7869E834DA1; Thu, 16 Jun 2022 15:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LP5BM2tGGz4VKY; Thu, 16 Jun 2022 15:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655392043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ty/oeKotTzt8oovaKp24CBqjfFNkDB5wMnECTrSrnoM=; b=nyzlm7guVJUbJjzzKBhK/JiI3SE4HP2klxsJBJqyAt0rA3cdFnfR1eVJ8EgOqO8rz5kdVa FOfN+Tyoz7/acyfshjk/hIMEnRdFPHsJvjy0caZKKnBsbGMjRrDzglmTwry9x7FWFeRaOB 3N/rbH5wutCOxWCJCGYHQqRqhlMp5MVRHr2srjQPFI6AVnLlD1H8KAX/qzlnXMS9uRKMtN pXj8SQWUMGpupyOVT4EZLaJeboM5QCN4ucPdjBnULwz92JHDF4YZYlE41qWycTSLx/QqVO uqpewAO49f3dePq9VQ/c3JQ9QKEeiCa2z9jZmhwYofMRUbAJw6omjLzq4hFL/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4257D5969; Thu, 16 Jun 2022 15:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25GF7Nq8097948; Thu, 16 Jun 2022 15:07:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25GF7Nq9097947; Thu, 16 Jun 2022 15:07:23 GMT (envelope-from git) Date: Thu, 16 Jun 2022 15:07:23 GMT Message-Id: <202206161507.25GF7Nq9097947@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 72fa35d5cb53 - main - www/elinks: improve support for various available (de)compressors List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72fa35d5cb531c78702fc467df019369e3676eff Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655392043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ty/oeKotTzt8oovaKp24CBqjfFNkDB5wMnECTrSrnoM=; b=Vtif/47OldEfnwGRf7+wkm1Y+TvAYST6sMqBknhjuu8iFGH+aOtnsP+TgNl+6tyzZD36Ll xwk+K18X+5j8eMbgkrA8HnZz1leAc6DC8oN3NCHNh0yvvaItaYjJFtosRWELSlljC9vEzF 5SwVTyjIVi6cJnZDzi8UR4YIt5VXlsRJ8VRsAmEf7+s05or4colnmyTGUqdEH2GmQFqyE+ t15YpEiud3+LUh3ERPDoY9y6UfC+aKBJlRTG4rnVa9Fy5QuergXwe45xu7cnL3vrNW/rk+ mTj/T/E6xLSNftzwuPufJQ9I0agYHJ2goe8FaqqgOhKYF1UsAJbsLngojkH/CQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655392043; a=rsa-sha256; cv=none; b=SMBrDpaPGT9mPyabdOXYy3eB6MgoWlxGYa+Q6Aj7c0WrOMaIb+fitFSl765eyWa1ZAqVUG z0yUd65pIVDrFeNwgnNRCUiGdYvQeYyNFDZXG7p3raFrMJNVyGAiXdj61RsBPN2vd4pvnr se1ip3l+yNjWfY2TbcncvYrIORh0DKNemHfD5xuvyijl6yQxMeaS1SjQ4zuSIsu6E3r/Kd wlfSM9NAVjGcDjdnWkPShL7YRAczt6T6qbhCBubX4q/is3fw1Hh8GSu4pJ3TZY6SOvW933 Fjmd7fMYoHOfMJPK5M2t03ht+bZWEB+U/4m5kqgPvhEEteboyCXXHZU7WCV5Tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=72fa35d5cb531c78702fc467df019369e3676eff commit 72fa35d5cb531c78702fc467df019369e3676eff Author: Alexey Dokuchaev AuthorDate: 2022-06-16 15:05:44 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-06-16 15:05:44 +0000 www/elinks: improve support for various available (de)compressors - Build with zlib support (looking at the commit history, it is unclear why it was disabled in the first place) - Add BROTLI, LZMA, and ZSTD options; disable the latter by default as it is being described as experimental in the configure script - Drop ICONV option as it typically does not pull additional dependency but is required for the BROTLI option (at least) - While here, sort the OPTIONS_* lists alphabetically as appropriate --- www/elinks/Makefile | 24 +++++++++++++++--------- www/elinks/files/patch-configure.ac | 12 ++++++++++-- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/www/elinks/Makefile b/www/elinks/Makefile index 4ff9a066ba88..2365c6fb3d1f 100644 --- a/www/elinks/Makefile +++ b/www/elinks/Makefile @@ -12,19 +12,19 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes -USES= autoreconf bison:alias cpe gmake pkgconfig ssl -CONFIGURE_ARGS= --without-zlib +USES= autoreconf bison:alias cpe gmake iconv pkgconfig ssl USE_GITHUB= yes GH_ACCOUNT= rkd77 LIBS+= -lexecinfo -OPTIONS_DEFINE= 88COLORS 256COLORS SPIDERMONKEY XBELMARKS LOCAL_CGI \ - FINGER GOPHER BITTORRENT NNTP FTP FSP SMB EXMODE \ - HIGHLIGHT IDN NOROOT FASTMEM PERL \ - LUA GUILE ICONV MOUSE NLS -OPTIONS_DEFAULT= 88COLORS 256COLORS FTP EXMODE HIGHLIGHT FASTMEM MOUSE +OPTIONS_DEFINE= 256COLORS 88COLORS BITTORRENT BROTLI EXMODE \ + FASTMEM FINGER FSP FTP GOPHER GUILE HIGHLIGHT \ + IDN LOCAL_CGI LUA LZMA MOUSE NLS NNTP NOROOT \ + PERL SMB SPIDERMONKEY XBELMARKS ZSTD +OPTIONS_DEFAULT= 256COLORS 88COLORS BROTLI EXMODE FASTMEM FTP \ + HIGHLIGHT LZMA MOUSE OPTIONS_SUB= yes 88COLORS_DESC= 88 color support @@ -38,6 +38,9 @@ HIGHLIGHT_DESC= HTML highlighting using DOM engine NOROOT_DESC= Prevention of usage by root FASTMEM_DESC= Fast memory allocation functions +BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli +BROTLI_CONFIGURE_ON= --with-brotli + NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls @@ -47,6 +50,8 @@ GUILE_CONFIGURE_WITH= guile LUA_USES= lua LUA_CONFIGURE_ON= --with-luapkg=lua-${LUA_VER} +LZMA_CONFIGURE_ON= --with-lzma + PERL_USES= perl5 PERL_CONFIGURE_WITH= perl @@ -99,7 +104,8 @@ SPIDERMONKEY_LDFLAGS= -L${LOCALBASE}/lib -lnspr4 -lpthread -lm SPIDERMONKEY_CONFIGURE_ON= --enable-sm-scripting --with-spidermonkey SPIDERMONKEY_CONFIGURE_OFF= --disable-sm-scripting --without-spidermonkey -ICONV_USES= iconv -ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} +ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd +ZSTD_USES= localbase +ZSTD_CONFIGURE_ON= --with-zstd .include diff --git a/www/elinks/files/patch-configure.ac b/www/elinks/files/patch-configure.ac index e7db5138422c..3c9bfe209491 100644 --- a/www/elinks/files/patch-configure.ac +++ b/www/elinks/files/patch-configure.ac @@ -1,6 +1,14 @@ ---- configure.ac.orig 2022-01-29 19:43:50 UTC +--- configure.ac.orig 2021-12-24 19:53:43 UTC +++ configure.ac -@@ -1861,7 +1861,7 @@ if test "x$ac_cv_c_compiler_gnu" = "xyes"; then +@@ -531,6 +531,7 @@ else + if $PKG_CONFIG $pkg_config_static libbrotlidec; then + BROTLI_CFLAGS=`$PKG_CONFIG $pkg_config_static --cflags libbrotlidec` + BROTLI_LIBS=`$PKG_CONFIG $pkg_config_static --libs libbrotlidec` ++ CFLAGS="$BROTLI_CFLAGS $CFLAGS" + LIBS="$BROTLI_LIBS $LIBS" + CONFIG_BROTLI=yes + AC_DEFINE([CONFIG_BROTLI], [1], [Define as 1 to use the libbrotli library.]) +@@ -1861,7 +1862,7 @@ if test "x$ac_cv_c_compiler_gnu" = "xyes"; then ;; 10|10.*|11|11.*) # gettext