From bf1a6ea2c4829544257493bee34851eb136dc046 Mon Sep 17 00:00:00 2001
From: mestre <mestre@openbsd.org>
Date: Mon, 20 Dec 2021 15:23:35 +0000
Subject: [PATCH] update to 6.0. ok naddy@

Improvements:
- Option --zero hides the interface and uses the whole terminal for editing.
- Colors can be given also in #rgb hexadecimal, to select the nearest color
  from the 6x6x6 color-cube palette available on 256-color terminals.
- Fourteen new color names are available, from rosy to crimson.
---
 editors/nano/Makefile                      | 6 +++---
 editors/nano/distinfo                      | 4 ++--
 editors/nano/patches/patch-src_Makefile_in | 6 +++---
 editors/nano/pkg/PLIST                     | 5 ++---
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index bb1012a9427..fc14385c22b 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.123 2021/10/10 11:51:20 naddy Exp $
+# $OpenBSD: Makefile,v 1.124 2021/12/20 15:23:35 mestre Exp $
 
 COMMENT=	simple editor, inspired by Pico
 
-DISTNAME=	nano-5.9
+DISTNAME=	nano-6.0
 CATEGORIES=	editors
 HOMEPAGE=	https://www.nano-editor.org/
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
-MASTER_SITES=	https://www.nano-editor.org/dist/v5/ \
+MASTER_SITES=	https://www.nano-editor.org/dist/v6/ \
 		${MASTER_SITE_GNU:=nano/}
 PORTROACH=	site:https://www.nano-editor.org/dist/latest/
 EXTRACT_SUFX=	.tar.xz
diff --git a/editors/nano/distinfo b/editors/nano/distinfo
index b37f53ef167..a109c465208 100644
--- a/editors/nano/distinfo
+++ b/editors/nano/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nano-5.9.tar.xz) = dX24zaS7KHNZnkd4OvRj47VHpiewyrsw6nv3H7TCSTc=
-SIZE (nano-5.9.tar.xz) = 1499852
+SHA256 (nano-6.0.tar.xz) = k6yMtotK0Q4KrrgKLdFcW7ietmWkhE960Bxn78sWnqI=
+SIZE (nano-6.0.tar.xz) = 1509388
diff --git a/editors/nano/patches/patch-src_Makefile_in b/editors/nano/patches/patch-src_Makefile_in
index 2dd1bf36c51..66b6d70b38d 100644
--- a/editors/nano/patches/patch-src_Makefile_in
+++ b/editors/nano/patches/patch-src_Makefile_in
@@ -1,8 +1,8 @@
-$OpenBSD: patch-src_Makefile_in,v 1.27 2021/05/01 20:53:36 naddy Exp $
+$OpenBSD: patch-src_Makefile_in,v 1.28 2021/12/20 15:23:35 mestre Exp $
 Index: src/Makefile.in
 --- src/Makefile.in.orig
 +++ src/Makefile.in
-@@ -1640,7 +1640,7 @@ nano_SOURCES = \
+@@ -1658,7 +1658,7 @@ nano_SOURCES = \
  		utils.c \
  		winio.c
  
@@ -11,7 +11,7 @@ Index: src/Makefile.in
  		$(LIB_CLOCK_GETTIME) $(LIBTHREAD)
  
  all: all-am
-@@ -2014,7 +2014,7 @@ winio.o: revision.h
+@@ -2031,7 +2031,7 @@ winio.o: revision.h
  
  # Always run the commands in this rule.  But update the target
  # only when the revision actually changed.
diff --git a/editors/nano/pkg/PLIST b/editors/nano/pkg/PLIST
index b7f436ae09c..5837e5e2cdd 100644
--- a/editors/nano/pkg/PLIST
+++ b/editors/nano/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.37 2021/10/10 11:51:21 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.38 2021/12/20 15:23:36 mestre Exp $
 @pkgpath editors/nano,slang
 @bin bin/nano
 bin/rnano
@@ -65,9 +65,7 @@ share/nano/elisp.nanorc
 share/nano/email.nanorc
 share/nano/extra/
 share/nano/extra/ada.nanorc
-share/nano/extra/debian.nanorc
 share/nano/extra/fortran.nanorc
-share/nano/extra/gentoo.nanorc
 share/nano/extra/haskell.nanorc
 share/nano/extra/povray.nanorc
 share/nano/extra/spec.nanorc
@@ -100,3 +98,4 @@ share/nano/tcl.nanorc
 share/nano/tex.nanorc
 share/nano/texinfo.nanorc
 share/nano/xml.nanorc
+share/nano/yaml.nanorc