- Update to 2.4.0 [1]

- Add EXAMPLES option

Submitted by:	Leonardo Brondani Schenkel <leonardo@schenkel.net> [1]

5 files changed, 22 insertions, 56 deletions

diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index f11da47852f6..9a3885175920 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	nano
-PORTVERSION=	2.2.6
+PORTVERSION=	2.4.0
 CATEGORIES=	editors
-MASTER_SITES=	http://www.nano-editor.org/dist/v2.2/ \
+MASTER_SITES=	http://www.nano-editor.org/dist/v2.4/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
@@ -22,7 +22,7 @@ MAKE_ARGS+=	install_htmlmanDATA=install-htmlmanDATA
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_DEFINE=	DOCS EXAMPLES NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
diff --git a/editors/nano/distinfo b/editors/nano/distinfo
index b849eb130554..caebb1168878 100644
--- a/editors/nano/distinfo
+++ b/editors/nano/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nano-2.2.6.tar.gz) = be68e133b5e81df41873d32c517b3e5950770c00fc5f4dd23810cd635abce67a
-SIZE (nano-2.2.6.tar.gz) = 1572388
+SHA256 (nano-2.4.0.tar.gz) = 5076fb502680503e648cbdcbf2077e39fba193420ae19203f0a54cb2d94a75bd
+SIZE (nano-2.4.0.tar.gz) = 1886052
diff --git a/editors/nano/files/patch-doc_man_Makefile.in b/editors/nano/files/patch-doc_man_Makefile.in
deleted file mode 100644
index eaffdfa21d71..000000000000
--- a/editors/nano/files/patch-doc_man_Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- doc/man/Makefile.in.orig
-+++ doc/man/Makefile.in
-@@ -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:
- 
diff --git a/editors/nano/files/patch-doc_man_fr_Makefile.in b/editors/nano/files/patch-doc_man_fr_Makefile.in
deleted file mode 100644
index 10fa4e8cacab..000000000000
--- a/editors/nano/files/patch-doc_man_fr_Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- doc/man/fr/Makefile.in.orig
-+++ doc/man/fr/Makefile.in
-@@ -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:
- 
diff --git a/editors/nano/pkg-plist b/editors/nano/pkg-plist
index 23183bb68f74..e7297dae9b7e 100644
--- a/editors/nano/pkg-plist
+++ b/editors/nano/pkg-plist
@@ -1,22 +1,25 @@
 bin/nano
 bin/rnano
-man/man1/nano.1.gz
-man/man1/rnano.1.gz
-man/man5/nanorc.5.gz
 %%NLS%%man/fr/man1/nano.1.gz
 %%NLS%%man/fr/man1/rnano.1.gz
 %%NLS%%man/fr/man5/nanorc.5.gz
+man/man1/nano.1.gz
+man/man1/rnano.1.gz
+man/man5/nanorc.5.gz
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%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
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nanorc.sample
 %%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
 %%NLS%%share/locale/de/LC_MESSAGES/nano.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/es/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/nano.mo
@@ -26,6 +29,7 @@ man/man5/nanorc.5.gz
 %%NLS%%share/locale/hu/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/id/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/it/LC_MESSAGES/nano.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/nano.mo
@@ -34,7 +38,7 @@ man/man5/nanorc.5.gz
 %%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/sl/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
@@ -42,18 +46,23 @@ man/man5/nanorc.5.gz
 %%NLS%%share/locale/vi/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/nano.mo
-%%EXAMPLESDIR%%/nanorc.sample
 %%DATADIR%%/asm.nanorc
 %%DATADIR%%/awk.nanorc
 %%DATADIR%%/c.nanorc
+%%DATADIR%%/changelog.nanorc
 %%DATADIR%%/cmake.nanorc
 %%DATADIR%%/css.nanorc
 %%DATADIR%%/debian.nanorc
+%%DATADIR%%/default.nanorc
 %%DATADIR%%/fortran.nanorc
 %%DATADIR%%/gentoo.nanorc
+%%DATADIR%%/go.nanorc
 %%DATADIR%%/groff.nanorc
 %%DATADIR%%/html.nanorc
 %%DATADIR%%/java.nanorc
+%%DATADIR%%/javascript.nanorc
+%%DATADIR%%/json.nanorc
+%%DATADIR%%/lua.nanorc
 %%DATADIR%%/makefile.nanorc
 %%DATADIR%%/man.nanorc
 %%DATADIR%%/mgp.nanorc
@@ -64,10 +73,13 @@ man/man5/nanorc.5.gz
 %%DATADIR%%/patch.nanorc
 %%DATADIR%%/perl.nanorc
 %%DATADIR%%/php.nanorc
+%%DATADIR%%/po.nanorc
 %%DATADIR%%/pov.nanorc
 %%DATADIR%%/python.nanorc
 %%DATADIR%%/ruby.nanorc
 %%DATADIR%%/sh.nanorc
+%%DATADIR%%/spec.nanorc
 %%DATADIR%%/tcl.nanorc
 %%DATADIR%%/tex.nanorc
+%%DATADIR%%/texinfo.nanorc
 %%DATADIR%%/xml.nanorc