Attachment #236613 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 meson perl5 pkgconfig python:3.7+ ssl
BUILD_DEPENDS=	xmlto:textproc/xmlto

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 MOUSE NLS NNTP NOROOT \
			SMB SPIDERMONKEY TRE XBELMARKS ZSTD
OPTIONS_DEFAULT=	256COLORS 88COLORS BROTLI EXMODE FASTMEM FTP \
			HIGHLIGHT LZMA MOUSE
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:52-53
LUA_MESON_ON=		-Dluapkg=lua-${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_MESON_TRUE=		ftp

NNTP_MESON_TRUE=	nntp

BITTORRENT_MESON_TRUE=	bittorrent

GOPHER_MESON_TRUE=	gopher

MOUSE_MESON_TRUE=	mouse

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_USES=		compiler:c++17-lang sqlite
SPIDERMONKEY_BUILD_DEPENDS=	${LOCALBASE}/lib/libmozjs-78.so:lang/spidermonkey78 \
				${LOCALBASE}/lib/libxml++-5.0.so:textproc/libxml++
SPIDERMONKEY_RUN_DEPENDS=	js78:lang/spidermonkey78
SPIDERMONKEY_LIB_DEPENDS=	libnspr4.so:devel/nspr \
				libxml++-5.0.so:textproc/libxml++
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




--- meson.build.orig	2022-07-31 10:16:29 UTC
+++ meson.build
@@ -3,9 +3,7 @@ srcdir = meson.source_root()
 
 srcdir = meson.source_root()
 
-txt = run_command('git', '--git-dir=' + srcdir + '/.git', 'rev-parse', 'HEAD').stdout().strip()
-dirty = run_command(srcdir + '/git-dirty.sh').stdout().strip()
-add_global_arguments('-DBUILD_ID="' + txt + dirty + '"', language : 'c')
+add_global_arguments('-DBUILD_ID="\\0"', language : 'c')
 
 conf_data = configuration_data()
 conf_data.set('VERSION', meson.project_version())




--- src/config/options.c.orig	2022-07-31 10:16:29 UTC
+++ src/config/options.c
@@ -892,6 +892,7 @@ change_hook_ui_double_esc(struct session *ses, struct 
 	return 0;
 }
 
+#ifdef CONFIG_MOUSE
 static int
 change_hook_ui_mouse_disable(struct session *ses, struct option *current, struct option *changed)
 {
@@ -907,6 +908,7 @@ change_hook_ui_mouse_disable(struct session *ses, stru
 	}
 	return 0;
 }
+#endif
 
 
 /** Make option templates visible or invisible in the option manager.
@@ -984,7 +986,9 @@ static const struct change_hook_info change_hooks[] = 
 	{ "ui.colors",			change_hook_ui_colors },
 	{ "ui.double_esc",		change_hook_ui_double_esc },
 	{ "ui.language",		change_hook_language },
+#ifdef CONFIG_MOUSE
 	{ "ui.mouse_disable",	change_hook_ui_mouse_disable },
+#endif
 	{ "ui",				change_hook_ui },
 	{ NULL,				NULL },
 };

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

Added Link Here

(-)b/www/elinks/files/patch-meson.build (+13 lines)
1	--- meson.build.orig 2022-07-31 10:16:29 UTC
2	+++ meson.build
3	@@ -3,9 +3,7 @@ srcdir = meson.source_root()
4
5	srcdir = meson.source_root()
6
7	-txt = run_command('git', '--git-dir=' + srcdir + '/.git', 'rev-parse', 'HEAD').stdout().strip()
8	-dirty = run_command(srcdir + '/git-dirty.sh').stdout().strip()
9	-add_global_arguments('-DBUILD_ID="' + txt + dirty + '"', language : 'c')
10	+add_global_arguments('-DBUILD_ID="\\0"', language : 'c')
11
12	conf_data = configuration_data()
13	conf_data.set('VERSION', meson.project_version())

Added Link Here

(-)b/www/elinks/files/patch-src_config_options.c (+28 lines)
1	--- src/config/options.c.orig 2022-07-31 10:16:29 UTC
2	+++ src/config/options.c
3	@@ -892,6 +892,7 @@ change_hook_ui_double_esc(struct session *ses, struct
4	return 0;
5	}
6
7	+#ifdef CONFIG_MOUSE
8	static int
9	change_hook_ui_mouse_disable(struct session ses, struct option current, struct option *changed)
10	{
11	@@ -907,6 +908,7 @@ change_hook_ui_mouse_disable(struct session *ses, stru
12	}
13	return 0;
14	}
15	+#endif
16
17
18	/** Make option templates visible or invisible in the option manager.
19	@@ -984,7 +986,9 @@ static const struct change_hook_info change_hooks[] =
20	{ "ui.colors", change_hook_ui_colors },
21	{ "ui.double_esc", change_hook_ui_double_esc },
22	{ "ui.language", change_hook_language },
23	+#ifdef CONFIG_MOUSE
24	{ "ui.mouse_disable", change_hook_ui_mouse_disable },
25	+#endif
26	{ "ui", change_hook_ui },
27	{ NULL, NULL },
28	};