4 files changed, 45 insertions, 40 deletions

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;