Update to 2.0.1. Improvements and new features:

* Improved color syntax highlighting
* Copy text without cutting
* Verbatim input mode
* Repeat last seach without confirmation (Meta-W)
* Spell check/replace selected text only
* Indent marked text
* Move to beginning/end of paragraph
* Search within the file browser
* Mixed file format auto-conversion

8 files changed, 114 insertions, 69 deletions

diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index 1f75b317fd2e..16834507175d 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -6,18 +6,21 @@
 #
 
 PORTNAME=	nano
-PORTVERSION=	1.2.5
+PORTVERSION=	2.0.1
 CATEGORIES=	editors
-MASTER_SITES=	http://www.nano-editor.org/dist/v1.2/ \
-		http://www.ewtoo.org/~astyanax/nano/dist/v1.2/
+MASTER_SITES=	http://www.nano-editor.org/dist/v2.0/ \
+		http://www.ewtoo.org/~astyanax/nano/dist/v2.0/
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Nano's ANOther editor, an enhanced free Pico clone
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--infodir=${PREFIX}/${INFO_PATH} --mandir=${PREFIX}/man \
+		--enable-all
+CONFIGURE_ARGS+=--disable-utf8	# requires wide character curses
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-all
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -28,15 +31,20 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 INFO=		nano
-MAN1=		nano.1
+MAN1=		nano.1 rnano.1
 MAN5=		nanorc.5
+MANLANG=	"" fr
 
 post-build:
