nano: bump version.

app-editors/nano/nano-2.5.1.recipe

@@ -14,7 +14,7 @@ COPYRIGHT="1999-2010 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="ff323e6fef74caf0a924304841c07ac65ec30db99dc5c1f8272b4c536a5c89ee"
+CHECKSUM_SHA256="e06fca01bf183f4d531aa65a28dffc0e2d10185239909eb3de797023f3453bde"
 PATCHES="nano-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"

app-editors/nano/patches/nano-2.5.1.patchset

@@ -1,14 +1,14 @@
-From 400d995a9c4acb135dd6febcd9494c44969d259e Mon Sep 17 00:00:00 2001
+From 015bc8bd3d1b155e54b4e588acacd2ccd98892e6 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 23 Mar 2015 17:20:54 +0000
 Subject: Haiku patch
 
 
 diff --git a/src/files.c b/src/files.c
-index 481ffeb..3cd4af0 100644
+index a027763..46ae935 100644
 --- a/src/files.c
 +++ b/src/files.c
-@@ -1212,10 +1212,10 @@ void do_insertfile(
+@@ -1198,10 +1198,10 @@ void do_insertfile(
  
  #if !defined(DISABLE_MULTIBUFFER) && !defined(DISABLE_HISTORIES)
  	    if (ISSET(MULTIBUFFER)) {
@@ -20,11 +20,31 @@ index 481ffeb..3cd4af0 100644
  		if (ISSET(POS_HISTORY) &&
  #ifndef NANO_TINY
  			!execute &&
+diff --git a/src/nano.c b/src/nano.c
+index 42d187c..dbf61e0 100644
+--- a/src/nano.c
++++ b/src/nano.c
+@@ -2571,6 +2571,7 @@ int main(int argc, char **argv)
+ #endif
+ 
+ #if !defined(NANO_TINY) && defined(HAVE_KEY_DEFINED)
++{
+     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)
+     keyvalue = tigetstr("kRIT5");
+     if (keyvalue != 0 && keyvalue != (char *)-1)
+ 	controlright = key_defined(keyvalue);
++}
+ #endif
+ 
+ #ifdef DEBUG
 diff --git a/src/text.c b/src/text.c
-index a798521..85d7ed7 100644
+index 067a134..5be2d18 100644
 --- a/src/text.c
 +++ b/src/text.c
-@@ -446,11 +446,12 @@ void undo_cut(undo *u)
+@@ -441,11 +441,12 @@ void undo_cut(undo *u)
  /* Redo a cut, or undo an uncut. */
  void redo_cut(undo *u)
  {
@@ -38,7 +58,7 @@ index a798521..85d7ed7 100644
      cutbuffer = cutbottom = NULL;
  
      goto_line_posx(u->lineno, u->begin);
-@@ -473,6 +474,7 @@ void redo_cut(undo *u)
+@@ -468,6 +469,7 @@ void redo_cut(undo *u)
  /* Undo the last thing(s) we did. */
  void do_undo(void)
  {
@@ -46,7 +66,7 @@ index a798521..85d7ed7 100644
      undo *u = openfile->current_undo;
      filestruct *t = NULL;
      char *data, *undidmsg = NULL;
-@@ -482,7 +484,7 @@ void do_undo(void)
+@@ -477,7 +479,7 @@ void do_undo(void)
  	return;
      }
  
@@ -55,7 +75,7 @@ index a798521..85d7ed7 100644
      if (!f) {
  	statusbar(_("Internal error: can't match line %d.  "
  			"Please save your work."), u->mark_begin_lineno);
-@@ -575,6 +577,7 @@ void do_undo(void)
+@@ -566,6 +568,7 @@ void do_undo(void)
  	break;
      case INSERT:
  	undidmsg = _("text insert");
@@ -63,7 +83,7 @@ index a798521..85d7ed7 100644
  	filestruct *oldcutbuffer = cutbuffer, *oldcutbottom = cutbottom;
  	cutbuffer = NULL;
  	cutbottom = NULL;
-@@ -593,6 +596,7 @@ void do_undo(void)
+@@ -584,6 +587,7 @@ void do_undo(void)
  	cutbuffer = oldcutbuffer;
  	cutbottom = oldcutbottom;
  	openfile->mark_set = FALSE;
@@ -71,7 +91,7 @@ index a798521..85d7ed7 100644
  	break;
      case REPLACE:
  	undidmsg = _("text replace");
-@@ -620,6 +624,8 @@ void do_undo(void)
+@@ -611,6 +615,8 @@ void do_undo(void)
  /* Redo the last thing(s) we undid. */
  void do_redo(void)
  {
@@ -80,7 +100,7 @@ index a798521..85d7ed7 100644
      char *data, *redidmsg = NULL;
      undo *u = openfile->undotop;
  
-@@ -637,7 +643,7 @@ void do_redo(void)
+@@ -628,7 +634,7 @@ void do_redo(void)
  	return;
      }
  
@@ -89,7 +109,7 @@ index a798521..85d7ed7 100644
      if (!f) {
  	statusbar(_("Internal error: can't match line %d.  "
  			"Please save your work."), u->mark_begin_lineno);
-@@ -671,7 +677,7 @@ void do_redo(void)
+@@ -662,7 +668,7 @@ void do_redo(void)
  	break;
      case ENTER:
  	redidmsg = _("line break");
@@ -98,7 +118,7 @@ index a798521..85d7ed7 100644
  	shoveline->data = mallocstrcpy(NULL, u->strdata);
  	data = mallocstrncpy(NULL, f->data, u->begin + 1);
  	data[u->begin] = '\0';
-@@ -1128,6 +1134,7 @@ fprintf(stderr, "  >> Updating... action = %d, openfile->last_action = %d, openf
+@@ -1112,6 +1118,7 @@ fprintf(stderr, "  >> Updating... action = %d, openfile->last_action = %d, openf
  	    free_filestruct(u->cutbuffer);
  	u->cutbuffer = copy_filestruct(cutbuffer);
  	if (u->mark_set) {
@@ -106,7 +126,7 @@ index a798521..85d7ed7 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)
-@@ -1136,7 +1143,7 @@ fprintf(stderr, "  >> Updating... action = %d, openfile->last_action = %d, openf
+@@ -1120,7 +1127,7 @@ fprintf(stderr, "  >> Updating... action = %d, openfile->last_action = %d, openf
  		u->begin = u->mark_begin_x;
  		u->mark_begin_x = x_loc;
  
@@ -115,7 +135,7 @@ index a798521..85d7ed7 100644
  		u->lineno = u->mark_begin_lineno;
  		u->mark_begin_lineno = line;
  	    } else
-@@ -1217,6 +1224,8 @@ bool do_wrap(filestruct *line)
+@@ -1201,6 +1208,8 @@ bool do_wrap(filestruct *line)
  	/* The next line, minus indentation. */
      size_t next_line_len = 0;
  	/* The length of next_line. */
@@ -124,7 +144,7 @@ index a798521..85d7ed7 100644
  
      /* There are three steps.  First, we decide where to wrap.  Then, we
       * create the new wrap line.  Finally, we clean up. */
-@@ -1264,8 +1273,8 @@ bool do_wrap(filestruct *line)
+@@ -1248,8 +1257,8 @@ bool do_wrap(filestruct *line)
      add_undo(SPLIT_BEGIN);
  #endif
  
@@ -136,5 +156,5 @@ index a798521..85d7ed7 100644
  
      /* Step 2, making the new wrap line.  It will consist of indentation
 -- 
-2.2.2
+2.7.0