3 files changed, 46 insertions, 43 deletions

diff --git a/editors/nano-devel/Makefile b/editors/nano-devel/Makefile
index 16c14efc2838..be1b5a518194 100644
--- a/editors/nano-devel/Makefile
+++ b/editors/nano-devel/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	nano
-PORTVERSION=	2.1.99
+PORTVERSION=	2.3.0
 PORTREVISION=	1
 CATEGORIES=	editors
-MASTER_SITES=	http://www.nano-editor.org/dist/v2.1/ \
-		http://www.ewtoo.org/~astyanax/nano/dist/v2.1/
+MASTER_SITES=	http://www.nano-editor.org/dist/v${PORTVERSION:R}/ \
+		http://www.ewtoo.org/~astyanax/nano/dist/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	nano-${PORTVERSION}pre2
+#DISTNAME=	nano-${PORTVERSION}pre2
 
 MAINTAINER=	ports@eitanadler.com
 COMMENT=	Nano's ANOther editor, an enhanced free Pico clone
@@ -39,7 +39,7 @@ MAN5=		nanorc.5
 .include <bsd.port.pre.mk>
 
 # requires wide character curses
-.if (${OSVERSION} < 602107) || (${OSVERSION} >= 700000 && ${OSVERSION} < 700033)
+.if (${OSVERSION} >= 700000 && ${OSVERSION} < 700033)
 CONFIGURE_ARGS+=--disable-utf8
 .else
 CONFIGURE_ARGS+=--enable-utf8
diff --git a/editors/nano-devel/distinfo b/editors/nano-devel/distinfo
index af0660abeb2b..ffc3003bbdf6 100644
--- a/editors/nano-devel/distinfo
+++ b/editors/nano-devel/distinfo
@@ -1,3 +1,2 @@
-MD5 (nano-2.1.99pre2.tar.gz) = 989f8a09f889b88252ec3ce653e226e6
-SHA256 (nano-2.1.99pre2.tar.gz) = 1fe50e431149fab814b748bfcc17d62bf45505d081184c4646ad39238229ee57
-SIZE (nano-2.1.99pre2.tar.gz) = 1494546
+SHA256 (nano-2.3.0.tar.gz) = a4f764f3408ffe69c82c8cb295b61e1b6c11b4849ad11698699de3b5e04d79f3
+SIZE (nano-2.3.0.tar.gz) = 1591018
diff --git a/editors/nano-devel/pkg-plist b/editors/nano-devel/pkg-plist
index c58fe7ec3d82..04300c647088 100644
--- a/editors/nano-devel/pkg-plist
+++ b/editors/nano-devel/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/editors/nano-devel/pkg-plist,v 1.3 2009-08-12 18:57:33 tabthorpe Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/editors/nano-devel/pkg-plist,v 1.4 2011-03-04 14:10:27 miwi Exp $
 bin/nano
 bin/rnano
 %%NLS%%share/locale/bg/LC_MESSAGES/nano.mo
@@ -32,40 +32,44 @@ 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/fortran.nanorc
-share/nano/xml.nanorc
-share/nano/php.nanorc
-share/nano/tcl.nanorc
-share/nano/ocaml.nanorc
-share/nano/debian.nanorc
-share/nano/css.nanorc
-share/nano/objc.nanorc
-share/nano/gentoo.nanorc
-share/nano/asm.nanorc
-share/nano/c.nanorc
-share/nano/groff.nanorc
-share/nano/html.nanorc
-share/nano/java.nanorc
-share/nano/man-html/fr/nano.1.html
-share/nano/man-html/fr/nanorc.5.html
-share/nano/man-html/fr/rnano.1.html
-share/nano/man-html/nano.1.html
-share/nano/man-html/nanorc.5.html
-share/nano/man-html/rnano.1.html
-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/man-html/fr
-@dirrm share/nano/man-html
-@dirrm share/nano
+%%DATADIR%%/awk.nanorc
+%%DATADIR%%/cmake.nanorc
+%%DATADIR%%/fortran.nanorc
+%%DATADIR%%/xml.nanorc
+%%DATADIR%%/php.nanorc
+%%DATADIR%%/tcl.nanorc
+%%DATADIR%%/ocaml.nanorc
+%%DATADIR%%/debian.nanorc
+%%DATADIR%%/css.nanorc
+%%DATADIR%%/objc.nanorc
+%%DATADIR%%/gentoo.nanorc
+%%DATADIR%%/asm.nanorc
+%%DATADIR%%/c.nanorc
+%%DATADIR%%/groff.nanorc
+%%DATADIR%%/html.nanorc
+%%DATADIR%%/java.nanorc
+%%DATADIR%%/makefile.nanorc
+%%DATADIR%%/mgp.nanorc
+
+%%NLS%%%%DATADIR%%/man-html/fr/nano.1.html
+%%NLS%%%%DATADIR%%/man-html/fr/nanorc.5.html
+%%NLS%%%%DATADIR%%/man-html/fr/rnano.1.html
+%%DATADIR%%/man-html/nano.1.html
+%%DATADIR%%/man-html/nanorc.5.html
+%%DATADIR%%/man-html/rnano.1.html
+%%DATADIR%%/man.nanorc
+%%DATADIR%%/mutt.nanorc
+%%DATADIR%%/nanorc.nanorc
+%%DATADIR%%/patch.nanorc
+%%DATADIR%%/perl.nanorc
+%%DATADIR%%/pov.nanorc
+%%DATADIR%%/python.nanorc
+%%DATADIR%%/ruby.nanorc
+%%DATADIR%%/sh.nanorc
+%%DATADIR%%/tex.nanorc
+%%NLS%%@dirrm %%DATADIR%%/man-html/fr
+@dirrm %%DATADIR%%/man-html
+@dirrm %%DATADIR%%
 @dirrm %%EXAMPLESDIR%%
 %%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/rw