svn commit: r335823 - head/misc/mc/files

[Rusmir Dusko]

Author: nemysis
Date: Sat Dec  7 10:27:08 2013
New Revision: 335823
URL: http://svnweb.freebsd.org/changeset/ports/335823

Log:
  - Fix build with Option NCURSES, add patches
  
  Reported by:	"Herbert J. Skuhra" <hskuhra at eumx.net>
  Approved by:	pawel / wg (mentors, implicit)

Added:
  head/misc/mc/files/patch-lib__tty__key.c   (contents, props changed)
  head/misc/mc/files/patch-lib__tty__tty-ncurses.c   (contents, props changed)
  head/misc/mc/files/patch-lib__tty__win.c   (contents, props changed)
Deleted:
  head/misc/mc/files/patch-lib-tty-win.c

Added: head/misc/mc/files/patch-lib__tty__key.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/mc/files/patch-lib__tty__key.c	Sat Dec  7 10:27:08 2013	(r335823)
@@ -0,0 +1,18 @@
+--- ./lib/tty/key.c.orig	2013-11-29 19:27:07.000000000 +0100
++++ ./lib/tty/key.c	2013-12-07 10:51:45.000000000 +0100
+@@ -1946,6 +1946,7 @@
+ tty_get_event (struct Gpm_Event *event, gboolean redo_event, gboolean block)
+ {
+     int c;
++    static int flag = 0;        /* Return value from select */
+ #ifdef HAVE_LIBGPM
+     static struct Gpm_Event ev; /* Mouse event */
+ #endif
+@@ -1978,7 +1979,6 @@
+     while (pending_keys == NULL)
+     {
+         int nfd;
+-        static int flag = 0;    /* Return value from select */
+         fd_set select_set;
+ 
+         FD_ZERO (&select_set);

Added: head/misc/mc/files/patch-lib__tty__tty-ncurses.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/mc/files/patch-lib__tty__tty-ncurses.c	Sat Dec  7 10:27:08 2013	(r335823)
@@ -0,0 +1,26 @@
+--- ./lib/tty/tty-ncurses.c.orig	2013-11-29 19:27:07.000000000 +0100
++++ ./lib/tty/tty-ncurses.c	2013-12-07 10:50:19.000000000 +0100
+@@ -49,6 +49,7 @@
+ #include "tty-internal.h"       /* mc_tty_normalize_from_utf8() */
+ #include "tty.h"
+ #include "color-internal.h"
++#include "key.h"
+ #include "mouse.h"
+ #include "win.h"
+ 
+@@ -530,6 +531,7 @@
+     if (mc_global.utf8_display || c > 255)
+     {
+         int res;
++        unsigned char str[UTF8_CHAR_LEN + 1];
+ 
+         res = g_unichar_to_utf8 (c, (char *) str);
+         if (res == 0)
+@@ -540,7 +542,6 @@
+         }
+         else
+         {
+-            unsigned char str[UTF8_CHAR_LEN + 1];
+             const char *s;
+ 
+             str[res] = '\0';

Added: head/misc/mc/files/patch-lib__tty__win.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/mc/files/patch-lib__tty__win.c	Sat Dec  7 10:27:08 2013	(r335823)
@@ -0,0 +1,20 @@
+--- ./lib/tty/win.c.orig	2013-09-02 19:13:32.000000000 +0200
++++ ./lib/tty/win.c	2013-12-07 10:33:20.000000000 +0100
+@@ -96,7 +96,7 @@
+ void
+ do_enter_ca_mode (void)
+ {
+-    if (mc_global.tty.xterm_flag && smcup != NULL)
++    if (mc_global.tty.xterm_flag)
+     {
+         fprintf (stdout, /* ESC_STR ")0" */ ESC_STR "7" ESC_STR "[?47h");
+         fflush (stdout);
+@@ -108,7 +108,7 @@
+ void
+ do_exit_ca_mode (void)
+ {
+-    if (mc_global.tty.xterm_flag && rmcup != NULL)
++    if (mc_global.tty.xterm_flag)
+     {
+         fprintf (stdout, ESC_STR "[?47l" ESC_STR "8" ESC_STR "[m");
+         fflush (stdout);