Update nano to 2.4.1

2015.04.14 - GNU nano 2.4.1 "Glitch Gremlin" is released.  This release
		includes several fixes for issues with the file browser
		menu, linter and formatter functions, spell checker,
		undo/redo with some specific marked-cutting situations,
		and some small improvements to the color syntax
		highlighting definitions. There are also various
		documentation and code comment updates included, and
		finally, fixes for compilation on non-GNU/Linux systems
		and certain configure combinations.  Toasters!

2015.03.22 - GNU nano 2.4.0 "lizf" is released.  This is the first
		stable release in many years, and brings together many
		new features from the 2.3 series, including:
		a fully functional undo system (now enabled by default),
		vim-compatible file locking, linter support, formatter
		support, syntax highlighting flexibility, and many fixes
		for issues reported since 2.2.  Many sincere thanks
		to all of the bug reports, patches, well wishes and
		contributions from everyone who has continued to
		support us.  Thank you for using nano!


2015.02.27 - GNU nano 2.3.99pre3 "Ashley" is released.  This is likely
		to be the last release before the next major (2.4.0)
		release.  Please test it out and send us any feedback
		via the Savannah bug page for nano
		(https://savannah.gnu.org/bugs/?group=nano).  This
		release includes fixes for rebinding toggles via
		nanorc, several memory alignment fixes, and documentation
		and build updates.  As always thank you for using
		nano - Share and Enjoy!

2015.02.06 - GNU nano 2.3.99pre2 "Snowblind" is released.  This release
		contains only fixes, including: a long-standing problem
		with cutting in nano-tiny, several memory alignment
		improvements, and issues with leftover file locks.  Please
		keep reporting bugs so we can get a happy and healthy
		2.4.0 soon.  Thanks for using nano!

2015.01.06 - GNU nano 2.3.99pre1 "Junior" is released.  As the first
		2.4 release candidate there will be fewer new features
		but many bugfixes going forward.  This release contains
		new support for language reformatters like Go's gofmt
		command which takes the place of the spelling checker.
		Fixes in this release include many syntax highlighting
		fixes and improvements, and documentation formatting updates.
		As always please report bugs via the Savannah bug page for
		nano (https://savannah.gnu.org/bugs/?group=nano), so we can
		release a super awesome and bug-free 2.4.0 soon!

2014.07.17 - GNU nano 2.3.6 "Columbo" is released.  This release
		contains a fix for installing internationalization
		files.  Also included are scattered documentation
		(in particular man page) fixes, and a few touch ups
		to syntax highlighting definitions.  Oh, just one
		more thing, thanks for using nano!

2014.07.11 - GNU nano 2.3.5 "lucky day" is released.  This release
		contains many visible and under-the-hood fixes for
		components such as file locking, more fixes to the
		undo system, and you no longer have to explicitly ask
		nano to have undo/redo support as it now defaults to
		being enabled.  Other notable fixes include a better
		handling of --tempfile mode, and better handling of
		command line arguments when also attempting to specify
		+<line number>.  As always, please file any bugs you
		find at the Savannah page for nano, at
		https://savannah.gnu.org/bugs/index.php?42639 and
		thanks for using nano.

2014.06.02 - GNU nano 2.3.4 won't leave you high, won't leave you dry. This
		release contains only a small number of fixes, but in
		particular allows nano to compile on non-UTF8 curses
		implementations (i.e. libncursesw).  Other small fixes to
		the undo implementation and the default syntax config are
		also included. As always, Share and Enjoy!

2014.05.28 - GNU nano 2.3.3 is in its right place.  This release contains
		many many improvements to the core system, including
		substantial improvements to the undo/redo code, UTF-8
		handling, the configure script, and display of shortcuts
		on very wide terminals,  New features include the
		ability to write to named pipes (--noread), as well as
		linter support (see the nanorc man page for details).  Also
		included are much improved syntax highlighting code, and
		configurations for JSON, texinfo, Go, and a default syntax
		for catch all highlighting. Finally, nano now has the
		ability to set the color of the title bar, status bar, and
		shortcut keys (e.g. "^X") and their descriptions.  Again
		see the nanorc page for details.  There's much more, too
		much to include here, but please keep those reports and
		general feedback coming!  Thank you for helping us help
		you help us all.

2013.03.22 - GNU nano 2.3.2 "Annoy your coworkers for fun and profit" is
		released.  This release introduces vim-style file locking
		(though not backup/restore), useful when using nano
		in a multi-editor environment.  Feedback is welcome if
		you run into any issues with this new code.  Other new
		features include additional support for word boundary
		checking when cross compiling, fixes for trying to go to
		an invalid line number, and the usual documentation
		tweaks.

2011.05.10 - GNU nano 2.3.1 "I'm in space" is released.  This
		release includes some fixes for the new libmagic code, as
		well as a fix for improper character counts when using
		auto-indent.  Also included are new syntax highlighting
		definitions for RPM spec and lua files.  Thanks for
		using nano and keep circulating the tapes.

2011.02.26 - GNU nano 2.3.0 "Septic surprise" is released.  This first
		release in the 2.3 unstable series brings several new
		features.  First, libmagic support for syntax highlighting
		has been added on top of the existing file extension
		and header support already available.  Secondly, cursor
		position can be saved between editing sessions with
		the -P or --poslog command-line flag, or via "set poslog"
		in your .nanorc.  Also included are some fixes for
		compilation with g++, and better handling of issues
		writing the backup file, which should reduce the need
		for the 'set allow_insecure_backup" nanorc option.
		Don't stop, get it get it, don't stop, get it get it.

5 files changed, 30 insertions, 18 deletions

diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index 8f25485882d..62fb2c1a5ae 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2012/10/03 11:43:38 asau Exp $
+# $NetBSD: Makefile,v 1.46 2015/06/05 01:32:38 wiedi Exp $
 
-DISTNAME=	nano-2.2.6
-PKGREVISION=	1
+DISTNAME=	nano-2.4.1
 CATEGORIES=	editors
-MASTER_SITES=	http://www.nano-editor.org/dist/v2.2/
+MASTER_SITES=	http://www.nano-editor.org/dist/v2.4/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.nano-editor.org/
diff --git a/editors/nano/PLIST b/editors/nano/PLIST
index 81c457bd874..7d4f944fb70 100644
--- a/editors/nano/PLIST
+++ b/editors/nano/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2012/08/27 10:37:50 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.18 2015/06/05 01:32:38 wiedi Exp $
 bin/nano
 bin/rnano
 info/nano.info
@@ -8,12 +8,14 @@ man/fr/man5/nanorc.5
 man/man1/nano.1
 man/man1/rnano.1
 man/man5/nanorc.5
+share/doc/nano/faq.html
 share/examples/nano/nanorc
 share/locale/bg/LC_MESSAGES/nano.mo
 share/locale/ca/LC_MESSAGES/nano.mo
 share/locale/cs/LC_MESSAGES/nano.mo
 share/locale/da/LC_MESSAGES/nano.mo
 share/locale/de/LC_MESSAGES/nano.mo
+share/locale/eo/LC_MESSAGES/nano.mo
 share/locale/es/LC_MESSAGES/nano.mo
 share/locale/eu/LC_MESSAGES/nano.mo
 share/locale/fi/LC_MESSAGES/nano.mo
@@ -23,6 +25,7 @@ share/locale/gl/LC_MESSAGES/nano.mo
 share/locale/hu/LC_MESSAGES/nano.mo
 share/locale/id/LC_MESSAGES/nano.mo
 share/locale/it/LC_MESSAGES/nano.mo
+share/locale/ja/LC_MESSAGES/nano.mo
 share/locale/ms/LC_MESSAGES/nano.mo
 share/locale/nb/LC_MESSAGES/nano.mo
 share/locale/nl/LC_MESSAGES/nano.mo
@@ -31,7 +34,7 @@ share/locale/pl/LC_MESSAGES/nano.mo
 share/locale/pt_BR/LC_MESSAGES/nano.mo
 share/locale/ro/LC_MESSAGES/nano.mo
 share/locale/ru/LC_MESSAGES/nano.mo
-share/locale/rw/LC_MESSAGES/nano.mo
+share/locale/sl/LC_MESSAGES/nano.mo
 share/locale/sr/LC_MESSAGES/nano.mo
 share/locale/sv/LC_MESSAGES/nano.mo
 share/locale/tr/LC_MESSAGES/nano.mo
@@ -42,14 +45,20 @@ share/locale/zh_TW/LC_MESSAGES/nano.mo
 share/nano/asm.nanorc
 share/nano/awk.nanorc
 share/nano/c.nanorc
+share/nano/changelog.nanorc
 share/nano/cmake.nanorc
 share/nano/css.nanorc
 share/nano/debian.nanorc
+share/nano/default.nanorc
 share/nano/fortran.nanorc
 share/nano/gentoo.nanorc
+share/nano/go.nanorc
 share/nano/groff.nanorc
 share/nano/html.nanorc
 share/nano/java.nanorc
+share/nano/javascript.nanorc
+share/nano/json.nanorc
+share/nano/lua.nanorc
 share/nano/makefile.nanorc
 share/nano/man.nanorc
 share/nano/mgp.nanorc
@@ -60,10 +69,13 @@ share/nano/ocaml.nanorc
 share/nano/patch.nanorc
 share/nano/perl.nanorc
 share/nano/php.nanorc
+share/nano/po.nanorc
 share/nano/pov.nanorc
 share/nano/python.nanorc
 share/nano/ruby.nanorc
 share/nano/sh.nanorc
+share/nano/spec.nanorc
 share/nano/tcl.nanorc
 share/nano/tex.nanorc
+share/nano/texinfo.nanorc
 share/nano/xml.nanorc
diff --git a/editors/nano/distinfo b/editors/nano/distinfo
index ca401707407..6b372a5e4ca 100644
--- a/editors/nano/distinfo
+++ b/editors/nano/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.19 2012/08/27 10:37:51 ryoon Exp $
+$NetBSD: distinfo,v 1.20 2015/06/05 01:32:38 wiedi Exp $
 
-SHA1 (nano-2.2.6.tar.gz) = f2a628394f8dda1b9f28c7e7b89ccb9a6dbd302a
-RMD160 (nano-2.2.6.tar.gz) = c7178c45c44ef2c3237811ac16b3d343b4ab6cd4
-Size (nano-2.2.6.tar.gz) = 1572388 bytes
-SHA1 (patch-configure) = 46dd0149d1d7a6ea5b574704edd01fb21272668d
+SHA1 (nano-2.4.1.tar.gz) = 422958cb700cc8cedc9a6b5ec00bf968c0fa875e
+RMD160 (nano-2.4.1.tar.gz) = 84bd54e50b5e8c6457d983dc7ef730b5a0303bf8
+Size (nano-2.4.1.tar.gz) = 1890805 bytes
+SHA1 (patch-configure) = 3a63b02a39000d5a15087739648b82e999d14f56
diff --git a/editors/nano/options.mk b/editors/nano/options.mk
index 5e24d3f1587..47b1a976c3a 100644
--- a/editors/nano/options.mk
+++ b/editors/nano/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2012/08/27 10:37:51 ryoon Exp $
+# $NetBSD: options.mk,v 1.4 2015/06/05 01:32:38 wiedi Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nano
 PKG_SUPPORTED_OPTIONS=	wide-curses
+PKG_SUGGESTED_OPTIONS=	wide-curses
 PKG_OPTIONS_LEGACY_OPTS+=	ncursesw:wide-curses
 
 .include "../../mk/bsd.options.mk"
diff --git a/editors/nano/patches/patch-configure b/editors/nano/patches/patch-configure
index db2accde954..db75d1d60d6 100644
--- a/editors/nano/patches/patch-configure
+++ b/editors/nano/patches/patch-configure
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure,v 1.1 2011/08/01 05:56:30 dholland Exp $
+$NetBSD: patch-configure,v 1.2 2015/06/05 01:32:38 wiedi Exp $
 
 Disable the groff html check to prevent random PLIST variation.
 
---- configure~	2011-08-01 05:52:01.000000000 +0000
+--- configure.orig	2015-04-14 17:59:05.000000000 +0000
 +++ configure
-@@ -8293,7 +8293,7 @@ fi
- # Check for groff html support
+@@ -9351,7 +9351,7 @@ fi
+ # Check for groff html support.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HTML support in groff" >&5
  $as_echo_n "checking for HTML support in groff... " >&6; }
 -groff -t -mandoc -Thtml </dev/null >/dev/null
 +false #groff -t -mandoc -Thtml </dev/null >/dev/null
  if test $? -ne 0 ; then
-     echo "no"
-     echo "*** Will not generate HTML version of man pages  ***"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }