Attachment #236443 for bug #266305




PORTNAME=	elinks
DISTVERSIONPREFIX=	v
DISTVERSION=	0.15.1
CATEGORIES=	www

MAINTAINER=	jailbird@fdf.net

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		bison:alias cpe gmake iconv pkgconfig ssl meson perl5 python:3.7+
USES=		autoreconf bison:alias cpe gmake iconv pkgconfig ssl

USE_GITHUB=	yes
GH_ACCOUNT=	rkd77

LIBS+=		-lexecinfo
CONIGURE_ENV=	PYTHON_PATH="${PYTHON_CMD}"
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 NLS NNTP NOROOT \
			SMB SPIDERMONKEY TRE XBELMARKS ZSTD
OPTIONS_DEFAULT=	256COLORS 88COLORS TRUECOLORS BROTLI EXMODE FASTMEM FTP \
			HIGHLIGHT LZMA
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

HIGHLIGHT_DESC=		HTML highlighting using DOM engine
NOROOT_DESC=		Prevention of usage by root
FASTMEM_DESC=		Fast memory allocation functions
TRE_DESC=		TRE regex search support

BROTLI_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli
BROTLI_MESON_TRUE=	brotli

NLS_USES=		gettext
NLS_MESON_TRUE=		nls

GUILE_LIB_DEPENDS=	libguile-3.0.so:lang/guile
GUILE_MESON_TRUE=	guile

LUA_USES=		lua
LUA_MESON_ON=		-Dluapkg=${LUA_VER}

LZMA_MESON_TRUE=	lzma

FASTMEM_MESON_TRUE=	fastmem
PERL_CONFIGURE_WITH=	perl

FASTMEM_CONFIGURE_ON=	--enable-fastmem

IDN_LIB_DEPENDS=	libidn.so:dns/libidn
IDN_USES=		localbase
IDN_MESON_TRUE=		idn

NOROOT_MESON_TRUE=	no-root

HIGHLIGHT_MESON_TRUE=	html-highlight

EXMODE_MESON_TRUE=	exmode

SMB_USES=		samba # smbclient
SMB_MESON_TRUE=		smb

FSP_RUN_DEPENDS=	${LOCALBASE}/lib/libfsplib.a:net/fsplib
FSP_BUILD_DEPENDS=	${LOCALBASE}/lib/libfsplib.a:net/fsplib
FSP_MESON_TRUE=		fsp

FTP_CONFIGURE_ENABLE=	ftp

FTP_MESON_TRUE=		ftp

NNTP_MESON_TRUE=	nntp

BITTORRENT_MESON_TRUE=	bittorrent

GOPHER_MESON_TRUE=	gopher

FINGER_MESON_TRUE=	finger

LOCAL_CGI_MESON_TRUE=	cgi

XBELMARKS_LIB_DEPENDS=	libexpat.so:textproc/expat2
XBELMARKS_MESON_TRUE=	xbel

256COLORS_MESON_TRUE=	256-colors

88COLORS_MESON_TRUE=	88-colors

TRUECOLORS_MESON_TRUE=	true-color

SPIDERMONKEY_BUILD_DEPENDS=	${LOCALBASE}/lib/libmozjs-78.so:lang/spidermonkey78
SPIDERMONKEY_RUN_DEPENDS=	js78:lang/spidermonkey78
SPIDERMONKEY_LIB_DEPENDS=	libnspr4.so:devel/nspr
SPIDERMONKEY_CFLAGS=		-I${LOCALBASE}/include/nspr \
				-I${LOCALBASE}/include/js-78
SPIDERMONKEY_CXXFLAGS=		-I${LOCALBASE}/include/nspr \
				-I${LOCALBASE}/include/js-78
SPIDERMONKEY_LDFLAGS=		-L${LOCALBASE}/lib -lnspr4 -lpthread -lm
SPIDERMONKEY_MESON_ON=		-Dsm-scripting=true -Dspidermonkey=true

TRE_LIB_DEPENDS=	libtre.so:textproc/libtre
TRE_MESON_TRUE=		tre

ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
ZSTD_USES=		localbase
ZSTD_MESON_TRUE=	zstd

