summaryrefslogtreecommitdiff
path: root/misc/far2l
diff options
context:
space:
mode:
Diffstat (limited to 'misc/far2l')
-rw-r--r--misc/far2l/Makefile10
-rw-r--r--misc/far2l/distinfo6
-rw-r--r--misc/far2l/files/patch-arclite_src_Patch7zCP.cpp27
-rw-r--r--misc/far2l/files/patch-far2l_CMakeLists.txt14
-rw-r--r--misc/far2l/files/patch-far2l_src_farwinapi.cpp73
-rw-r--r--misc/far2l/files/patch-far2l_src_farwinapi.hpp13
-rw-r--r--misc/far2l/files/patch-far2l_src_mix_MountInfo.cpp20
-rw-r--r--misc/far2l/files/patch-far2l_src_mix_MountInfo.h11
-rw-r--r--misc/far2l/files/patch-far2l_src_panels_infolist.cpp68
-rw-r--r--misc/far2l/pkg-descr4
-rw-r--r--misc/far2l/pkg-plist155
11 files changed, 335 insertions, 66 deletions
diff --git a/misc/far2l/Makefile b/misc/far2l/Makefile
index ba3aa24ddd58..cc38f6e6025c 100644
--- a/misc/far2l/Makefile
+++ b/misc/far2l/Makefile
@@ -1,5 +1,5 @@
PORTNAME= far2l
-PORTVERSION= 2.6.5
+PORTVERSION= 2.7.0
PORTREVISION= 1
DISTVERSIONPREFIX= v_
CATEGORIES= misc
@@ -10,7 +10,7 @@ WWW= https://github.com/elfmz/far2l
LICENSE= GPLv2
-LIB_DEPENDS= libpcre.so:devel/pcre \
+LIB_DEPENDS= libsysinfo.so:devel/libsysinfo \
libuchardet.so:textproc/uchardet
RUN_DEPENDS= bash:shells/bash
@@ -25,10 +25,13 @@ SHEBANG_FILES= far2l/bootstrap/view.sh
CMAKE_OFF= UNRAR # libarchive handles *.rar files just fine
-OPTIONS_DEFINE= NFS SFTP SMB WEBDAV WXGTK X11
+OPTIONS_DEFINE= AWS NFS SFTP SMB WEBDAV WXGTK X11
OPTIONS_DEFAULT= NFS SFTP WEBDAV WXGTK X11
OPTIONS_SUB= yes
+AWS_DESC= AWS S3 protocol support
+AWS_LIB_DEPENDS= libaws-cpp-sdk-s3.so:devel/aws-sdk-cpp
+
NFS_LIB_DEPENDS= libnfs.so:net/libnfs
SFTP_DESC= SFTP file transfer support
@@ -54,6 +57,7 @@ post-patch:
${WRKSRC}/CMakeLists.txt
@${GREP} -Rl --null --include=\*.cpp /bin/bash ${WRKSRC} | ${XARGS} \
-0 ${REINPLACE_CMD} -e 's,/bin/bash,${LOCALBASE}&,'
+# Show icon in graphical mode (https://github.com/elfmz/far2l/issues/1143)
@${REINPLACE_CMD} -e '/SetBackgroundColour/ { x; \
s|^|SetIcon(wxIcon(wxStandardPaths::Get().GetInstallPrefix()\
+ "/share/icons/far2l.svg", wxBITMAP_TYPE_ICO));|; H; x; }' \
diff --git a/misc/far2l/distinfo b/misc/far2l/distinfo
index c8e83961e924..0643d20e7ecb 100644
--- a/misc/far2l/distinfo
+++ b/misc/far2l/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743361217
-SHA256 (elfmz-far2l-v_2.6.5_GH0.tar.gz) = 0e68efff1c5d950c86cdad0387bf1aae7b152dbdd7d24b70bbefeeb4f873a9c9
-SIZE (elfmz-far2l-v_2.6.5_GH0.tar.gz) = 8274199
+TIMESTAMP = 1761467992
+SHA256 (elfmz-far2l-v_2.7.0_GH0.tar.gz) = 712ab8e5b40482ddd68e33f870e4c3d7e8f8c44b90fb9fe91288a00cb27dff48
+SIZE (elfmz-far2l-v_2.7.0_GH0.tar.gz) = 8825358
diff --git a/misc/far2l/files/patch-arclite_src_Patch7zCP.cpp b/misc/far2l/files/patch-arclite_src_Patch7zCP.cpp
new file mode 100644
index 000000000000..c8a459db31fe
--- /dev/null
+++ b/misc/far2l/files/patch-arclite_src_Patch7zCP.cpp
@@ -0,0 +1,27 @@
+--- 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
new file mode 100644
index 000000000000..81fa1cdd83bf
--- /dev/null
+++ b/misc/far2l/files/patch-far2l_CMakeLists.txt
@@ -0,0 +1,14 @@
+--- far2l/CMakeLists.txt.orig 2025-10-26 08:39:52 UTC
++++ far2l/CMakeLists.txt
+@@ -263,9 +263,11 @@ set_target_properties(far2l
+ ENABLE_EXPORTS TRUE)
+
+ if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
++ find_library(SYSINFO_LIBRARY NAMES sysinfo)
+ target_link_libraries(far2l
+ PRIVATE ${WINPORT}
+ PRIVATE c
++ PRIVATE ${SYSINFO_LIBRARY}
+ PRIVATE ${UCHARDET_LIBRARIES})
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Haiku")
+ target_link_libraries(far2l
diff --git a/misc/far2l/files/patch-far2l_src_farwinapi.cpp b/misc/far2l/files/patch-far2l_src_farwinapi.cpp
new file mode 100644
index 000000000000..760615a0c3b2
--- /dev/null
+++ b/misc/far2l/files/patch-far2l_src_farwinapi.cpp
@@ -0,0 +1,73 @@
+--- far2l/src/farwinapi.cpp.orig 2025-10-26 08:39:52 UTC
++++ far2l/src/farwinapi.cpp
+@@ -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__)
++#include <sys/disk.h>
+ #include <sys/mount.h>
+ #elif !defined(__HAIKU__)
+ #include <sys/statfs.h>
+@@ -472,8 +473,8 @@ bool apiExpandEnvironmentStrings(const wchar_t *src, F
+ }
+
+ BOOL apiGetVolumeInformation(const wchar_t *lpwszRootPathName, FARString *pVolumeName,
+- DWORD64 *lpVolumeSerialNumber, LPDWORD lpMaximumComponentLength, LPDWORD lpFileSystemFlags,
+- FARString *pFileSystemName, FARString *pFileSystemMountPoint)
++ FARString *pDiskIdent, LPDWORD lpMaximumComponentLength, LPDWORD lpFileSystemFlags,
++ FARString *pFileSystemName, FARString *pDeviceName, FARString *pFileSystemMountPoint)
+ {
+ struct statvfs svfs {};
+ const std::string &path = Wide2MB(lpwszRootPathName);
+@@ -483,13 +484,9 @@ BOOL apiGetVolumeInformation(const wchar_t *lpwszRootP
+
+ if (lpMaximumComponentLength)
+ *lpMaximumComponentLength = svfs.f_namemax;
+- if (lpVolumeSerialNumber)
+- *lpVolumeSerialNumber = (DWORD)svfs.f_fsid;
+ if (lpFileSystemFlags)
+ *lpFileSystemFlags = (DWORD)svfs.f_flag;
+
+- if (pVolumeName) {
+- pVolumeName->Clear();
+ #if 0
+ #if defined(FS_IOC_GETFSLABEL) && defined(FSLABEL_MAX)
+ int fd = open(path.c_str(), O_RDONLY);
+@@ -502,13 +499,35 @@ BOOL apiGetVolumeInformation(const wchar_t *lpwszRootP
+ }
+ #endif
+ #endif
+- }
+
+ if (pFileSystemName) {
+ *pFileSystemName = MountInfo().GetFileSystem(path);
+ }
+- if (*pFileSystemMountPoint) {
++ if (pFileSystemMountPoint) {
+ *pFileSystemMountPoint = MountInfo().GetFileSystemMountPoint(lpwszRootPathName);
++ }
++ // XXX: can we avoid calling GetFileSystemMountPoint() twice?
++ const std::string devname = MountInfo().GetFileSystemMountPoint(lpwszRootPathName, true);
++ if (pDeviceName) {
++ *pDeviceName = devname;
++ }
++ if (pDiskIdent) {
++ int fd = open(devname.c_str(), O_RDONLY);
++ if (fd != -1) {
++ char ident[DISK_IDENT_SIZE];
++ if (ioctl(fd, DIOCGIDENT, ident) != -1)
++ *pDiskIdent = ident;
++ close(fd);
++ }
++ }
++ if (pVolumeName) {
++ std::string reply{}, cmd{"fstyp -l " + devname};
++ if (POpen(reply, cmd.c_str())) {
++ const auto pos = reply.find(' ') + 1;
++ if (pos > 0) {
++ *pVolumeName = reply.substr(pos, reply.size() - pos - 1);
++ } //else pVolumeName->Clear();
++ } //else pVolumeName->Clear();
+ }
+
+ return TRUE;
diff --git a/misc/far2l/files/patch-far2l_src_farwinapi.hpp b/misc/far2l/files/patch-far2l_src_farwinapi.hpp
new file mode 100644
index 000000000000..4f7eb9510547
--- /dev/null
+++ b/misc/far2l/files/patch-far2l_src_farwinapi.hpp
@@ -0,0 +1,13 @@
+--- far2l/src/farwinapi.hpp.orig 2025-10-26 08:39:52 UTC
++++ far2l/src/farwinapi.hpp
+@@ -180,8 +180,8 @@ void apiGetTempPath(FARString &strBuffer);
+ bool apiExpandEnvironmentStrings(const wchar_t *src, FARString &strDest);
+
+ BOOL apiGetVolumeInformation(const wchar_t *lpwszRootPathName, FARString *pVolumeName,
+- DWORD64 *lpVolumeSerialNumber, LPDWORD lpMaximumComponentLength, LPDWORD lpFileSystemFlags,
+- FARString *pFileSystemName, FARString *pFileSystemMountPoint = nullptr);
++ FARString *pDiskIdent, LPDWORD lpMaximumComponentLength, LPDWORD lpFileSystemFlags,
++ FARString *pFileSystemName, FARString *pDeviceName, FARString *pFileSystemMountPoint);
+
+ void apiFindDataToDataEx(const FAR_FIND_DATA *pSrc, FAR_FIND_DATA_EX *pDest);
+
diff --git a/misc/far2l/files/patch-far2l_src_mix_MountInfo.cpp b/misc/far2l/files/patch-far2l_src_mix_MountInfo.cpp
new file mode 100644
index 000000000000..3fa268388fd4
--- /dev/null
+++ b/misc/far2l/files/patch-far2l_src_mix_MountInfo.cpp
@@ -0,0 +1,20 @@
+--- far2l/src/mix/MountInfo.cpp.orig 2025-10-26 08:39:52 UTC
++++ far2l/src/mix/MountInfo.cpp
+@@ -384,7 +384,7 @@ std::string MountInfo::GetFileSystem(const std::string
+ return out;
+ }
+
+-std::string MountInfo::GetFileSystemMountPoint(const wchar_t *lpwsz_path) const
++std::string MountInfo::GetFileSystemMountPoint(const wchar_t *lpwsz_path, bool want_device) const
+ {
+ std::string out;
+ size_t longest_match = 0;
+@@ -394,7 +394,7 @@ std::string MountInfo::GetFileSystemMountPoint(const w
+ for (const auto &it : *_mountpoints) {
+ if (it.path.size() > longest_match && StrStartsFrom(path, it.path.c_str())) {
+ longest_match = it.path.size();
+- out = it.path;
++ out = want_device ? it.device : it.path;
+ }
+ }
+ return out;
diff --git a/misc/far2l/files/patch-far2l_src_mix_MountInfo.h b/misc/far2l/files/patch-far2l_src_mix_MountInfo.h
new file mode 100644
index 000000000000..f8dd9beb1695
--- /dev/null
+++ b/misc/far2l/files/patch-far2l_src_mix_MountInfo.h
@@ -0,0 +1,11 @@
+--- far2l/src/mix/MountInfo.h.orig 2025-10-26 08:39:52 UTC
++++ far2l/src/mix/MountInfo.h
+@@ -40,7 +40,7 @@ class MountInfo (public)
+
+ std::string GetFileSystem(const std::string &path) const;
+
+- std::string GetFileSystemMountPoint(const wchar_t *lpwsz_path) const;
++ std::string GetFileSystemMountPoint(const wchar_t *lpwsz_path, bool want_device = false) const;
+
+ /// Returns true if path fine to be used multi-threaded-ly
+ bool IsMultiThreadFriendly(const std::string &path) const;
diff --git a/misc/far2l/files/patch-far2l_src_panels_infolist.cpp b/misc/far2l/files/patch-far2l_src_panels_infolist.cpp
new file mode 100644
index 000000000000..43e0f9ea1f52
--- /dev/null
+++ b/misc/far2l/files/patch-far2l_src_panels_infolist.cpp
@@ -0,0 +1,68 @@
+--- far2l/src/panels/infolist.cpp.orig 2025-10-26 08:39:52 UTC
++++ far2l/src/panels/infolist.cpp
+@@ -62,7 +62,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
+ // # 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__)
+ #include <sys/sysinfo.h>
+ #endif
+ #include <sys/statvfs.h>
+@@ -171,8 +171,7 @@ void InfoList::DisplayObject()
+ // FARString strDriveRoot;
+ FARString strVolumeName, strFileSystemName, strFileSystemMountPoint;
+ DWORD MaxNameLength, FileSystemFlags;
+- DWORD64 VolumeNumber;
+- FARString strDiskNumber;
++ FARString strDeviceName, strDiskNumber; // Serial Number, really.
+ CloseFile();
+ ClearTitles();
+
+@@ -223,13 +222,11 @@ void InfoList::DisplayObject()
+ ConvertNameToReal(strCurDir, strRealDir);
+
+ fprintf(stderr, "apiGetVolumeInformation: %ls\n", strRealDir.CPtr());
+- bool b_info = apiGetVolumeInformation(strRealDir, &strVolumeName, &VolumeNumber, &MaxNameLength, &FileSystemFlags,
+- &strFileSystemName, &strFileSystemMountPoint);
++ bool b_info = apiGetVolumeInformation(strRealDir, &strVolumeName, &strDiskNumber, &MaxNameLength, &FileSystemFlags,
++ &strFileSystemName, &strDeviceName, &strFileSystemMountPoint);
+ if (b_info) {
+ // strTitle=FARString(L" ")+DiskType+L" "+Msg::InfoDisk+L" "+(strDriveRoot)+L" ("+strFileSystemName+L") ";
+- strTitle = L"(" + strFileSystemName + L")";
+-
+- strDiskNumber.Format(L"%08X-%08X", (DWORD)(VolumeNumber >> 32), (DWORD)(VolumeNumber & 0xffffffff));
++ strTitle = strDeviceName + L" (" + strFileSystemName + L")";
+ } else // Error!
+ strTitle = strCurDir; // strDriveRoot;
+
+@@ -259,9 +256,11 @@ void InfoList::DisplayObject()
+ PrintInfo(strVolumeName);
+ }
+
++ if (!strDiskNumber.IsEmpty()) {
+ GotoXY(X1 + 2, CurY++);
+ PrintText(Msg::InfoDiskNumber);
+ PrintInfo(strDiskNumber);
++ }
+
+ // new fields
+ GotoXY(X1 + 2, CurY++);
+@@ -444,7 +443,7 @@ void InfoList::DisplayObject()
+ PrintInfo(strOutStr);
+ }
+
+-#elif !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__HAIKU__)
++#elif !defined(__DragonFly__) && !defined(__HAIKU__)
+ struct sysinfo si = {};
+ if (sysinfo(&si) == 0) {
+ DWORD dwMemoryLoad = 100 - ToPercent64(si.freeram + si.freeswap, si.totalram + si.totalswap);
+@@ -683,7 +682,7 @@ void InfoList::PrintInfo(const wchar_t *str)
+
+ FARString strStr = str;
+ TruncStr(strStr, MaxLength);
+- int Length = (int)strStr.GetLength();
++ int Length = (int)strStr.CellsCount();
+ int NewX = X2 - Length - 1;
+
+ if (NewX > X1 && NewX > WhereX()) {
diff --git a/misc/far2l/pkg-descr b/misc/far2l/pkg-descr
index 183802364ba5..da73c6ec626e 100644
--- a/misc/far2l/pkg-descr
+++ b/misc/far2l/pkg-descr
@@ -2,7 +2,3 @@ GNU/Linux port of the FAR Manager v2 (http://farmanager.com/) which also
works on macOS and *BSD systems. Short for File and ARchive Manager, it
is one of the most prominent Norton Commander clones, or implementations
of the classic, orthodox two-panel file manager idea.
-
-Plugins that currently work: NetRocks (SFTP/SCP/FTP/FTPS/SMB/NFS/WebDAV),
-colorer, multiarc, tmppanel, align, autowrap, drawline, editcase,
-SimpleIndent, Python (optional scripting support).
diff --git a/misc/far2l/pkg-plist b/misc/far2l/pkg-plist
index 87c519b71b3c..bd38b140f5f3 100644
--- a/misc/far2l/pkg-plist
+++ b/misc/far2l/pkg-plist
@@ -1,5 +1,6 @@
bin/far2l
bin/far2ledit
+%%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
%%NFS%%lib/far2l/Plugins/NetRocks/plug/NetRocks-NFS.broker
@@ -8,8 +9,10 @@ lib/far2l/Plugins/NetRocks/plug/NetRocks-SHELL.broker
%%SMB%%lib/far2l/Plugins/NetRocks/plug/NetRocks-SMB.broker
%%WEBDAV%%lib/far2l/Plugins/NetRocks/plug/NetRocks-WebDAV.broker
lib/far2l/Plugins/NetRocks/plug/NetRocks.far-plug-wide
+lib/far2l/Plugins/OpenWith/plug/OpenWith.far-plug-wide
lib/far2l/Plugins/SimpleIndent/plug/SimpleIndent.far-plug-wide
lib/far2l/Plugins/align/plug/align.far-plug-wide
+lib/far2l/Plugins/arclite/plug/arclite.far-plug-wide
lib/far2l/Plugins/autowrap/plug/autowrap.far-plug-wide
lib/far2l/Plugins/calc/plug/calc.far-plug-wide
lib/far2l/Plugins/colorer/plug/colorer.far-plug-wide
@@ -18,6 +21,7 @@ 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/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/multiarc/plug/multiarc.far-plug-mb
@@ -51,9 +55,24 @@ share/bash-completion/completions/far2l
%%DATADIR%%/Plugins/NetRocks/plug/helpe.hlf
%%DATADIR%%/Plugins/NetRocks/plug/helpr.hlf
%%DATADIR%%/Plugins/NetRocks/plug/rus.lng
+%%DATADIR%%/Plugins/OpenWith/plug/OpenWithEng.lng
+%%DATADIR%%/Plugins/OpenWith/plug/OpenWithRus.lng
+%%DATADIR%%/Plugins/OpenWith/plug/help_en.hlf
+%%DATADIR%%/Plugins/OpenWith/plug/help_ru.hlf
%%DATADIR%%/Plugins/align/plug/AlignBel.lng
%%DATADIR%%/Plugins/align/plug/AlignEng.lng
%%DATADIR%%/Plugins/align/plug/AlignRus.lng
+%%DATADIR%%/Plugins/arclite/plug/arclite-extra.farconfig
+%%DATADIR%%/Plugins/arclite/plug/arclite.xml
+%%DATADIR%%/Plugins/arclite/plug/arclite_bel.lng
+%%DATADIR%%/Plugins/arclite/plug/arclite_eng.hlf
+%%DATADIR%%/Plugins/arclite/plug/arclite_eng.lng
+%%DATADIR%%/Plugins/arclite/plug/arclite_ita.lng
+%%DATADIR%%/Plugins/arclite/plug/arclite_pol.hlf
+%%DATADIR%%/Plugins/arclite/plug/arclite_pol.lng
+%%DATADIR%%/Plugins/arclite/plug/arclite_rus.hlf
+%%DATADIR%%/Plugins/arclite/plug/arclite_rus.lng
+%%DATADIR%%/Plugins/arclite/plug/arclite_spa.lng
%%DATADIR%%/Plugins/autowrap/plug/WrapBel.lng
%%DATADIR%%/Plugins/autowrap/plug/WrapEng.lng
%%DATADIR%%/Plugins/autowrap/plug/WrapRus.lng
@@ -187,11 +206,17 @@ share/bash-completion/completions/far2l
%%DATADIR%%/Plugins/colorer/base/hrc/misc/ddoc.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/misc/diff.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/misc/filesbbs.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/misc/go-template-sprig.ent.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/misc/go-template-sprig.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/misc/go-template.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/misc/helm-text.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/misc/helm-tpl.ent.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/misc/helm-tpl.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/misc/markdown.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/misc/mediawiki.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/misc/srt.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/misc/text.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/php-prot.ent.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/php-prot-gen.ent.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/proto.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/rare.gen.ent.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/rare.ie-weidu.ent.hrc
@@ -221,6 +246,33 @@ share/bash-completion/completions/far2l
%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/ibatis2-sql-map-config.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/ibatis2-sql-map-pack.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/ibatis2-sql-map.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/application-client_1_4.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/application-client_5.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/application_1_2.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/application_1_3.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/application_1_4.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/application_5.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/connector_1_0.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/connector_1_5.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/ejb-jar_1_1.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/ejb-jar_2_0.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/ejb-jar_2_1.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/ejb-jar_3_0.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/j2ee_jaxrpc_mapping_1_1.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/j2ee_web_services_1_0.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/j2ee_web_services_1_1.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/javaee_web_services_1_2.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/javaee_web_services_metadata_handler_2_0.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/web-app_2_3.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/web-app_2_4.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/web-app_2_5.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/web-facesconfig_1_0.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/web-facesconfig_1_1.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/web-facesconfig_1_2.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/web-jsptaglibrary_1_1.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/web-jsptaglibrary_1_2.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/web-jsptaglibrary_2_0.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/j2ee/web-jsptaglibrary_2_1.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/log4j.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/parser-brackets.ent.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/rare/gen/parser-ex.ent.hrc
@@ -235,33 +287,6 @@ share/bash-completion/completions/far2l
%%DATADIR%%/Plugins/colorer/base/hrc/rare/ie-weidu/tp2.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/rare/ie-weidu/tp2h.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/rare/ie-weidu/tra.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/application-client_1_4.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/application-client_5.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/application_1_2.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/application_1_3.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/application_1_4.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/application_5.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/connector_1_0.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/connector_1_5.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/ejb-jar_1_1.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/ejb-jar_2_0.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/ejb-jar_2_1.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/ejb-jar_3_0.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/j2ee_jaxrpc_mapping_1_1.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/j2ee_web_services_1_0.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/j2ee_web_services_1_1.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/javaee_web_services_1_2.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/javaee_web_services_metadata_handler_2_0.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/web-app_2_3.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/web-app_2_4.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/web-app_2_5.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/web-facesconfig_1_0.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/web-facesconfig_1_1.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/web-facesconfig_1_2.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/web-jsptaglibrary_1_1.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/web-jsptaglibrary_1_2.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/web-jsptaglibrary_2_0.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/rare/j2ee/web-jsptaglibrary_2_1.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/rare/jcl.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/rare/json.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/rare/lisp.hrc
@@ -326,15 +351,6 @@ share/bash-completion/completions/far2l
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/avisynth.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/awk.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/batch.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/scripts/cmake/cmake-auto.ent.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/scripts/cmake/cmake.ent.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/scripts/cmake/cmake.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/scripts/colorer/bkt.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/scripts/colorer/colorer5catalog.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/scripts/colorer/ent.hrc.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/scripts/colorer/hrc.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/scripts/colorer/hrd.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/scripts/colorer/xsd2hrc.custom.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/config.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/dcl.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/dfm.hrc
@@ -343,14 +359,24 @@ share/bash-completion/completions/far2l
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/far/farlng.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/far/farmailscript.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/far/farmenu.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/scripts/far/gen/calcset.hrc
-%%DATADIR%%/Plugins/colorer/base/hrc/scripts/far/gen/esc.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/far/macro.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/far/macrolib.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/far/macroliblua.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/far/tgs.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/far/truemac.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/gen/ant.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/scripts/gen/cmake/LICENSE
+%%DATADIR%%/Plugins/colorer/base/hrc/scripts/gen/cmake/cmake-auto.ent.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/scripts/gen/cmake/cmake.ent.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/scripts/gen/cmake/cmake.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/scripts/gen/colorer/bkt.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/scripts/gen/colorer/colorer5catalog.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/scripts/gen/colorer/ent.hrc.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/scripts/gen/colorer/hrc.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/scripts/gen/colorer/hrd.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/scripts/gen/colorer/xsd2hrc.custom.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/scripts/gen/far/calcset.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/scripts/gen/far/esc.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/gen/qrc.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/gen/sh-brackets.ent.hrc
%%DATADIR%%/Plugins/colorer/base/hrc/scripts/gen/wsc.hrc
@@ -426,7 +452,6 @@ share/bash-completion/completions/far2l
%%DATADIR%%/Plugins/colorer/base/hrc/xml/xquery.hrc
%%DATADIR%%/Plugins/colorer/base/hrd/catalog-console.xml
%%DATADIR%%/Plugins/colorer/base/hrd/catalog-rgb.xml
-%%DATADIR%%/Plugins/colorer/base/hrd/catalog-text.xml
%%DATADIR%%/Plugins/colorer/base/hrd/console/black.hrd
%%DATADIR%%/Plugins/colorer/base/hrd/console/blue.hrd
%%DATADIR%%/Plugins/colorer/base/hrd/console/contrib/black_ay.hrd
@@ -446,20 +471,6 @@ share/bash-completion/completions/far2l
%%DATADIR%%/Plugins/colorer/base/hrd/console/nc.hrd
%%DATADIR%%/Plugins/colorer/base/hrd/console/white.hrd
%%DATADIR%%/Plugins/colorer/base/hrd/console/xmastree.hrd
-%%DATADIR%%/Plugins/colorer/base/hrd/css/black.css
-%%DATADIR%%/Plugins/colorer/base/hrd/css/blue.css
-%%DATADIR%%/Plugins/colorer/base/hrd/css/contrib/bred3.css
-%%DATADIR%%/Plugins/colorer/base/hrd/css/contrib/fmx.css
-%%DATADIR%%/Plugins/colorer/base/hrd/css/contrib/navy-mirror.css
-%%DATADIR%%/Plugins/colorer/base/hrd/css/contrib/visual-rgb.css
-%%DATADIR%%/Plugins/colorer/base/hrd/css/eclipse.css
-%%DATADIR%%/Plugins/colorer/base/hrd/css/grayscale.css
-%%DATADIR%%/Plugins/colorer/base/hrd/css/hs.css
-%%DATADIR%%/Plugins/colorer/base/hrd/css/mirice.css
-%%DATADIR%%/Plugins/colorer/base/hrd/css/mirror.css
-%%DATADIR%%/Plugins/colorer/base/hrd/css/navy.css
-%%DATADIR%%/Plugins/colorer/base/hrd/css/neo.css
-%%DATADIR%%/Plugins/colorer/base/hrd/css/white.css
%%DATADIR%%/Plugins/colorer/base/hrd/rgb/black.hrd
%%DATADIR%%/Plugins/colorer/base/hrd/rgb/blue.hrd
%%DATADIR%%/Plugins/colorer/base/hrd/rgb/contrib/bred3.hrd
@@ -474,9 +485,8 @@ share/bash-completion/completions/far2l
%%DATADIR%%/Plugins/colorer/base/hrd/rgb/mirror.hrd
%%DATADIR%%/Plugins/colorer/base/hrd/rgb/navy.hrd
%%DATADIR%%/Plugins/colorer/base/hrd/rgb/neo.hrd
+%%DATADIR%%/Plugins/colorer/base/hrd/rgb/violet.hrd
%%DATADIR%%/Plugins/colorer/base/hrd/rgb/white.hrd
-%%DATADIR%%/Plugins/colorer/base/hrd/text/htmlcss.hrd
-%%DATADIR%%/Plugins/colorer/base/hrd/text/tags.hrd
%%DATADIR%%/Plugins/colorer/plug/colorerb.lng
%%DATADIR%%/Plugins/colorer/plug/colorere.hlf
%%DATADIR%%/Plugins/colorer/plug/colorere.lng
@@ -506,6 +516,12 @@ share/bash-completion/completions/far2l
%%DATADIR%%/Plugins/filecase/plug/CaseEng.lng
%%DATADIR%%/Plugins/filecase/plug/CaseRus.hlf
%%DATADIR%%/Plugins/filecase/plug/CaseRus.lng
+%%DATADIR%%/Plugins/hexitor/plug/Hexitor_en.hlf
+%%DATADIR%%/Plugins/hexitor/plug/Hexitor_en.lng
+%%DATADIR%%/Plugins/hexitor/plug/Hexitor_pl.hlf
+%%DATADIR%%/Plugins/hexitor/plug/Hexitor_pl.lng
+%%DATADIR%%/Plugins/hexitor/plug/Hexitor_ru.hlf
+%%DATADIR%%/Plugins/hexitor/plug/Hexitor_ru.lng
%%DATADIR%%/Plugins/incsrch/plug/incsrche.hlf
%%DATADIR%%/Plugins/incsrch/plug/incsrchr.hlf
%%DATADIR%%/Plugins/incsrch/plug/isrcbel.lng
@@ -528,6 +544,7 @@ share/bash-completion/completions/far2l
%%DATADIR%%/Plugins/tmppanel/plug/TmpRus.hlf
%%DATADIR%%/Plugins/tmppanel/plug/TmpRus.lng
%%DATADIR%%/closewait.sh
+%%DATADIR%%/far2l-cd.sh
%%DATADIR%%/notify.sh
%%DATADIR%%/open.sh
%%DATADIR%%/ps.sh
@@ -535,31 +552,57 @@ share/bash-completion/completions/far2l
%%DATADIR%%/unmount.sh
%%DATADIR%%/view.sh
%%DATADIR%%/xlats.ini
+share/icons/far2l-wx.svg
share/icons/far2l.svg
+share/icons/far2ledit-wx.svg
share/icons/far2ledit.svg
+share/icons/hicolor/1024x1024/apps/far2l-wx.svg
share/icons/hicolor/1024x1024/apps/far2l.svg
+share/icons/hicolor/1024x1024/apps/far2ledit-wx.svg
share/icons/hicolor/1024x1024/apps/far2ledit.svg
+share/icons/hicolor/128x128/apps/far2l-wx.svg
share/icons/hicolor/128x128/apps/far2l.svg
+share/icons/hicolor/128x128/apps/far2ledit-wx.svg
share/icons/hicolor/128x128/apps/far2ledit.svg
+share/icons/hicolor/16x16/apps/far2l-wx.svg
share/icons/hicolor/16x16/apps/far2l.svg
+share/icons/hicolor/16x16/apps/far2ledit-wx.svg
share/icons/hicolor/16x16/apps/far2ledit.svg
+share/icons/hicolor/192x192/apps/far2l-wx.svg
share/icons/hicolor/192x192/apps/far2l.svg
+share/icons/hicolor/192x192/apps/far2ledit-wx.svg
share/icons/hicolor/192x192/apps/far2ledit.svg
+share/icons/hicolor/24x24/apps/far2l-wx.svg
share/icons/hicolor/24x24/apps/far2l.svg
+share/icons/hicolor/24x24/apps/far2ledit-wx.svg
share/icons/hicolor/24x24/apps/far2ledit.svg
+share/icons/hicolor/256x256/apps/far2l-wx.svg
share/icons/hicolor/256x256/apps/far2l.svg
+share/icons/hicolor/256x256/apps/far2ledit-wx.svg
share/icons/hicolor/256x256/apps/far2ledit.svg
+share/icons/hicolor/32x32/apps/far2l-wx.svg
share/icons/hicolor/32x32/apps/far2l.svg
+share/icons/hicolor/32x32/apps/far2ledit-wx.svg
share/icons/hicolor/32x32/apps/far2ledit.svg
+share/icons/hicolor/48x48/apps/far2l-wx.svg
share/icons/hicolor/48x48/apps/far2l.svg
+share/icons/hicolor/48x48/apps/far2ledit-wx.svg
share/icons/hicolor/48x48/apps/far2ledit.svg
+share/icons/hicolor/512x512/apps/far2l-wx.svg
share/icons/hicolor/512x512/apps/far2l.svg
+share/icons/hicolor/512x512/apps/far2ledit-wx.svg
share/icons/hicolor/512x512/apps/far2ledit.svg
+share/icons/hicolor/64x64/apps/far2l-wx.svg
share/icons/hicolor/64x64/apps/far2l.svg
+share/icons/hicolor/64x64/apps/far2ledit-wx.svg
share/icons/hicolor/64x64/apps/far2ledit.svg
+share/icons/hicolor/72x72/apps/far2l-wx.svg
share/icons/hicolor/72x72/apps/far2l.svg
+share/icons/hicolor/72x72/apps/far2ledit-wx.svg
share/icons/hicolor/72x72/apps/far2ledit.svg
+share/icons/hicolor/96x96/apps/far2l-wx.svg
share/icons/hicolor/96x96/apps/far2l.svg
+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