5 files changed, 11 insertions, 48 deletions

diff --git a/editors/nano-devel/Makefile b/editors/nano-devel/Makefile
index 1debf5c5fcc8..de25f844e507 100644
--- a/editors/nano-devel/Makefile
+++ b/editors/nano-devel/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	nano-devel
-PORTVERSION=	2.1.9
-PORTREVISION=	1
+PORTNAME=	nano
+PORTVERSION=	2.1.10
 CATEGORIES=	editors
 MASTER_SITES=	http://www.nano-editor.org/dist/v2.1/ \
 		http://www.ewtoo.org/~astyanax/nano/dist/v2.1/
+PKGNAMESUFFIX=	-devel
 DISTNAME=	nano-${PORTVERSION}
 
 MAINTAINER=	EitanAdlerList@gmail.com
@@ -19,7 +19,6 @@ COMMENT=	Nano's ANOther editor, an enhanced free Pico clone
 CONFLICTS=	nano-2*
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-all --enable-rc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/editors/nano-devel/distinfo b/editors/nano-devel/distinfo
index d5bac1d1f472..174de8759fdb 100644
--- a/editors/nano-devel/distinfo
+++ b/editors/nano-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (nano-2.1.9.tar.gz) = 41e9ffb4a055eba666cdb17c4e50ba21
-SHA256 (nano-2.1.9.tar.gz) = eb49281f0db551311d22cb47087963b870b864046bfc7e7f8b46671bace81e34
-SIZE (nano-2.1.9.tar.gz) = 1483856
+MD5 (nano-2.1.10.tar.gz) = f55bd9efeccf9da98950b54a4b0d872e
+SHA256 (nano-2.1.10.tar.gz) = 03af11adace9f6c482a06f5304c5aba5d134972a416ce4368307b604420b2e40
+SIZE (nano-2.1.10.tar.gz) = 1478204
diff --git a/editors/nano-devel/files/patch-doc_man_Makefile.in b/editors/nano-devel/files/patch-doc_man_Makefile.in
deleted file mode 100644
index 4d9f6ec9fbbd..000000000000
--- a/editors/nano-devel/files/patch-doc_man_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- doc/man/Makefile.in.orig
-+++ doc/man/Makefile.in
-@@ -630,11 +630,11 @@
- 
- 
- @GROFF_HTML_TRUE@nano.1.html: nano.1
--@GROFF_HTML_TRUE@	groff -t -mandoc -Thtml < $< > $@
-+@GROFF_HTML_TRUE@	groff -t -mandoc -Thtml < $? > $@
- @GROFF_HTML_TRUE@nanorc.5.html: nanorc.5
--@GROFF_HTML_TRUE@	groff -t -mandoc -Thtml < $< > $@
-+@GROFF_HTML_TRUE@	groff -t -mandoc -Thtml < $? > $@
- @GROFF_HTML_TRUE@rnano.1.html: rnano.1
--@GROFF_HTML_TRUE@	groff -t -mandoc -Thtml < $< > $@
-+@GROFF_HTML_TRUE@	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-devel/files/patch-doc_man_fr_Makefile.in b/editors/nano-devel/files/patch-doc_man_fr_Makefile.in
deleted file mode 100644
index 7a8b96fe6880..000000000000
--- a/editors/nano-devel/files/patch-doc_man_fr_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/editors/nano-devel/files/Attic/patch-doc_man_fr_Makefile.in,v 1.1 2008-11-16 23:59:19 wxs Exp $
-
---- doc/man/fr/Makefile.in.orig
-+++ doc/man/fr/Makefile.in
-@@ -434,11 +434,11 @@
- 
- 
- 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-devel/pkg-plist b/editors/nano-devel/pkg-plist
index 40ff24173937..c58fe7ec3d82 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.2 2009-02-20 18:46:39 naddy Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/editors/nano-devel/pkg-plist,v 1.3 2009-08-12 18:57:33 tabthorpe Exp $
 bin/nano
 bin/rnano
 %%NLS%%share/locale/bg/LC_MESSAGES/nano.mo
@@ -47,6 +47,9 @@ 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
@@ -60,6 +63,7 @@ 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
 @dirrm %%EXAMPLESDIR%%