From eff58b25f0024ae534f0d7763bb54ad2a6d99fb9 Mon Sep 17 00:00:00 2001 From: obache Date: Wed, 24 Oct 2007 15:28:38 +0000 Subject: Update nano to 2.0.6. Based on patch provided by Jason White in PR 37133. * Added patch to work with NetBSD's curses. * Added ncuesesw option. * IRIX now require glib2, not glib. The 2.0 release of GNU nano is a major leap forward in usability and features, building on the 1.3 branch. The following improvemens and features are available in version 2.0 include: * UTF-8 support. * Improved color syntax highlighting. * Copy text without cutting.. * Verbatim input mode. * Repeat last seach w/o confirmation (Meta-W) * Spell check/replace selected text only * Indent marked text * Move to beginning/end of paragraph * Search within the file browser * Mixed file format auto-conversion --- editors/nano/Makefile | 18 ++++++++++-------- editors/nano/PLIST | 28 +++++++++++++++++++++++++++- editors/nano/distinfo | 9 +++++---- editors/nano/options.mk | 12 ++++++++++++ editors/nano/patches/patch-aa | 20 ++++++++++++++++++++ 5 files changed, 74 insertions(+), 13 deletions(-) create mode 100644 editors/nano/options.mk create mode 100644 editors/nano/patches/patch-aa (limited to 'editors') diff --git a/editors/nano/Makefile b/editors/nano/Makefile index 7a797c231fa..7f2637678c6 100644 --- a/editors/nano/Makefile +++ b/editors/nano/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.28 2007/10/14 13:30:45 obache Exp $ +# $NetBSD: Makefile,v 1.29 2007/10/24 15:28:38 obache Exp $ -DISTNAME= nano-1.2.5 +DISTNAME= nano-2.0.6 CATEGORIES= editors -MASTER_SITES= http://www.nano-editor.org/dist/v1.2/ +MASTER_SITES= http://www.nano-editor.org/dist/v2.0/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.nano-editor.org/ @@ -11,22 +11,24 @@ COMMENT= Small and friendly text editor (a free replacement for Pico) GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= msgfmt +USE_NCURSES= yes -INFO_FILES= yes +INFO_FILES= yes CONFIGURE_ARGS+= --enable-color CONFIGURE_ARGS+= --enable-multibuffer CONFIGURE_ARGS+= --enable-nanorc CONFIGURE_ARGS+= --enable-extra -# Looks like that IRIX 5.x lacks snprintf()/vsnprintf() functions, -# which are required to make this work, so glib is used instead. +# Looks like that IRIX 5.x lacks vsnprintf() functions, +# which are required to make this work, so glib2 is used instead. .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_PLATFORM:MIRIX-5*) -. include "../../devel/glib/buildlink3.mk" +. include "../../devel/glib2/buildlink3.mk" .endif +.include "options.mk" + .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/nano/PLIST b/editors/nano/PLIST index 197b551526e..9e2285e8a1c 100644 --- a/editors/nano/PLIST +++ b/editors/nano/PLIST @@ -1,8 +1,14 @@ -@comment $NetBSD: PLIST,v 1.11 2006/04/17 07:07:18 jlam Exp $ +@comment $NetBSD: PLIST,v 1.12 2007/10/24 15:28:38 obache Exp $ bin/nano +bin/rnano info/nano.info +man/fr/man1/nano.1 +man/fr/man1/rnano.1 +man/fr/man5/nanorc.5 man/man1/nano.1 +man/man1/rnano.1 man/man5/nanorc.5 +share/locale/bg/LC_MESSAGES/nano.mo share/locale/ca/LC_MESSAGES/nano.mo share/locale/cs/LC_MESSAGES/nano.mo share/locale/da/LC_MESSAGES/nano.mo @@ -11,6 +17,7 @@ share/locale/es/LC_MESSAGES/nano.mo share/locale/eu/LC_MESSAGES/nano.mo share/locale/fi/LC_MESSAGES/nano.mo share/locale/fr/LC_MESSAGES/nano.mo +share/locale/ga/LC_MESSAGES/nano.mo share/locale/gl/LC_MESSAGES/nano.mo share/locale/hu/LC_MESSAGES/nano.mo share/locale/id/LC_MESSAGES/nano.mo @@ -23,7 +30,26 @@ share/locale/pl/LC_MESSAGES/nano.mo share/locale/pt_BR/LC_MESSAGES/nano.mo share/locale/ro/LC_MESSAGES/nano.mo share/locale/ru/LC_MESSAGES/nano.mo +share/locale/rw/LC_MESSAGES/nano.mo share/locale/sr/LC_MESSAGES/nano.mo share/locale/sv/LC_MESSAGES/nano.mo share/locale/tr/LC_MESSAGES/nano.mo share/locale/uk/LC_MESSAGES/nano.mo +share/locale/vi/LC_MESSAGES/nano.mo +share/locale/zh_TW/LC_MESSAGES/nano.mo +share/nano/asm.nanorc +share/nano/c.nanorc +share/nano/groff.nanorc +share/nano/html.nanorc +share/nano/java.nanorc +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 diff --git a/editors/nano/distinfo b/editors/nano/distinfo index c62534fff11..89ea0db9881 100644 --- a/editors/nano/distinfo +++ b/editors/nano/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.11 2007/10/14 13:30:46 obache Exp $ +$NetBSD: distinfo,v 1.12 2007/10/24 15:28:38 obache Exp $ -SHA1 (nano-1.2.5.tar.gz) = ba55942aacf9f296a910d8f73afb7446f118830d -RMD160 (nano-1.2.5.tar.gz) = 92d694b79588fafdedc2731c2e1240bb100950f9 -Size (nano-1.2.5.tar.gz) = 911938 bytes +SHA1 (nano-2.0.6.tar.gz) = 00102580404cdb1c8594e5f6193000d5acac2249 +RMD160 (nano-2.0.6.tar.gz) = 858dc7cf7137cc2b19e9084a503fe508ef734381 +Size (nano-2.0.6.tar.gz) = 1315207 bytes +SHA1 (patch-aa) = 0d6ed0ab2df9bdef495b26e63ee1a3cac41d7d1b diff --git a/editors/nano/options.mk b/editors/nano/options.mk new file mode 100644 index 00000000000..fd9cdfd813b --- /dev/null +++ b/editors/nano/options.mk @@ -0,0 +1,12 @@ +# $NetBSD: options.mk,v 1.1 2007/10/24 15:28:38 obache Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.nano +PKG_SUPPORTED_OPTIONS= ncursesw + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mncursesw) +. include "../../devel/ncursesw/buildlink3.mk" +.else +. include "../../mk/curses.buildlink3.mk" +.endif diff --git a/editors/nano/patches/patch-aa b/editors/nano/patches/patch-aa new file mode 100644 index 00000000000..00bf3ac0787 --- /dev/null +++ b/editors/nano/patches/patch-aa @@ -0,0 +1,20 @@ +$NetBSD: patch-aa,v 1.6 2007/10/24 15:28:38 obache Exp $ + +--- src/nano.c.orig 2007-01-12 02:58:12.000000000 +0000 ++++ src/nano.c +@@ -1280,6 +1280,7 @@ void terminal_init(void) + cbreak(); + nonl(); + noecho(); ++ raw(); + disable_extended_io(); + disable_signals(); + if (!ISSET(PRESERVE)) +@@ -2230,6 +2231,7 @@ int main(int argc, char **argv) + + /* Make sure the cursor is in the edit window. */ + reset_cursor(); ++ wrefresh(edit); + + #ifndef NANO_TINY + if (!jump_buf_main) { -- cgit v1.2.3