# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1427292027 -7200
# Node ID f9a21d0369a2f88eb7a0be274b3aecbaee9f7f6b
# Parent  c654a2bb95d01b145d4ee4375af93b33578759e1
Up: nano (2.4.0)

diff -r c654a2bb95d0 -r f9a21d0369a2 nano/receipt
--- a/nano/receipt	Wed Mar 25 12:50:26 2015 +0100
+++ b/nano/receipt	Wed Mar 25 16:00:27 2015 +0200
@@ -1,23 +1,20 @@
 # SliTaz package receipt.
 
 PACKAGE="nano"
-VERSION="2.3.6"
+VERSION="2.4.0"
 CATEGORY="utilities"
 SHORT_DESC="GNU Nano Text Editor"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.nano-editor.org/"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="${WEB_SITE}dist/v2.3/$TARBALL"
+WGET_URL="${WEB_SITE}dist/v${VERSION%.*}/$TARBALL"
 TAGS="text-editor"
 HOST_ARCH="i486 arm"
 
-TRACKER="http://sourcewell.berlios.de/appbyid.php?id=1733"
-VERSION_NOTE="latest stable"
-
-DEPENDS="ncursesw"
+DEPENDS="ncursesw zlib"
 SUGGESTED="gpm"
-BUILD_DEPENDS="ncursesw-dev"
+BUILD_DEPENDS="ncursesw-dev zlib-dev groff"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -38,6 +35,8 @@
 		$fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/nano $fs/usr/share
+
 	# Config file.
-	cp $stuff/nanorc $fs/etc
+	cp $src/doc/nanorc.sample $fs/etc/nanorc
+	cd $fs; patch -p0 < $stuff/nano.patch
 }
