nnn: Update to 3.1

Package changes:
 - Now installs completions for fish, zsh, and bash.
 - New option 'mouse' (enabled by default) makes mouse support optional.
 - New option 'pcre' (enabled by default) for Perl regular expressions.
 - Removed checksum for deleted patch-src_nnn.c in distinfo.

Upstream changes:
 - unlimited bookmarks and plugin keys
 - status bar text in context color
 - support config `NO_COLOR` to disable colors
 - config `NNN_OPTS` to specify binary options to `nnn`
 - config `NNN_MCLICK` to emulate configurable key
 - toggle selection on right click
 - ignore hard links when calculating disk usage
 - dim (hard/sym) link names (symlink to file has `@`)
 - more special keys at empty filter prompt in _type-to-nav_
 - key `>` to export file list
 - option `-F` to show fortune in help and settings screen
 - option `-T` to specify sort order (obsoletes `-v`)
 - option to clear sort order
 - key `T` to change time type (access/change/mod)
 - `.nmv` - internal fully-functional batch renamer plugin
 - make var `O_NOBATCH` to disable native batch renamer
 - `nuke` & `imgview` - open all images in directory sxiv
 - `nuke` - open log files in vi
 - plugin `x2sel` - system clipboard to selection copier
 - plugin `fzy` - cd using z database
 - plugin `fzopen` - support `FZF_DEFAULT_COMMAND`
 - create new context on TAB without prompt
 - hover and connect by dir name (within config dir)
 - move to next entry on current file delete
 - on single file copy/move, select the copied/moved file
 - option `-f` to to use readline history file (off by default)
 - use `s` in status bar to indicate selection in progress
 - make var `O_NOMOUSE` to disable mouse support
 - do not store `NNN_TRASH` and `-Q` in config/session
 - add sample .desktop file for XDG compatible DEs
 - rename _nav-as-you-type_ to _type-to-nav_ mode
 - fix PCRE case-insensitive regex search
 - fix no error msg when filter length limit exceeded
 - fix static package generation
 - fix broken abort message when started in du-mode
 - fix filter lost on context switch in non _type-to-nav_ mode
 - fix broken readline prompt
 - fix long strings treated as action keys in filter prompt
 - fix `NNNLVL` not reset when spawned shell is exited

4 files changed, 41 insertions, 13 deletions

diff --git a/sysutils/nnn/Makefile b/sysutils/nnn/Makefile
index f53e38631c3..6a2a105f294 100644
--- a/sysutils/nnn/Makefile
+++ b/sysutils/nnn/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2020/03/16 16:27:18 sjmulder Exp $
+# $NetBSD: Makefile,v 1.17 2020/04/29 09:29:38 sjmulder Exp $
 
-DISTNAME=	nnn-3.0
+DISTNAME=	nnn-3.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jarun/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -11,7 +11,11 @@ COMMENT=	Optimized, feature-packed terminal file manager
 LICENSE=	2-clause-bsd
 
 USE_TOOLS+=	gmake pkg-config
-USE_CURSES=	wide set_escdelay getmouse
+USE_CURSES=	wide set_escdelay
+
+INSTALLATION_DIRS+=	share/bash-completion/completions
+INSTALLATION_DIRS+=	share/fish/vendor_completions.d
+INSTALLATION_DIRS+=	share/zsh/site-functions
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -31,6 +35,17 @@ MAKE_ENV+=	CFLAGS_OPTIMIZATION=
 MAKE_ENV+=	CFLAGS_CURSES=${BUILDLINK_CFLAGS.curses:Q}
 MAKE_ENV+=	LDLIBS_CURSES=${BUILDLINK_LDADD.curses:Q}
 
