Index: head/editors/nano-devel/Makefile
===================================================================
--- head/editors/nano-devel/Makefile	(revision 403679)
+++ head/editors/nano-devel/Makefile	(revision 403680)
@@ -1,47 +1,47 @@
 # $FreeBSD$
 
 PORTNAME=	nano
-PORTVERSION=	2.3.6
+PORTVERSION=	2.5.0
 CATEGORIES=	editors
 MASTER_SITES=	http://www.nano-editor.org/dist/v${PORTVERSION:R}/ \
 		GNU
 
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Nano's ANOther editor, an enhanced free Pico clone
 
 LICENSE=	GPLv3
 
 CONFLICTS=	nano-2*
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--docdir=${DOCSDIR} --enable-utf8
 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
 NLS_CONFIGURE_ENABLE=	nls
 
 INFO=		nano
 
 PORTSCOUT=	limitw:1,odd
 
 post-build:
 	cd ${WRKSRC}/doc/man; ${REINPLACE_CMD} \
 		-e 's:SYSCONFDIR:${PREFIX}/etc:g' \
 		-e 's:EXAMPLESDIR:${EXAMPLESDIR}:g' \
 		nano.1 rnano.1 nanorc.5 ${WRKSRC}/doc/texinfo/${INFO:=.info}
 	${REINPLACE_CMD} -e 's/\\</[[:<:]]/g' -e 's/\\>/[[:>:]]/g' \
 		${WRKSRC}/doc/syntax/*.nanorc
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/nanorc.sample ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/editors/nano-devel/distinfo
===================================================================
--- head/editors/nano-devel/distinfo	(revision 403679)
+++ head/editors/nano-devel/distinfo	(revision 403680)
@@ -1,2 +1,2 @@
-SHA256 (nano-2.3.6.tar.gz) = a74bf3f18b12c1c777ae737c0e463152439e381aba8720b4bc67449f36a09534
-SIZE (nano-2.3.6.tar.gz) = 1816012
+SHA256 (nano-2.5.0.tar.gz) = ff323e6fef74caf0a924304841c07ac65ec30db99dc5c1f8272b4c536a5c89ee
+SIZE (nano-2.5.0.tar.gz) = 1909625
Index: head/editors/nano-devel/pkg-plist
===================================================================
--- head/editors/nano-devel/pkg-plist	(revision 403679)
+++ head/editors/nano-devel/pkg-plist	(revision 403680)
@@ -1,85 +1,88 @@
 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
 %%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
 %%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
 %%NLS%%share/locale/nn/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/nano.mo
 %%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/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
 %%NLS%%share/locale/uk/LC_MESSAGES/nano.mo
 %%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
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/nano.1.html
-%%PORTDOCS%%%%DOCSDIR%%/nanorc.5.html
-%%PORTDOCS%%%%DOCSDIR%%/rnano.1.html
-%%PORTEXAMPLES%%%%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%%/elisp.nanorc
 %%DATADIR%%/fortran.nanorc
 %%DATADIR%%/gentoo.nanorc
 %%DATADIR%%/go.nanorc
 %%DATADIR%%/groff.nanorc
+%%DATADIR%%/guile.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
 %%DATADIR%%/mutt.nanorc
 %%DATADIR%%/nanorc.nanorc
 %%DATADIR%%/objc.nanorc
 %%DATADIR%%/ocaml.nanorc
 %%DATADIR%%/patch.nanorc
 %%DATADIR%%/perl.nanorc
 %%DATADIR%%/php.nanorc
 %%DATADIR%%/po.nanorc
+%%DATADIR%%/postgresql.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
-%%NLS%%%%DOCSDIR%%/fr/nano.1.html
-%%NLS%%%%DOCSDIR%%/fr/nanorc.5.html
-%%NLS%%%%DOCSDIR%%/fr/rnano.1.html