From nobody Mon Sep 16 20:20:36 2024 X-Original-To: dev-commits-ports-main@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 4X6x9x3LNBz5Wswk; Mon, 16 Sep 2024 20:20:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X6x9x0NG1z40w8; Mon, 16 Sep 2024 20:20:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726518037; 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=yW/hJZyHNATJ9mnva3C9lZ+OF9gf7XXkVx6U4Wv5YSU=; b=JeWmYQ1j28iWYSDYxY50hH92a8ePzZpKoiThVhk8r73PVkY9MR4w7SdaAcugrJXnPuxD89 ylkPnyRcdKmzw/7VUcac/9zSGfaXxm/iuauD1P05cWKC6wwCpoZ4mFCqlVpWvmbQNVDnpb HLdVRRcB9r4rIjJrfzdzfQIQscgo+feq6tGd2EZjhPGtwi8cRWVvg5qzWSLSjwVPwFOk4o DPXu9nk2E1MubBvpzwPq01g3QFU7K7U8LSjJfb/aainie0gkgZH58USKGxmr5ZyvxZC0S/ wNi2bDLjwg6xkie2jmir0qgSVngx3MU8l3SpLHcf5VquxhiXveygDBTnoh6nNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726518037; a=rsa-sha256; cv=none; b=EzgVoC9LD4Lx/2WQ3awsLovkIRaiC3s8xmXLWy9k2oJZb1W/mlDOMeyvN9UoUAG0iLR1ca Pin4EUkeV9j0bsGNYYnpQ266PLdHh0fHIEjMRrLNj68K28ORSJnqTF5ET+oVTGGB3vayH0 dtrK5LyLU7IuCrg55gDUMZ8tYscwgvYfdkLLM9pE4/5R4jg67cy5aO7LD4tEsAZnS68LNg u3lobSzEsHw/LYWYXk1baVQyfeSnF4mCTohRV8NFaLmv7GgPa6zgerv5UjpWrZq2r+48ha ld0yN2dIRRP6jLCWPKX9FR4zHDWXJqVW9S9ByJuO3gkblsRQUpdr/3BxLl/O5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726518037; 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=yW/hJZyHNATJ9mnva3C9lZ+OF9gf7XXkVx6U4Wv5YSU=; b=BWjYcAsibcFPl0nXxBdfCEM4BMziKC4EPmzy81tC8twN62p27q0Ps7+20V9vy0wNDHObql Z8M+hdhdnWqBWX1bdgjUjnYlORDoidA9BU76ubh7mkS1A/Wax06Qy1GHdyTK7MuUl/92dp 2OmFXnwh9OyPzOesUcduRu53Fve73pxO4WENbJ38+Bmt2p7vesAnKZp7yyn+qrmuS+OoeR ngD1gSbhGibEwURqcJq+lYLvTilfcXjCRvSzv+HDNykrD3dWynrXVE/0QmM5bFn/1jtWFb mIWTFzkRKwGZR4a+SAc6bDbPRgpoio7YxVG6pSIXfNgw73Zm65yXUMm/RvDhDw== 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 4X6x9w74DCz1810; Mon, 16 Sep 2024 20:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48GKKaJb065020; Mon, 16 Sep 2024 20:20:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48GKKaPL065017; Mon, 16 Sep 2024 20:20:36 GMT (envelope-from git) Date: Mon, 16 Sep 2024 20:20:36 GMT Message-Id: <202409162020.48GKKaPL065017@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 29a794c2b890 - main - www/elinks: fix build with CSS option on List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29a794c2b8900c8a650dc67e8b138d4e9e470a24 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=29a794c2b8900c8a650dc67e8b138d4e9e470a24 commit 29a794c2b8900c8a650dc67e8b138d4e9e470a24 Author: John Hein AuthorDate: 2024-09-12 10:07:23 +0000 Commit: Robert Clausecker CommitDate: 2024-09-16 20:14:25 +0000 www/elinks: fix build with CSS option on - add upstream patch to support libcss 0.9.2 and libdom 0.4.2 - appease stage-qa and add libwapcaplet to LIB_DEPENDS - also address some LIB_DEPENDS needed or no longer needed (also found by stage-qa): - libintl.so is not directly used by elinks, so change USES=gettext to USES=gettext-runtime:build - nspr is no longer needed by elinks in 0.17.0 (or perhaps earlier) - libxml++ is no longer needed by elinks in 0.17.0 (or perhaps earlier) - libmozjs should have been a LIB_DEPENDS item (with SPIDERMONKEY on) - add it - gettext-tools is also needed (only a build time dependency by default) as msgfmt is invoked during the build. - option SPIDERMONKEY now depends on option CSS PR: 281215 MFH: 2024Q3 Approved by: jailbird@fdf.net (maintainer) --- www/elinks/Makefile | 26 +++++++++++++------------- www/elinks/distinfo | 4 +++- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/www/elinks/Makefile b/www/elinks/Makefile index 832c237b9ae1..93ff2a7915b8 100644 --- a/www/elinks/Makefile +++ b/www/elinks/Makefile @@ -1,7 +1,7 @@ PORTNAME= elinks DISTVERSIONPREFIX= v DISTVERSION= 0.17.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= jailbird@fdf.net @@ -54,8 +54,12 @@ BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli BROTLI_MESON_TRUE= brotli CSS_LIB_DEPENDS= libcss.so:textproc/libcss \ - libdom.so:www/libdom + libdom.so:www/libdom \ + libwapcaplet.so:textproc/libwapcaplet CSS_MESON_TRUE= libcss +# support libcss 0.9.2, libdom 0.4.2 for elinks 0.17.0 +CSS_PATCHFILES= 2fdb04a6ab5523b94c4bd5c0062b0701686e127f.patch:-p1 +CSS_PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_MESON_TRUE= libcurl @@ -92,7 +96,7 @@ LZMA_MESON_TRUE= lzma MOUSE_MESON_TRUE= mouse -NLS_USES= gettext +NLS_USES= gettext-runtime:build gettext-tools NLS_MESON_TRUE= nls NNTP_MESON_TRUE= nntp @@ -103,17 +107,13 @@ SMB_USES= samba # smbclient SMB_MESON_TRUE= smb SPIDERMONKEY_USES= compiler:c++17-lang sqlite -SPIDERMONKEY_BUILD_DEPENDS= ${LOCALBASE}/lib/libmozjs-102.so:lang/spidermonkey102 \ - ${LOCALBASE}/lib/libxml++-5.0.so:textproc/libxml++ -SPIDERMONKEY_LIB_DEPENDS= libnspr4.so:devel/nspr \ - libxml++-5.0.so:textproc/libxml++ -SPIDERMONKEY_CFLAGS= -I${LOCALBASE}/include/nspr \ - -I${LOCALBASE}/include/js-102 -SPIDERMONKEY_CXXFLAGS= -I${LOCALBASE}/include/nspr \ - -I${LOCALBASE}/include/js-102 -SPIDERMONKEY_LDFLAGS= -L${LOCALBASE}/lib -lnspr4 -lpthread -lm +SPIDERMONKEY_BUILD_DEPENDS= ${LOCALBASE}/lib/libmozjs-102.so:lang/spidermonkey102 +SPIDERMONKEY_LIB_DEPENDS= libmozjs-102.so:lang/spidermonkey102 +SPIDERMONKEY_CFLAGS= -I${LOCALBASE}/include/js-102 +SPIDERMONKEY_CXXFLAGS= -I${LOCALBASE}/include/js-102 +SPIDERMONKEY_LDFLAGS= -L${LOCALBASE}/lib -lpthread -lm SPIDERMONKEY_MESON_ON= -Dsm-scripting=true -Dspidermonkey=true -SPIDERMONKEY_IMPLIES= CURL +SPIDERMONKEY_IMPLIES= CSS CURL TRE_LIB_DEPENDS= libtre.so:textproc/libtre TRE_MESON_TRUE= tre diff --git a/www/elinks/distinfo b/www/elinks/distinfo index 5859cc0da016..de6f1b06c1fc 100644 --- a/www/elinks/distinfo +++ b/www/elinks/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1703503620 +TIMESTAMP = 1725369974 SHA256 (rkd77-elinks-v0.17.0_GH0.tar.gz) = 250a55198bb3e16a49a52fde85ffc54f1e654b7615369467725a3d74bc469f22 SIZE (rkd77-elinks-v0.17.0_GH0.tar.gz) = 4006073 +SHA256 (2fdb04a6ab5523b94c4bd5c0062b0701686e127f.patch) = 9aa25bdcadf99d8c43a7cce932b24a33f0c8eda448e5f132f1010d1ba9c667d0 +SIZE (2fdb04a6ab5523b94c4bd5c0062b0701686e127f.patch) = 5932