+post-install:
+	${INSTALL_DATA} \
+		${WRKSRC}/misc/auto-completion/bash/nnn-completion.bash \
+		${DESTDIR}${PREFIX}/share/bash-completion/completions/nnn
+	${INSTALL_DATA} \
+		${WRKSRC}/misc/auto-completion/fish/nnn.fish \
+		${DESTDIR}${PREFIX}/share/fish/vendor_completions.d/
+	${INSTALL_DATA} \
+		${WRKSRC}/misc/auto-completion/zsh/_nnn \
+		${DESTDIR}${PREFIX}/share/zsh/site-functions
+
 .include "options.mk"
 
 .include "../../mk/curses.buildlink3.mk"
diff --git a/sysutils/nnn/PLIST b/sysutils/nnn/PLIST
index a7af52a7473..1ca09d5011b 100644
--- a/sysutils/nnn/PLIST
+++ b/sysutils/nnn/PLIST
@@ -1,3 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2018/12/17 14:22:52 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/04/29 09:29:38 sjmulder Exp $
 bin/nnn
 man/man1/nnn.1
+share/bash-completion/completions/nnn
+share/fish/vendor_completions.d/nnn.fish
+share/zsh/site-functions/_nnn
diff --git a/sysutils/nnn/distinfo b/sysutils/nnn/distinfo
index 879428cccb3..6d2dbcf6ecf 100644
--- a/sysutils/nnn/distinfo
+++ b/sysutils/nnn/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.11 2020/03/16 16:27:18 sjmulder Exp $
+$NetBSD: distinfo,v 1.12 2020/04/29 09:29:38 sjmulder Exp $
 
-SHA1 (nnn-3.0.tar.gz) = 5adbc738d905da80018b6a6526b69b36ff453b92
-RMD160 (nnn-3.0.tar.gz) = d2ca7b2061f15eded16872f788f108bbc5cb8acb
-SHA512 (nnn-3.0.tar.gz) = a8092e1e5970e1f48baf04a3f9f7064b2efd61bc54bf993b0545c1c2148d775c29328b8e51d5b3f94340de82a468be8547bdd6bb40023811bbcfb755d611435f
-Size (nnn-3.0.tar.gz) = 102636 bytes
-SHA1 (patch-src_nnn.c) = 8d89c07976cbaab520f9aaf5a3d66bed02aa1a3a
+SHA1 (nnn-3.1.tar.gz) = 70e40acc2e2a9cd330e75ea8641751d69089597d
+RMD160 (nnn-3.1.tar.gz) = fd18ec2f3dcb17ff90463afc21c6f764bf08d806
+SHA512 (nnn-3.1.tar.gz) = f17bdcf95bba3eb50d20cb06725022bcdc2fae34a365e55dea1baa49e40c567e175a3d5c66fcf70f560e64a8933f0ed9a8ca39af67fd39edcb81c82be5aedca9
+Size (nnn-3.1.tar.gz) = 110005 bytes
diff --git a/sysutils/nnn/options.mk b/sysutils/nnn/options.mk
index a619a1593b1..ffc408cb9e7 100644
--- a/sysutils/nnn/options.mk
+++ b/sysutils/nnn/options.mk
@@ -1,11 +1,22 @@
-# $NetBSD: options.mk,v 1.3 2020/01/28 14:31:19 sjmulder Exp $
+# $NetBSD: options.mk,v 1.4 2020/04/29 09:29:38 sjmulder Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nnn
-PKG_SUPPORTED_OPTIONS+=	readline debug
-PKG_SUGGESTED_OPTIONS+=	readline
+PKG_SUPPORTED_OPTIONS+=	mouse pcre readline debug
+PKG_SUGGESTED_OPTIONS+=	mouse pcre readline
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mmouse)
+USE_CURSES+=		getmouse
+.else
+MAKE_FLAGS+=		O_NOMOUSE=1
+.endif
+
+.if !empty(PKG_OPTIONS:Mpcre)
+.include "../../devel/pcre/buildlink3.mk"
+MAKE_FLAGS+=		O_PCRE=1
+.endif
+
 .if !empty(PKG_OPTIONS:Mreadline)
 .include "../../mk/readline.buildlink3.mk"
 .else