git: 194ab5013bee - main - misc/far2l: update to the latest tagged snapshot (v2021-12-04_alpha)

From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Mon, 06 Dec 2021 18:15:38 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=194ab5013bee5129bd1a40283c5534754db2175c

commit 194ab5013bee5129bd1a40283c5534754db2175c
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2021-12-06 18:14:56 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2021-12-06 18:14:57 +0000

    misc/far2l: update to the latest tagged snapshot (v2021-12-04_alpha)
    
    wxWidgets-based graphical backend is now factored out as a separate
    module.  Once we get subpackages, it should be packaged separately,
    so the main port would not have to pull this heavy dependency which
    could be useful in pure console environments (e.g. on servers).
    
    Inspired by:    https://habr.com/ru/post/593451/
---
 misc/far2l/Makefile  | 15 +++++++++++----
 misc/far2l/distinfo  |  6 +++---
 misc/far2l/pkg-plist |  2 ++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/misc/far2l/Makefile b/misc/far2l/Makefile
index 0564f3d715c7..e0afdae77c5c 100644
--- a/misc/far2l/Makefile
+++ b/misc/far2l/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	far2l
 # Upstream tags (pre-)releases very rarely and irregularly, so keep using
 # the g${DATE} format even for tagged releases to avoid bumping PORTEPOCH
 # in case we'd have to use raw commit hashes again in the future.
-PORTVERSION=	g20210921
+PORTVERSION=	g20211204 # don't forget to update unknown -> git hash below
 CATEGORIES=	misc
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -22,13 +22,13 @@ RUN_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	elfmz
-GH_TAGNAME=	v2021-09-21_alpha
+GH_TAGNAME=	v2021-12-04_alpha
 
 USES=		cmake compiler:c++11-lang libarchive pkgconfig shebangfix ssl
 SHEBANG_FILES=	far2l/bootstrap/view.sh
 
-OPTIONS_DEFINE=	NFS SFTP SMB WEBDAV WXGTK
-OPTIONS_DEFAULT=	NFS SFTP WEBDAV WXGTK
+OPTIONS_DEFINE=	NFS SFTP SMB WEBDAV WXGTK X11
+OPTIONS_DEFAULT=	NFS SFTP WEBDAV WXGTK X11
 OPTIONS_SUB=	yes
 
 NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
@@ -44,7 +44,14 @@ WEBDAV_LIB_DEPENDS=	libneon.so:www/neon
 WXGTK_CMAKE_OFF=	-DUSEWX:BOOL=OFF
 WXGTK_USE=	WX=3.0+
 
+X11_DESC=	Build with TTY X11 extensions
+X11_CMAKE_OFF=	-DTTYX:BOOL=OFF
+X11_USES=	xorg
+X11_USE=	XORG=ice,sm,x11,xext
+
 post-patch:
+	@${REINPLACE_CMD} -e 's,-unknown,-git-48654cc,' \
+		${WRKSRC}/far2l/bootstrap/scripts/vbuild.sh
 	@${GREP} -Rl --null --include=\*.cpp /bin/bash ${WRKSRC} | ${XARGS} \
 		-0 ${REINPLACE_CMD} -e 's,/bin/bash,${LOCALBASE}&,'
 
diff --git a/misc/far2l/distinfo b/misc/far2l/distinfo
index 4745abc76fd2..6e4d4f1b5024 100644
--- a/misc/far2l/distinfo
+++ b/misc/far2l/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632184046
-SHA256 (elfmz-far2l-g20210921-v2021-09-21_alpha_GH0.tar.gz) = 242d0fb94cce6b370f32c89a8d8fd07e017a02effcae0ce861a915229b252836
-SIZE (elfmz-far2l-g20210921-v2021-09-21_alpha_GH0.tar.gz) = 5427544
+TIMESTAMP = 1638615268
+SHA256 (elfmz-far2l-g20211204-v2021-12-04_alpha_GH0.tar.gz) = 9d3500e563db261332147be0cde9f2284ec21519ed045f12e27948400d361eea
+SIZE (elfmz-far2l-g20211204-v2021-12-04_alpha_GH0.tar.gz) = 5471538
diff --git a/misc/far2l/pkg-plist b/misc/far2l/pkg-plist
index c335d3f6f11e..ba1204ac1ce4 100644
--- a/misc/far2l/pkg-plist
+++ b/misc/far2l/pkg-plist
@@ -20,6 +20,8 @@ lib/far2l/Plugins/incsrch/plug/incsrch.far-plug-wide
 lib/far2l/Plugins/inside/plug/inside.far-plug-mb
 lib/far2l/Plugins/multiarc/plug/multiarc.far-plug-mb
 lib/far2l/Plugins/tmppanel/plug/tmppanel.far-plug-wide
+%%WXGTK%%lib/far2l/far2l_gui.so
+%%X11%%lib/far2l/far2l_ttyx.broker
 share/applications/far2l.desktop
 %%DATADIR%%/FarCze.lng
 %%DATADIR%%/FarEng.hlf