Update to 2.2.0 and pass maintainership to Eitan Adler.

PR:		141049
Submitted by:	Eitan Adler <eitanadlerlist@gmail.com>

7 files changed, 79 insertions, 49 deletions

diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index 970870e56e2c..31a473adacd6 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	nano
-PORTVERSION=	2.0.9
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	editors
-MASTER_SITES=	http://www.nano-editor.org/dist/v2.0/ \
-		http://www.ewtoo.org/~astyanax/nano/dist/v2.0/
+MASTER_SITES=	http://www.nano-editor.org/dist/v2.2/ \
+		${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	naddy@FreeBSD.org
+MAINTAINER=	EitanAdlerList@gmail.com
 COMMENT=	Nano's ANOther editor, an enhanced free Pico clone
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-all
+CONFIGURE_ARGS=	--docdir=${DOCSDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_JOBS_SAFE=	yes
@@ -30,6 +30,12 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.if !defined(NOPORTDOCS)
+MAKE_ARGS+=	install_htmlmanDATA=install-htmlmanDATA
+.else
+MAKE_ARGS+=	install_htmlmanDATA=""
+.endif
+
 INFO=		nano
 MAN1=		nano.1 rnano.1
 MAN5=		nanorc.5
diff --git a/editors/nano/distinfo b/editors/nano/distinfo
index ff4f3d84d8f9..710a7d1def54 100644
--- a/editors/nano/distinfo
+++ b/editors/nano/distinfo
@@ -1,3 +1,3 @@
-MD5 (nano-2.0.9.tar.gz) = 2be94dc43fb60fff4626a2401a977220
-SHA256 (nano-2.0.9.tar.gz) = 6d212385680d29dcda35dda7801da19c80182a8bc6bc6d5cf7533034c853d37f
-SIZE (nano-2.0.9.tar.gz) = 1403773
+MD5 (nano-2.2.0.tar.gz) = b34ea8fac9563b0485f39a065b5893bf
+SHA256 (nano-2.2.0.tar.gz) = c1e5e9c2baf2c4cfae6bebd1499ef9c20bfd5e094a966ed3d73a3a9e3f641e2f
+SIZE (nano-2.2.0.tar.gz) = 1495381
diff --git a/editors/nano/files/patch-doc_man_Makefile.in b/editors/nano/files/patch-doc_man_Makefile.in
index d9b01eacc922..eaffdfa21d71 100644
--- a/editors/nano/files/patch-doc_man_Makefile.in
+++ b/editors/nano/files/patch-doc_man_Makefile.in
@@ -3,18 +3,21 @@ $FreeBSD$
 
 --- doc/man/Makefile.in.orig
 +++ doc/man/Makefile.in
-@@ -592,11 +592,11 @@
+@@ -204,7 +204,7 @@
+ @GROFF_HTML_TRUE@@USE_NANORC_TRUE@BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
+ nano_man_mans = nano.1 nanorc.5 rnano.1
+ @GROFF_HTML_TRUE@htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html
+-@GROFF_HTML_TRUE@htmlmandir = $(datadir)/nano/man-html
++@GROFF_HTML_TRUE@htmlmandir = $(htmldir)
+ @GROFF_HTML_TRUE@nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
+ @GROFF_HTML_FALSE@EXTRA_DIST = $(nano_man_mans)
+ @GROFF_HTML_TRUE@EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
+@@ -577,7 +577,7 @@
  
+ info-am:
+ 
+-install-data-am: install-htmlmanDATA install-man
++install-data-am: $(install_htmlmanDATA) install-man
+ 
+ install-exec-am:
  
- nano.1.html: nano.1
--	groff -t -mandoc -Thtml < $< > $@
-+	groff -t -mandoc -Thtml < $? > $@
- nanorc.5.html: nanorc.5
--	groff -t -mandoc -Thtml < $< > $@
-+	groff -t -mandoc -Thtml < $? > $@
- rnano.1.html: rnano.1
--	groff -t -mandoc -Thtml < $< > $@
-+	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
index 59e431873b71..10fa4e8cacab 100644
--- a/editors/nano/files/patch-doc_man_fr_Makefile.in
+++ b/editors/nano/files/patch-doc_man_fr_Makefile.in
@@ -3,18 +3,21 @@ $FreeBSD$
 
 --- doc/man/fr/Makefile.in.orig
 +++ doc/man/fr/Makefile.in
-@@ -434,11 +434,11 @@
+@@ -193,7 +193,7 @@
+ @GROFF_HTML_TRUE@@USE_NANORC_TRUE@BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
+ nano_man_mans = nano.1 nanorc.5 rnano.1
+ @GROFF_HTML_TRUE@htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html
+-@GROFF_HTML_TRUE@htmlmandir = $(datadir)/nano/man-html/fr
++@GROFF_HTML_TRUE@htmlmandir = $(htmldir)/fr
+ @GROFF_HTML_TRUE@nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
+ @GROFF_HTML_FALSE@EXTRA_DIST = $(nano_man_mans)
+ @GROFF_HTML_TRUE@EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
+@@ -424,7 +424,7 @@
  
+ info-am:
+ 
+-install-data-am: install-htmlmanDATA install-man
++install-data-am: $(install_htmlmanDATA) install-man
+ 
+ install-exec-am:
  
- nano.1.html: nano.1
--	groff -t -mandoc -Thtml < $< > $@
-+	groff -t -mandoc -Thtml < $? > $@
- nanorc.5.html: nanorc.5
--	groff -t -mandoc -Thtml < $< > $@
-+	groff -t -mandoc -Thtml < $? > $@
- rnano.1.html: rnano.1
--	groff -t -mandoc -Thtml < $< > $@
-+	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_syntax_makefile.nanorc b/editors/nano/files/patch-doc_syntax_makefile.nanorc
new file mode 100644
index 000000000000..7cd2ebd79a19
--- /dev/null
+++ b/editors/nano/files/patch-doc_syntax_makefile.nanorc
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- doc/syntax/makefile.nanorc.orig
++++ doc/syntax/makefile.nanorc
+@@ -3,6 +3,6 @@
+ syntax "makefile" "Makefile[^/]*$"
+ color red "[:=]"
+ color magenta "\<(if|ifeq|else|endif)\>"
+-color blue "\$+[{(][a-Z0-9_-]+[})]"
++color blue "\$+[{(][a-zA-Z0-9_-]+[})]"
+ color brightblue "^[^ 	]+:"
+ color green "#.*$"
diff --git a/editors/nano/files/patch-src_rcfile.c b/editors/nano/files/patch-src_rcfile.c
deleted file mode 100644
index 6dbf573c286c..000000000000
--- a/editors/nano/files/patch-src_rcfile.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/rcfile.c.orig
-+++ src/rcfile.c
-@@ -612,7 +612,7 @@
- {
-     char *buf = NULL;
-     ssize_t len;
--    size_t n;
-+    size_t n = 0;
- 
-     while ((len = getline(&buf, &n, rcstream)) > 0) {
- 	char *ptr, *keyword, *option;
diff --git a/editors/nano/pkg-plist b/editors/nano/pkg-plist
index 955f65307754..9a324f953329 100644
--- a/editors/nano/pkg-plist
+++ b/editors/nano/pkg-plist
@@ -1,6 +1,12 @@
 @comment $FreeBSD$
 bin/nano
 bin/rnano
+%%NLS%%%%PORTDOCS%%%%DOCSDIR%%/fr/nano.1.html
+%%NLS%%%%PORTDOCS%%%%DOCSDIR%%/fr/nanorc.5.html
+%%NLS%%%%PORTDOCS%%%%DOCSDIR%%/fr/rnano.1.html
+%%PORTDOCS%%%%DOCSDIR%%/nano.1.html
+%%PORTDOCS%%%%DOCSDIR%%/nanorc.5.html
+%%PORTDOCS%%%%DOCSDIR%%/rnano.1.html
 %%NLS%%share/locale/bg/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/nano.mo
@@ -32,25 +38,38 @@ bin/rnano
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/nano.mo
 %%EXAMPLESDIR%%/nanorc.sample
+share/nano/awk.nanorc
 share/nano/asm.nanorc
 share/nano/c.nanorc
+share/nano/css.nanorc
+share/nano/debian.nanorc
+share/nano/fortran.nanorc
+share/nano/gentoo.nanorc
 share/nano/groff.nanorc
 share/nano/html.nanorc
 share/nano/java.nanorc
+share/nano/makefile.nanorc
 share/nano/man.nanorc
 share/nano/mutt.nanorc
 share/nano/nanorc.nanorc
+share/nano/objc.nanorc
+share/nano/ocaml.nanorc
 share/nano/patch.nanorc
 share/nano/perl.nanorc
+share/nano/php.nanorc
 share/nano/pov.nanorc
 share/nano/python.nanorc
 share/nano/ruby.nanorc
 share/nano/sh.nanorc
+share/nano/tcl.nanorc
 share/nano/tex.nanorc
+share/nano/xml.nanorc
 @dirrm share/nano
 @dirrm %%EXAMPLESDIR%%
 %%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/rw
+%%NLS%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/fr
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%NLS%%@dirrmtry man/fr/man5
 %%NLS%%@dirrmtry man/fr/man1
 %%NLS%%@dirrmtry man/fr