git: 4b227516c09f - main - misc/far2l: update Far2L to version 2.8.0 (nothing except)

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Mon, 30 Mar 2026 16:05:36 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4b227516c09fe5e3bf90bedd10400ee57bfbbabc

commit 4b227516c09fe5e3bf90bedd10400ee57bfbbabc
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2026-03-30 16:03:32 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2026-03-30 16:03:32 +0000

    misc/far2l: update Far2L to version 2.8.0 (nothing except)
    
    - New ImageViewer plugin (requires ImageMagick and/or FFmpeg,
      please install them as needed)
    - Disable AppStream metainfo generation to avoid pulling
      additional dependencies and because its usefulness on
      FreeBSD is doubtful (yet keep the @comment in pkg-plist)
    - Prune empty directories and fix WEBDAV_DESC while here
    
    Reported by:    portscout
---
 misc/far2l/Makefile                                | 10 ++++--
 misc/far2l/distinfo                                |  6 ++--
 misc/far2l/files/patch-arclite_src_Patch7zCP.cpp   | 27 ---------------
 misc/far2l/files/patch-far2l_CMakeLists.txt        | 24 +++++++++++--
 misc/far2l/files/patch-far2l_src_farwinapi.cpp     |  2 +-
 .../files/patch-far2l_src_panels_infolist.cpp      |  8 ++---
 misc/far2l/pkg-plist                               | 39 ++++++++++++++++++++--
 7 files changed, 73 insertions(+), 43 deletions(-)

diff --git a/misc/far2l/Makefile b/misc/far2l/Makefile
index cc38f6e6025c..1c490a5887f1 100644
--- a/misc/far2l/Makefile
+++ b/misc/far2l/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	far2l
-PORTVERSION=	2.7.0
-PORTREVISION=	1
+PORTVERSION=	2.8.0
 DISTVERSIONPREFIX=	v_
 CATEGORIES=	misc
 
@@ -39,7 +38,7 @@ SFTP_LIB_DEPENDS=	libssh.so:security/libssh
 
 SMB_USES=	samba:lib
 
-WEBDAV_DESC=	WebDav protocol support via libneon
+WEBDAV_DESC=	WebDAV protocol support via libneon
 WEBDAV_LIB_DEPENDS=	libneon.so:www/neon
 
 WXGTK_CMAKE_OFF=	-DUSEWX:BOOL=OFF
