1 files changed, 47 insertions, 41 deletions

diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 82bf889d751f..224bfb88ca96 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	elinks
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.16.1.1
-PORTREVISION=	1
+DISTVERSION=	0.17.0
 CATEGORIES=	www
 
 MAINTAINER=	jailbird@fdf.net
@@ -20,9 +19,9 @@ GH_ACCOUNT=	rkd77
 LDFLAGS+=	-lexecinfo
 MESON_ARGS=	-Dgpm=false -Dperl=true
 
-OPTIONS_DEFINE=		256COLORS 88COLORS TRUECOLORS BITTORRENT BROTLI EXMODE \
-			FASTMEM FINGER FSP FTP GOPHER GUILE HIGHLIGHT \
-			IDN LOCAL_CGI LUA LZMA MOUSE NLS NNTP NOROOT \
+OPTIONS_DEFINE=		256COLORS 88COLORS TRUECOLORS BITTORRENT BROTLI CSS \
+			CURL EXMODE FASTMEM FINGER FSP FTP GOPHER GUILE \
+			HIGHLIGHT IDN LOCAL_CGI LUA LZMA MOUSE NLS NNTP NOROOT \
 			SMB SPIDERMONKEY TRE XBELMARKS ZSTD
 OPTIONS_DEFAULT=	256COLORS 88COLORS BROTLI EXMODE FASTMEM FTP \
 			HIGHLIGHT LZMA MOUSE
@@ -31,44 +30,40 @@ OPTIONS_SUB=		yes
 88COLORS_DESC=		88 color support
 256COLORS_DESC=		256 color support
 TRUECOLORS_DESC=	True color support
-SPIDERMONKEY_DESC=	ECMAScript support (via SpiderMonkey)
-XBELMARKS_DESC=		XBEL bookmarks (via expat)
-LOCAL_CGI_DESC=		Local CGI support
-FSP_DESC=		FSP protocol support (via fsplib)
+CSS_DESC=		Cascading Style Sheets support (via libcss & libdom)
 EXMODE_DESC=		Exmode (CLI) support
+FASTMEM_DESC=		Fast memory allocation functions
+FSP_DESC=		FSP protocol support (via fsplib)
 HIGHLIGHT_DESC=		HTML highlighting using DOM engine
+LOCAL_CGI_DESC=		Local CGI support
 NOROOT_DESC=		Prevention of usage by root
-FASTMEM_DESC=		Fast memory allocation functions
+SPIDERMONKEY_DESC=	ECMAScript support (via SpiderMonkey)
 TRE_DESC=		TRE regex search support
+XBELMARKS_DESC=		XBEL bookmarks (via expat)
 
-BROTLI_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli
-BROTLI_MESON_TRUE=	brotli
-
-NLS_USES=		gettext
-NLS_MESON_TRUE=		nls
-
-GUILE_USES=		guile:3.0
-GUILE_MESON_TRUE=	guile
+256COLORS_MESON_TRUE=	256-colors
 
-LUA_USES=		lua:52-53
-LUA_MESON_ON=		-Dluapkg=lua-${LUA_VER}
+88COLORS_MESON_TRUE=	88-colors
 
-LZMA_MESON_TRUE=	lzma
+TRUECOLORS_MESON_TRUE=	true-color
 
-FASTMEM_MESON_TRUE=	fastmem
+BITTORRENT_MESON_TRUE=	bittorrent
 
-IDN_LIB_DEPENDS=	libidn.so:dns/libidn
-IDN_USES=		localbase
-IDN_MESON_TRUE=		idn
+BROTLI_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli
+BROTLI_MESON_TRUE=	brotli
 
-NOROOT_MESON_TRUE=	no-root
+CSS_LIB_DEPENDS=	libcss.so:textproc/libcss \
+			libdom.so:www/libdom
+CSS_MESON_TRUE=		libcss
 
-HIGHLIGHT_MESON_TRUE=	html-highlight
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+CURL_MESON_TRUE=	libcurl
 
 EXMODE_MESON_TRUE=	exmode
 
-SMB_USES=		samba # smbclient
-SMB_MESON_TRUE=		smb
+FASTMEM_MESON_TRUE=	fastmem
+
+FINGER_MESON_TRUE=	finger
 
 FSP_RUN_DEPENDS=	${LOCALBASE}/lib/libfsplib.a:net/fsplib
 FSP_BUILD_DEPENDS=	${LOCALBASE}/lib/libfsplib.a:net/fsplib
@@ -76,26 +71,35 @@ FSP_MESON_TRUE=		fsp
 
 FTP_MESON_TRUE=		ftp
 
-NNTP_MESON_TRUE=	nntp
-
-BITTORRENT_MESON_TRUE=	bittorrent
-
 GOPHER_MESON_TRUE=	gopher
 
-MOUSE_MESON_TRUE=	mouse
+GUILE_USES=		guile:3.0
+GUILE_MESON_TRUE=	guile
 
-FINGER_MESON_TRUE=	finger
+HIGHLIGHT_MESON_TRUE=	html-highlight
+
+IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
+IDN_USES=		localbase
+IDN_MESON_TRUE=		idn
 
 LOCAL_CGI_MESON_TRUE=	cgi
 
-XBELMARKS_LIB_DEPENDS=	libexpat.so:textproc/expat2
-XBELMARKS_MESON_TRUE=	xbel
+LUA_USES=		lua:52-53
+LUA_MESON_ON=		-Dluapkg=lua-${LUA_VER}
 
-256COLORS_MESON_TRUE=	256-colors
+LZMA_MESON_TRUE=	lzma
 
-88COLORS_MESON_TRUE=	88-colors
+MOUSE_MESON_TRUE=	mouse
 
-TRUECOLORS_MESON_TRUE=	true-color
+NLS_USES=		gettext
+NLS_MESON_TRUE=		nls
+
+NNTP_MESON_TRUE=	nntp
+
+NOROOT_MESON_TRUE=	no-root
+
+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 \
@@ -112,12 +116,14 @@ SPIDERMONKEY_MESON_ON=		-Dsm-scripting=true -Dspidermonkey=true
 TRE_LIB_DEPENDS=	libtre.so:textproc/libtre
 TRE_MESON_TRUE=		tre
 
+XBELMARKS_LIB_DEPENDS=	libexpat.so:textproc/expat2
+XBELMARKS_MESON_TRUE=	xbel
+
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_USES=		localbase
 ZSTD_MESON_TRUE=	zstd
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%OPENSSLLIB%%|${OPENSSLLIB}|g' ${WRKSRC}/meson.build
 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|g' ${WRKSRC}/doc/tools/help2xml
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python3|${PYTHON_CMD}|g' ${WRKSRC}/doc/tools/asciidoc/asciidoc.py