diff -r c654a2bb95d0 -r f9a21d0369a2 nano/stuff/nano.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nano/stuff/nano.patch	Wed Mar 25 16:00:27 2015 +0200
@@ -0,0 +1,190 @@
+--- ./etc/nanorc
++++ ./etc/nanorc
+@@ -1,10 +1,6 @@
+-## Sample initialization file for GNU nano.
++## /etc/nanorc: system-wide initialization file for GNU nano
++## ~/.nanorc for personal config file.
+ ##
+-## Please note that you must have configured nano with --enable-nanorc
+-## for this file to be read!  Also note that this file should not be in
+-## DOS or Mac format, and that characters specially interpreted by the
+-## shell should not be escaped here.
+-##
+ ## To make sure an option is disabled, use "unset <option>".
+ ##
+ ## For the options that take parameters, the default value is given.
+@@ -57,7 +53,7 @@
+ # set fill -8
+ 
+ ## Enable ~/.nano_history for saving and reading search/replace strings.
+-# set historylog
++set historylog
+ 
+ ## Enable vim-style lock-files.  This is just to let a vim user know you
+ ## are editing a file [s]he is trying to edit and vice versa. There are
+@@ -76,7 +72,7 @@
+ ## mouse clicks can be used to place the cursor, set the mark (with a
+ ## double click), and execute shortcuts.  The mouse will work in the X
+ ## Window System, and on the console when gpm is running.
+-# set mouse
++set mouse
+ 
+ ## Switch on multiple file buffers (inserting a file will put it into
+ ## a separate buffer).
+@@ -157,7 +153,7 @@
+ # set suspend
+ 
+ ## Use this tab size instead of the default; it must be greater than 0.
+-# set tabsize 8
++set tabsize 4
+ 
+ ## Convert typed tabs to spaces.
+ # set tabstospaces
+@@ -245,3 +241,136 @@
+ 
+ ## Set this if your backspace key sends Del most of the time.
+ # bind Del backspace all
++
++
++
++## Assembler
++# include "/usr/share/nano/asm.nanorc"
++
++## AWK
++# include "/usr/share/nano/awk.nanorc"
++
++## C/C++
++include "/usr/share/nano/c.nanorc"
++
++## Changelogs
++# include "/usr/share/nano/changelog.nanorc"
++
++## CMake
++# include "/usr/share/nano/cmake.nanorc"
++
++## CSS
++include "/usr/share/nano/css.nanorc"
++
++## Apt's sources.list
++# include "/usr/share/nano/debian.nanorc"
++
++## Default
++include "/usr/share/nano/default.nanorc"
++
++## Fortran 90/95
++# include "/usr/share/nano/fortran.nanorc"
++
++## Gentoo ebuilds/eclasses
++# include "/usr/share/nano/gentoo.nanorc"
++
++## Go
++# include "/usr/share/nano/go.nanorc"
++
++## Groff
++# include "/usr/share/nano/groff.nanorc"
++
++## HTML
++# include "/usr/share/nano/html.nanorc"
++
++## Java
++# include "/usr/share/nano/java.nanorc"
++
++## Javascript
++include "/usr/share/nano/javascript.nanorc"
++
++## JSON
++# include "/usr/share/nano/json.nanorc"
++
++## Lua
++# include "/usr/share/nano/lua.nanorc"
++
++## Makefiles
++include "/usr/share/nano/makefile.nanorc"
++
++## Manpages
++# include "/usr/share/nano/man.nanorc"
++
++## Magicpoint presentations
++# include "/usr/share/nano/mgp.nanorc"
++
++## Quoted emails (under e.g. mutt)
++include "/usr/share/nano/mutt.nanorc"
++
++## Nanorc files
++include "/usr/share/nano/nanorc.nanorc"
++
++## C/C++/Obj-C
++# include "/usr/share/nano/objc.nanorc"
++
++## OCaml
++# include "/usr/share/nano/ocaml.nanorc"
++
++## Patch files
++include "/usr/share/nano/patch.nanorc"
++
++## Perl
++# include "/usr/share/nano/perl.nanorc"
++
++## PHP
++include "/usr/share/nano/php.nanorc"
++
++## PO files
++include "/usr/share/nano/po.nanorc"
++
++## POV-Ray
++# include "/usr/share/nano/pov.nanorc"
++
++## Python
++include "/usr/share/nano/python.nanorc"
++
++## Ruby
++# include "/usr/share/nano/ruby.nanorc"
++
++## Bourne shell scripts
++include "/usr/share/nano/sh.nanorc"
++
++## RPM spec files
++# include "/usr/share/nano/spec.nanorc"
++
++## Tcl files
++# include "/usr/share/nano/tcl.nanorc"
++
++## TeX files
++# include "/usr/share/nano/tex.nanorc"
++
++## Texinfo files
++# include "/usr/share/nano/texinfo.nanorc"
++
++## XML files
++include "/usr/share/nano/xml.nanorc"
++
++
++## Config file - By SliTaz
++syntax "conf" "\.?conf$"
++## Keywords
++icolor brightgreen "="
++## Comments
++icolor cyan "^[[:space:]]*#.*$"
++
++## HTML - With modification for SliTaz.
++syntax "HTML" "\.html$"
++color brightblue start="<" end=">"
++color red "&[^; 	]*;"
++color brightwhite start="<!DOCTYPE" end=">" start="<title>" end="</title>" start="<!--" end="-->"
++color brightcyan start="<meta" end=">" start="<link" end=">"
++color brightyellow "<p>|</p>|<pre>|</pre>|<li>|</li>"
++color yellow "<ul>|</ul>|<hr>|<hr />"
++color brightred "href=|name=|rel=|http-equiv=|content=|title=|type|style"
++color brightgreen "<h1>|</h1>|<h2>|</h2>|<h3>|</h3>|<h4>|</h4>|<h5>|</h5>|<h6>|</h6>"
++
+
+--- ./usr/share/nano/sh.nanorc
++++ ./usr/share/nano/sh.nanorc
+@@ -1,6 +1,6 @@
+ ## Here is an example for Bourne shell scripts.
+ 
+-syntax "sh" "\.sh$"
++syntax "sh" "\.sh$" "receipt"
+ header "^#!.*((ba|da|k|pdk)?sh[-0-9_]*|openrc-run|runscript)"
+ magic "(POSIX|Bourne.*) shell script text"
+ 
diff -r c654a2bb95d0 -r f9a21d0369a2 nano/stuff/nanorc
--- a/nano/stuff/nanorc	Wed Mar 25 12:50:26 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,273 +0,0 @@
-## /etc/nanorc: system-wide initialization file for GNU nano
-## Well know text editor on SliTaz GNU/linux. ~/.nanorc for 
-## personal config file.
-##
-## To make sure a value is not enabled, use "unset <option>"
-##
-## For the options that take parameters, the default value is given.
-## Other options are unset by default.
-##
-## Quotes inside string parameters don't have to be escaped with
-## backslashes.  The last double quote in the string will be treated as
-## its end.  For example, for the "brackets" option, ""')>]}" will match
-## ", ', ), >, ], and }.
-
-## Use auto-indentation.
-# set autoindent
-
-## Backup files to filename~.
-# set backup
-
-## The directory to put unique backup files in.
-# set backupdir ""
-
-## Do backwards searches by default.
-# set backwards
-
-## Use bold text instead of reverse video text.
-# set boldtext
-
-## The characters treated as closing brackets when justifying
-## paragraphs.  They cannot contain blank characters.  Only closing
-## punctuation, optionally followed by closing brackets, can end
-## sentences.
-##
-# set brackets ""')>]}"
-
-## Do case sensitive searches by default.
-# set casesensitive
-
-## Constantly display the cursor position in the statusbar.  Note that
-## this overrides "quickblank".
-# set const
-
-## Use cut to end of line by default.
-# set cut
-
-## Set the line length for wrapping text and justifying paragraphs.
-## If fill is 0 or less, the line length will be the screen width less
-## this number.
-##
-# set fill -8
-
-## Enable ~/.nano_history for saving and reading search/replace strings.
-set historylog
-
-## The opening and closing brackets that can be found by bracket
-## searches.  They cannot contain blank characters.  The former set must
-## come before the latter set, and both must be in the same order.
-##
-# set matchbrackets "(<[{)>]}"
-
-## Use the blank line below the titlebar as extra editing space.
-# set morespace
-
-## Enable mouse support, if available for your system.  When enabled,
-## mouse clicks can be used to place the cursor, set the mark (with a
-## double click), and execute shortcuts.  The mouse will work in the X
-## Window System, and on the console when gpm is running.
-##
-set mouse
-
-## Allow multiple file buffers (inserting a file will put it into a
-## separate buffer).  You must have configured with --enable-multibuffer
-## for this to work.
-##
-# set multibuffer
-
-## Don't convert files from DOS/Mac format.
-# set noconvert
-
-## Don't follow symlinks when writing files.
-# set nofollow
-
-## Don't display the helpful shortcut lists at the bottom of the screen.
-# set nohelp
-
-## Don't add newlines to the ends of files.
-# set nonewlines
-
-## Don't wrap text at all.
-# set nowrap
-
-## Set operating directory.  nano will not read or write files outside
-## this directory and its subdirectories.  Also, the current directory
-## is changed to here, so any files are inserted from this dir.  A blank
-## string means the operating directory feature is turned off.
-##
-# set operatingdir ""
-
-## Preserve the XON and XOFF keys (^Q and ^S).
-# set preserve
-
-## The characters treated as closing punctuation when justifying
-## paragraphs.  They cannot contain blank characters.  Only closing
-## punctuation, optionally followed by closing brackets, can end
-## sentences.
-##
-# set punct "!.?"
-
-## Do quick statusbar blanking.  Statusbar messages will disappear after
-## 1 keystroke instead of 26.  Note that "const" overrides this.
-##
-# set quickblank
-
-## The email-quote string, used to justify email-quoted paragraphs.
-## This is an extended regular expression if your system supports them,
-## otherwise a literal string.  Default:
-# set quotestr "^([ 	]*[#:>\|}])+"
-## if you have extended regular expression support, otherwise:
-# set quotestr "> "
-
-## Fix Backspace/Delete confusion problem.
-# set rebinddelete
-
-## Fix numeric keypad key confusion problem.
-# set rebindkeypad
-
-## Do extended regular expression searches by default.
-# set regexp
-
-## Make the Home key smarter.  When Home is pressed anywhere but at the
-## very beginning of non-whitespace characters on a line, the cursor
-## will jump to that beginning (either forwards or backwards).  If the
-## cursor is already at that position, it will jump to the true
-## beginning of the line.
-# set smarthome
-
-## Use smooth scrolling as the default.
-# set smooth
-
-## Use this spelling checker instead of the internal one.  This option
-## does not properly have a default value.
-##
-# set speller "aspell -x -c"
-
-## Allow nano to be suspended.
-# set suspend
-
-## Use this tab size instead of the default; it must be greater than 0.
-# set tabsize 8
-
-## Convert typed tabs to spaces.
-# set tabstospaces
-
-## Save automatically on exit, don't prompt.
-# set tempfile
-
-## Disallow file modification.  Why would you want this in an rcfile? ;)
-# set view
-
-## The two single-column characters used to display the first characters
-## of tabs and spaces.  187 in ISO 8859-1 (0000BB in Unicode) and 183 in
-## ISO-8859-1 (0000B7 in Unicode) seem to be good values for these.
-# set whitespace "  "
-
-## Detect word boundaries more accurately by treating punctuation
-## characters as parts of words.
-# set wordbounds
-
-
-## Color setup
-##
-## Format:
-##
-## syntax "short description" ["filename regex" ...]
-##
-## The "none" syntax is reserved; specifying it on the command line is
-## the same as not having a syntax at all.  The "default" syntax is
-## special: it takes no filename regexes, and applies to files that
-## don't match any other syntax's filename regexes.
-##
-## color foreground,background "regex" ["regex"...]
-## or
-## icolor foreground,background "regex" ["regex"...]
-##
-## "color" will do case sensitive matches, while "icolor" will do case
-## insensitive matches.
-##
-## Valid colors: white, black, red, blue, green, yellow, magenta, cyan.
-## For foreground colors, you may use the prefix "bright" to get a
-## stronger highlight.
-##
-## To use multi-line regexes, use the start="regex" end="regex"
-## [start="regex" end="regex"...] format.
-##
-## If your system supports transparency, not specifying a background
-## color will use a transparent color.  If you don't want this, be sure
-## to set the background color to black or white.
-##
-## If you wish, you may put your syntaxes in separate files.  You can
-## make use of such files (which can only include "syntax", "color", and
-## "icolor" commands) as follows:
-##
-## include "/path/to/syntax_file.nanorc"
-##
-## Unless otherwise noted, the name of the syntax file (without the
-## ".nanorc" extension) should be the same as the "short description"
-## name inside that file.  These names are kept fairly short to make
-## them easier to remember and faster to type using nano's -Y option.
-##
-## All regexes should be extended regular expressions.
-
-
-## Nanorc files
-include "/usr/share/nano/nanorc.nanorc"
-
-## C/C++
-include "/usr/share/nano/c.nanorc"
-
-## Config file - By SliTaz
-syntax "conf" "\.?conf$"
-## Keywords
-icolor brightgreen "="
-## Comments
-icolor cyan "^[[:space:]]*#.*$"
-
-## HTML - With modification for SliTaz.
-#include "/usr/share/nano/html.nanorc"
-syntax "HTML" "\.html$"
-color brightblue start="<" end=">"
-color red "&[^; 	]*;"
-color brightwhite start="<!DOCTYPE" end=">" start="<title>" end="</title>" start="<!--" end="-->"  
-color brightcyan start="<meta" end=">" start="<link" end=">"
-color brightyellow "<p>|</p>|<pre>|</pre>|<li>|</li>"
-color yellow "<ul>|</ul>|<hr>|<hr />"
-color brightred "href=|name=|rel=|http-equiv=|content=|title=|type|style"
-color brightgreen "<h1>|</h1>|<h2>|</h2>|<h3>|</h3>|<h4>|</h4>|<h5>|</h5>|<h6>|</h6>"
-
-## TeX
-include "/usr/share/nano/tex.nanorc"
-
-## Quoted emails (under e.g. mutt)
-include "/usr/share/nano/mutt.nanorc"
-
-## Patch files
-include "/usr/share/nano/patch.nanorc"
-
-## Manpages
-# include "/usr/share/nano/man.nanorc"
-
-## Groff
-# include "/usr/share/nano/groff.nanorc"
-
-## Perl
-# include "/usr/share/nano/perl.nanorc"
-
-## Python
-# include "/usr/share/nano/python.nanorc"
-
-## Ruby
-# include "/usr/share/nano/ruby.nanorc"
-
-## Java
-# include "/usr/share/nano/java.nanorc"
-
-## Assembler
-# include "/usr/share/nano/asm.nanorc"
-
-## Bourne shell scripts
-include "/usr/share/nano/sh.nanorc"
-
-## POV-Ray
-# include "/usr/share/nano/pov.nanorc"