Update to 3.1

Upstream changes:
2018 September 18

GNU nano 3.1 "Je faisais des bonds comme ça!" fixes a
misbinding of ^H on some terminals and some systems,
does not leave stray stuff after the prompt upon exit
when having suspended nano while using --constantshow,
and does not allow to toggle to Replace in view mode.

4 files changed, 7 insertions, 53 deletions

diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index b95b07f2b35..8c6f6ff79f6 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.75 2018/09/13 19:34:33 wiedi Exp $
+# $NetBSD: Makefile,v 1.76 2018/09/23 03:46:04 wen Exp $
 
-DISTNAME=	nano-3.0
-PKGREVISION=	1
+DISTNAME=	nano-3.1
 CATEGORIES=	editors
 MASTER_SITES=	https://www.nano-editor.org/dist/v${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=	.tar.xz
diff --git a/editors/nano/distinfo b/editors/nano/distinfo
index f5acc31ad10..d5d5395c2fa 100644
--- a/editors/nano/distinfo
+++ b/editors/nano/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.47 2018/09/13 19:34:33 wiedi Exp $
+$NetBSD: distinfo,v 1.48 2018/09/23 03:46:04 wen Exp $
 
-SHA1 (nano-3.0.tar.xz) = 0396d85df64a7927ca2d3425a0263dacf8502220
-RMD160 (nano-3.0.tar.xz) = 682546c3dec370918de7e9d1b8517612c43ae6f0
-SHA512 (nano-3.0.tar.xz) = 120b606d65672a905e9ef9f3b55381cc62b7929abeaf409ea4af6be9f51b3d038e6e68f082755cbb7e198f0fb5203e0f4796c6c96ebd054d9a2241b313fcdda1
-Size (nano-3.0.tar.xz) = 1508248 bytes
+SHA1 (nano-3.1.tar.xz) = 64518199009b8d5094778b5f3373d16ad9a5a980
+RMD160 (nano-3.1.tar.xz) = fec0a804d4b87edf2399186775f8592d41b58126
+SHA512 (nano-3.1.tar.xz) = dc50381a129fec32d85982d8129324268e3e27a28c5b958fb7bcfca690646bd0a3b995dc456971355b91952c0ac3ea3e0a873b228010238a76e8dbb0ddaf1143
+Size (nano-3.1.tar.xz) = 1509524 bytes
 SHA1 (patch-configure) = 4a618bf99332fcfce2413be14400b919d042cc30
-SHA1 (patch-src_nano.c) = f4be36781f7f4f72905a5e7c2821a3351002eb39
-SHA1 (patch-src_nano.h) = 6834c3bc38adc645a5ef4741a9263f7bfa81f93f
diff --git a/editors/nano/patches/patch-src_nano.c b/editors/nano/patches/patch-src_nano.c
deleted file mode 100644
index e77efd072ee..00000000000
--- a/editors/nano/patches/patch-src_nano.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_nano.c,v 1.1 2018/09/13 19:34:34 wiedi Exp $
-
-When curses gives no code for Ctrl+Shift+Delete, do not fall back
-to KEY_BACKSPACE, because then ^H and/or <Backspace> get bound to
-'cutwordleft'.
-
-This fixes https://savannah.gnu.org/bugs/?54642.
-Upstream commit: 09ab2e3d0eeb33bc4d0702623404ba01b1f8fa9a
-
-Version 3.1 will be released in one or two weeks and include this.
-
---- src/nano.c.orig	2018-09-09 09:39:27.000000000 +0000
-+++ src/nano.c
-@@ -2580,7 +2580,7 @@ int main(int argc, char **argv)
- 	controlhome = get_keycode("kHOM5", CONTROL_HOME);
- 	controlend = get_keycode("kEND5", CONTROL_END);
- 	controldelete = get_keycode("kDC5", CONTROL_DELETE);
--	controlshiftdelete = get_keycode("kDC6", KEY_BACKSPACE);
-+	controlshiftdelete = get_keycode("kDC6", CONTROL_SHIFT_DELETE);
- #ifndef NANO_TINY
- 	/* Ask for the codes for Shift+Control+Left/Right/Up/Down. */
- 	shiftcontrolleft = get_keycode("kLFT6", SHIFT_CONTROL_LEFT);
diff --git a/editors/nano/patches/patch-src_nano.h b/editors/nano/patches/patch-src_nano.h
deleted file mode 100644
index 7dbd5431168..00000000000
--- a/editors/nano/patches/patch-src_nano.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_nano.h,v 1.1 2018/09/13 19:34:34 wiedi Exp $
-
-When curses gives no code for Ctrl+Shift+Delete, do not fall back
-to KEY_BACKSPACE, because then ^H and/or <Backspace> get bound to
-'cutwordleft'.
-
-This fixes https://savannah.gnu.org/bugs/?54642.
-Upstream commit: 09ab2e3d0eeb33bc4d0702623404ba01b1f8fa9a
-
-Version 3.1 will be released in one or two weeks and include this.
-
---- src/nano.h.orig	2018-08-29 17:37:02.000000000 +0000
-+++ src/nano.h
-@@ -588,6 +588,7 @@ enum
- #define SHIFT_CONTROL_DOWN 0x414
- #define SHIFT_CONTROL_HOME 0x415
- #define SHIFT_CONTROL_END 0x416
-+#define CONTROL_SHIFT_DELETE 0x417
- #define ALT_LEFT 0x421
- #define ALT_RIGHT 0x422
- #define ALT_UP 0x423