@@ -65,6 +64,11 @@ post-patch:
 
 post-stage:
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/far2l/Plugins/NetRocks/plug/SHELL
+	${RMDIR} ${STAGEDIR}${PREFIX}/lib/far2l/Plugins/calc/plug/units
+	${RMDIR} ${STAGEDIR}${PREFIX}/lib/far2l/themes/*
+	${RMDIR} ${STAGEDIR}${PREFIX}/lib/far2l/themes
+	${RMDIR} ${STAGEDIR}${DATADIR}/Plugins/SimpleIndent/plug
+	${RMDIR} ${STAGEDIR}${DATADIR}/Plugins/SimpleIndent
 	${RM} ${STAGEDIR}${DATADIR}/wslgclip.*
 
 .include <bsd.port.mk>
diff --git a/misc/far2l/distinfo b/misc/far2l/distinfo
index 0643d20e7ecb..4896d1756be7 100644
--- a/misc/far2l/distinfo
+++ b/misc/far2l/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1761467992
-SHA256 (elfmz-far2l-v_2.7.0_GH0.tar.gz) = 712ab8e5b40482ddd68e33f870e4c3d7e8f8c44b90fb9fe91288a00cb27dff48
-SIZE (elfmz-far2l-v_2.7.0_GH0.tar.gz) = 8825358
+TIMESTAMP = 1774253091
+SHA256 (elfmz-far2l-v_2.8.0_GH0.tar.gz) = b0fddad2e3985f245f9e691e23b90fb97f7d29d9a0b131fe686aa3cbb2e4ea01
+SIZE (elfmz-far2l-v_2.8.0_GH0.tar.gz) = 9011883
diff --git a/misc/far2l/files/patch-arclite_src_Patch7zCP.cpp b/misc/far2l/files/patch-arclite_src_Patch7zCP.cpp
deleted file mode 100644
index c8a459db31fe..000000000000
--- a/misc/far2l/files/patch-arclite_src_Patch7zCP.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
---- arclite/src/Patch7zCP.cpp.orig	2025-10-26 08:39:52 UTC
-+++ arclite/src/Patch7zCP.cpp
-@@ -641,7 +641,7 @@ FAR_ALIGNED(16) void CItem::GetUnicodeString(UString &
- //{
- //	return NULL;
- //}
--#else
-+#elif 0 // unused, incomplete 64-bit-only linux-specific code
- void **find_plt_entry_for_symbol(struct link_map *map, void *target_addr)
- {
- //	ElfW(Dyn) *dynamic = map->l_ld;
-@@ -776,6 +776,7 @@ bool get_faddrs(void *handle)
- 	return true;
- }
- 
-+#if 0 // unused, incomplete 64-bit-only linux-specific code
- static bool patch_plt(void *handle)
- {
- #if defined(__APPLE__) || defined(__UCLIBC__)
-@@ -812,6 +813,7 @@ static bool patch_plt(void *handle)
- 	return true;
- #endif
- }
-+#endif
- 
- static bool patch_addr(void *handle)
- {
diff --git a/misc/far2l/files/patch-far2l_CMakeLists.txt b/misc/far2l/files/patch-far2l_CMakeLists.txt
index 81fa1cdd83bf..8f86fe4deaf5 100644
--- a/misc/far2l/files/patch-far2l_CMakeLists.txt
+++ b/misc/far2l/files/patch-far2l_CMakeLists.txt
@@ -1,9 +1,9 @@
---- far2l/CMakeLists.txt.orig	2025-10-26 08:39:52 UTC
+--- far2l/CMakeLists.txt.orig	2026-03-23 08:04:51 UTC
 +++ far2l/CMakeLists.txt
-@@ -263,9 +263,11 @@ set_target_properties(far2l
+@@ -271,9 +271,11 @@ set_target_properties(far2l
      ENABLE_EXPORTS TRUE)
  
- if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD")
 +    find_library(SYSINFO_LIBRARY NAMES sysinfo)
      target_link_libraries(far2l
      PRIVATE ${WINPORT}
@@ -12,3 +12,21 @@
      PRIVATE ${UCHARDET_LIBRARIES})
  elseif(${CMAKE_SYSTEM_NAME} MATCHES "Haiku")
      target_link_libraries(far2l
+@@ -314,7 +316,7 @@ else()
+ 
+     find_package(Python3 3.9 COMPONENTS Interpreter)
+ 
+-    if(Python3_Interpreter_FOUND)
++    if (FALSE AND Python3_Interpreter_FOUND)
+         execute_process(COMMAND "${Python3_EXECUTABLE}" -c "import markdown"
+                         RESULT_VARIABLE PYTHON_MARKDOWN_STATUS
+                         OUTPUT_QUIET
+@@ -340,7 +342,7 @@ else()
+             message(WARNING "Python-Markdown not found. Skipping AppStream metainfo generation.")
+         endif()
+     else()
+-        message(WARNING "Python >=3.9 interpreter not found. Skipping AppStream metainfo generation.")
++        message(WARNING "AppStream metainfo generation disabled.")
+     endif()
+ 
+ endif()
diff --git a/misc/far2l/files/patch-far2l_src_farwinapi.cpp b/misc/far2l/files/patch-far2l_src_farwinapi.cpp
index 760615a0c3b2..52233eb695a1 100644
--- a/misc/far2l/files/patch-far2l_src_farwinapi.cpp
+++ b/misc/far2l/files/patch-far2l_src_farwinapi.cpp
@@ -3,7 +3,7 @@
 @@ -38,6 +38,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
  #include <fcntl.h>
  #include <errno.h>
- #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__CYGWIN__)
+ #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__CYGWIN__)
 +#include <sys/disk.h>
  #include <sys/mount.h>
  #elif !defined(__HAIKU__)
diff --git a/misc/far2l/files/patch-far2l_src_panels_infolist.cpp b/misc/far2l/files/patch-far2l_src_panels_infolist.cpp
index 43e0f9ea1f52..7af941683de5 100644
--- a/misc/far2l/files/patch-far2l_src_panels_infolist.cpp
+++ b/misc/far2l/files/patch-far2l_src_panels_infolist.cpp
@@ -4,8 +4,8 @@
  // # include <sys/sysctl.h>
  #include <mach/mach_host.h>
  #include <mach/vm_statistics.h>
--#elif !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__HAIKU__)
-+#elif !defined(__DragonFly__) && !defined(__HAIKU__)
+-#elif !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__HAIKU__)
++#elif !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__HAIKU__)
  #include <sys/sysinfo.h>
  #endif
  #include <sys/statvfs.h>
@@ -52,8 +52,8 @@
  			PrintInfo(strOutStr);
  		}
  
--#elif !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__HAIKU__)
-+#elif !defined(__DragonFly__) && !defined(__HAIKU__)
+-#elif !defined(__FreeBSD__)&& !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__HAIKU__)
++#elif !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__HAIKU__)
  		struct sysinfo si = {};
  		if (sysinfo(&si) == 0) {
  			DWORD dwMemoryLoad = 100 - ToPercent64(si.freeram + si.freeswap, si.totalram + si.totalswap);
diff --git a/misc/far2l/pkg-plist b/misc/far2l/pkg-plist
index bd38b140f5f3..c366f29e6ea0 100644
--- a/misc/far2l/pkg-plist
+++ b/misc/far2l/pkg-plist
@@ -1,5 +1,6 @@
 bin/far2l
 bin/far2ledit
+lib/far2l/Plugins/ImageViewer/plug/ImageViewer.far-plug-wide
 %%AWS%%lib/far2l/Plugins/NetRocks/plug/NetRocks-AWS.broker
 lib/far2l/Plugins/NetRocks/plug/NetRocks-FILE.broker
 lib/far2l/Plugins/NetRocks/plug/NetRocks-FTP.broker
@@ -20,12 +21,15 @@ lib/far2l/Plugins/compare/plug/compare.far-plug-wide
 lib/far2l/Plugins/drawline/plug/drawline.far-plug-wide
 lib/far2l/Plugins/editcase/plug/editcase.far-plug-wide
 lib/far2l/Plugins/editorcomp/plug/editorcomp.far-plug-wide
+lib/far2l/Plugins/edsort/plug/edsort.far-plug-wide
 lib/far2l/Plugins/filecase/plug/filecase.far-plug-wide
 lib/far2l/Plugins/hexitor/plug/hexitor.far-plug-wide
 lib/far2l/Plugins/incsrch/plug/incsrch.far-plug-wide
 lib/far2l/Plugins/inside/plug/inside.far-plug-mb
+lib/far2l/Plugins/memo/plug/memo.far-plug-wide
 lib/far2l/Plugins/multiarc/plug/multiarc.far-plug-mb
 lib/far2l/Plugins/tmppanel/plug/tmppanel.far-plug-wide
+lib/far2l/Plugins/truncate/plug/truncate.far-plug-wide
 lib/far2l/far2l_askpass
 %%WXGTK%%lib/far2l/far2l_gui.so
 lib/far2l/far2l_sudoapp
@@ -48,6 +52,10 @@ share/bash-completion/completions/far2l
 %%DATADIR%%/FarSpa.lng
 %%DATADIR%%/FarUkr.hlf
 %%DATADIR%%/FarUkr.lng
+%%DATADIR%%/Plugins/ImageViewer/plug/ImageViewer_en.hlf
+%%DATADIR%%/Plugins/ImageViewer/plug/ImageViewer_en.lng
+%%DATADIR%%/Plugins/ImageViewer/plug/ImageViewer_ru.hlf
+%%DATADIR%%/Plugins/ImageViewer/plug/ImageViewer_ru.lng
 %%DATADIR%%/Plugins/NetRocks/plug/SHELL/remote.sh
 %%DATADIR%%/Plugins/NetRocks/plug/SHELL/ways.ini
 %%DATADIR%%/Plugins/NetRocks/plug/bel.lng
@@ -137,11 +145,13 @@ share/bash-completion/completions/far2l
 %%DATADIR%%/Plugins/colorer/base/hrc/base/perl-vars.pkg.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/base/perl.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/base/python.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/base/qml.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/base/ruby.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/base/ruby.kw-class.ent.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/base/ruby.kw.ent.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/base/rust.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/base/scala.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/base/swift.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/base/tcltk.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/base/vb.net.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/base/vbasic.hrc
@@ -461,6 +471,7 @@ share/bash-completion/completions/far2l
 %%DATADIR%%/Plugins/colorer/base/hrd/console/contrib/gray_pult.hrd
 %%DATADIR%%/Plugins/colorer/base/hrd/console/contrib/ocean.hrd
 %%DATADIR%%/Plugins/colorer/base/hrd/console/contrib/take4.hrd
+%%DATADIR%%/Plugins/colorer/base/hrd/console/contrib/violet.hrd
 %%DATADIR%%/Plugins/colorer/base/hrd/console/contrib/visual.hrd
 %%DATADIR%%/Plugins/colorer/base/hrd/console/default.hrd
 %%DATADIR%%/Plugins/colorer/base/hrd/console/dnlike.hrd
@@ -511,6 +522,12 @@ share/bash-completion/completions/far2l
 %%DATADIR%%/Plugins/editorcomp/plug/editorcomp_be.lng
 %%DATADIR%%/Plugins/editorcomp/plug/editorcomp_en.lng
 %%DATADIR%%/Plugins/editorcomp/plug/editorcomp_ru.lng
+%%DATADIR%%/Plugins/edsort/plug/edsort_en.hlf
+%%DATADIR%%/Plugins/edsort/plug/edsort_en.lng
+%%DATADIR%%/Plugins/edsort/plug/edsort_pl.hlf
+%%DATADIR%%/Plugins/edsort/plug/edsort_pl.lng
+%%DATADIR%%/Plugins/edsort/plug/edsort_ru.hlf
+%%DATADIR%%/Plugins/edsort/plug/edsort_ru.lng
 %%DATADIR%%/Plugins/filecase/plug/CaseBel.lng
 %%DATADIR%%/Plugins/filecase/plug/CaseEng.hlf
 %%DATADIR%%/Plugins/filecase/plug/CaseEng.lng
@@ -527,10 +544,13 @@ share/bash-completion/completions/far2l
 %%DATADIR%%/Plugins/incsrch/plug/isrcbel.lng
 %%DATADIR%%/Plugins/incsrch/plug/isrceng.lng
 %%DATADIR%%/Plugins/incsrch/plug/isrcrus.lng
+%%DATADIR%%/Plugins/incsrch/plug/key_macros.ini
 %%DATADIR%%/Plugins/inside/plug/bel.lng
 %%DATADIR%%/Plugins/inside/plug/config.ini
 %%DATADIR%%/Plugins/inside/plug/eng.lng
 %%DATADIR%%/Plugins/inside/plug/rus.lng
+%%DATADIR%%/Plugins/memo/plug/memoe.lng
+%%DATADIR%%/Plugins/memo/plug/memor.lng
 %%DATADIR%%/Plugins/multiarc/plug/arcbel.lng
 %%DATADIR%%/Plugins/multiarc/plug/arceng.hlf
 %%DATADIR%%/Plugins/multiarc/plug/arceng.lng
@@ -543,11 +563,27 @@ share/bash-completion/completions/far2l
 %%DATADIR%%/Plugins/tmppanel/plug/TmpEng.lng
 %%DATADIR%%/Plugins/tmppanel/plug/TmpRus.hlf
 %%DATADIR%%/Plugins/tmppanel/plug/TmpRus.lng
+%%DATADIR%%/Plugins/truncate/plug/TruncEng.lng
+%%DATADIR%%/Plugins/truncate/plug/TruncRus.lng
 %%DATADIR%%/closewait.sh
 %%DATADIR%%/far2l-cd.sh
 %%DATADIR%%/notify.sh
 %%DATADIR%%/open.sh
 %%DATADIR%%/ps.sh
+%%DATADIR%%/themes/Amber on Black/author.txt
+%%DATADIR%%/themes/Amber on Black/farcolors.ini
+%%DATADIR%%/themes/DOS Navigator/author.txt
+%%DATADIR%%/themes/DOS Navigator/farcolors.ini
+%%DATADIR%%/themes/Dark classic/author.txt
+%%DATADIR%%/themes/Dark classic/farcolors.ini
+%%DATADIR%%/themes/Gold on Blue/author.txt
+%%DATADIR%%/themes/Gold on Blue/farcolors.ini
+%%DATADIR%%/themes/Green on LightGray/author.txt
+%%DATADIR%%/themes/Green on LightGray/farcolors.ini
+%%DATADIR%%/themes/Magenta on Violet/author.txt
+%%DATADIR%%/themes/Magenta on Violet/farcolors.ini
+%%DATADIR%%/themes/Tokyo Night/author.txt
+%%DATADIR%%/themes/Tokyo Night/farcolors.ini
 %%DATADIR%%/trash.sh
 %%DATADIR%%/unmount.sh
 %%DATADIR%%/view.sh
@@ -606,5 +642,4 @@ share/icons/hicolor/96x96/apps/far2ledit-wx.svg
 share/icons/hicolor/96x96/apps/far2ledit.svg
 share/man/man1/far2l.1.gz
 share/man/ru/man1/far2l.1.gz
-@dir lib/far2l/Plugins/calc/plug/units
-@dir %%DATADIR%%/Plugins/SimpleIndent/plug
+@comment share/metainfo/io.github.elfmz.far2l.metainfo.xml