post-patch:
	@${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

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/www/elinks/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1644995066	1	TIMESTAMP = 1659262740
2	SHA256 (rkd77-elinks-v0.15.0_GH0.tar.gz) = 49e261fb7a6b061b51ca38b7152712caba90c8eaa6996bcf4c00fe2867a7f366	2	SHA256 (rkd77-elinks-v0.15.1_GH0.tar.gz) = a3ebb14e179fcf97f93874b7771b4b05c1b7fdc704807334e865273d9de8428f
3	SIZE (rkd77-elinks-v0.15.0_GH0.tar.gz) = 3783388	3	SIZE (rkd77-elinks-v0.15.1_GH0.tar.gz) = 3860003




--- configure.ac.orig	2021-12-24 19:53:43 UTC
+++ configure.ac
@@ -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
-      CFLAGS="$CFLAGS -fno-strict-aliasing -Wno-builtin-declaration-mismatch -Wno-array-bounds"
+      CFLAGS="$CFLAGS -fno-strict-aliasing -Wno-array-bounds"
       ;;
     *)
       # These should be ok using -Werror

Added Link Here

(-)b/www/elinks/files/patch-src_intl_gettext_libintl.h (-1 / +11 lines)
0	-	1	--- src/intl/gettext/libintl.h.orig 2022-07-31 10:16:29 UTC
		2	+++ src/intl/gettext/libintl.h
		3	@@ -44,7 +44,7 @@ _(const char msg, struct terminal term)
		4	return (char *)gettext_noop(msg);
		5	}
		6
		7	-static inline char *
		8	+static inline const char *
		9	n_(const char msg1, const char msg2, unsigned long int n, struct terminal *term)
		10	{
		11	return gettext_noop(msg1);

Return to bug 266305

Lines 1-6 Link Here

(-)b/www/elinks/Makefile (-40 / +48 lines)
1	PORTNAME= elinks	1	PORTNAME= elinks
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.15.0	3	DISTVERSION= 0.15.1
4	CATEGORIES= www	4	CATEGORIES= www
5		5
6	MAINTAINER= jailbird@fdf.net	6	MAINTAINER= jailbird@fdf.net
Lines 10-33 WWW= https://github.com/rkd77/elinks/ Link Here
10	LICENSE= GPLv2	10	LICENSE= GPLv2
11	LICENSE_FILE= ${WRKSRC}/COPYING	11	LICENSE_FILE= ${WRKSRC}/COPYING
12		12
13	GNU_CONFIGURE= yes	13	USES= bison:alias cpe gmake iconv pkgconfig ssl meson perl5 python:3.7+
14	USES= autoreconf bison:alias cpe gmake iconv pkgconfig ssl
15		14
16	USE_GITHUB= yes	15	USE_GITHUB= yes
17	GH_ACCOUNT= rkd77	16	GH_ACCOUNT= rkd77
18		17
19	LIBS+= -lexecinfo	18	LIBS+= -lexecinfo
		19	CONIGURE_ENV= PYTHON_PATH="${PYTHON_CMD}"
		20	MESON_ARGS= -Dgpm=false -Dperl=true
20		21
21	OPTIONS_DEFINE= 256COLORS 88COLORS BITTORRENT BROTLI EXMODE \	22	OPTIONS_DEFINE= 256COLORS 88COLORS TRUECOLORS BITTORRENT BROTLI EXMODE \
22	FASTMEM FINGER FSP FTP GOPHER GUILE HIGHLIGHT \	23	FASTMEM FINGER FSP FTP GOPHER GUILE HIGHLIGHT \
23	IDN LOCAL_CGI LUA LZMA MOUSE NLS NNTP NOROOT \	24	IDN LOCAL_CGI LUA LZMA NLS NNTP NOROOT \
24	PERL SMB SPIDERMONKEY XBELMARKS ZSTD	25	SMB SPIDERMONKEY TRE XBELMARKS ZSTD
25	OPTIONS_DEFAULT= 256COLORS 88COLORS BROTLI EXMODE FASTMEM FTP \	26	OPTIONS_DEFAULT= 256COLORS 88COLORS TRUECOLORS BROTLI EXMODE FASTMEM FTP \
26	HIGHLIGHT LZMA MOUSE	27	HIGHLIGHT LZMA
27	OPTIONS_SUB= yes	28	OPTIONS_SUB= yes
28		29
29	88COLORS_DESC= 88 color support	30	88COLORS_DESC= 88 color support
30	256COLORS_DESC= 256 color support	31	256COLORS_DESC= 256 color support
		32	TRUECOLORS_DESC= True color support
31	SPIDERMONKEY_DESC= ECMAScript support (via SpiderMonkey)	33	SPIDERMONKEY_DESC= ECMAScript support (via SpiderMonkey)
32	XBELMARKS_DESC= XBEL bookmarks (via expat)	34	XBELMARKS_DESC= XBEL bookmarks (via expat)
33	LOCAL_CGI_DESC= Local CGI support	35	LOCAL_CGI_DESC= Local CGI support
Lines 36-110 EXMODE_DESC= Exmode (CLI) support Link Here
36	HIGHLIGHT_DESC= HTML highlighting using DOM engine	38	HIGHLIGHT_DESC= HTML highlighting using DOM engine
37	NOROOT_DESC= Prevention of usage by root	39	NOROOT_DESC= Prevention of usage by root
38	FASTMEM_DESC= Fast memory allocation functions	40	FASTMEM_DESC= Fast memory allocation functions
		41	TRE_DESC= TRE regex search support
39		42
40	BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli	43	BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli
41	BROTLI_CONFIGURE_ON= --with-brotli	44	BROTLI_MESON_TRUE= brotli
42		45
43	NLS_USES= gettext	46	NLS_USES= gettext
44	NLS_CONFIGURE_OFF= --disable-nls	47	NLS_MESON_TRUE= nls
45		48
46	GUILE_LIB_DEPENDS= libguile-3.0.so:lang/guile	49	GUILE_LIB_DEPENDS= libguile-3.0.so:lang/guile
47	GUILE_CONFIGURE_WITH= guile	50	GUILE_MESON_TRUE= guile
48		51
49	LUA_USES= lua	52	LUA_USES= lua
50	LUA_CONFIGURE_ON= --with-luapkg=lua-${LUA_VER}	53	LUA_MESON_ON= -Dluapkg=${LUA_VER}
51		54
52	LZMA_CONFIGURE_ON= --with-lzma	55	LZMA_MESON_TRUE= lzma
53		56
54	PERL_USES= perl5	57	FASTMEM_MESON_TRUE= fastmem
55	PERL_CONFIGURE_WITH= perl
56
57	FASTMEM_CONFIGURE_ON= --enable-fastmem
58		58
59	IDN_LIB_DEPENDS= libidn.so:dns/libidn	59	IDN_LIB_DEPENDS= libidn.so:dns/libidn
60	IDN_USES= localbase	60	IDN_USES= localbase
61	IDN_CONFIGURE_WITH= idn	61	IDN_MESON_TRUE= idn
62		62
63	NOROOT_CONFIGURE_ON= --enable-no-root	63	NOROOT_MESON_TRUE= no-root
64		64
65	HIGHLIGHT_CONFIGURE_ON= --enable-html-highlight	65	HIGHLIGHT_MESON_TRUE= html-highlight
66		66
67	EXMODE_CONFIGURE_ON= --enable-exmode	67	EXMODE_MESON_TRUE= exmode
68		68
69	SMB_USES= samba # smbclient	69	SMB_USES= samba # smbclient
70	SMB_CONFIGURE_ENABLE= smb	70	SMB_MESON_TRUE= smb
71		71
72	FSP_RUN_DEPENDS= ${LOCALBASE}/lib/libfsplib.a:net/fsplib	72	FSP_RUN_DEPENDS= ${LOCALBASE}/lib/libfsplib.a:net/fsplib
73	FSP_BUILD_DEPENDS= ${LOCALBASE}/lib/libfsplib.a:net/fsplib	73	FSP_BUILD_DEPENDS= ${LOCALBASE}/lib/libfsplib.a:net/fsplib
74	FSP_CONFIGURE_ENABLE= fsp	74	FSP_MESON_TRUE= fsp
75
76	FTP_CONFIGURE_ENABLE= ftp
77		75
78	NNTP_CONFIGURE_ENABLE= nntp	76	FTP_MESON_TRUE= ftp
79		77
80	BITTORRENT_CONFIGURE_ENABLE= bittorrent	78	NNTP_MESON_TRUE= nntp
81		79
82	GOPHER_CONFIGURE_ENABLE= gopher	80	BITTORRENT_MESON_TRUE= bittorrent
83		81
84	MOUSE_CONFIGURE_ENABLE= mouse	82	GOPHER_MESON_TRUE= gopher
85		83
86	FINGER_CONFIGURE_ENABLE= finger	84	FINGER_MESON_TRUE= finger
87		85
88	LOCAL_CGI_CONFIGURE_ENABLE= cgi	86	LOCAL_CGI_MESON_TRUE= cgi
89		87
90	XBELMARKS_LIB_DEPENDS= libexpat.so:textproc/expat2	88	XBELMARKS_LIB_DEPENDS= libexpat.so:textproc/expat2
91	XBELMARKS_CONFIGURE_OFF=--disable-xbel	89	XBELMARKS_MESON_TRUE= xbel
		90
		91	256COLORS_MESON_TRUE= 256-colors
92		92
93	256COLORS_CONFIGURE_ON= --enable-256-colors	93	88COLORS_MESON_TRUE= 88-colors
94		94
95	88COLORS_CONFIGURE_ON= --enable-88-colors	95	TRUECOLORS_MESON_TRUE= true-color
96		96
97	SPIDERMONKEY_BUILD_DEPENDS= ${LOCALBASE}/lib/libjs.so:lang/spidermonkey17	97	SPIDERMONKEY_BUILD_DEPENDS= ${LOCALBASE}/lib/libmozjs-78.so:lang/spidermonkey78
98	SPIDERMONKEY_RUN_DEPENDS= js:lang/spidermonkey17	98	SPIDERMONKEY_RUN_DEPENDS= js78:lang/spidermonkey78
99	SPIDERMONKEY_LIB_DEPENDS= libnspr4.so:devel/nspr	99	SPIDERMONKEY_LIB_DEPENDS= libnspr4.so:devel/nspr
100	SPIDERMONKEY_CFLAGS= -I${LOCALBASE}/include/nspr \	100	SPIDERMONKEY_CFLAGS= -I${LOCALBASE}/include/nspr \
101	-I${LOCALBASE}/include/js-1.7	101	-I${LOCALBASE}/include/js-78
		102	SPIDERMONKEY_CXXFLAGS= -I${LOCALBASE}/include/nspr \
		103	-I${LOCALBASE}/include/js-78
102	SPIDERMONKEY_LDFLAGS= -L${LOCALBASE}/lib -lnspr4 -lpthread -lm	104	SPIDERMONKEY_LDFLAGS= -L${LOCALBASE}/lib -lnspr4 -lpthread -lm
103	SPIDERMONKEY_CONFIGURE_ON= --enable-sm-scripting --with-spidermonkey	105	SPIDERMONKEY_MESON_ON= -Dsm-scripting=true -Dspidermonkey=true
104	SPIDERMONKEY_CONFIGURE_OFF= --disable-sm-scripting --without-spidermonkey	106
		107	TRE_LIB_DEPENDS= libtre.so:textproc/libtre
		108	TRE_MESON_TRUE= tre
105		109
106	ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd	110	ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd
107	ZSTD_USES= localbase	111	ZSTD_USES= localbase
108	ZSTD_CONFIGURE_ON= --with-zstd	112	ZSTD_MESON_TRUE= zstd
		113
		114	post-patch:
		115	@${REINPLACE_CMD} -e 's\|/usr/bin/perl\|${PERL}\|g' ${WRKSRC}/doc/tools/help2xml
		116	@${REINPLACE_CMD} -e 's\|/usr/bin/env python3\|${PYTHON_CMD}\|g' ${WRKSRC}/doc/tools/asciidoc/asciidoc.py
109		117
110	.include <bsd.port.mk>	118	.include <bsd.port.mk>

Removed Link Here

(-)a/www/elinks/files/patch-configure.ac (-19 lines)
1	--- configure.ac.orig 2021-12-24 19:53:43 UTC
2	+++ configure.ac
3	@@ -531,6 +531,7 @@ else
4	if $PKG_CONFIG $pkg_config_static libbrotlidec; then
5	BROTLI_CFLAGS=`$PKG_CONFIG $pkg_config_static --cflags libbrotlidec`
6	BROTLI_LIBS=`$PKG_CONFIG $pkg_config_static --libs libbrotlidec`
7	+ CFLAGS="$BROTLI_CFLAGS $CFLAGS"
8	LIBS="$BROTLI_LIBS $LIBS"
9	CONFIG_BROTLI=yes
10	AC_DEFINE([CONFIG_BROTLI], [1], [Define as 1 to use the libbrotli library.])
11	@@ -1861,7 +1862,7 @@ if test "x$ac_cv_c_compiler_gnu" = "xyes"; then
12	;;
13	10\|10.\|11\|11.)
14	# gettext
15	- CFLAGS="$CFLAGS -fno-strict-aliasing -Wno-builtin-declaration-mismatch -Wno-array-bounds"
16	+ CFLAGS="$CFLAGS -fno-strict-aliasing -Wno-array-bounds"
17	;;
18	*)
19	# These should be ok using -Werror