aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Dokuchaev <danfe@FreeBSD.org>2023-09-02 15:24:48 +0000
committerAlexey Dokuchaev <danfe@FreeBSD.org>2023-09-02 15:24:48 +0000
commit8957bf52a7f742ff5ee98fc78240dc7737dfa7be (patch)
tree085922163a1a170ce89f99fb7fdebb2ba6afb4eb
parent9bca36b5a32afcebd8f8aa010aa524fe0d7d8d94 (diff)
downloadports-8957bf52a7f742ff5ee98fc78240dc7737dfa7be.tar.gz
ports-8957bf52a7f742ff5ee98fc78240dc7737dfa7be.zip
misc/far2l: update the port to version 2.5.2 (color it up)
Drop no longer needed BUILD_DEPENDS, but as a result of M4 -> Perl conversion in the bootstrap scripts upstream we now must patch the hardcoded operating system and CPU architecture names. Reported by: portscout
-rw-r--r--misc/far2l/Makefile6
-rw-r--r--misc/far2l/distinfo6
-rw-r--r--misc/far2l/files/patch-multiarc_src_formats_7z_C_7zCrc.c11
-rw-r--r--misc/far2l/pkg-plist1
4 files changed, 7 insertions, 17 deletions
diff --git a/misc/far2l/Makefile b/misc/far2l/Makefile
index 1de0cc1b6b57..6009ddfad0be 100644
--- a/misc/far2l/Makefile
+++ b/misc/far2l/Makefile
@@ -1,5 +1,5 @@
PORTNAME= far2l
-PORTVERSION= 2.5.0
+PORTVERSION= 2.5.2
DISTVERSIONPREFIX= v_
CATEGORIES= misc
@@ -9,8 +9,6 @@ WWW= https://github.com/elfmz/far2l
LICENSE= GPLv2
-BUILD_DEPENDS= gawk:lang/gawk gm4:devel/m4 \
- ${LOCALBASE}/include/spdlog/spdlog.h:devel/spdlog
LIB_DEPENDS= libfmt.so:devel/libfmt \
libpcre.so:devel/pcre \
libuchardet.so:textproc/uchardet \
@@ -48,6 +46,8 @@ X11_USES= xorg
X11_USE= XORG=ice,sm,x11,xext,xi
post-patch:
+ @${REINPLACE_CMD} -e 's,Linux x86_64,${OPSYS} ${ARCH},' \
+ ${WRKSRC}/far2l/bootstrap/scripts/far2l_m4.pl
@${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 2fac71112d90..afbb997c2cde 100644
--- a/misc/far2l/distinfo
+++ b/misc/far2l/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1673740382
-SHA256 (elfmz-far2l-v_2.5.0_GH0.tar.gz) = c0cdb302d90b71f3c1c04205a6f0eb1bdb5fe81c36b13d8dd184f18e4b35bddb
-SIZE (elfmz-far2l-v_2.5.0_GH0.tar.gz) = 6431408
+TIMESTAMP = 1692098850
+SHA256 (elfmz-far2l-v_2.5.2_GH0.tar.gz) = c8ae8bd7b9f242e267f4b13c81735706accdc40046dd262d30a4017b703f36b7
+SIZE (elfmz-far2l-v_2.5.2_GH0.tar.gz) = 6483703
diff --git a/misc/far2l/files/patch-multiarc_src_formats_7z_C_7zCrc.c b/misc/far2l/files/patch-multiarc_src_formats_7z_C_7zCrc.c
deleted file mode 100644
index 3badab66c6bb..000000000000
--- a/misc/far2l/files/patch-multiarc_src_formats_7z_C_7zCrc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- multiarc/src/formats/7z/C/7zCrc.c.orig 2023-01-14 23:53:02 UTC
-+++ multiarc/src/formats/7z/C/7zCrc.c
-@@ -86,7 +86,7 @@ UInt32 MY_FAST_CALL CrcUpdateT1(UInt32 v, const void *
- #if !defined(__ARM_FEATURE_CRC32)
- #define __ARM_FEATURE_CRC32 1
- #if (!defined(__clang__) || (__clang_major__ > 3)) // fix these numbers
-- #define ATTRIB_CRC __attribute__((__target__("arch=armv8-a+crc")))
-+ #define ATTRIB_CRC __attribute__((__target__("crc")))
- #endif
- #endif
- #if defined(__ARM_FEATURE_CRC32)
diff --git a/misc/far2l/pkg-plist b/misc/far2l/pkg-plist
index f632b10b62fc..48f58181550f 100644
--- a/misc/far2l/pkg-plist
+++ b/misc/far2l/pkg-plist
@@ -1,4 +1,5 @@
bin/far2l
+bin/far2ledit
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