-	${REINPLACE_CMD} 's:\$$SYSCONFDIR:${PREFIX}/etc:g' \
-		${WRKSRC}/${MAN1} ${WRKSRC}/${MAN5} ${WRKSRC}/${INFO:=.info}
+	cd ${WRKSRC}/doc/man; ${REINPLACE_CMD} \
+		-e 's:SYSCONFDIR:${PREFIX}/etc:g' \
+		-e 's:EXAMPLESDIR:${EXAMPLESDIR}:g' \
+		${MAN1} ${MAN5} ${WRKSRC}/doc/texinfo/${INFO:=.info}
+	${REINPLACE_CMD} -e 's/\\</[[:<:]]/g' -e 's/\\>/[[:>:]]/g' \
+		${WRKSRC}/doc/syntax/*.nanorc
 
 post-install:
 	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/nanorc.sample ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/nanorc.sample ${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/nano/distinfo b/editors/nano/distinfo
index 75d16fc42934..83c1433fa5e7 100644
--- a/editors/nano/distinfo
+++ b/editors/nano/distinfo
@@ -1,3 +1,3 @@
-MD5 (nano-1.2.5.tar.gz) = f2b3efbf1cf356d736740d531b6b22c4
-SHA256 (nano-1.2.5.tar.gz) = 66b25e3b0df504e2f43bc9711e1c4835ff0826f9d784c323152910b559165346
-SIZE (nano-1.2.5.tar.gz) = 911938
+MD5 (nano-2.0.1.tar.gz) = 8abe33be6816ad9acd17391806b42d92
+SHA256 (nano-2.0.1.tar.gz) = 6af1a2081c6303008163719b9012b403b461fb07991b5603ac28a820494741e2
+SIZE (nano-2.0.1.tar.gz) = 1299203
diff --git a/editors/nano/files/patch-doc_man_Makefile.in b/editors/nano/files/patch-doc_man_Makefile.in
new file mode 100644
index 000000000000..3502384fed06
--- /dev/null
+++ b/editors/nano/files/patch-doc_man_Makefile.in
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- doc/man/Makefile.in.orig
++++ doc/man/Makefile.in
+@@ -586,11 +586,11 @@
+ 
+ 
+ nano.1.html: nano.1
+-	cat $< | groff -t -mandoc -Thtml > $@
++	cat $? | groff -t -mandoc -Thtml > $@
+ nanorc.5.html: nanorc.5
+-	cat $< | groff -t -mandoc -Thtml > $@
++	cat $? | groff -t -mandoc -Thtml > $@
+ rnano.1.html: rnano.1
+-	cat $< | groff -t -mandoc -Thtml > $@
++	cat $? | groff -t -mandoc -Thtml > $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/editors/nano/files/patch-doc_man_fr_Makefile.in b/editors/nano/files/patch-doc_man_fr_Makefile.in
new file mode 100644
index 000000000000..7389d0260ea8
--- /dev/null
+++ b/editors/nano/files/patch-doc_man_fr_Makefile.in
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- doc/man/fr/Makefile.in.orig
++++ doc/man/fr/Makefile.in
+@@ -428,11 +428,11 @@
+ 
+ 
+ nano.1.html: nano.1
+-	cat $< | groff -t -mandoc -Thtml > $@
++	cat $? | groff -t -mandoc -Thtml > $@
+ nanorc.5.html: nanorc.5
+-	cat $< | groff -t -mandoc -Thtml > $@
++	cat $? | groff -t -mandoc -Thtml > $@
+ rnano.1.html: rnano.1
+-	cat $< | groff -t -mandoc -Thtml > $@
++	cat $? | groff -t -mandoc -Thtml > $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/editors/nano/files/patch-doc_man_nano.1 b/editors/nano/files/patch-doc_man_nano.1
new file mode 100644
index 000000000000..7e9101bf8eb4
--- /dev/null
+++ b/editors/nano/files/patch-doc_man_nano.1
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/man/nano.1.orig
++++ doc/man/nano.1
+@@ -224,8 +224,6 @@
+ .PD 0
+ .TP
+ \fBnanorc\fP(5)
+-.PP
+-\fI/usr/share/doc/nano/\fP (or equivalent on your system)
+ 
+ .SH AUTHOR
+ Chris Allegretta <chrisa@asty.org>, et al (see \fIAUTHORS\fP and
diff --git a/editors/nano/files/patch-doc_man_nanorc.5 b/editors/nano/files/patch-doc_man_nanorc.5
new file mode 100644
index 000000000000..1899813d3467
--- /dev/null
+++ b/editors/nano/files/patch-doc_man_nanorc.5
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- doc/man/nanorc.5.orig
++++ doc/man/nanorc.5
+@@ -250,8 +250,7 @@
+ .TP
+ \fBnano\fP(1)
+ .PP
+-\fI/usr/share/doc/nano/examples/nanorc.sample\fP (or equivalent on your
+-system)
++\fIEXAMPLESDIR/nanorc.sample\fP
+ .SH AUTHOR
+ Chris Allegretta <chrisa@asty.org>, et al (see \fIAUTHORS\fP and
+ \fITHANKS\fP for details).  This manual page was originally written by
diff --git a/editors/nano/files/patch-nanorc.sample b/editors/nano/files/patch-nanorc.sample
deleted file mode 100644
index 8b7a51ce75fb..000000000000
--- a/editors/nano/files/patch-nanorc.sample
+++ /dev/null
@@ -1,58 +0,0 @@
-
-$FreeBSD$
-
---- nanorc.sample.orig	Sat Dec 27 17:35:21 2003
-+++ nanorc.sample	Thu Jul  1 00:19:16 2004
-@@ -107,9 +107,9 @@
- ## to set the background color to black or white.
- ##
- # syntax "c-file" "\.(c|h)$"
--# color red "\<[A-Z_]{2,}\>" 
--# color green "\<(float|char|int|void|static|const|struct)\>" 
--# color brightyellow "\<(if|while|do|else|case|switch)\>"
-+# color red "[[:<:]][A-Z_]{2,}[[:>:]]" 
-+# color green "[[:<:]](float|char|int|void|static|const|struct)[[:>:]]" 
-+# color brightyellow "[[:<:]](if|while|do|else|case|switch)[[:>:]]"
- # color brightcyan "^#( 	)*(define|include|ifn?def|endif|elif|else|if)" 
- ##
- ## You will in general want your comments and strings to come last,
-@@ -173,8 +173,8 @@
- ## Here is an example for perl
- ##
- # syntax "perl" "\.p[lm]$"
--# color red "\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork)|get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join|keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek|seekdir|se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr|y|truncate|umask|un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"
--# color magenta "\<(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\>"
-+# color red "[[:<:]](accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork)|get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join|keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek|seekdir|se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr|y|truncate|umask|un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)[[:>:]]"
-+# color magenta "[[:<:]](continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)[[:>:]]"
- # color cyan start="[$@%]" end="( |\\W|-)"
- # color yellow "".*"|qq\|.*\|"
- # color white "[sm]/.*/"
-@@ -185,11 +185,11 @@
- ## Here is an example for Java source
- ##
- # syntax "Java source" "\.java$"
--# color green "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>"
--# color red "\<(break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\>"
--# color cyan "\<(abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\>"
-+# color green "[[:<:]](boolean|byte|char|double|float|int|long|new|short|this|transient|void)[[:>:]]"
-+# color red "[[:<:]](break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)[[:>:]]"
-+# color cyan "[[:<:]](abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)[[:>:]]"
- # color red ""[^\"]*""
--# color yellow "\<(true|false|null)\>"
-+# color yellow "[[:<:]](true|false|null)[[:>:]]"
- # color blue "//.*"
- # color blue start="/\*" end="\*/"
- # color brightblue start="/\*\*" end="\*/"
-@@ -201,8 +201,8 @@
- # color white "^ *(set|unset).*$"
- # color cyan "^ *(set|unset) (autoindent|backup|const|cut|fill|keypad|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|quotestr|regexp|smooth|speller|suspend|tabsize|tempfile|historylog|view)"
- # color brightwhite "^ *syntax [^ ]*"
--# color brightblue "^ *set\>" "^ *unset\>" "^ *syntax\>"
--# color white "^ *color\>.*"
--# color yellow "^ *color (bright)?(white|black|red|blue|green|yellow|magenta|cyan)\>"
--# color magenta "^ *color\>"
-+# color brightblue "^ *set[[:>:]]" "^ *unset[[:>:]]" "^ *syntax[[:>:]]"
-+# color white "^ *color[[:>:]].*"
-+# color yellow "^ *color (bright)?(white|black|red|blue|green|yellow|magenta|cyan)[[:>:]]"
-+# color magenta "^ *color[[:>:]]"
- # color green "^#.*$"
diff --git a/editors/nano/pkg-plist b/editors/nano/pkg-plist
index c0c9948a0878..47e0b9ff976c 100644
--- a/editors/nano/pkg-plist
+++ b/editors/nano/pkg-plist
@@ -1,5 +1,7 @@
 @comment $FreeBSD$
 bin/nano
+bin/rnano
+%%NLS%%share/locale/bg/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/da/LC_MESSAGES/nano.mo
@@ -8,6 +10,7 @@ bin/nano
 %%NLS%%share/locale/eu/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/nano.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/id/LC_MESSAGES/nano.mo
@@ -20,9 +23,32 @@ bin/nano
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/nano.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/nano.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/nano.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/nano.mo
 %%EXAMPLESDIR%%/nanorc.sample
+share/nano/asm.nanorc
+share/nano/c.nanorc
+share/nano/groff.nanorc
+share/nano/html.nanorc
+share/nano/java.nanorc
+share/nano/man.nanorc
+share/nano/mutt.nanorc
+share/nano/nanorc.nanorc
+share/nano/patch.nanorc
+share/nano/perl.nanorc
+share/nano/pov.nanorc
+share/nano/python.nanorc
+share/nano/ruby.nanorc
+share/nano/sh.nanorc
+share/nano/tex.nanorc
+@dirrm share/nano
 @dirrm %%EXAMPLESDIR%%
+%%NLS%%@dirrmtry share/locale/rw
+@dirrmtry man/fr/man5
+@dirrmtry man/fr/man1
+@dirrmtry man/fr