patches/nnn-4.4.diff
2023-01-11 10:10:34 +01:00

81 lines
2.5 KiB
Diff

Index: sysutils/nnn/Makefile
===================================================================
RCS file: /home/cvs/ports/sysutils/nnn/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- sysutils/nnn/Makefile 4 Oct 2021 14:16:52 -0000 1.17
+++ sysutils/nnn/Makefile 25 Nov 2021 06:49:20 -0000
@@ -2,7 +2,7 @@
COMMENT = the missing terminal file browser for X
-V = 4.3
+V = 4.4
DISTNAME = nnn-v${V}
PKGNAME = nnn-${V}
@@ -22,6 +22,8 @@ MASTER_SITES = https://github.com/jarun
# Uses -std=c11 so cannot use base-gcc
COMPILER = base-clang ports-gcc
COMPILER_LANGS = c
+
+RUN_DEPENDS = textproc/gsed
MAKE_FLAGS = CFLAGS_OPTIMIZATION=
FAKE_FLAGS = MANPREFIX="$(PREFIX)/man" \
Index: sysutils/nnn/distinfo
===================================================================
RCS file: /home/cvs/ports/sysutils/nnn/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- sysutils/nnn/distinfo 4 Oct 2021 14:16:52 -0000 1.14
+++ sysutils/nnn/distinfo 25 Nov 2021 06:49:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (nnn-v4.3.tar.gz) = tt+OJi5WE90ZK6xhCm2nETBmJ9Vlc/GncKFz7weJU7s=
-SIZE (nnn-v4.3.tar.gz) = 236606
+SHA256 (nnn-v4.4.tar.gz) = 4Eo/Dwwq8eGMtvAF0YJnx3A2RCdNIbuT8Dsw5P09FlM=
+SIZE (nnn-v4.4.tar.gz) = 239005
Index: sysutils/nnn/patches/patch-src_nnn_c
===================================================================
RCS file: sysutils/nnn/patches/patch-src_nnn_c
diff -N sysutils/nnn/patches/patch-src_nnn_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysutils/nnn/patches/patch-src_nnn_c 25 Nov 2021 06:53:01 -0000
@@ -0,0 +1,36 @@
+$OpenBSD$
+
+Cherry pick patch to make file renames more reliable.
+https://patch-diff.githubusercontent.com/raw/jarun/nnn/pull/1243.diff
+
+Index: src/nnn.c
+--- src/nnn.c.orig
++++ src/nnn.c
+@@ -202,12 +202,14 @@
+ #define CTX_MAX 8
+ #endif
+
++#ifndef SED
+ /* BSDs or Solaris or SunOS */
+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(sun) || defined(__sun)
+ #define SED "gsed"
+ #else
+ #define SED "sed"
+ #endif
++#endif
+
+ /* Large selection threshold */
+ #ifndef LARGESEL
+@@ -2729,12 +2731,7 @@ static void archive_selection(const char *cmd, const c
+ }
+
+ snprintf(buf, CMD_LEN_MAX,
+-#ifdef __linux__
+ SED" -ze 's|^%s/||' '%s' | xargs -0 %s %s", curpath, selpath, cmd, archive
+-#else
+- "tr '\\0' '\n' < '%s' | "SED" -e 's|^%s/||' | tr '\n' '\\0' | xargs -0 %s %s",
+- selpath, curpath, cmd, archive
+-#endif
+ );
+ spawn(utils[UTIL_SH_EXEC], buf, NULL, NULL, F_CLI | F_CONFIRM);
+ free(buf);