diff --git a/app-editors/nano/nano-2.5.1.recipe b/app-editors/nano/nano-2.5.2.recipe similarity index 89% rename from app-editors/nano/nano-2.5.1.recipe rename to app-editors/nano/nano-2.5.2.recipe index 6c0799598..4aecbc68f 100644 --- a/app-editors/nano/nano-2.5.1.recipe +++ b/app-editors/nano/nano-2.5.2.recipe @@ -10,11 +10,11 @@ functionality. Features include: - Warnings for un-writable files - More syntax highlighting samples (Fortran, objC, OCaml, Makefiles)" HOMEPAGE="http://www.nano-editor.org/" -COPYRIGHT="1999-2010 Free Software Foundation, Inc." +COPYRIGHT="1999-2016 Free Software Foundation, Inc." LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="http://www.nano-editor.org/dist/v2.5/nano-$portVersion.tar.gz" -CHECKSUM_SHA256="e06fca01bf183f4d531aa65a28dffc0e2d10185239909eb3de797023f3453bde" +CHECKSUM_SHA256="89bd6ac5120880d2a95431d8bad22bf92c7ccbf10b8f1716d4ea062f3faeeb41" PATCHES="nano-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/app-editors/nano/patches/nano-2.5.1.patchset b/app-editors/nano/patches/nano-2.5.2.patchset similarity index 76% rename from app-editors/nano/patches/nano-2.5.1.patchset rename to app-editors/nano/patches/nano-2.5.2.patchset index 821019d1a..e3a0149c4 100644 --- a/app-editors/nano/patches/nano-2.5.1.patchset +++ b/app-editors/nano/patches/nano-2.5.2.patchset @@ -1,30 +1,14 @@ -From 015bc8bd3d1b155e54b4e588acacd2ccd98892e6 Mon Sep 17 00:00:00 2001 +From f80a591de9d191ac3d0d86e2a0cb641f8b7b8f7a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 23 Mar 2015 17:20:54 +0000 Subject: Haiku patch -diff --git a/src/files.c b/src/files.c -index a027763..46ae935 100644 ---- a/src/files.c -+++ b/src/files.c -@@ -1198,10 +1198,10 @@ void do_insertfile( - - #if !defined(DISABLE_MULTIBUFFER) && !defined(DISABLE_HISTORIES) - if (ISSET(MULTIBUFFER)) { -+ ssize_t savedposline, savedposcol; - /* Update the screen to account for the current buffer. */ - display_buffer(); - -- ssize_t savedposline, savedposcol; - if (ISSET(POS_HISTORY) && - #ifndef NANO_TINY - !execute && diff --git a/src/nano.c b/src/nano.c -index 42d187c..dbf61e0 100644 +index 3e26ae5..b151fb2 100644 --- a/src/nano.c +++ b/src/nano.c -@@ -2571,6 +2571,7 @@ int main(int argc, char **argv) +@@ -2558,6 +2558,7 @@ int main(int argc, char **argv) #endif #if !defined(NANO_TINY) && defined(HAVE_KEY_DEFINED) @@ -32,7 +16,7 @@ index 42d187c..dbf61e0 100644 const char *keyvalue; /* Ask ncurses for the key codes for Control+Left and Control+Right. */ keyvalue = tigetstr("kLFT5"); -@@ -2579,6 +2580,7 @@ int main(int argc, char **argv) +@@ -2566,6 +2567,7 @@ int main(int argc, char **argv) keyvalue = tigetstr("kRIT5"); if (keyvalue != 0 && keyvalue != (char *)-1) controlright = key_defined(keyvalue); @@ -41,7 +25,7 @@ index 42d187c..dbf61e0 100644 #ifdef DEBUG diff --git a/src/text.c b/src/text.c -index 067a134..5be2d18 100644 +index 5ed326d..9f3491c 100644 --- a/src/text.c +++ b/src/text.c @@ -441,11 +441,12 @@ void undo_cut(undo *u) @@ -75,7 +59,7 @@ index 067a134..5be2d18 100644 if (!f) { statusbar(_("Internal error: can't match line %d. " "Please save your work."), u->mark_begin_lineno); -@@ -566,6 +568,7 @@ void do_undo(void) +@@ -568,6 +570,7 @@ void do_undo(void) break; case INSERT: undidmsg = _("text insert"); @@ -83,7 +67,7 @@ index 067a134..5be2d18 100644 filestruct *oldcutbuffer = cutbuffer, *oldcutbottom = cutbottom; cutbuffer = NULL; cutbottom = NULL; -@@ -584,6 +587,7 @@ void do_undo(void) +@@ -586,6 +589,7 @@ void do_undo(void) cutbuffer = oldcutbuffer; cutbottom = oldcutbottom; openfile->mark_set = FALSE; @@ -91,7 +75,7 @@ index 067a134..5be2d18 100644 break; case REPLACE: undidmsg = _("text replace"); -@@ -611,6 +615,8 @@ void do_undo(void) +@@ -613,6 +617,8 @@ void do_undo(void) /* Redo the last thing(s) we undid. */ void do_redo(void) { @@ -100,7 +84,7 @@ index 067a134..5be2d18 100644 char *data, *redidmsg = NULL; undo *u = openfile->undotop; -@@ -628,7 +634,7 @@ void do_redo(void) +@@ -630,7 +636,7 @@ void do_redo(void) return; } @@ -109,7 +93,7 @@ index 067a134..5be2d18 100644 if (!f) { statusbar(_("Internal error: can't match line %d. " "Please save your work."), u->mark_begin_lineno); -@@ -662,7 +668,7 @@ void do_redo(void) +@@ -664,7 +670,7 @@ void do_redo(void) break; case ENTER: redidmsg = _("line break"); @@ -118,7 +102,7 @@ index 067a134..5be2d18 100644 shoveline->data = mallocstrcpy(NULL, u->strdata); data = mallocstrncpy(NULL, f->data, u->begin + 1); data[u->begin] = '\0'; -@@ -1112,6 +1118,7 @@ fprintf(stderr, " >> Updating... action = %d, openfile->last_action = %d, openf +@@ -1117,6 +1123,7 @@ fprintf(stderr, " >> Updating... action = %d, openfile->last_action = %d, openf free_filestruct(u->cutbuffer); u->cutbuffer = copy_filestruct(cutbuffer); if (u->mark_set) { @@ -126,7 +110,7 @@ index 067a134..5be2d18 100644 /* If the "marking" operation was from right-->left or * bottom-->top, then swap the mark points. */ if ((u->lineno == u->mark_begin_lineno && u->begin < u->mark_begin_x) -@@ -1120,7 +1127,7 @@ fprintf(stderr, " >> Updating... action = %d, openfile->last_action = %d, openf +@@ -1125,7 +1132,7 @@ fprintf(stderr, " >> Updating... action = %d, openfile->last_action = %d, openf u->begin = u->mark_begin_x; u->mark_begin_x = x_loc; @@ -135,7 +119,7 @@ index 067a134..5be2d18 100644 u->lineno = u->mark_begin_lineno; u->mark_begin_lineno = line; } else -@@ -1201,6 +1208,8 @@ bool do_wrap(filestruct *line) +@@ -1206,6 +1213,8 @@ bool do_wrap(filestruct *line) /* The next line, minus indentation. */ size_t next_line_len = 0; /* The length of next_line. */ @@ -144,7 +128,7 @@ index 067a134..5be2d18 100644 /* There are three steps. First, we decide where to wrap. Then, we * create the new wrap line. Finally, we clean up. */ -@@ -1248,8 +1257,8 @@ bool do_wrap(filestruct *line) +@@ -1253,8 +1262,8 @@ bool do_wrap(filestruct *line) add_undo(SPLIT_BEGIN); #endif