git: 29a794c2b890 - main - www/elinks: fix build with CSS option on
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 16 Sep 2024 20:20:36 UTC
The branch main has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=29a794c2b8900c8a650dc67e8b138d4e9e470a24
commit 29a794c2b8900c8a650dc67e8b138d4e9e470a24
Author: John Hein <jcfyecrayz@liamekaens.com>
AuthorDate: 2024-09-12 10:07:23 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
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