sysutils/nnn: Update to 3.3

Changes:
 - subdir mounts for remote and archive mounts
 - remove mount point on successful unmount of remote/archive
 - show error and prompt user if cp/mv/rm operation fails
 - support absolute/relative paths in cp/mv as
 - mark current path automatically on archive/remote mount
 - mark current path automatically on target file visit in find and
   list mode
 - option -C to place HW cursor on hovered for screen readers and
   braille displays
 - option -u to use selection (if available) and skip current/sel prompt
 - key Alt+Esc to clear filter prompt and redraw
 - support Esc to cancel remove operation
 - gpge & gpgd: encrypt and decrypt with GPG
 - blknew: create new files and directories in bulk
 - preview-tui:
   - unified to support tmux/kitty/xterm/$TERMINAL
   - auto-determine split orientation based on terminal height and width
   - provision to use scope.sh and pistol
   - various other improvements
 - upload: send to Firefox Send if ffsend is found
 - hexview: add hx as alternative hex viewer
 - nuke and imgview: add imv as alternative image viewer
 - add find (with fd) and grep (with rg) examples in plugins doc
 - key Esc or left click to resend hovered file path to NNN_FIFO
 - show + instead of s in status bar on selection
 - F5 removed (misfit for toggle hidden), ^S removed (often masked,
   redundant)
 - handle abnormal program termination and remove NNN_PIPE and/or
   NNN_FIFO
 - clear selection after successful batch rename, link creation
 - make option O_CTX8 for 8 contexts (NOT backward compatible with 4
   contexts)
 - fix issue with child window resize (see #656)
 - fix issue with NNNLVL on macOS (see #639)
 - fix issue with restoring session with du/au enabled

Package changes:
 - New 8 context mode is enabled
 - Patches have been merged

3 files changed, 8 insertions, 60 deletions

diff --git a/sysutils/nnn/Makefile b/sysutils/nnn/Makefile
index 1f779c26adc..1d7f19349e3 100644
--- a/sysutils/nnn/Makefile
+++ b/sysutils/nnn/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2020/06/23 23:32:30 sjmulder Exp $
+# $NetBSD: Makefile,v 1.21 2020/07/14 12:51:01 sjmulder Exp $
 
-DISTNAME=	nnn-3.2
-PKGREVISION=	2
+DISTNAME=	nnn-3.3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jarun/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -35,6 +34,7 @@ READLINE_DEFAULT=	readline
 # https://github.com/jarun/nnn/issues/453
 MAKE_ENV.Linux+=	LDLIBS=-lrt
 
+CFLAGS+=		-DCTX8
 CFLAGS.SunOS+=		-D__EXTENSIONS__
 
 .include "../../mk/compiler.mk"
diff --git a/sysutils/nnn/distinfo b/sysutils/nnn/distinfo
index acb4f092dcc..e721225a416 100644
--- a/sysutils/nnn/distinfo
+++ b/sysutils/nnn/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.15 2020/06/23 23:32:30 sjmulder Exp $
+$NetBSD: distinfo,v 1.16 2020/07/14 12:51:01 sjmulder Exp $
 
-SHA1 (nnn-3.2.tar.gz) = 074b20d4a9da51a673e9a43e6ccc1bd8d0b9b425
-RMD160 (nnn-3.2.tar.gz) = 3a0bc30d30da0cb468390f8a583489f0725f1a6e
-SHA512 (nnn-3.2.tar.gz) = 9cdc8d0d74162ddd4b90f69a4f558a25845732497ebdb129159fda658a799a949fe237013bf69a2d6a649433254ba2ed4c65f8f10cddd119f713c1d5518ea378
-Size (nnn-3.2.tar.gz) = 143122 bytes
-SHA1 (patch-src_nnn.c) = a1ee2addb56d4e5fdab18dfe1dae492af0afe7fc
+SHA1 (nnn-3.3.tar.gz) = 20b1c11376c47b98242a5d780484543ffd32d0cf
+RMD160 (nnn-3.3.tar.gz) = e342c2ad76927d1ff415394eefa689ee834e78d5
+SHA512 (nnn-3.3.tar.gz) = 34b772b4a876f7b31fb7badc1d7854faacebf266e4bda29cba0d2ee8e6728b5e7a842a0964a7d28d82d39053c8325dcafe6dafeaae43e7a7cfcc0e5d5dc719e9
+Size (nnn-3.3.tar.gz) = 148795 bytes
diff --git a/sysutils/nnn/patches/patch-src_nnn.c b/sysutils/nnn/patches/patch-src_nnn.c
deleted file mode 100644
index aaf3167731d..00000000000
--- a/sysutils/nnn/patches/patch-src_nnn.c
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-src_nnn.c,v 1.2 2020/06/23 23:32:30 sjmulder Exp $
-
- - Always use builtin alloca() on GCC to fix NetBSD/arm64 build.
-
-   https://github.com/jarun/nnn/pull/666
-
- - Wrap FILE_MIME_OPTS use in check, since it's not defined (at the top
-   of nnn.c) for Illumos which doesn't have such an option.
-
-   https://github.com/jarun/nnn/pull/622
-
---- src/nnn.c.orig	2020-06-23 22:41:07.232929706 +0000
-+++ src/nnn.c
-@@ -90,9 +90,6 @@
- #include <signal.h>
- #include <stdarg.h>
- #include <stdlib.h>
--#ifdef __sun
--#include <alloca.h>
--#endif
- #include <string.h>
- #include <strings.h>
- #include <time.h>
-@@ -103,6 +100,15 @@
- #include <ftw.h>
- #include <wchar.h>
- 
-+#if !defined(alloca) && defined(__GNUC__)
-+/*
-+ * GCC doesn't expand alloca() to __builtin_alloca() in standards mode
-+ * (-std=...) and not all standard libraries do or supply it, e.g.
-+ * NetBSD/arm64 so explicitly use the builtin.
-+ */
-+#define alloca(size) __builtin_alloca(size)
-+#endif
-+
- #include "nnn.h"
- #include "dbg.h"
- 
-@@ -3689,9 +3695,11 @@ static bool show_stats(const char *fpath
- 			}
- 			fprintf(fp, " %s\n  ", begin);
- 
-+#ifdef FILE_MIME_OPTS
- 			/* Show the file mime type */
- 			get_output(g_buf, CMD_LEN_MAX, "file", FILE_MIME_OPTS, fpath, FALSE);
- 			fprintf(fp, "%s", g_buf);
-+#endif
- 		}
- 	}
-