From nobody Tue Jun 14 09:42: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 8780E847610; Tue, 14 Jun 2022 09:42: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 4LMk4H3R99z3L8q; Tue, 14 Jun 2022 09:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655199743; 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=szuBkL/HsNo0uLSO5v8okbZ13zKIMx1qCe3F9CiQ95Y=; b=kRKmDWd97unmYVfW2CZqn8JM3EU0fktrmIN3S+OLP0R2/gq3dGaiQVe0xBLvIF+y6jjbWp CdO35b6/7zHB2K8xxqeJw7HQXqi5ayavR2h0llqVxc7oLcZY1NLjMDmnU/R3gGho+FuNOL yckBGcuj9pVMa8RQjDSttLhth28Q+5COe4ZLGHdCRXEVk9JwWAojx/aPBh2Hhbz+S1dpCh 2DyLyydYHH8LI5e7fPPcNFvabSTFtBWigyLnlwfHRR+2XA524jXzJ5bOklOUX2PQkQFEtc Wfkh2tI3tjrENgGOuCCub+6+DO4JPcuzFl/CSitd2ReymBsK0aeKeC+9me/4eQ== 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 4BAF2278E6; Tue, 14 Jun 2022 09:42: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 25E9gNoW071165; Tue, 14 Jun 2022 09:42:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25E9gN5t071164; Tue, 14 Jun 2022 09:42:23 GMT (envelope-from git) Date: Tue, 14 Jun 2022 09:42:23 GMT Message-Id: <202206140942.25E9gN5t071164@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: 93992337df3d - main - www/elinks: fix handing of several non-default options 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: 93992337df3df24e2fb7788a3157a885ffc4b408 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655199743; 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=szuBkL/HsNo0uLSO5v8okbZ13zKIMx1qCe3F9CiQ95Y=; b=C35f15qRIRupyJITXzgV2WE2fIvmWy7hGj5qN5biwIF5nhUPtp0q+bgfapt1T2hU88UV2K //98WDY4wXCDBYa7vAjGwWR9rfcxW1m798Yl1925r+bZwdgrZ7Hw2YY/0+iboeI5OlJuEc MZ309BxReiO2GO3VwJfyBkFy8xfOQKRJ1XcP5SuOTYFBHFPnPKTeI9y83WSusokAoLKK2X GdKYg2XdyRCUyaXNO37MIbVWFqDfiKaYPLA/otxdqEhsoW0wyI9bW+8dPS81mfk5GlNKLw zH7nEsdYhj+sqBkXj12dQHIaYHgJnL63dtlzWveLPjqgMs26ybVl7ymBTigc6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655199743; a=rsa-sha256; cv=none; b=wx0a2q31oznWBpwpJfJeSG7KMSsFh5defxXI0jfqlLXvr1L5IVGNrf8ySgKh/5nm9Mr1C9 7n5iJ0XZ4MN5XX0vuKzo9iLoRW1Anwwh/dNBZ48Fs1+Ziex3aeQYFl4m+lwYqeZ8nNpHw2 1+92OsD4RESqV16ldJN1OAzdwkboYm2BGFK7TAtsNVOMdwcViTgXHOm9btQObtUit7p/M+ FTC2QbY/MiPijMDK/KCs6UvxOhUfa94G8zD23+C1Ww7LUfxpdO48KLJTfGunl3H5O4H80Q mKJw2vmAKC2O9NWBDZKxpozWb8A0HW9nyn7JPDGJnrOLow+tov22TEymxPpJnA== 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=93992337df3df24e2fb7788a3157a885ffc4b408 commit 93992337df3df24e2fb7788a3157a885ffc4b408 Author: Alexey Dokuchaev AuthorDate: 2022-06-14 09:40:36 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-06-14 09:40:36 +0000 www/elinks: fix handing of several non-default options - Depend on the correct Guile 3.x library name - Prefer our default Lua version and pass it to the configure script the way it expects (*) - Add `pkgconfig' to the global USES list since it is commonly used during configure, and limit `localbase' to the only option that actually needs it (IDN) - Drop no longer useful `--with-expat' and redundant `-pthread' PR: 226878 (*) --- www/elinks/Makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/www/elinks/Makefile b/www/elinks/Makefile index 392077f5c50f..4ff9a066ba88 100644 --- a/www/elinks/Makefile +++ b/www/elinks/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes -USES= autoreconf bison:alias cpe gmake localbase ssl +USES= autoreconf bison:alias cpe gmake pkgconfig ssl CONFIGURE_ARGS= --without-zlib USE_GITHUB= yes @@ -41,13 +41,11 @@ FASTMEM_DESC= Fast memory allocation functions NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls -GUILE_LIB_DEPENDS= libguile.so:lang/guile +GUILE_LIB_DEPENDS= libguile-3.0.so:lang/guile GUILE_CONFIGURE_WITH= guile -LUA_USES= lua:51 -LUA_CONFIGURE_WITH= lua -LUA_CPPFLAGS= -I${LUA_INCDIR} -LUA_LDFLAGS= -L${LUA_LIBDIR} +LUA_USES= lua +LUA_CONFIGURE_ON= --with-luapkg=lua-${LUA_VER} PERL_USES= perl5 PERL_CONFIGURE_WITH= perl @@ -55,6 +53,7 @@ PERL_CONFIGURE_WITH= perl FASTMEM_CONFIGURE_ON= --enable-fastmem IDN_LIB_DEPENDS= libidn.so:dns/libidn +IDN_USES= localbase IDN_CONFIGURE_WITH= idn NOROOT_CONFIGURE_ON= --enable-no-root @@ -85,7 +84,6 @@ FINGER_CONFIGURE_ENABLE= finger LOCAL_CGI_CONFIGURE_ENABLE= cgi XBELMARKS_LIB_DEPENDS= libexpat.so:textproc/expat2 -XBELMARKS_CONFIGURE_ON= --enable-xbel --with-expat XBELMARKS_CONFIGURE_OFF=--disable-xbel 256COLORS_CONFIGURE_ON= --enable-256-colors @@ -97,7 +95,7 @@ SPIDERMONKEY_RUN_DEPENDS= js:lang/spidermonkey17 SPIDERMONKEY_LIB_DEPENDS= libnspr4.so:devel/nspr SPIDERMONKEY_CFLAGS= -I${LOCALBASE}/include/nspr \ -I${LOCALBASE}/include/js-1.7 -SPIDERMONKEY_LDFLAGS= -lnspr4 -pthread -lpthread -lm +SPIDERMONKEY_LDFLAGS= -L${LOCALBASE}/lib -lnspr4 -lpthread -lm SPIDERMONKEY_CONFIGURE_ON= --enable-sm-scripting --with-spidermonkey SPIDERMONKEY_CONFIGURE_OFF= --disable-sm-scripting --without-spidermonkey