diff --git a/www/elinks/Makefile b/www/elinks/Makefile index 30b5c821a985..320097115d5d 100644 --- a/www/elinks/Makefile +++ b/www/elinks/Makefile @@ -1,124 +1,124 @@ PORTNAME= elinks DISTVERSIONPREFIX= v DISTVERSION= 0.15.1 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= jailbird@fdf.net COMMENT= Links text WWW browser with enhancements WWW= https://github.com/rkd77/elinks/ 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 FSP_DESC= FSP protocol support (via fsplib) EXMODE_DESC= Exmode (CLI) 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 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 diff --git a/www/elinks/files/patch-meson.build b/www/elinks/files/patch-meson.build index dd8549a15b67..77b35a8981b2 100644 --- a/www/elinks/files/patch-meson.build +++ b/www/elinks/files/patch-meson.build @@ -1,13 +1,24 @@ --- 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()) +@@ -158,6 +156,10 @@ if compiler.has_header('fcntl.h') + + if compiler.has_header('fcntl.h') + conf_data.set('HAVE_FCNTL_H', 1) ++endif ++ ++if compiler.has_header('execinfo.h') ++ conf_data.set('HAVE_EXECINFO_H', 1) + endif + + if compiler.has_header('libgen.h') diff --git a/www/elinks/files/patch-src_util_error.c b/www/elinks/files/patch-src_util_error.c new file mode 100644 index 000000000000..30424736bf20 --- /dev/null +++ b/www/elinks/files/patch-src_util_error.c @@ -0,0 +1,29 @@ +--- src/util/error.c.orig 2022-07-31 10:16:29 UTC ++++ src/util/error.c +@@ -301,26 +301,6 @@ dump_backtrace(FILE *f, int trouble) + fprintf(f, "[%p] %s\n", stack[i], strings[i]); + + free(strings); +- +-#else +- /* User torturation. */ +- /* You are worried about what you see here? You don't see anything in +- * the first place. Also, be assured that we know what are we doing. */ +- /* (We are killing the user, obviously.) */ +- +- /* TODO: Gettextify? Er, better not. More people (translators) could +- * find out what are we doing... ;-) --pasky */ +- /* TODO: Be more cruel when in trouble? ;-) --pasky */ +- +- fputs( "Wheeeeeeeeeee! You played with the config.h by hand, didn't you?\n" +- "Of _COURSE_ you did! Is that how a nice .. creature behaves like?\n" +- "Of _COURSE_ it isn't! I feel offended and thus I will revenge now!\n" +- "You will _suffer_ >:).\n" +- "\n" +- "CPU burning sequence initiated...\n", f); +- +- /* TODO: Include cpuburn.c here. --pasky */ +- while (1); + #endif + fflush(f); + }